update aws-authservice

awsconfigs/common/aws-authservice/base/kustomization.yaml

@@ -9,7 +9,7 @@ resources:
 images:
   - name: public.ecr.aws/c9e4w0g3/cognito/aws-authservice
     newName: public.ecr.aws/c9e4w0g3/cognito/aws-authservice
-    newTag: v1.0.0
+    newTag: v2.0.0
 configMapGenerator:
 - name: authservice-config
   env: params.env

awsconfigs/common/aws-authservice/base/virtual-service.yaml

@@ -10,7 +10,7 @@ spec:
   http:
     - match:
         - uri:
-            prefix: /logout
+            prefix: /authservice/logout
       route:
         - destination:
             host: aws-authservice.istio-system.svc.cluster.local

charts/common/aws-authservice/Chart.yaml

@@ -1,24 +1,6 @@
 apiVersion: v2
-name: aws-authservice
+appVersion: v2.0.0
 description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+name: aws-authservice
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "v0.1.0"
+version: 0.2.0

charts/common/aws-authservice/templates/ConfigMap/authservice-config-ck6577dfkd-istio-system-ConfigMap.yaml → charts/common/aws-authservice/templates/ConfigMap/authservice-config-c9f7d7t7db-istio-system-ConfigMap.yaml

@@ -3,5 +3,5 @@ data:
   LOGOUT_URL: {{ .Values.LOGOUT_URL }}
 kind: ConfigMap
 metadata:
-  name: authservice-config-ck6577dfkd
+  name: authservice-config-c9f7d7t7db
   namespace: istio-system

charts/common/aws-authservice/templates/Deployment/aws-authservice-istio-system-Deployment.yaml

@@ -23,8 +23,8 @@ spec:
           valueFrom:
             configMapKeyRef:
               key: LOGOUT_URL
-              name: authservice-config-ck6577dfkd
-        image: public.ecr.aws/c9e4w0g3/cognito/aws-authservice:v1.0.0
+              name: authservice-config-c9f7d7t7db
+        image: public.ecr.aws/c9e4w0g3/cognito/aws-authservice:v2.0.0
         imagePullPolicy: IfNotPresent
         name: aws-authservice
         ports:

charts/common/aws-authservice/templates/VirtualService/authservice-web-cognito-istio-system-VirtualService.yaml

@@ -11,7 +11,7 @@ spec:
   http:
   - match:
     - uri:
-        prefix: /logout
+        prefix: /authservice/logout
     route:
     - destination:
         host: aws-authservice.istio-system.svc.cluster.local

components/aws-authservice/main.go

@@ -14,6 +14,7 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
 	"net/http"
@@ -36,23 +37,36 @@ func init() {
 // LogoutHandler expires ALB Cookies and redirects to Cognito Logout Endpoint
 func LogoutHandler(w http.ResponseWriter, r *http.Request) {
 	log.Println("Traffic reached LogoutHandler")
-
 	// There are 4 possible AWSELBAuthSessionCookies
 	// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/listener-authenticate-users.html#authentication-logout
 	for cookieIndex := 0; cookieIndex < 4; cookieIndex++ {
 		name := fmt.Sprintf("AWSELBAuthSessionCookie-%s", strconv.Itoa(cookieIndex))
 		expireALBCookie := &http.Cookie{Value: "Expired", Name: name, MaxAge: -1, Path: "/"}
 		http.SetCookie(w, expireALBCookie)
 	}
-	http.Redirect(w, r, redirectURL, http.StatusSeeOther)
+
+	// Central Dashboard expects to redirect to event.detail.response['afterLogoutURL']) after logout
+	// https://github.com/kubeflow/kubeflow/blob/master/components/centraldashboard/public/components/logout-button.js#L49
+	resp := struct {
+		AfterLogoutURL string `json:"afterLogoutURL"`
+	}{
+		AfterLogoutURL: redirectURL,
+	}
+	jsonBytes, err := json.Marshal(resp)
+	if err != nil {
+		log.Println("Failed to marshal struct to json: %v", err)
+	}
+
+	w.Write(jsonBytes)
+
+	http.Redirect(w, r, redirectURL, http.StatusCreated)
 }
 
 func main() {
 
 	router := mux.NewRouter()
-	router.HandleFunc("/logout", LogoutHandler).Methods(http.MethodGet)
-
+	router.HandleFunc("/authservice/logout", LogoutHandler).Methods(http.MethodPost)
 	var listenPort = ":" + port
 	log.Println("Starting web server at", listenPort)
-	log.Fatal(http.ListenAndServe(listenPort, handlers.CORS()(router)))
+	log.Println(http.ListenAndServe(listenPort, handlers.CORS()(router)))
 }

tools/helmify/src/config.yaml

@@ -336,8 +336,8 @@ aws-authservice:
   kustomization_paths:
     - awsconfigs/common/aws-authservice/base
   output_helm_chart_path: charts/common/aws-authservice
-  version: 0.1.0
-  app_version: v0.1.0
+  version: 0.2.0
+  app_version: v2.0.0
   params:
     template_paths: 
       - tools/helmify/template/aws-authservice/params.env