forked from kubernetes/ingress-nginx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement object deep inspector (kubernetes#8456)
- Loading branch information
Showing
15 changed files
with
468 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package inspector | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| networking "k8s.io/api/networking/v1" | ||
| ) | ||
|
|
||
| // InspectIngress is used to do the deep inspection of an ingress object, walking through all | ||
| // of the spec fields and checking for matching strings and configurations that may represent | ||
| // an attempt to escape configs | ||
| func InspectIngress(ingress *networking.Ingress) error { | ||
| for _, rule := range ingress.Spec.Rules { | ||
| if rule.Host != "" { | ||
| if err := CheckRegex(rule.Host); err != nil { | ||
| return fmt.Errorf("invalid host in ingress %s/%s: %s", ingress.Namespace, ingress.Name, err) | ||
| } | ||
| } | ||
| if rule.HTTP != nil { | ||
| if err := inspectIngressRule(rule.HTTP); err != nil { | ||
| return fmt.Errorf("invalid rule in ingress %s/%s: %s", ingress.Namespace, ingress.Name, err) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| for _, tls := range ingress.Spec.TLS { | ||
| if err := CheckRegex(tls.SecretName); err != nil { | ||
| return fmt.Errorf("invalid secret in ingress %s/%s: %s", ingress.Namespace, ingress.Name, err) | ||
| } | ||
| for _, host := range tls.Hosts { | ||
| if err := CheckRegex(host); err != nil { | ||
| return fmt.Errorf("invalid host in ingress tls config %s/%s: %s", ingress.Namespace, ingress.Name, err) | ||
| } | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func inspectIngressRule(httprule *networking.HTTPIngressRuleValue) error { | ||
| for _, path := range httprule.Paths { | ||
| if err := CheckRegex(path.Path); err != nil { | ||
| return fmt.Errorf("invalid http path: %s", err) | ||
| } | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package inspector | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| networking "k8s.io/api/networking/v1" | ||
| v1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| func makeSimpleIngress(hostname string, paths ...string) *networking.Ingress { | ||
|
|
||
| newIngress := networking.Ingress{ | ||
| ObjectMeta: v1.ObjectMeta{ | ||
| Name: "test1", | ||
| Namespace: "default", | ||
| }, | ||
| Spec: networking.IngressSpec{ | ||
| Rules: []networking.IngressRule{ | ||
| { | ||
| Host: hostname, | ||
| IngressRuleValue: networking.IngressRuleValue{ | ||
| HTTP: &networking.HTTPIngressRuleValue{ | ||
| Paths: []networking.HTTPIngressPath{}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| prefix := networking.PathTypePrefix | ||
| for _, path := range paths { | ||
| newPath := networking.HTTPIngressPath{ | ||
| Path: path, | ||
| PathType: &prefix, | ||
| } | ||
| newIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths = append(newIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths, newPath) | ||
| } | ||
| return &newIngress | ||
| } | ||
|
|
||
| func TestInspectIngress(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| hostname string | ||
| path []string | ||
| wantErr bool | ||
| }{ | ||
| { | ||
| name: "invalid-path-etc", | ||
| hostname: "invalid.etc.com", | ||
| path: []string{ | ||
| "/var/run/secrets", | ||
| "/mypage", | ||
| }, | ||
| wantErr: true, | ||
| }, | ||
| { | ||
| name: "invalid-path-etc", | ||
| hostname: "invalid.etc.com", | ||
| path: []string{ | ||
| "/etc/nginx", | ||
| }, | ||
| wantErr: true, | ||
| }, | ||
| { | ||
| name: "invalid-path-etc", | ||
| hostname: "invalid.etc.com", | ||
| path: []string{ | ||
| "/mypage", | ||
| }, | ||
| wantErr: false, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| ingress := makeSimpleIngress(tt.hostname, tt.path...) | ||
| if err := InspectIngress(ingress); (err != nil) != tt.wantErr { | ||
| t.Errorf("InspectIngress() error = %v, wantErr %v", err, tt.wantErr) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.