feat(routing): Extra validation on route addition

Routes that are not public are now verified to
be within the same cookiescope

Author: gnur

cmd/tobab/tobab.go

@@ -50,7 +50,7 @@ func (app *Tobab) setTobabRoutes(r *mux.Router) {
 			return
 		}
 
-		if ok, err := h.Validate(); !ok {
+		if ok, err := h.Validate(app.config.CookieScope); !ok {
 			http.Error(w, fmt.Sprintf("invalid backend: %e", err), http.StatusBadRequest)
 			return
 		}
@@ -156,7 +156,7 @@ func (app *Tobab) GetHosts(in *clirpc.Empty, out *clirpc.GetHostsOut) error {
 }
 
 func (app *Tobab) AddHost(in *clirpc.AddHostIn, out *clirpc.Empty) error {
-	ok, err := in.Host.Validate()
+	ok, err := in.Host.Validate(app.config.CookieScope)
 	if !ok {
 		return err
 	}

types.go

@@ -47,7 +47,7 @@ Globs: %s
 `, aurora.Magenta(aurora.Bold(h.Hostname)), h.Backend, h.Type, h.Public, h.Globs)
 }
 
-func (h *Host) Validate() (bool, error) {
+func (h *Host) Validate(cookiescope string) (bool, error) {
 	ok, err := govalidator.ValidateStruct(h)
 	if !ok {
 		return ok, err
@@ -62,6 +62,9 @@ func (h *Host) Validate() (bool, error) {
 	if !strings.HasPrefix(u.Scheme, "http") {
 		return false, fmt.Errorf("%s has invalid or missing scheme", h.Backend)
 	}
+	if !strings.HasSuffix(h.Hostname, cookiescope) && !h.Public {
+		return false, fmt.Errorf("'%s' won't be accessible because the cookiescope ('%s') does not match this domain", h.Hostname, cookiescope)
+	}
 	if !h.Public && len(h.Globs) == 0 {
 		return false, fmt.Errorf("%s will not be accessible by anybody", h.Hostname)
 	}
@@ -93,7 +96,16 @@ func (h Host) HasAccess(user string) bool {
 }
 
 func (c *Config) Validate() (bool, error) {
-	return govalidator.ValidateStruct(c)
+	ok, err := govalidator.ValidateStruct(c)
+	if !ok {
+		return ok, err
+	}
+
+	if !strings.HasSuffix(c.Hostname, c.CookieScope) {
+		return false, fmt.Errorf("Hostname: '%s' should be in the same domain as the cookiescope: '%s'", c.Hostname, c.CookieScope)
+	}
+
+	return ok, err
 }
 
 func LoadConf(path string) (Config, error) {

types_test.go

@@ -3,6 +3,7 @@ package tobab
 import "testing"
 
 func TestHost_Validate(t *testing.T) {
+	cookiescope := "example.com"
 	type fields struct {
 		Hostname string
 		Backend  string
@@ -93,6 +94,18 @@ func TestHost_Validate(t *testing.T) {
 			want:    true,
 			wantErr: false,
 		},
+		{
+			name: "unreachable because of domain",
+			fields: fields{
+				Hostname: "test.example.co.uk",
+				Backend:  "http://localhost:1234",
+				Type:     "http",
+				Public:   false,
+				Globs:    []Glob{"*"},
+			},
+			want:    false,
+			wantErr: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -103,7 +116,7 @@ func TestHost_Validate(t *testing.T) {
 				Public:   tt.fields.Public,
 				Globs:    tt.fields.Globs,
 			}
-			got, err := h.Validate()
+			got, err := h.Validate(cookiescope)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Host.Validate() error = %v, wantErr %v", err, tt.wantErr)
 				return