Remove need for overriding auth type and initing auth service in CF h…

…osting plugin
cloudfoundry · nwmac · Nov 1, 2019 · Sep 6, 2019 · Sep 11, 2019 · Sep 6, 2019
commit ba731b468b5db597f995c2c5ecb365e47fa07fdd
diff --git a/src/jetstream/authlocal.go b/src/jetstream/authlocal.go
@@ -31,7 +31,7 @@ type localAuth struct {
 func (a *localAuth) Login(c echo.Context) error {
 
 	//This check will remain in until auth is factored down into its own package
-	if interfaces.AuthEndpointTypes[a.p.Config.ConsoleConfig.AuthEndpointType] != interfaces.Local {
+	if interfaces.AuthEndpointTypes[a.p.Config.AuthEndpointType] != interfaces.Local {
 		err := interfaces.NewHTTPShadowError(
 			http.StatusNotFound,
 			"Local Login is not enabled",

diff --git a/src/jetstream/authuaa.go b/src/jetstream/authuaa.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-
 	"database/sql"
 	"encoding/base64"
 	"encoding/json"
@@ -17,8 +16,8 @@ import (
 	"github.com/labstack/echo"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/stringutils"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/stringutils"
 )
 
 // UAAAdminIdentifier - The identifier that UAA uses to convey administrative level perms
@@ -27,15 +26,15 @@ const UAAAdminIdentifier = "stratos.admin"
 //More fields will be moved into here as global portalProxy struct is phased out
 type uaaAuth struct {
 	databaseConnectionPool *sql.DB
-	p *portalProxy
-	skipSSLValidation bool
+	p                      *portalProxy
+	skipSSLValidation      bool
 }
 
 //Login provides UAA-auth specific Stratos login
 func (a *uaaAuth) Login(c echo.Context) error {
-
+	log.Debug("UAA Login")
 	//This check will remain in until auth is factored down into its own package
-	if interfaces.AuthEndpointTypes[a.p.Config.ConsoleConfig.AuthEndpointType] != interfaces.Remote {
+	if interfaces.AuthEndpointTypes[a.p.Config.AuthEndpointType] != interfaces.Remote {
 		err := interfaces.NewHTTPShadowError(
 			http.StatusNotFound,
 			"UAA Login is not enabled",
@@ -83,7 +82,7 @@ func (a *uaaAuth) GetUsername(userid string) (string, error) {
 //GetUser gets the user guid for the specified UAA user
 func (a *uaaAuth) GetUser(userGUID string) (*interfaces.ConnectedUser, error) {
 	log.Debug("GetUser")
-	
+
 	// get the uaa token record
 	uaaTokenRecord, err := a.p.GetUAATokenRecord(userGUID)
 	if err != nil {
@@ -112,7 +111,7 @@ func (a *uaaAuth) GetUser(userGUID string) (*interfaces.ConnectedUser, error) {
 	}
 
 	return uaaEntry, nil
-	
+
 }
 
 //VerifySession verifies the session the specified UAA user and refreshes the token if necessary
@@ -310,7 +309,7 @@ func (p *portalProxy) RefreshUAALogin(username, password string, store bool) err
 	return nil
 }
 
-//getUAATokenWithAuthorizationCode 
+//getUAATokenWithAuthorizationCode
 func (p *portalProxy) getUAATokenWithAuthorizationCode(skipSSLValidation bool, code, client, clientSecret, authEndpoint string, state string, cnsiGUID string) (*interfaces.UAAResponse, error) {
 	log.Debug("getUAATokenWithAuthorizationCode")
 
@@ -405,8 +404,6 @@ func (p *portalProxy) GetUAATokenRecord(userGUID string) (interfaces.TokenRecord
 	return tr, nil
 }
 
-
-
 //RefreshUAAToken refreshes the UAA Token for the user using the refresh token, then updates our store
 func (p *portalProxy) RefreshUAAToken(userGUID string) (t interfaces.TokenRecord, err error) {
 	log.Debug("RefreshUAAToken")
@@ -556,7 +553,7 @@ func getSSORedirectURI(base string, state string, endpointGUID string) string {
 
 //HTTP Basic
 
-//fetchHTTPBasicToken currently unused? 
+//fetchHTTPBasicToken currently unused?
 func (p *portalProxy) fetchHTTPBasicToken(cnsiRecord interfaces.CNSIRecord, c echo.Context) (*interfaces.UAAResponse, *interfaces.JWTUserTokenInfo, *interfaces.CNSIRecord, error) {
 
 	uaaRes, u, err := p.loginHTTPBasic(c)
@@ -570,7 +567,7 @@ func (p *portalProxy) fetchHTTPBasicToken(cnsiRecord interfaces.CNSIRecord, c ec
 	return uaaRes, u, &cnsiRecord, nil
 }
 
-//fetchHTTPBasicToken currently unused? 
+//fetchHTTPBasicToken currently unused?
 func (p *portalProxy) loginHTTPBasic(c echo.Context) (uaaRes *interfaces.UAAResponse, u *interfaces.JWTUserTokenInfo, err error) {
 	log.Debug("login")
 	username := c.FormValue("username")
@@ -585,4 +582,4 @@ func (p *portalProxy) loginHTTPBasic(c echo.Context) (uaaRes *interfaces.UAAResp
 
 	uaaRes.AccessToken = fmt.Sprintf("Basic %s", base64EncodedAuthString)
 	return uaaRes, u, nil
-}
+}
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
@@ -499,6 +499,19 @@ func loadPortalConfig(pc interfaces.PortalConfig, env *env.VarSet) (interfaces.P
 		pc.HTTPClientTimeoutMutatingInSecs = pc.HTTPClientTimeoutInSecs
 	}
 
+	if len(pc.AuthEndpointType) == 0 {
+		//Default to "remote" if AUTH_ENDPOINT_TYPE is not set
+		pc.AuthEndpointType = string(interfaces.Remote)
+	} else {
+		val, endpointTypeSupported := interfaces.AuthEndpointTypes[pc.AuthEndpointType]
+		if endpointTypeSupported {
+			pc.AuthEndpointType = string(val)
+		} else {
+			return pc, fmt.Errorf("AUTH_ENDPOINT_TYPE: %v is not valid. Must be set to local or remote (defaults to remote)", val)
+		}
+	}
+
+	log.Debugf("Portal config auth endpoint type initialised to: %v", pc.AuthEndpointType)
 	return pc, nil
 }
 
@@ -597,10 +610,10 @@ func newPortalProxy(pc interfaces.PortalConfig, dcp *sql.DB, ss HttpSessionStore
 	})
 
 	err := pp.InitStratosAuthService(interfaces.AuthEndpointTypes[pp.Config.AuthEndpointType])
-	if(err != nil) {
+	if err != nil {
 		log.Warnf("Defaulting to UAA authentication: %v", err)
 		err = pp.InitStratosAuthService(interfaces.Remote)
-		if(err != nil) {
+		if err != nil {
 			log.Fatalf("Could not initialise auth service. %v", err)
 		}
 	}
@@ -959,7 +972,7 @@ func echoV2DefaultHTTPErrorHandler(err error, c echo.Context) {
 	}
 
 	//Only log if there is a message to log
-	he, _  := err.(*echo.HTTPError)
+	he, _ := err.(*echo.HTTPError)
 	if err != nil && he.Message.(string) != "" {
 		c.Logger().Error(err)
 	}

diff --git a/src/jetstream/plugins/cloudfoundryhosting/main.go b/src/jetstream/plugins/cloudfoundryhosting/main.go
@@ -124,13 +124,6 @@ func (ch *CFHosting) Init() error {
 
 		ch.portalProxy.GetConfig().ConsoleConfig = new(interfaces.ConsoleConfig)
 
-		//Force auth endpoint type to remote (CF UAA)
-		ch.portalProxy.GetConfig().ConsoleConfig.AuthEndpointType = "remote"
-		err := ch.portalProxy.InitStratosAuthService(interfaces.Remote)
-		if(err != nil) {
-			return fmt.Errorf("Could not initialise auth service: %v", err)
-		}
-
 		// We are using the CF UAA - so the Console must use the same Client and Secret as CF
 		ch.portalProxy.GetConfig().ConsoleConfig.ConsoleClient = ch.portalProxy.GetConfig().CFClient
 		ch.portalProxy.GetConfig().ConsoleConfig.ConsoleClientSecret = ch.portalProxy.GetConfig().CFClientSecret
@@ -158,7 +151,7 @@ func (ch *CFHosting) Init() error {
 		var appData interfaces.VCapApplicationData
 		vCapApp, _ := ch.portalProxy.Env().Lookup(VCapApplication)
 		data := []byte(vCapApp)
-		err = json.Unmarshal(data, &appData)
+		err := json.Unmarshal(data, &appData)
 		if err != nil {
 			log.Fatalf("Could not get the Cloud Foundry API URL: %+v", err)
 			return nil

diff --git a/src/jetstream/plugins/userinfo/main.go b/src/jetstream/plugins/userinfo/main.go
@@ -54,11 +54,12 @@ func (userInfo *UserInfo) AddSessionGroupRoutes(echoGroup *echo.Group) {
 
 // Init performs plugin initialization
 func (userInfo *UserInfo) Init() error {
+
 	return nil
 }
 
 func (userInfo *UserInfo) getProvider(c echo.Context) Provider {
-	if interfaces.AuthEndpointTypes[userInfo.portalProxy.GetConfig().ConsoleConfig.AuthEndpointType] == interfaces.Local {
+	if interfaces.AuthEndpointTypes[userInfo.portalProxy.GetConfig().AuthEndpointType] == interfaces.Local {
 		return InitLocalUserInfo(userInfo.portalProxy)
 	}
 
@@ -108,7 +109,6 @@ func (userInfo *UserInfo) userInfo(c echo.Context) error {
 	return nil
 }
 
-
 // update the user info for the current user
 func (userInfo *UserInfo) updateUserInfo(c echo.Context) error {
 	_, err := userInfo.preFlightChecks(c)
@@ -142,8 +142,8 @@ func (userInfo *UserInfo) updateUserInfo(c echo.Context) error {
 			"Unable to update user profile",
 			"Unable to update user profile: %v", err,
 		)
-	}		
-	
+	}
+
 	c.Response().WriteHeader(http.StatusOK)
 
 	return nil
@@ -182,9 +182,9 @@ func (userInfo *UserInfo) updateUserPassword(c echo.Context) error {
 			"Unable to update user password",
 			"Unable to update user password: %v", err,
 		)
-	}		
-	
+	}
+
 	c.Response().WriteHeader(http.StatusOK)
 
 	return nil
-}
+}