Add load balancer

api.go

@@ -274,9 +274,14 @@ func (a *Api) GetTunnel(tokenData TokenData, params url.Values) (Tunnel, error)
 		return Tunnel{}, errors.New("Invalid domain parameter")
 	}
 
-	tun, exists := a.db.GetTunnel(domain)
+	client := params.Get("client")
+	if client == "" {
+		return Tunnel{}, errors.New("Invalid client parameter")
+	}
+
+	tun, exists := a.db.GetTunnel(domain + "|" + client)
 	if !exists {
-		return Tunnel{}, errors.New("Tunnel doesn't exist for domain")
+		return Tunnel{}, errors.New("Tunnel doesn't exist for this domain|client combination")
 	}
 
 	user, _ := a.db.GetUser(tokenData.Owner)
@@ -389,6 +394,7 @@ func (a *Api) CreateTunnel(tokenData TokenData, params url.Values) (*Tunnel, err
 		AuthUsername:     username,
 		AuthPassword:     password,
 		TlsTermination:   tlsTerm,
+		Used:             false,
 	}
 
 	tunnel, err := a.tunMan.RequestCreateTunnel(request)
@@ -406,7 +412,12 @@ func (a *Api) DeleteTunnel(tokenData TokenData, params url.Values) error {
 		return errors.New("Invalid domain parameter")
 	}
 
-	tun, exists := a.db.GetTunnel(domain)
+	client := params.Get("client")
+	if client == "" {
+		return errors.New("Invalid client parameter")
+	}
+
+	tun, exists := a.db.GetTunnel(domain + "|" + client)
 	if !exists {
 		return errors.New("Tunnel doesn't exist")
 	}
@@ -418,7 +429,7 @@ func (a *Api) DeleteTunnel(tokenData TokenData, params url.Values) error {
 		}
 	}
 
-	a.tunMan.DeleteTunnel(domain)
+	a.tunMan.DeleteTunnel(domain + "|" + client)
 
 	return nil
 }

boringproxy.go

@@ -281,7 +281,7 @@ func Listen() {
 			}
 		} else {
 
-			tunnel, exists := db.GetTunnel(hostDomain)
+			tunnel, exists := db.SelectLoadBalancedTunnel(hostDomain)
 			if !exists {
 				errMessage := fmt.Sprintf("No tunnel attached to %s", hostDomain)
 				w.WriteHeader(500)
@@ -342,7 +342,7 @@ func (p *Server) handleConnection(clientConn net.Conn) {
 
 	passConn := NewProxyConn(clientConn, clientReader)
 
-	tunnel, exists := p.db.GetTunnel(clientHello.ServerName)
+	tunnel, exists := p.db.SelectLoadBalancedTunnel(clientHello.ServerName)
 
 	if exists && (tunnel.TlsTermination == "client" || tunnel.TlsTermination == "passthrough") || tunnel.TlsTermination == "client-tls" {
 		p.passthroughRequest(passConn, tunnel)

database.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"io/ioutil"
 	"log"
+	"strings"
 	"sync"
 
 	"github.com/takingnames/namedrop-go"
@@ -58,6 +59,7 @@ type Tunnel struct {
 	ClientName   string `json:"client_name"`
 	AuthUsername string `json:"auth_username"`
 	AuthPassword string `json:"auth_password"`
+	Used         bool
 }
 
 func NewDatabase() (*Database, error) {
@@ -223,6 +225,44 @@ func (d *Database) GetTunnels() map[string]Tunnel {
 	return tunnels
 }
 
+func (d *Database) SelectLoadBalancedTunnel(domain string) (Tunnel, bool) {
+	d.mutex.Lock()
+	defer d.mutex.Unlock()
+
+	tunnels := make(map[string]Tunnel)
+	for dom, tun := range d.Tunnels {
+		keys := strings.Split(dom, "|")
+		if domain == keys[0] {
+			tunnels[dom] = tun
+		}
+	}
+
+	// Load balance
+	for _, t := range tunnels {
+		if !t.Used {
+			t.Used = true
+			log.Printf("Routing to : %s|%s", t.Domain, t.ClientName)
+			return t, true
+		}
+	}
+
+	// Reset all used flags
+	count := 1
+	for _, t := range tunnels {
+		t.Used = false
+
+		if count == len(tunnels) {
+			t.Used = true
+			log.Printf("Routing to : %s|%s", t.Domain, t.ClientName)
+			return t, true
+		}
+		count += 1
+	}
+
+	// len(tunnels) is 0
+	return Tunnel{}, false
+}
+
 func (d *Database) GetTunnel(domain string) (Tunnel, bool) {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()

templates/tunnel.tmpl

@@ -30,8 +30,8 @@
 </div>
 
 <div class='button-row'>
-  <a class='button' href="/tunnel-private-key?domain={{$.Tunnel.Domain}}">Download Private Key</a>
+  <a class='button' href="/tunnel-private-key?domain={{$.Tunnel.Domain}}&client={{$.Tunnel.ClientName}}">Download Private Key</a>
-  <a class='button' href="/confirm-delete-tunnel?domain={{$.Tunnel.Domain}}">Delete</a>
+  <a class='button' href="/confirm-delete-tunnel?domain={{$.Tunnel.Domain}}&client={{$.Tunnel.ClientName}}">Delete</a>
 </div>
 
 {{ template "footer.tmpl" . }}

templates/tunnels.tmpl

@@ -4,7 +4,7 @@
   <div class='tn-tunnel-list-item'>
     <div class='tn-attribute'>
       <div class='tn-attribute__name'>Domain:</div>
-      <div class='tn-attribute__value'><a href='https://{{$domain}}'>{{$domain}}</a></div>
+      <div class='tn-attribute__value'><a href='https://{{$tunnel.Domain}}'>{{$tunnel.Domain}}</a></div>
     </div>
     <div class='tn-attribute'>
       <div class='tn-attribute__name'>Client:</div>
@@ -15,8 +15,8 @@
       <div class='tn-attribute__value'>{{$tunnel.ClientAddress}}:{{$tunnel.ClientPort}}</div>
     </div>
     <div class='button-row'>
-      <a class='button' href="/tunnels/{{$domain}}">View</a>
+      <a class='button' href="/tunnels/{{$tunnel.Domain}}/{{$tunnel.ClientName}}">View</a>
-      <a class='button' href="/confirm-delete-tunnel?domain={{$domain}}">Delete</a>
+      <a class='button' href="/confirm-delete-tunnel?domain={{$tunnel.Domain}}&client={{$tunnel.ClientName}}">Delete</a>
     </div>
   </div>
   {{ end }}
@@ -36,14 +36,14 @@
       {{range $domain, $tunnel:= .Tunnels}}
       <tr>
         <td class='tn-tunnel-table__cell'>
-          <a href='https://{{$domain}}'>{{$domain}}</a>
+          <a href='https://{{$tunnel.Domain}}'>{{$tunnel.Domain}}</a>
         </td>
         <td class='tn-tunnel-table__cell'>{{$tunnel.ClientName}}</td>
         <td class='tn-tunnel-table__cell'>{{$tunnel.ClientAddress}}:{{$tunnel.ClientPort}}</td>
         <td class='tn-tunnel-table__cell'>
           <div class='button-row'>
-            <a class='button' href="/tunnels/{{$domain}}">View</a>
+            <a class='button' href="/tunnels/{{$tunnel.Domain}}/{{$tunnel.ClientName}}">View</a>
-            <a class='button' href="/confirm-delete-tunnel?domain={{$domain}}">Delete</a>
+            <a class='button' href="/confirm-delete-tunnel?domain={{$tunnel.Domain}}&client={{$tunnel.ClientName}}">Delete</a>
           </div>
         </td>
       </tr>

tunnel_manager.go

@@ -8,14 +8,15 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"github.com/caddyserver/certmagic"
-	"golang.org/x/crypto/ssh"
 	"io/ioutil"
 	"log"
 	"os"
 	"os/user"
 	"strings"
 	"sync"
+
+	"github.com/caddyserver/certmagic"
+	"golang.org/x/crypto/ssh"
 )
 
 type TunnelManager struct {
@@ -34,9 +35,9 @@ func NewTunnelManager(config *Config, db *Database, certConfig *certmagic.Config
 	}
 
 	if config.autoCerts {
-		for domainName, tun := range db.GetTunnels() {
+		for _, tun := range db.GetTunnels() {
 			if tun.TlsTermination == "server" {
-				err = certConfig.ManageSync(context.Background(), []string{domainName})
+				err = certConfig.ManageSync(context.Background(), []string{tun.Domain})
 				if err != nil {
 					log.Println("CertMagic error at startup")
 					log.Println(err)
@@ -84,8 +85,8 @@ func (m *TunnelManager) RequestCreateTunnel(tunReq Tunnel) (Tunnel, error) {
 	}
 
 	for _, tun := range m.db.GetTunnels() {
-		if tunReq.Domain == tun.Domain {
+		if tunReq.Domain == tun.Domain && tunReq.ClientName == tun.ClientName {
-			return Tunnel{}, errors.New("Tunnel domain already in use")
+			return Tunnel{}, errors.New("Tunnel domain and client name combination already in use")
 		}
 
 		if tunReq.TunnelPort == tun.TunnelPort {
@@ -104,7 +105,7 @@ func (m *TunnelManager) RequestCreateTunnel(tunReq Tunnel) (Tunnel, error) {
 	tunReq.Username = m.user.Username
 	tunReq.TunnelPrivateKey = privKey
 
-	m.db.SetTunnel(tunReq.Domain, tunReq)
+	m.db.SetTunnel(tunReq.Domain+"|"+tunReq.ClientName, tunReq)
 
 	return tunReq, nil
 }

ui_handler.go

@@ -3,12 +3,15 @@ package boringproxy
 import (
 	"embed"
 	"encoding/base64"
+
 	//"encoding/json"
 	"fmt"
-	qrcode "github.com/skip2/go-qrcode"
 	"html/template"
 	"io"
 	"net/http"
+
+	qrcode "github.com/skip2/go-qrcode"
+
 	//"net/url"
 	//"os"
 	"strings"
@@ -142,10 +145,17 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
 		}
 		domain := r.Form["domain"][0]
 
+		if len(r.Form["client"]) != 1 {
+			w.WriteHeader(400)
+			w.Write([]byte("Invalid client parameter"))
+			return
+		}
+		client := r.Form["client"][0]
+
 		data := &ConfirmData{
 			Head:       h.headHtml,
-			Message:    fmt.Sprintf("Are you sure you want to delete %s?", domain),
+			Message:    fmt.Sprintf("Are you sure you want to delete %s|%s?", domain, client),
-			ConfirmUrl: fmt.Sprintf("/delete-tunnel?domain=%s", domain),
+			ConfirmUrl: fmt.Sprintf("/delete-tunnel?domain=%s&client=%s", domain, client),
 			CancelUrl:  "/tunnels",
 		}
 
@@ -291,15 +301,17 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
 
 			parts := strings.Split(r.URL.Path, "/")
 
-			if len(parts) != 3 {
+			if len(parts) != 4 {
 				w.WriteHeader(400)
 				h.alertDialog(w, r, "Invalid path", "/tunnels")
 				return
 			}
 
 			domain := parts[2]
+			client := parts[3]
 
 			r.Form.Set("domain", domain)
+			r.Form.Set("client", client)
 
 			tunnel, err := h.api.GetTunnel(tokenData, r.Form)
 			if err != nil {