Skip to content

feat: use signed JWT as access token #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: use signed JWT as access token #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions server/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,7 @@ func (s *IDPServer) issueTokens(w http.ResponseWriter, r *http.Request, ar *Auth
return
}

// Add new access token and refresh token to the token store
at := rands.HexString(32)
at := token
rt := rands.HexString(32)

s.mu.Lock()
Expand Down Expand Up @@ -910,6 +909,9 @@ func (s *IDPServer) serveIntrospect(w http.ResponseWriter, r *http.Request) {
resp["scope"] = strings.Join(ar.Scopes, " ")
}

// Include extra claims from capability if present (best-effort)
addExtraClaims(resp, ar)

// Include act claim if present (RFC 8693)
if ar.ActorInfo != nil {
resp["act"] = ar.ActorInfo
Expand Down Expand Up @@ -949,3 +951,20 @@ func (ar *AuthRequest) allowRelyingParty(r *http.Request) (int, error) {
}
return http.StatusOK, nil
}

// addExtraClaims adds extra claims from the user's capabilities to the response map.
// It does not overwrite existing keys in the response.
func addExtraClaims(resp map[string]any, ar *AuthRequest) {
if ar.RemoteUser == nil || ar.RemoteUser.CapMap == nil {
return
}
rules, err := tailcfg.UnmarshalCapJSON[capRule](ar.RemoteUser.CapMap, tailcfg.PeerCapabilityTsIDP)
if err != nil {
return
}
for k, v := range flattenExtraClaims(rules) {
if _, exists := resp[k]; !exists {
resp[k] = v
}
}
}