willdot.net
+10
-3
models/models.go
+10
-3
models/models.go
···
8
8
"github.com/bluesky-social/indigo/atproto/atcrypto"
9
9
)
10
10
11
+
type TwoFactorType string
12
+
13
+
var (
14
+
TwoFactorTypeNone = TwoFactorType("none")
15
+
TwoFactorTypeEmail = TwoFactorType("email")
16
+
)
17
+
11
18
type Repo struct {
12
19
Did string `gorm:"primaryKey"`
13
20
CreatedAt time.Time
···
29
36
Root []byte
30
37
Preferences []byte
31
38
Deactivated bool
32
-
EmailAuthFactor bool
33
-
AuthCode *string
34
-
AuthCodeExpiresAt *time.Time
39
+
TwoFactorCode *string
40
+
TwoFactorCodeExpiresAt *time.Time
41
+
TwoFactorType TwoFactorType `gorm:"default:none"`
35
42
}
36
43
37
44
func (r *Repo) SignFor(ctx context.Context, did string, msg []byte) ([]byte, error) {
+9
-9
server/handle_account_signin.go
+9
-9
server/handle_account_signin.go
···
123
123
return e.Redirect(303, "/account/signin"+queryParams)
124
124
}
125
125
126
-
// if repo requires auth factor token and one hasn't been provided, return error prompting for one
127
-
if repo.EmailAuthFactor && req.AuthFactorToken == "" {
128
-
err = s.createAndSendAuthCode(ctx, repo)
126
+
// if repo requires 2FA token and one hasn't been provided, return error prompting for one
127
+
if repo.TwoFactorType != models.TwoFactorTypeNone && req.AuthFactorToken == "" {
128
+
err = s.createAndSendTwoFactorCode(ctx, repo)
129
129
if err != nil {
130
130
sess.AddFlash("Something went wrong!", "error")
131
131
sess.Save(e.Request(), e.Response())
···
137
137
return e.Redirect(303, "/account/signin"+queryParams)
138
138
}
139
139
140
-
// if auth factor is required, now check that the one provided is valid
141
-
if repo.EmailAuthFactor {
142
-
if repo.AuthCode == nil || repo.AuthCodeExpiresAt == nil {
143
-
err = s.createAndSendAuthCode(ctx, repo)
140
+
// if 2FAis required, now check that the one provided is valid
141
+
if repo.TwoFactorType != models.TwoFactorTypeNone {
142
+
if repo.TwoFactorCode == nil || repo.TwoFactorCodeExpiresAt == nil {
143
+
err = s.createAndSendTwoFactorCode(ctx, repo)
144
144
if err != nil {
145
145
sess.AddFlash("Something went wrong!", "error")
146
146
sess.Save(e.Request(), e.Response())
···
152
152
return e.Redirect(303, "/account/signin"+queryParams)
153
153
}
154
154
155
-
if *repo.AuthCode != req.AuthFactorToken {
155
+
if *repo.TwoFactorCode != req.AuthFactorToken {
156
156
return helpers.InvalidTokenError(e)
157
157
}
158
158
159
-
if time.Now().UTC().After(*repo.AuthCodeExpiresAt) {
159
+
if time.Now().UTC().After(*repo.TwoFactorCodeExpiresAt) {
160
160
return helpers.ExpiredTokenError(e)
161
161
}
162
162
}
+18
-15
server/handle_server_create_session.go
+18
-15
server/handle_server_create_session.go
···
94
94
return helpers.InputError(e, to.StringPtr("InvalidRequest"))
95
95
}
96
96
97
-
// if repo requires auth factor token and one hasn't been provided, return error prompting for one
98
-
if repo.EmailAuthFactor && (req.AuthFactorToken == nil || *req.AuthFactorToken == "") {
99
-
err = s.createAndSendAuthCode(ctx, repo)
97
+
// if repo requires 2FA token and one hasn't been provided, return error prompting for one
98
+
if repo.TwoFactorType != models.TwoFactorTypeNone && (req.AuthFactorToken == nil || *req.AuthFactorToken == "") {
99
+
err = s.createAndSendTwoFactorCode(ctx, repo)
100
100
if err != nil {
101
-
s.logger.Error("sending auth code", "error", err)
101
+
logger.Error("sending 2FA code", "error", err)
102
102
return helpers.ServerError(e, nil)
103
103
}
104
104
105
105
return helpers.InputError(e, to.StringPtr("AuthFactorTokenRequired"))
106
106
}
107
107
108
-
// if auth factor is required, now check that the one provided is valid
109
-
if repo.EmailAuthFactor {
110
-
if repo.AuthCode == nil || repo.AuthCodeExpiresAt == nil {
111
-
err = s.createAndSendAuthCode(ctx, repo)
108
+
// if 2FA is required, now check that the one provided is valid
109
+
if repo.TwoFactorType != models.TwoFactorTypeNone {
110
+
if repo.TwoFactorCode == nil || repo.TwoFactorCodeExpiresAt == nil {
111
+
err = s.createAndSendTwoFactorCode(ctx, repo)
112
112
if err != nil {
113
-
logger.Error("sending auth code", "error", err)
113
+
logger.Error("sending 2FA code", "error", err)
114
114
return helpers.ServerError(e, nil)
115
115
}
116
116
117
117
return helpers.InputError(e, to.StringPtr("AuthFactorTokenRequired"))
118
118
}
119
119
120
-
if *repo.AuthCode != *req.AuthFactorToken {
120
+
if *repo.TwoFactorCode != *req.AuthFactorToken {
121
121
return helpers.InvalidTokenError(e)
122
122
}
123
123
124
-
if time.Now().UTC().After(*repo.AuthCodeExpiresAt) {
124
+
if time.Now().UTC().After(*repo.TwoFactorCodeExpiresAt) {
125
125
return helpers.ExpiredTokenError(e)
126
126
}
127
127
}
···
139
139
Did: repo.Repo.Did,
140
140
Email: repo.Email,
141
141
EmailConfirmed: repo.EmailConfirmedAt != nil,
142
-
EmailAuthFactor: repo.EmailAuthFactor,
142
+
EmailAuthFactor: repo.TwoFactorType != models.TwoFactorTypeNone,
143
143
Active: repo.Active(),
144
144
Status: repo.Status(),
145
145
})
146
146
}
147
147
148
-
func (s *Server) createAndSendAuthCode(ctx context.Context, repo models.RepoActor) error {
148
+
func (s *Server) createAndSendTwoFactorCode(ctx context.Context, repo models.RepoActor) error {
149
+
// TODO: when implementing a new type of 2FA there should be some logic in here to send the
150
+
// right type of code
151
+
149
152
code := fmt.Sprintf("%s-%s", helpers.RandomVarchar(5), helpers.RandomVarchar(5))
150
153
eat := time.Now().Add(10 * time.Minute).UTC()
151
154
152
-
if err := s.db.Exec(ctx, "UPDATE repos SET auth_code = ?, auth_code_expires_at = ? WHERE did = ?", nil, code, eat, repo.Repo.Did).Error; err != nil {
155
+
if err := s.db.Exec(ctx, "UPDATE repos SET two_factor_code = ?, two_factor_code_expires_at = ? WHERE did = ?", nil, code, eat, repo.Repo.Did).Error; err != nil {
153
156
return fmt.Errorf("updating repo: %w", err)
154
157
}
155
158
156
-
if err := s.sendAuthCode(repo.Email, repo.Handle, code); err != nil {
159
+
if err := s.sendTwoFactorCode(repo.Email, repo.Handle, code); err != nil {
157
160
return fmt.Errorf("sending email: %w", err)
158
161
}
159
162
+1
-1
server/handle_server_get_session.go
+1
-1
server/handle_server_get_session.go
+8
-3
server/handle_server_update_email.go
+8
-3
server/handle_server_update_email.go
···
33
33
// To disable email auth factor a token is required.
34
34
// To enable email auth factor a token is not required.
35
35
// If updating an email address, a token will be sent anyway
36
-
if urepo.EmailAuthFactor && req.EmailAuthFactor == false && req.Token == "" {
36
+
if urepo.TwoFactorType != models.TwoFactorTypeNone && req.EmailAuthFactor == false && req.Token == "" {
37
37
return helpers.InvalidTokenError(e)
38
38
}
39
39
···
51
51
}
52
52
}
53
53
54
-
query := "UPDATE repos SET email_update_code = NULL, email_update_code_expires_at = NULL, email_auth_factor = ?, email = ?"
54
+
twoFactorType := models.TwoFactorTypeNone
55
+
if req.EmailAuthFactor {
56
+
twoFactorType = models.TwoFactorTypeEmail
57
+
}
58
+
59
+
query := "UPDATE repos SET email_update_code = NULL, email_update_code_expires_at = NULL, two_factor_type = ?, email = ?"
55
60
56
61
if urepo.Email != req.Email {
57
62
query += ",email_confirmed_at = NULL"
···
59
64
60
65
query += " WHERE did = ?"
61
66
62
-
if err := s.db.Exec(ctx, query, nil, req.EmailAuthFactor, req.Email, urepo.Repo.Did).Error; err != nil {
67
+
if err := s.db.Exec(ctx, query, nil, twoFactorType, req.Email, urepo.Repo.Did).Error; err != nil {
63
68
logger.Error("error updating repo", "error", err)
64
69
return helpers.ServerError(e, nil)
65
70
}