Support a list of subdomain gateway domains and legacy gateway domains

handlers.go

@@ -116,8 +116,18 @@ func setupGatewayHandler(cfg Config, nd *Node) (http.Handler, error) {
 			UseSubdomains:         true,
 		},
 	}
-	if cfg.GatewayDomain != "" {
-		publicGateways[cfg.GatewayDomain] = &gateway.PublicGateway{
+	for _, domain := range cfg.GatewayDomains {
+		publicGateways[domain] = &gateway.PublicGateway{
+			Paths:                 []string{"/ipfs", "/ipns", "/version", "/api/v0"},
+			NoDNSLink:             noDNSLink,
+			InlineDNSLink:         true,
+			DeserializedResponses: true,
+			UseSubdomains:         false,
+		}
+	}
+
+	for _, domain := range cfg.SubdomainGatewayDomains {
+		publicGateways[domain] = &gateway.PublicGateway{
 			Paths:                 []string{"/ipfs", "/ipns", "/version", "/api/v0"},
 			NoDNSLink:             noDNSLink,
 			InlineDNSLink:         true,

main.go

@@ -53,10 +53,16 @@ func main() {
 			Usage:   "Specify an index to derivate the peerID from the key (needs --seed)",
 		},
 		&cli.StringFlag{
-			Name:    "gateway-domain",
+			Name:    "gateway-domains",
 			Value:   "",
-			EnvVars: []string{"RAINBOW_GATEWAY_DOMAIN"},
-			Usage:   "Set to enable subdomain gateway on this domain",
+			EnvVars: []string{"RAINBOW_GATEWAY_DOMAINS"},
+			Usage:   "Set to enable legacy gateway on these domains. Comma-separated list.",
+		},
+		&cli.StringFlag{
+			Name:    "subdomain-gateway-domains",
+			Value:   "",
+			EnvVars: []string{"RAINBOW_SUBDOMAIN_GATEWAY_DOMAINS"},
+			Usage:   "Set to enable legacy gateway on these domains. Comma-separated list.",
 		},
 		&cli.IntFlag{
 			Name:    "gateway-port",
@@ -191,24 +197,20 @@ to create libp2p identities for the gateway.
 			return err
 		}
 
-		var denylists []string
-		if list := cctx.String("denylists"); len(list) > 0 {
-			denylists = strings.Split(list, ",")
-		}
-
 		cfg := Config{
-			DataDir:         ddir,
-			GatewayDomain:   cctx.String("gateway-domain"),
-			ConnMgrLow:      cctx.Int("connmgr-low"),
-			ConnMgrHi:       cctx.Int("connmgr-high"),
-			ConnMgrGrace:    cctx.Duration("connmgr-grace"),
-			MaxMemory:       cctx.Uint64("max-memory"),
-			MaxFD:           cctx.Int("max-fd"),
-			InMemBlockCache: cctx.Int64("inmem-block-cache"),
-			RoutingV1:       cctx.String("routing"),
-			KuboRPCURLs:     getEnvs(EnvKuboRPC, DefaultKuboRPC),
-			DHTSharedHost:   cctx.Bool("dht-fallback-shared-host"),
-			DenylistSubs:    denylists,
+			DataDir:                 ddir,
+			GatewayDomains:          getCommaSeparatedList(cctx.String("gateway-domains")),
+			SubdomainGatewayDomains: getCommaSeparatedList(cctx.String("subdomain-gateway-domains")),
+			ConnMgrLow:              cctx.Int("connmgr-low"),
+			ConnMgrHi:               cctx.Int("connmgr-high"),
+			ConnMgrGrace:            cctx.Duration("connmgr-grace"),
+			MaxMemory:               cctx.Uint64("max-memory"),
+			MaxFD:                   cctx.Int("max-fd"),
+			InMemBlockCache:         cctx.Int64("inmem-block-cache"),
+			RoutingV1:               cctx.String("routing"),
+			KuboRPCURLs:             getEnvs(EnvKuboRPC, DefaultKuboRPC),
+			DHTSharedHost:           cctx.Bool("dht-fallback-shared-host"),
+			DenylistSubs:            getCommaSeparatedList(cctx.String("denylists")),
 		}
 
 		goLog.Debugf("Rainbow config: %+v", cfg)
@@ -344,3 +346,14 @@ func getEnvs(key, defaultValue string) []string {
 	value = strings.TrimSpace(value)
 	return strings.Split(value, ",")
 }
+
+func getCommaSeparatedList(val string) []string {
+	if val == "" {
+		return nil
+	}
+	items := strings.Split(val, ",")
+	for i, item := range items {
+		items[i] = strings.TrimSpace(item)
+	}
+	return items
+}

setup.go

@@ -92,10 +92,11 @@ type Config struct {
 	MaxMemory       uint64
 	MaxFD           int
 
-	GatewayDomain string
-	RoutingV1     string
-	KuboRPCURLs   []string
-	DHTSharedHost bool
+	GatewayDomains          []string
+	SubdomainGatewayDomains []string
+	RoutingV1               string
+	KuboRPCURLs             []string
+	DHTSharedHost           bool
 
 	DenylistSubs []string
 }