Skip to content

Commit 0943132

Browse files
committed
ultimate confusion
1 parent 69c891e commit 0943132

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

callback.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (t *Tmpauth) authCallback(w http.ResponseWriter, r *http.Request) (int, err
111111

112112
// token validated, can cache now
113113
tokenID := sha256.Sum256([]byte(wToken))
114-
token.RawToken = wToken
114+
token.WrappedToken = wToken
115115
t.tokenCacheMutex.Lock()
116116
t.TokenCache[tokenID] = token
117117
t.tokenCacheMutex.Unlock()

handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,12 +433,12 @@ func (t *Tmpauth) Whomst(token *CachedToken) (map[string]json.RawMessage, error)
433433
return nil, fmt.Errorf("invalid mini server request: %w", err)
434434
}
435435

436-
req.Header.Set(TokenHeader, token.RawToken)
436+
req.Header.Set(TokenHeader, token.InnerToken)
437437

438438
resp, respErr = t.miniClient(req, 0)
439439
} else {
440440
resp, respErr = t.HttpClient.Get("https://" + TmpAuthHost + "/whomst/tmpauth/db?token=" +
441-
url.QueryEscape(token.RawToken))
441+
url.QueryEscape(token.InnerToken))
442442
}
443443
if respErr != nil {
444444
return nil, respErr

token.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ type CachedToken struct {
2929
ValidatedAt time.Time
3030
IssuedAt time.Time
3131
UserIDs []string // IDs that can be used in Config.AllowedUsers from IDFormats
32-
RawToken string
32+
WrappedToken string
33+
InnerToken string
3334
headersMutex *sync.RWMutex
3435
}
3536

@@ -258,7 +259,8 @@ func (t *Tmpauth) ParseAuthJWT(tokenStr string, wrappedToken string, minValidati
258259
IssuedAt: iat,
259260
StateID: stateID,
260261
ValidatedAt: minValidationTime,
261-
RawToken: wrappedToken,
262+
WrappedToken: wrappedToken,
263+
InnerToken: tokenStr,
262264
headersMutex: new(sync.RWMutex),
263265
}
264266

@@ -302,7 +304,7 @@ func (t *Tmpauth) SetHeaders(token *CachedToken, headers http.Header) error {
302304
}
303305

304306
req.Header.Set(ConfigIDHeader, t.miniConfigID)
305-
req.Header.Set(TokenHeader, token.RawToken)
307+
req.Header.Set(TokenHeader, token.WrappedToken)
306308

307309
req.Header.Set("Content-Type", "application/jwt")
308310
resp, err := t.miniClient(req, 0)

0 commit comments

Comments
 (0)