Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
80 changes: 80 additions & 0 deletions server/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,86 @@ func (s *Server) handleVerify(w http.ResponseWriter, r *http.Request) {
}{redirectURL})
}

func (s *Server) handleVerifyDirect(w http.ResponseWriter, r *http.Request) {
var verifyReq struct {
Signed string `json:"signed"`
State string `json:"state"`
}
if err := json.NewDecoder(r.Body).Decode(&verifyReq); err != nil {
s.renderErrorJSON(w, http.StatusBadRequest, "Could not parse request body JSON.")
return
}

authReq, err := s.storage.GetAuthRequest(verifyReq.State)
if err != nil {
s.renderErrorJSON(w, http.StatusBadRequest, "Requested resource does not exist.")
return
}

var data web3ConnectorData
json.Unmarshal(authReq.ConnectorData, &data)

conn, err := s.getConnector(authReq.ConnectorID)
if err != nil {
s.renderErrorJSON(w, http.StatusInternalServerError, "Requested resource does not exist.")
return
}

w3Conn, ok := conn.Connector.(connector.Web3Connector)
if !ok {
s.renderErrorJSON(w, http.StatusInternalServerError, "Requested resource does not exist.")
return
}

identity, err := w3Conn.Verify(data.Address, data.Nonce, verifyReq.Signed)
if err != nil {
s.renderErrorJSON(w, http.StatusBadRequest, "Could not verify signature.")
return
}

_, err = s.finalizeLogin(identity, authReq, conn)
if err != nil {
s.renderErrorJSON(w, http.StatusInternalServerError, "Login failure.")
}

if s.now().After(authReq.Expiry) {
s.renderErrorJSON(w, http.StatusBadRequest, "User session has expired.")
return
}

if err := s.storage.DeleteAuthRequest(authReq.ID); err != nil {
if err != storage.ErrNotFound {
s.logger.Errorf("Failed to delete authorization request: %v", err)
s.renderErrorJSON(w, http.StatusInternalServerError, "Internal server error.")
} else {
s.renderErrorJSON(w, http.StatusBadRequest, "User session error.")
}
return
}

code := storage.AuthCode{
ID: storage.NewID(),
ClientID: authReq.ClientID,
ConnectorID: authReq.ConnectorID,
Nonce: authReq.Nonce,
Scopes: authReq.Scopes,
Claims: authReq.Claims,
Expiry: s.now().Add(time.Minute * 30),
RedirectURI: authReq.RedirectURI,
ConnectorData: authReq.ConnectorData,
PKCE: authReq.PKCE,
}
if err := s.storage.CreateAuthCode(code); err != nil {
s.logger.Errorf("Failed to create auth code: %v", err)
s.renderError(r, w, http.StatusInternalServerError, "Internal server error.")
return
}

s.renderJSON(w, struct {
Redirect string `json:"code"`
}{code.ID})
}

func (s *Server) handleCreateAuthorizationRequest(w http.ResponseWriter, r *http.Request) {
authReq, err := s.parseAuthorizationRequest(r)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ func newServer(ctx context.Context, c Config, rotationStrategy rotationStrategy)
handleFunc("/auth/{connector}/login", s.handlePasswordLogin)
handleWithCORS("/auth/{connector}/challenge", s.handleChallenge)
handleWithCORS("/auth/{connector}/verify", s.handleVerify)
handleWithCORS("/auth/{connector}/verify_direct", s.handleVerifyDirect)
handleWithCORS("/auth/{connector}/init", s.handleCreateAuthorizationRequest)
handleFunc("/device", s.handleDeviceExchange)
handleFunc("/device/auth/verify_code", s.verifyUserCode)
Expand Down
3 changes: 3 additions & 0 deletions storage/ent/db/authcode_create.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions storage/ent/db/authrequest_create.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions storage/ent/db/connector_create.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions storage/ent/db/keys_create.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions storage/ent/db/oauth2client_create.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions storage/ent/db/offlinesession_create.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions storage/ent/db/refreshtoken_create.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions storage/ent/db/runtime/runtime.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.