fix: allow websockets in url rewrite (envoyproxy#3022)

allow websockets in url rewrite Signed-off-by: Jesse Haka <[email protected]> Co-authored-by: zirain <[email protected]> Signed-off-by: Yael Shechter <[email protected]>
yaelSchechter · Mar 28, 2024 · 03d33af · 03d33af
1 parent 35079c3
commit 03d33af
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/internal/xds/translator/route.go b/internal/xds/translator/route.go
@@ -59,6 +59,16 @@ func buildXdsRoute(httpRoute *ir.HTTPRoute) (*routev3.Route, error) {
 			routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirrors)
 		}
 
+		if !httpRoute.IsHTTP2 {
+			// Allow websocket upgrades for HTTP 1.1
+			// Reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Protocol_upgrade_mechanism
+			routeAction.UpgradeConfigs = []*routev3.RouteAction_UpgradeConfig{
+				{
+					UpgradeType: "websocket",
+				},
+			}
+		}
+
 		router.Action = &routev3.Route_Route{Route: routeAction}
 	default:
 		var routeAction *routev3.RouteAction

diff --git a/...al/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml b/...al/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml
@@ -18,3 +18,5 @@
           pattern:
             regex: ^/origin/\/*
           substitution: /
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.routes.yaml
@@ -14,3 +14,5 @@
           pattern:
             regex: /.+
           substitution: /rewrite
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.routes.yaml
@@ -17,3 +17,5 @@
         cluster: rewrite-route-dest
         hostRewriteLiteral: 3.3.3.3
         prefixRewrite: /rewrite
+        upgradeConfigs:
+        - upgradeType: websocket
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.routes.yaml
@@ -15,3 +15,5 @@
       route:
         cluster: rewrite-route-dest
         prefixRewrite: /rewrite
+        upgradeConfigs:
+        - upgradeType: websocket