fix token handling

tmpim · Sep 7, 2024 · 69c891e · 69c891e
1 parent efa68f5
commit 69c891e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/callback.go b/callback.go
@@ -79,7 +79,7 @@ func (t *Tmpauth) authCallback(w http.ResponseWriter, r *http.Request) (int, err
 		})
 	}
 
-	token, err := t.ParseAuthJWT(tokenStr, backgroundWorker.MinValidationTime())
+	token, err := t.ParseAuthJWT(tokenStr, "", backgroundWorker.MinValidationTime())
 	if err != nil {
 		t.DebugLog(fmt.Sprintf("failed to verify callback token: %v", err))
 		return t.failRedirect(w, r, ErrInvalidCallbackToken)
@@ -111,6 +111,7 @@ func (t *Tmpauth) authCallback(w http.ResponseWriter, r *http.Request) (int, err
 
 	// token validated, can cache now
 	tokenID := sha256.Sum256([]byte(wToken))
+	token.RawToken = wToken
 	t.tokenCacheMutex.Lock()
 	t.TokenCache[tokenID] = token
 	t.tokenCacheMutex.Unlock()

diff --git a/token.go b/token.go
@@ -147,7 +147,7 @@ func (t *Tmpauth) ParseWrappedAuthJWT(tokenStr string) (*CachedToken, error) {
 
 	wToken := wTokenRaw.Claims.(*wrappedToken)
 
-	cachedToken, err = t.ParseAuthJWT(wToken.Token, minValidationTime)
+	cachedToken, err = t.ParseAuthJWT(wToken.Token, tokenStr, minValidationTime)
 	if err != nil {
 		return nil, err
 	}
@@ -159,7 +159,7 @@ func (t *Tmpauth) ParseWrappedAuthJWT(tokenStr string) (*CachedToken, error) {
 	return cachedToken, nil
 }
 
-func (t *Tmpauth) ParseAuthJWT(tokenStr string, minValidationTime time.Time) (*CachedToken, error) {
+func (t *Tmpauth) ParseAuthJWT(tokenStr string, wrappedToken string, minValidationTime time.Time) (*CachedToken, error) {
 	if t.miniServerHost != "" {
 		return nil, errors.New("tmpauth: mini server endpoint is set, cannot parse auth JWTs")
 	}
@@ -258,7 +258,7 @@ func (t *Tmpauth) ParseAuthJWT(tokenStr string, minValidationTime time.Time) (*C
 		IssuedAt:       iat,
 		StateID:        stateID,
 		ValidatedAt:    minValidationTime,
-		RawToken:       tokenStr,
+		RawToken:       wrappedToken,
 		headersMutex:   new(sync.RWMutex),
 	}