IntenseWebs/boringproxy
3
0
Fork 0
mirror of https://github.com/boringproxy/boringproxy.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Implement binding non-default ports

Browse Source 
Can now bind to ports other than 80/443, using the -http-port and
-https-port arguments.

Assuming you already have the certs you need, HTTPS even works.

Unfortunately you can't get the certs automatically because
LetsEncrypt doesn't support ports other than 80/443 as far as I
know.
This commit is contained in:
Anders Pitman 2021-12-20 12:56:50 -07:00
parent cf281fa7f2
commit 30358d7808
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
boringproxy.go
View File

@ -67,15 +67,21 @@ func checkPublicAddress(host string, port int) error {
}
}()
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", host, port))
addr := fmt.Sprintf("%s:%d", host, port)
conn, err := net.DialTimeout("tcp", addr, time.Second)
if err != nil {
return nil
return err
}
defer conn.Close()
go func() {
time.Sleep(time.Second)
conn.Close()
}()
data, err := io.ReadAll(conn)
if err != nil {
return nil
return errors.New(fmt.Sprintf("Error connecting to public address %s. Probably timed out", addr))
}
retCode := string(data)
@ -110,6 +116,8 @@ func Listen() {
sshServerPort := flagSet.Int("ssh-server-port", 22, "SSH Server Port")
certDir := flagSet.String("cert-dir", "", "TLS cert directory")
printLogin := flagSet.Bool("print-login", false, "Prints admin login information")
httpPort := flagSet.Int("http-port", 80, "HTTP (insecure) port")
httpsPort := flagSet.Int("https-port", 443, "HTTPS (secure) port")
err := flagSet.Parse(os.Args[2:])
if err != nil {
fmt.Fprintf(os.Stderr, "%s: parsing flags: %s\n", os.Args[0], err)
@ -122,12 +130,12 @@ func Listen() {
log.Fatal(err)
}
err = checkPublicAddress(ip, 80)
err = checkPublicAddress(ip, *httpPort)
if err != nil {
log.Fatal(err)
}
err = checkPublicAddress(ip, 443)
err = checkPublicAddress(ip, *httpsPort)
if err != nil {
log.Fatal(err)
}
@ -221,6 +229,11 @@ func Listen() {
timestamp := time.Now().Format(time.RFC3339)
srcIp := strings.Split(r.RemoteAddr, ":")[0]
fmt.Println(fmt.Sprintf("%s %s %s %s %s", timestamp, srcIp, r.Method, r.Host, r.URL.Path))
// TODO: handle ipv6
hostParts := strings.Split(r.Host, ":")
hostDomain := hostParts[0]
if r.URL.Path == "/dnsapi/requests" {
r.ParseForm()
@ -274,7 +287,7 @@ func Listen() {
http.Redirect(w, r, fmt.Sprintf("https://%s/edit-tunnel?domain=%s", adminDomain, domain), 303)
}
} else if r.Host == db.GetAdminDomain() {
} else if hostDomain == db.GetAdminDomain() {
if strings.HasPrefix(r.URL.Path, "/api/") {
http.StripPrefix("/api", api).ServeHTTP(w, r)
} else {
@ -282,9 +295,9 @@ func Listen() {
}
} else {
tunnel, exists := db.GetTunnel(r.Host)
tunnel, exists := db.GetTunnel(hostDomain)
if !exists {
errMessage := fmt.Sprintf("No tunnel attached to %s", r.Host)
errMessage := fmt.Sprintf("No tunnel attached to %s", hostDomain)
w.WriteHeader(500)
io.WriteString(w, errMessage)
return
@ -295,14 +308,14 @@ func Listen() {
})
go func() {
if err := http.ListenAndServe(":80", nil); err != nil {
if err := http.ListenAndServe(fmt.Sprintf(":%d", *httpPort), nil); err != nil {
log.Fatalf("ListenAndServe error: %v", err)
}
}()
go http.Serve(tlsListener, nil)
listener, err := net.Listen("tcp", ":443")
listener, err := net.Listen("tcp", fmt.Sprintf(":%d", *httpsPort))
if err != nil {
log.Fatal(err)
}