Split implementations from generic code

core/pkg/ingress/annotations/authreq/main.go

@@ -0,0 +1,101 @@
+/*
+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 authreq
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+
+	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/kubernetes/pkg/apis/extensions"
+)
+
+const (
+	// external URL that provides the authentication
+	authURL    = "ingress.kubernetes.io/auth-url"
+	authMethod = "ingress.kubernetes.io/auth-method"
+	authBody   = "ingress.kubernetes.io/auth-send-body"
+)
+
+// External returns external authentication configuration for an Ingress rule
+type External struct {
+	URL      string
+	Method   string
+	SendBody bool
+}
+
+var (
+	methods = []string{"GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "CONNECT", "OPTIONS", "TRACE"}
+)
+
+func validMethod(method string) bool {
+	if len(method) == 0 {
+		return false
+	}
+
+	for _, m := range methods {
+		if method == m {
+			return true
+		}
+	}
+	return false
+}
+
+// ParseAnnotations parses the annotations contained in the ingress
+// rule used to use an external URL as source for authentication
+func ParseAnnotations(ing *extensions.Ingress) (External, error) {
+	if ing.GetAnnotations() == nil {
+		return External{}, parser.ErrMissingAnnotations
+	}
+
+	str, err := parser.GetStringAnnotation(authURL, ing)
+	if err != nil {
+		return External{}, err
+	}
+	if str == "" {
+		return External{}, fmt.Errorf("an empty string is not a valid URL")
+	}
+
+	ur, err := url.Parse(str)
+	if err != nil {
+		return External{}, err
+	}
+	if ur.Scheme == "" {
+		return External{}, fmt.Errorf("url scheme is empty")
+	}
+	if ur.Host == "" {
+		return External{}, fmt.Errorf("url host is empty")
+	}
+
+	if strings.Contains(ur.Host, "..") {
+		return External{}, fmt.Errorf("invalid url host")
+	}
+
+	m, _ := parser.GetStringAnnotation(authMethod, ing)
+	if len(m) != 0 && !validMethod(m) {
+		return External{}, fmt.Errorf("invalid HTTP method")
+	}
+
+	sb, _ := parser.GetBoolAnnotation(authBody, ing)
+
+	return External{
+		URL:      str,
+		Method:   m,
+		SendBody: sb,
+	}, nil
+}

core/pkg/ingress/annotations/authreq/main_test.go

@@ -0,0 +1,109 @@
+/*
+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 authreq
+
+import (
+	"fmt"
+	"testing"
+
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/kubernetes/pkg/util/intstr"
+)
+
+func buildIngress() *extensions.Ingress {
+	defaultBackend := extensions.IngressBackend{
+		ServiceName: "default-backend",
+		ServicePort: intstr.FromInt(80),
+	}
+
+	return &extensions.Ingress{
+		ObjectMeta: api.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 TestAnnotations(t *testing.T) {
+	ing := buildIngress()
+
+	data := map[string]string{}
+	ing.SetAnnotations(data)
+
+	tests := []struct {
+		title    string
+		url      string
+		method   string
+		sendBody bool
+		expErr   bool
+	}{
+		{"empty", "", "", false, true},
+		{"no scheme", "bar", "", false, true},
+		{"invalid host", "http://", "", false, true},
+		{"invalid host (multiple dots)", "http://foo..bar.com", "", false, true},
+		{"valid URL", "http://bar.foo.com/external-auth", "", false, false},
+		{"valid URL - send body", "http://foo.com/external-auth", "POST", true, false},
+		{"valid URL - send body", "http://foo.com/external-auth", "GET", true, false},
+	}
+
+	for _, test := range tests {
+		data[authURL] = test.url
+		data[authBody] = fmt.Sprintf("%v", test.sendBody)
+		data[authMethod] = fmt.Sprintf("%v", test.method)
+
+		u, err := ParseAnnotations(ing)
+
+		if test.expErr {
+			if err == nil {
+				t.Errorf("%v: expected error but retuned nil", test.title)
+			}
+			continue
+		}
+
+		if u.URL != test.url {
+			t.Errorf("%v: expected \"%v\" but \"%v\" was returned", test.title, test.url, u.URL)
+		}
+		if u.Method != test.method {
+			t.Errorf("%v: expected \"%v\" but \"%v\" was returned", test.title, test.method, u.Method)
+		}
+		if u.SendBody != test.sendBody {
+			t.Errorf("%v: expected \"%v\" but \"%v\" was returned", test.title, test.sendBody, u.SendBody)
+		}
+	}
+}