Add Slack OpenID login with verified identities and callback replay protection
This commit is contained in:
+10
-29
@@ -30,14 +30,15 @@ type service struct {
|
||||
email *EmailConfig
|
||||
passwordSlots chan struct{}
|
||||
dummyPassword []byte
|
||||
slack *SlackConfig
|
||||
}
|
||||
|
||||
func New(db *sql.DB, callbacks map[string]string, redirectURI, id, secret string, email *EmailConfig) (http.Handler, error) {
|
||||
func New(db *sql.DB, callbacks map[string]string, redirectURI, id, secret string, email *EmailConfig, slack *SlackConfig) (http.Handler, error) {
|
||||
dummy, err := bcrypt.GenerateFromPassword([]byte("foundry-invalid-login-placeholder"), bcrypt.DefaultCost)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
s := &service{db: db, email: email, passwordSlots: make(chan struct{}, 4), dummyPassword: dummy, projects: make(map[string]*url.URL), redirectURI: redirectURI, clientID: id, secret: secret,
|
||||
s := &service{db: db, email: email, slack: slack, passwordSlots: make(chan struct{}, 4), dummyPassword: dummy, projects: make(map[string]*url.URL), redirectURI: redirectURI, clientID: id, secret: secret,
|
||||
google: &http.Client{Timeout: 10 * time.Second, CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}}
|
||||
for name, raw := range callbacks {
|
||||
u, err := url.Parse(raw)
|
||||
@@ -60,6 +61,7 @@ func New(db *sql.DB, callbacks map[string]string, redirectURI, id, secret string
|
||||
reply(w, 200, payload{"status": "ready"})
|
||||
return nil
|
||||
}))
|
||||
mux.HandleFunc("/auth/slack/callback", s.wrap(s.slackCallback))
|
||||
mux.HandleFunc("GET /auth/google/callback", s.wrap(s.callback))
|
||||
mux.HandleFunc("/projects/{project}/auth/{action}", s.wrap(s.project))
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -114,6 +116,9 @@ func (s *service) project(w http.ResponseWriter, r *http.Request) error {
|
||||
if frontend == nil {
|
||||
return reject(w, 404, "not_found")
|
||||
}
|
||||
if r.Method == http.MethodGet && action == "slack" {
|
||||
return s.startSlack(w, r, project)
|
||||
}
|
||||
if r.Method == http.MethodGet && action == "google" {
|
||||
return s.start(w, r, project)
|
||||
}
|
||||
@@ -156,7 +161,7 @@ func (s *service) start(w http.ResponseWriter, r *http.Request, project string)
|
||||
}
|
||||
state, browser, verifier := token(), token(), token()
|
||||
_, err := s.db.ExecContext(r.Context(), `
|
||||
INSERT INTO oauth_attempts VALUES ($1, $2, $3, $4, $5, now() + interval '10 minutes')
|
||||
INSERT INTO oauth_attempts(state_hash,browser_hash,project,frontend_challenge,google_verifier,expires_at) VALUES ($1, $2, $3, $4, $5, now() + interval '10 minutes')
|
||||
`, digest(state), digest(browser), project, challenge, verifier)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -211,7 +216,7 @@ func (s *service) callback(w http.ResponseWriter, r *http.Request) error {
|
||||
var project, challenge, verifier string
|
||||
err = s.db.QueryRowContext(ctx, `
|
||||
DELETE FROM oauth_attempts
|
||||
WHERE state_hash = $1 AND browser_hash = $2 AND expires_at > now()
|
||||
WHERE state_hash = $1 AND browser_hash = $2 AND expires_at > now() AND provider='google'
|
||||
RETURNING project, frontend_challenge, google_verifier
|
||||
`, digest(state), digest(browser.Value)).Scan(&project, &challenge, &verifier)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
@@ -263,31 +268,7 @@ func (s *service) callback(w http.ResponseWriter, r *http.Request) error {
|
||||
user.Email = nil
|
||||
}
|
||||
|
||||
grant := token()
|
||||
_, err = s.db.ExecContext(ctx, `
|
||||
WITH identity AS (
|
||||
SELECT gen_random_uuid() AS id
|
||||
), account AS (
|
||||
INSERT INTO project_accounts (project, id, google_subject, email, username, display_name, avatar_url)
|
||||
SELECT $1, id, $2, $3,
|
||||
left(COALESCE(NULLIF(regexp_replace(lower($6), '[^a-z0-9]', '', 'g'), ''), 'user'),7)
|
||||
|| '_' || replace(id::text,'-',''),
|
||||
$6, NULLIF($7,'') FROM identity
|
||||
ON CONFLICT (project, google_subject) DO UPDATE SET
|
||||
email = EXCLUDED.email,
|
||||
username = COALESCE(project_accounts.username, EXCLUDED.username),
|
||||
display_name = CASE WHEN project_accounts.display_name='' THEN EXCLUDED.display_name ELSE project_accounts.display_name END,
|
||||
avatar_url = COALESCE(project_accounts.avatar_url, EXCLUDED.avatar_url),
|
||||
updated_at = now()
|
||||
RETURNING id
|
||||
), provider AS (
|
||||
INSERT INTO account_identities(project,provider,subject,account_id)
|
||||
SELECT $1,'google',$2,id FROM account
|
||||
ON CONFLICT (project,provider,subject) DO NOTHING
|
||||
)
|
||||
INSERT INTO login_grants
|
||||
SELECT $4, $1, id, $5, now() + interval '1 minute' FROM account
|
||||
`, project, user.Subject, user.Email, digest(grant), challenge, user.Name, user.Picture)
|
||||
grant, err := s.identityGrant(ctx, project, "google", user.Subject, user.Email, user.Name, user.Picture, challenge)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user