forked from wrenn/wrenn
pptx704
3932bc056e
- Add name column to users (migration + sqlc regen); propagate through JWT claims, auth context, all auth/OAuth handlers, service layer, and frontend - Sidebar and team page show name instead of email; team page splits Name/Email into separate columns - Block sandbox creation in UI and API when user has no active team context - loginTeam helper falls back to first active team when no default is set, fixing login for invited users with no is_default membership - Exclude soft-deleted teams from GetDefaultTeamForUser, GetBYOCTeams queries - Guard host creation against soft-deleted teams in service/host.go - SwitchTeam re-fetches name from DB instead of trusting stale JWT claim - Reset teams store on login so stale data from a previous session never persists - Update openapi.yaml: add name to SignupRequest and AuthResponse schemas
107 lines
3.2 KiB
Go
107 lines
3.2 KiB
Go
package auth
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/golang-jwt/jwt/v5"
|
|
)
|
|
|
|
const jwtExpiry = 6 * time.Hour
|
|
const hostJWTExpiry = 8760 * time.Hour // 1 year
|
|
|
|
// Claims are the JWT payload for user tokens.
|
|
type Claims struct {
|
|
Type string `json:"typ,omitempty"` // empty for user tokens; used to reject host tokens
|
|
TeamID string `json:"team_id"`
|
|
Role string `json:"role"` // owner, admin, or member within TeamID
|
|
Email string `json:"email"`
|
|
Name string `json:"name"`
|
|
jwt.RegisteredClaims
|
|
}
|
|
|
|
// SignJWT signs a new 6-hour JWT for the given user.
|
|
func SignJWT(secret []byte, userID, teamID, email, name, role string) (string, error) {
|
|
now := time.Now()
|
|
claims := Claims{
|
|
TeamID: teamID,
|
|
Role: role,
|
|
Email: email,
|
|
Name: name,
|
|
RegisteredClaims: jwt.RegisteredClaims{
|
|
Subject: userID,
|
|
IssuedAt: jwt.NewNumericDate(now),
|
|
ExpiresAt: jwt.NewNumericDate(now.Add(jwtExpiry)),
|
|
},
|
|
}
|
|
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
|
return token.SignedString(secret)
|
|
}
|
|
|
|
// VerifyJWT parses and validates a user JWT, returning the claims on success.
|
|
// Rejects host JWTs (which carry a "typ" claim) to prevent cross-token confusion.
|
|
func VerifyJWT(secret []byte, tokenStr string) (Claims, error) {
|
|
token, err := jwt.ParseWithClaims(tokenStr, &Claims{}, func(t *jwt.Token) (any, error) {
|
|
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
|
|
return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
|
|
}
|
|
return secret, nil
|
|
})
|
|
if err != nil {
|
|
return Claims{}, fmt.Errorf("invalid token: %w", err)
|
|
}
|
|
c, ok := token.Claims.(*Claims)
|
|
if !ok || !token.Valid {
|
|
return Claims{}, fmt.Errorf("invalid token claims")
|
|
}
|
|
if c.Type == "host" {
|
|
return Claims{}, fmt.Errorf("invalid token: host token cannot be used as user token")
|
|
}
|
|
return *c, nil
|
|
}
|
|
|
|
// HostClaims are the JWT payload for host agent tokens.
|
|
type HostClaims struct {
|
|
Type string `json:"typ"` // always "host"
|
|
HostID string `json:"host_id"`
|
|
jwt.RegisteredClaims
|
|
}
|
|
|
|
// SignHostJWT signs a long-lived (1 year) JWT for a registered host agent.
|
|
func SignHostJWT(secret []byte, hostID string) (string, error) {
|
|
now := time.Now()
|
|
claims := HostClaims{
|
|
Type: "host",
|
|
HostID: hostID,
|
|
RegisteredClaims: jwt.RegisteredClaims{
|
|
Subject: hostID,
|
|
IssuedAt: jwt.NewNumericDate(now),
|
|
ExpiresAt: jwt.NewNumericDate(now.Add(hostJWTExpiry)),
|
|
},
|
|
}
|
|
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
|
return token.SignedString(secret)
|
|
}
|
|
|
|
// VerifyHostJWT parses and validates a host JWT, returning the claims on success.
|
|
// It rejects user JWTs by checking the "typ" claim.
|
|
func VerifyHostJWT(secret []byte, tokenStr string) (HostClaims, error) {
|
|
token, err := jwt.ParseWithClaims(tokenStr, &HostClaims{}, func(t *jwt.Token) (any, error) {
|
|
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
|
|
return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
|
|
}
|
|
return secret, nil
|
|
})
|
|
if err != nil {
|
|
return HostClaims{}, fmt.Errorf("invalid token: %w", err)
|
|
}
|
|
c, ok := token.Claims.(*HostClaims)
|
|
if !ok || !token.Valid {
|
|
return HostClaims{}, fmt.Errorf("invalid token claims")
|
|
}
|
|
if c.Type != "host" {
|
|
return HostClaims{}, fmt.Errorf("invalid token type: expected host")
|
|
}
|
|
return *c, nil
|
|
}
|