char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add 'completed' field in Interactive Auth API (#1469) 

This field must be present even after authentication failure, as
tested by sytest. This is needed by #1455.

Signed-off-by: Loïck Bonniot <git@lesterpig.com>
main
Loïck Bonniot 2020-10-02 16:05:23 +02:00 committed by GitHub
parent fb9a8f215b
commit 439bc235d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clientapi/auth/user_interactive.go
View File

@ -103,7 +103,8 @@ type userInteractiveFlow struct {
// the user already has a valid access token, but we want to double-check // the user already has a valid access token, but we want to double-check
// that it isn't stolen by re-authenticating them. // that it isn't stolen by re-authenticating them.
type UserInteractive struct { type UserInteractive struct {
Flows []userInteractiveFlow Completed []string
Flows []userInteractiveFlow
// Map of login type to implementation // Map of login type to implementation
Types map[string]Type Types map[string]Type
// Map of session ID to completed login types, will need to be extended in future // Map of session ID to completed login types, will need to be extended in future
@ -117,6 +118,7 @@ func NewUserInteractive(getAccByPass GetAccountByPassword, cfg *config.ClientAPI
} }
// TODO: Add SSO login // TODO: Add SSO login
return &UserInteractive{ return &UserInteractive{
Completed: []string{},
Flows: []userInteractiveFlow{ Flows: []userInteractiveFlow{
{ {
Stages: []string{typePassword.Name()}, Stages: []string{typePassword.Name()},
@ -140,6 +142,7 @@ func (u *UserInteractive) IsSingleStageFlow(authType string) bool {
func (u *UserInteractive) AddCompletedStage(sessionID, authType string) { func (u *UserInteractive) AddCompletedStage(sessionID, authType string) {
// TODO: Handle multi-stage flows // TODO: Handle multi-stage flows
u.Completed = append(u.Completed, authType)
delete(u.Sessions, sessionID) delete(u.Sessions, sessionID)
} }
@ -148,11 +151,13 @@ func (u *UserInteractive) Challenge(sessionID string) *util.JSONResponse {
return &util.JSONResponse{ return &util.JSONResponse{
Code: 401, Code: 401,
JSON: struct { JSON: struct {
Flows []userInteractiveFlow `json:"flows"` Completed []string `json:"completed"`
Session string `json:"session"` Flows []userInteractiveFlow `json:"flows"`
Session string `json:"session"`
// TODO: Return any additional `params` // TODO: Return any additional `params`
Params map[string]interface{} `json:"params"` Params map[string]interface{} `json:"params"`
}{ }{
u.Completed,
u.Flows, u.Flows,
sessionID, sessionID,
make(map[string]interface{}), make(map[string]interface{}),