From 650cb687e60d3b01bfcd516840d111e353a0e552 Mon Sep 17 00:00:00 2001
From: Jeremy Facchetti <j-dawg@redhat.com>
Date: Wed, 5 Jul 2023 09:52:37 +0200
Subject: [PATCH] more logging

---
 pkg/portal/middleware/intAAD.go | 14 ++++++++------
 pkg/portal/portal.go            |  2 +-
 test/e2e/setup.go               |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkg/portal/middleware/intAAD.go b/pkg/portal/middleware/intAAD.go
index 91e6637ae22..70576f55430 100644
--- a/pkg/portal/middleware/intAAD.go
+++ b/pkg/portal/middleware/intAAD.go
@@ -47,20 +47,22 @@ func (a IntAAD) AAD(h http.Handler) http.Handler {
 		Groups   string
 	}
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		a.log.Errorf("running AAD middleware from int")
+		for _, v := range r.Cookies() {
+			a.log.Errorf("cookies name %s value %s", v.Name, v.Value)
+
+		}
 		groups := ""
 		username := ""
 
 		//here we use cookies because selenium doesn't allow us to set headers
 		for _, v := range r.Cookies() {
 			switch v.Name {
-			case IntGroupsKey:
-				groups = v.Value
-
 			case IntUsernameKey:
 				userInfo := userinfo{}
 				json.Unmarshal([]byte(v.Value), &userInfo)
-				a.log.Infof("username is %s", userInfo.Username)
-				a.log.Infof("groups are %s", userInfo.Groups)
+				a.log.Errorf("username is %s", userInfo.Username)
+				a.log.Errorf("groups are %s", userInfo.Groups)
 				if string(userInfo.Password) != string(a.sessionKey) {
 					a.log.Debug("password did not match")
 					h.ServeHTTP(w, r)
@@ -72,7 +74,7 @@ func (a IntAAD) AAD(h http.Handler) http.Handler {
 			case IntPasswordKey:
 				if v.Value != string(a.sessionKey) {
 					//discard all values and continue
-					a.log.Info("session key is different from the expected one")
+					a.log.Errorf("session key is different from the expected one")
 
 					groups = ""
 					username = ""
diff --git a/pkg/portal/portal.go b/pkg/portal/portal.go
index ece186713ff..849b1d7edce 100644
--- a/pkg/portal/portal.go
+++ b/pkg/portal/portal.go
@@ -165,7 +165,7 @@ func (p *portal) setupRouter(kconfig *kubeconfig.Kubeconfig, prom *prometheus.Pr
 	disableOauthOption := os.Getenv("DISABLE_OAUTH")
 	if disableOauthOption == "true" || env.IsLocalDevelopmentMode() || env.IsCI() {
 		p.log.Error("running in int")
-		p.aad, err = middleware.NewIntAAD(p.sessionKey, p.audit)
+		p.aad, err = middleware.NewIntAAD(p.sessionKey, p.log)
 	} else {
 		p.log.Error("not running in int")
 		p.aad, err = middleware.NewAAD(p.log, p.audit, p.env, p.baseAccessLog, p.hostname, p.sessionKey, p.clientID, p.clientKey, p.clientCerts, allGroups,
diff --git a/test/e2e/setup.go b/test/e2e/setup.go
index b6508339fe5..835f64f21b3 100644
--- a/test/e2e/setup.go
+++ b/test/e2e/setup.go
@@ -203,6 +203,7 @@ func adminPortalSessionSetup() (string, *selenium.WebDriver) {
 	if !ok {
 		log.Fatal("AZURE_PORTAL_ELEVATED_GROUPS_IDS is not set")
 	}
+	log.Infof("adding groups %s", elevatedGroups)
 
 	msiKVAuthorizer, err := _env.NewMSIAuthorizer(env.MSIContextRP, _env.Environment().KeyVaultScope)
 	if err != nil {