Default app lookup to default domain

Author: akclace

internal/server/app_apis.go

@@ -544,29 +544,16 @@ func (s *Server) MatchApp(hostHeader, matchPath string) (types.AppInfo, error) {
 		hostHeader = "localhost"
 	}
 
-	// Check if host header matches a known domain
-	checkDomain := false
-	if hostHeader != "" && domainMap[hostHeader] {
-		checkDomain = true
+	if !domainMap[hostHeader] {
+		// Request to unknown domain, match against default domain
+		hostHeader = s.config.System.DefaultDomain
 	}
 
 	for _, appInfo := range apps {
-		if s.config.System.DisableUnknownDomains {
-			appDomain := cmp.Or(appInfo.Domain, s.config.System.DefaultDomain)
-			if hostHeader != appDomain {
-				// Host header does not match
-				continue
-			}
-		} else {
-			if checkDomain && appInfo.Domain != hostHeader {
-				// Request uses known domain, but app is not for this domain
-				continue
-			}
-
-			if !checkDomain && appInfo.Domain != "" {
-				// Request does not use known domain, but app is for a domain
-				continue
-			}
+		appDomain := cmp.Or(appInfo.Domain, s.config.System.DefaultDomain)
+		if hostHeader != appDomain {
+			// Host header does not match
+			continue
 		}
 
 		if strings.HasPrefix(matchPath, appInfo.Path) {

internal/server/server.go

@@ -469,11 +469,6 @@ func (s *Server) setupHTTPSServer() (*http.Server, error) {
 		magicConfig := certmagic.NewDefault()
 		magicConfig.OnDemand = &certmagic.OnDemandConfig{
 			DecisionFunc: func(ctx context.Context, name string) error {
-				if !s.config.System.DisableUnknownDomains {
-					// Allow on-demand certificates for unknown domains
-					return nil
-				}
-
 				if name == s.config.System.DefaultDomain || name == "localhost" || name == "127.0.0.1" {
 					return nil
 				}

internal/system/clace.default.toml

@@ -58,7 +58,6 @@ file_watcher_debounce_millis = 300
 node_path = ""                      # node module lookup paths https://esbuild.github.io/api/#node-paths
 container_command = "auto"          # "auto" or "docker" or "podman"
 default_domain = "localhost"        # default domain for apps
-disable_unknown_domains = true      # disable unknown domains, if default domain is set. Otherwise, unknown domains are allowed
 root_serve_list_apps = "auto"       # "auto" means serve list_apps app for default domain, "disable" means don't server for any domain,
 # any other value means server for specified domain
 

internal/system/config_test.go

@@ -47,7 +47,6 @@ func TestServerConfig(t *testing.T) {
 	testutil.AssertEqualsInt(t, "file debounce", 300, c.System.FileWatcherDebounceMillis)
 	testutil.AssertEqualsString(t, "node path", "", c.System.NodePath)
 	testutil.AssertEqualsString(t, "default domain", "localhost", c.System.DefaultDomain)
-	testutil.AssertEqualsBool(t, "unknown domains", true, c.System.DisableUnknownDomains)
 
 	// Global Settings
 	testutil.AssertEqualsString(t, "server uri", "$CL_HOME/run/clace.sock", c.ServerUri)

internal/types/types.go

@@ -206,7 +206,6 @@ type SystemConfig struct {
 	NodePath                  string `toml:"node_path"`
 	ContainerCommand          string `toml:"container_command"`
 	DefaultDomain             string `toml:"default_domain"`
-	DisableUnknownDomains     bool   `toml:"disable_unknown_domains"`
 	RootServeListApps         string `toml:"root_serve_list_apps"`
 
 	HttpEventRetentionDays    int `toml:"http_event_retention_days"`