-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3506 from KoerberDigitalDevTeam/feature/extrenal-…
…auth-security-opt-out Improve the external authorization concept from opt-in to secure-by-default
- Loading branch information
Showing
20 changed files
with
814 additions
and
67 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| Copyright 2015 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 authreqglobal | ||
|
|
||
| import ( | ||
| extensions "k8s.io/api/extensions/v1beta1" | ||
|
|
||
| "k8s.io/ingress-nginx/internal/ingress/annotations/parser" | ||
| "k8s.io/ingress-nginx/internal/ingress/resolver" | ||
| ) | ||
|
|
||
| type authReqGlobal struct { | ||
| r resolver.Resolver | ||
| } | ||
|
|
||
| // NewParser creates a new authentication request annotation parser | ||
| func NewParser(r resolver.Resolver) parser.IngressAnnotation { | ||
| return authReqGlobal{r} | ||
| } | ||
|
|
||
| // ParseAnnotations parses the annotations contained in the ingress | ||
| // rule used to enable or disable global external authentication | ||
| func (a authReqGlobal) Parse(ing *extensions.Ingress) (interface{}, error) { | ||
|
|
||
| enableGlobalAuth, err := parser.GetBoolAnnotation("enable-global-auth", ing) | ||
| if err != nil { | ||
| enableGlobalAuth = true | ||
| } | ||
|
|
||
| return enableGlobalAuth, 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,82 @@ | ||
| /* | ||
| Copyright 2015 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 authreqglobal | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| api "k8s.io/api/core/v1" | ||
| extensions "k8s.io/api/extensions/v1beta1" | ||
| meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/ingress-nginx/internal/ingress/annotations/parser" | ||
| "k8s.io/ingress-nginx/internal/ingress/resolver" | ||
|
|
||
| "k8s.io/apimachinery/pkg/util/intstr" | ||
| ) | ||
|
|
||
| func buildIngress() *extensions.Ingress { | ||
| defaultBackend := extensions.IngressBackend{ | ||
| ServiceName: "default-backend", | ||
| ServicePort: intstr.FromInt(80), | ||
| } | ||
|
|
||
| return &extensions.Ingress{ | ||
| ObjectMeta: meta_v1.ObjectMeta{ | ||
| Name: "foo", | ||
| Namespace: api.NamespaceDefault, | ||
| }, | ||
| Spec: extensions.IngressSpec{ | ||
| Backend: &extensions.IngressBackend{ | ||
| ServiceName: "default-backend", | ||
| ServicePort: intstr.FromInt(80), | ||
| }, | ||
| Rules: []extensions.IngressRule{ | ||
| { | ||
| Host: "foo.bar.com", | ||
| IngressRuleValue: extensions.IngressRuleValue{ | ||
| HTTP: &extensions.HTTPIngressRuleValue{ | ||
| Paths: []extensions.HTTPIngressPath{ | ||
| { | ||
| Path: "/foo", | ||
| Backend: defaultBackend, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func TestAnnotation(t *testing.T) { | ||
| ing := buildIngress() | ||
|
|
||
| data := map[string]string{} | ||
| data[parser.GetAnnotationWithPrefix("auth-url")] = "http://foo.com/external-auth" | ||
| data[parser.GetAnnotationWithPrefix("enable-global-auth")] = "false" | ||
| ing.SetAnnotations(data) | ||
|
|
||
| i, _ := NewParser(&resolver.Mock{}).Parse(ing) | ||
| u, ok := i.(bool) | ||
| if !ok { | ||
| t.Errorf("expected a Config type") | ||
| } | ||
| if u { | ||
| t.Errorf("Expected false but returned true") | ||
| } | ||
| } |
Oops, something went wrong.