Fix alpn protocol leakage (#2216)

* copy transport configuration to avoid modifying shared object
openziti · Jul 11, 2024 · 150e74d · 150e74d
1 parent b67700d
commit 150e74d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/router/internal/edgerouter/config.go b/router/internal/edgerouter/config.go
@@ -447,11 +447,14 @@ func (config *Config) ensureIdentity(rootConfigMap map[interface{}]interface{})
 
 func (config *Config) loadTransportConfig(rootConfigMap map[interface{}]interface{}) error {
 	if val, ok := rootConfigMap["transport"]; ok && val != nil {
-		var tcfg map[interface{}]interface{}
-		if tcfg, ok = val.(map[interface{}]interface{}); !ok {
+		config.Tcfg = make(transport.Configuration)
+		if tcfg, ok := val.(map[interface{}]interface{}); ok {
+			for k, v := range tcfg {
+				config.Tcfg[k] = v
+			}
+		} else {
 			return fmt.Errorf("expected map as transport configuration")
 		}
-		config.Tcfg = tcfg
 	}
 
 	return nil