support multiple subdomains of the name gateways (#2356)

Author: rawdaGastan

pkg/gateway/gateway.go

@@ -541,7 +541,7 @@ func (g *gatewayModule) validateNameContract(name string, twinID uint32) error {
 	}
 	contract, subErr := g.substrateGateway.GetContract(context.Background(), contractID)
 	if subErr.IsCode(pkg.CodeNotFound) {
-		return fmt.Errorf("contract by name returned %d, but retreiving it results in 'not found' error", contractID)
+		return fmt.Errorf("contract by name returned %d, but retrieving it results in 'not found' error", contractID)
 	} else if subErr.IsError() {
 		return subErr.Err
 	}
@@ -573,7 +573,11 @@ func (g *gatewayModule) SetNamedProxy(wlID string, config zos.GatewayNameProxy)
 	if cfg.Domain == "" {
 		return "", errors.New("node doesn't support name proxy (doesn't have a domain)")
 	}
-	if err := g.validateNameContract(config.Name, twinID); err != nil {
+
+	subdomains := strings.Split(config.Name, ".")
+	reservedName := subdomains[len(subdomains)-1]
+
+	if err := g.validateNameContract(reservedName, twinID); err != nil {
 		return "", errors.Wrap(err, "failed to verify name contract")
 	}
 

pkg/gridtypes/zos/gw_name.go

@@ -8,7 +8,7 @@ import (
 	"github.com/threefoldtech/zos/pkg/gridtypes"
 )
 
-var gwNameRegex = regexp.MustCompile(`^[a-zA-Z0-9-_]+$`)
+var gwNameRegex = regexp.MustCompile(`^([a-zA-Z0-9-_]+\.)?[a-zA-Z0-9-_]+$`)
 
 // GatewayNameProxy definition. this will proxy name.<zos.domain> to backends
 type GatewayNameProxy struct {