Only allow header validation on gateway

kgateway-dev · Jun 20, 2024 · ba0aff3 · ba0aff3
1 parent 9c94b4f
commit ba0aff3
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 217 deletions.
diff --git a/.../reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/options.proto.sk.md b/.../reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/options.proto.sk.md
diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_RouteOption.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_RouteOption.yaml
@@ -386,11 +386,6 @@ spec:
                           type: string
                         type: array
                     type: object
-                  headerValidationSettings:
-                    properties:
-                      allowCustomHeaderMethods:
-                        type: boolean
-                    type: object
                   hostRewrite:
                     type: string
                   hostRewriteHeader:

diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_RouteTable.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_RouteTable.yaml
@@ -496,11 +496,6 @@ spec:
                                 type: string
                               type: array
                           type: object
-                        headerValidationSettings:
-                          properties:
-                            allowCustomHeaderMethods:
-                              type: boolean
-                          type: object
                         hostRewrite:
                           type: string
                         hostRewriteHeader:

diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_VirtualHostOption.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_VirtualHostOption.yaml
@@ -356,11 +356,6 @@ spec:
                           type: string
                         type: array
                     type: object
-                  headerValidationSettings:
-                    properties:
-                      allowCustomHeaderMethods:
-                        type: boolean
-                    type: object
                   includeAttemptCountInResponse:
                     nullable: true
                     type: boolean

diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_VirtualService.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_VirtualService.yaml
@@ -446,11 +446,6 @@ spec:
                               type: string
                             type: array
                         type: object
-                      headerValidationSettings:
-                        properties:
-                          allowCustomHeaderMethods:
-                            type: boolean
-                        type: object
                       includeAttemptCountInResponse:
                         nullable: true
                         type: boolean
@@ -3334,11 +3329,6 @@ spec:
                                     type: string
                                   type: array
                               type: object
-                            headerValidationSettings:
-                              properties:
-                                allowCustomHeaderMethods:
-                                  type: boolean
-                              type: object
                             hostRewrite:
                               type: string
                             hostRewriteHeader:

diff --git a/projects/gloo/api/v1/options.proto b/projects/gloo/api/v1/options.proto
@@ -380,12 +380,6 @@ message VirtualHostOptions {
     // Enterprise-only: External Processing filter settings for the virtual host. This can be used to
     // override certain HttpListenerOptions settings, and can be overridden by RouteOptions settings.
     extproc.options.gloo.solo.io.RouteSettings ext_proc = 30;
-
-    // Whether custom HTTP methods should be allowed. Defaults to false (custom
-    // HTTP methods are not allowed). The list of default-allowed HTTP methods
-    // can be found here:
-    // https://github.com/envoyproxy/envoy/blob/2970ddbd4ade787dd51dfbe605ae2e8c5d8ffcf7/source/common/http/http1/balsa_parser.cc#L54
-    header_validation.options.gloo.solo.io.HeaderValidationSettings header_validation_settings = 31;
 }
 
 // Optional, feature-specific configuration that lives on routes.
@@ -590,13 +584,6 @@ message RouteOptions {
     // Enterprise-only: External Processing filter settings for the route. This can be used to
     // override certain HttpListenerOptions or VirtualHostOptions settings.
     extproc.options.gloo.solo.io.RouteSettings ext_proc = 30;
-
-    // Header Validation Settings. These can be used to configure Gloo with
-    // rules to customize whether requests should be accepted or rejected,
-    // based on the contents of the HTTP header.
-    // TODO: include some kind of warning that the behavior of these fields may
-    // change when we update Envoy to a new version.
-    header_validation.options.gloo.solo.io.HeaderValidationSettings header_validation_settings = 31;
 }
 
 // Configuration for Destinations that are tied to the UpstreamSpec or ServiceSpec on that destination

diff --git a/projects/gloo/pkg/api/v1/options.pb.clone.go b/projects/gloo/pkg/api/v1/options.pb.clone.go
diff --git a/projects/gloo/pkg/api/v1/options.pb.equal.go b/projects/gloo/pkg/api/v1/options.pb.equal.go