Fix PAT initialization/refresh (#163)

gogatekeeper · Jun 15, 2022 · 73f7df2 · 73f7df2
1 parent 83dcaf7
commit 73f7df2
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/middleware_test.go b/middleware_test.go
@@ -1847,6 +1847,9 @@ func TestEnableUma(t *testing.T) {
 				c.EnableDefaultDeny = true
 				c.ClientID = validUsername
 				c.ClientSecret = validPassword
+				c.PatRetryCount = 5
+				c.PatRefreshInterval = 33 * time.Second
+				c.PatRetryInterval = 2 * time.Second
 			},
 			ExecutionSettings: []fakeRequest{
 				{
@@ -1871,6 +1874,9 @@ func TestEnableUma(t *testing.T) {
 				c.EnableDefaultDeny = true
 				c.ClientID = validUsername
 				c.ClientSecret = validPassword
+				c.PatRetryCount = 5
+				c.PatRefreshInterval = 33 * time.Second
+				c.PatRetryInterval = 2 * time.Second
 			},
 			ExecutionSettings: []fakeRequest{
 				{
@@ -1897,6 +1903,9 @@ func TestEnableUma(t *testing.T) {
 				c.EnableDefaultDeny = true
 				c.ClientID = validUsername
 				c.ClientSecret = validPassword
+				c.PatRetryCount = 5
+				c.PatRefreshInterval = 33 * time.Second
+				c.PatRetryInterval = 2 * time.Second
 			},
 			ExecutionSettings: []fakeRequest{
 				{
@@ -1931,6 +1940,9 @@ func TestEnableUma(t *testing.T) {
 				c.EnableDefaultDeny = true
 				c.ClientID = validUsername
 				c.ClientSecret = validPassword
+				c.PatRetryCount = 5
+				c.PatRefreshInterval = 33 * time.Second
+				c.PatRetryInterval = 2 * time.Second
 			},
 			ExecutionSettings: []fakeRequest{
 				{
@@ -1965,6 +1977,9 @@ func TestEnableUma(t *testing.T) {
 				c.EnableDefaultDeny = true
 				c.ClientID = validUsername
 				c.ClientSecret = validPassword
+				c.PatRetryCount = 5
+				c.PatRefreshInterval = 33 * time.Second
+				c.PatRetryInterval = 2 * time.Second
 			},
 			ExecutionSettings: []fakeRequest{
 				{

diff --git a/server.go b/server.go
@@ -143,7 +143,7 @@ func newProxy(config *Config) (*oauthProxy, error) {
 
 	if config.EnableUma {
 		patDone := make(chan bool)
-		go svc.getPAT(patDone)
+		go svc.getPAT(patDone, *config)
 		<-patDone
 	}
 
@@ -1042,9 +1042,17 @@ func (r *oauthProxy) Render(w io.Writer, name string, data interface{}) error {
 	return r.templates.ExecuteTemplate(w, name, data)
 }
 
-func (r *oauthProxy) getPAT(done chan bool) {
+func (r *oauthProxy) getPAT(done chan bool, config Config) {
 	retry := 0
 	r.pat = &PAT{}
+	initialized := false
+	clientID := config.ClientID
+	clientSecret := config.ClientSecret
+	realm := config.Realm
+	timeout := config.OpenIDProviderTimeout
+	patRetryCount := config.PatRetryCount
+	patRetryInterval := config.PatRetryInterval
+	patRefreshInterval := config.PatRefreshInterval
 
 	for {
 		if retry > 0 {
@@ -1056,41 +1064,44 @@ func (r *oauthProxy) getPAT(done chan bool) {
 
 		ctx, cancel := context.WithTimeout(
 			context.Background(),
-			r.config.OpenIDProviderTimeout,
+			timeout,
 		)
-		clientID := r.config.ClientID
-		clientSecret := r.config.ClientSecret
 
 		token, err := r.idpClient.LoginClient(
 			ctx,
 			clientID,
 			clientSecret,
-			r.config.Realm,
+			realm,
 		)
 
 		if err != nil {
 			retry++
 			r.log.Error(
 				"problem getting PAT token",
+
 				zap.Error(err),
 			)
 
-			if retry >= r.config.PatRetryCount {
+			if retry >= patRetryCount {
 				cancel()
 				os.Exit(10)
 			}
 
-			time.Sleep(r.config.PatRetryInterval)
+			time.Sleep(patRetryInterval)
 			continue
 		}
 
 		r.pat.m.Lock()
 		r.pat.Token = token
 		r.pat.m.Unlock()
 
-		done <- true
+		if !initialized {
+			done <- true
+		}
+
+		initialized = true
 
 		retry = 0
-		time.Sleep(r.config.PatRefreshInterval)
+		time.Sleep(patRefreshInterval)
 	}
 }