Skip to content
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

Jump to bottom

refactoring user interactive auth #3380

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactoring user interactive auth #3380

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4954427
refactoring user interactive auth:
hkohlsaat May 26, 2024
7f53e66
resolving comments
hkohlsaat Oct 9, 2024
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
50 changes: 23 additions & 27 deletions clientapi/auth/user_interactive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,13 @@ type userInteractiveFlow struct {
// the user already has a valid access token, but we want to double-check
// that it isn't stolen by re-authenticating them.
type UserInteractive struct {
sync.RWMutex
Flows []userInteractiveFlow
flows []userInteractiveFlow
// Map of login type to implementation
Types map[string]Type
types map[string]Type

mutex sync.RWMutex
// Map of session ID to completed login types, will need to be extended in future
Sessions map[string][]string
sessions map[string][]string
}

func NewUserInteractive(userAccountAPI api.UserLoginAPI, cfg *config.ClientAPI) *UserInteractive {
Expand All @@ -117,22 +118,20 @@ func NewUserInteractive(userAccountAPI api.UserLoginAPI, cfg *config.ClientAPI)
Config: cfg,
}
return &UserInteractive{
Flows: []userInteractiveFlow{
flows: []userInteractiveFlow{
{
Stages: []string{typePassword.Name()},
},
},
Types: map[string]Type{
types: map[string]Type{
typePassword.Name(): typePassword,
},
Sessions: make(map[string][]string),
sessions: make(map[string][]string),
}
}

func (u *UserInteractive) IsSingleStageFlow(authType string) bool {
u.RLock()
defer u.RUnlock()
for _, f := range u.Flows {
for _, f := range u.flows {
if len(f.Stages) == 1 && f.Stages[0] == authType {
return true
}
Expand All @@ -141,10 +140,10 @@ func (u *UserInteractive) IsSingleStageFlow(authType string) bool {
}

func (u *UserInteractive) AddCompletedStage(sessionID, authType string) {
u.Lock()
u.mutex.Lock()
// TODO: Handle multi-stage flows
delete(u.Sessions, sessionID)
u.Unlock()
delete(u.sessions, sessionID)
u.mutex.Unlock()
}

type Challenge struct {
Expand All @@ -157,16 +156,15 @@ type Challenge struct {

// Challenge returns an HTTP 401 with the supported flows for authenticating
func (u *UserInteractive) challenge(sessionID string) *util.JSONResponse {
u.RLock()
completed := u.Sessions[sessionID]
flows := u.Flows
u.RUnlock()
u.mutex.RLock()
completed := u.sessions[sessionID]
u.mutex.RUnlock()

return &util.JSONResponse{
Code: 401,
JSON: Challenge{
Completed: completed,
Flows: flows,
Flows: u.flows,
Session: sessionID,
Params: make(map[string]interface{}),
},
Expand All @@ -183,9 +181,9 @@ func (u *UserInteractive) NewSession() *util.JSONResponse {
JSON: spec.InternalServerError{},
}
}
u.Lock()
u.Sessions[sessionID] = []string{}
u.Unlock()
u.mutex.Lock()
u.sessions[sessionID] = []string{}
u.mutex.Unlock()
return u.challenge(sessionID)
}

Expand Down Expand Up @@ -233,9 +231,7 @@ func (u *UserInteractive) Verify(ctx context.Context, bodyBytes []byte, device *
// extract the type so we know which login type to use
authType := gjson.GetBytes(bodyBytes, "auth.type").Str

u.RLock()
loginType, ok := u.Types[authType]
u.RUnlock()
loginType, ok := u.types[authType]

if !ok {
return nil, &util.JSONResponse{
Expand All @@ -247,9 +243,9 @@ func (u *UserInteractive) Verify(ctx context.Context, bodyBytes []byte, device *
// retrieve the session
sessionID := gjson.GetBytes(bodyBytes, "auth.session").Str

u.RLock()
_, ok = u.Sessions[sessionID]
u.RUnlock()
u.mutex.RLock()
_, ok = u.sessions[sessionID]
u.mutex.RUnlock()

if !ok {
// if the login type is part of a single stage flow then allow them to omit the session ID
Expand Down