fix: allow websockets in url rewrite (#3022)

zetaab · zirain · web-flow · commit 3d519339bc68 · 2024-03-28T00:51:31.000-07:00
allow websockets in url rewrite

Signed-off-by: Jesse Haka &lt;haka.jesse@gmail.com&gt;
Co-authored-by: zirain &lt;zirain2009@gmail.com&gt;
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/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml b/internal/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
