Attempt to fix the webauthn migration again - part 3 (#18770)
v208.go is seriously broken as it misses an ID() check. We need to no-op and remigrate all of the u2f keys. See #18756 Signed-off-by: Andrew Thornton <art27@cantab.net>tokarchuk/v1.17
zeripath
3 years ago
committed by
GitHub
parent
f48771ae78
commit
3a29a23cdc
@ -0,0 +1,172 @@ |
||||
// Copyright 2022 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package migrations |
||||
|
||||
import ( |
||||
"crypto/elliptic" |
||||
"encoding/base32" |
||||
"fmt" |
||||
"strings" |
||||
|
||||
"code.gitea.io/gitea/modules/timeutil" |
||||
"github.com/tstranex/u2f" |
||||
|
||||
"xorm.io/xorm" |
||||
"xorm.io/xorm/schemas" |
||||
) |
||||
|
||||
// v208 migration was completely broken
|
||||
func remigrateU2FCredentials(x *xorm.Engine) error { |
||||
// Create webauthnCredential table
|
||||
type webauthnCredential struct { |
||||
ID int64 `xorm:"pk autoincr"` |
||||
Name string |
||||
LowerName string `xorm:"unique(s)"` |
||||
UserID int64 `xorm:"INDEX unique(s)"` |
||||
CredentialID string `xorm:"INDEX VARCHAR(410)"` // CredentalID in U2F is at most 255bytes / 5 * 8 = 408 - add a few extra characters for safety
|
||||
PublicKey []byte |
||||
AttestationType string |
||||
AAGUID []byte |
||||
SignCount uint32 `xorm:"BIGINT"` |
||||
CloneWarning bool |
||||
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` |
||||
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` |
||||
} |
||||
if err := x.Sync2(&webauthnCredential{}); err != nil { |
||||
return err |
||||
} |
||||
|
||||
switch x.Dialect().URI().DBType { |
||||
case schemas.MYSQL: |
||||
_, err := x.Exec("ALTER TABLE webauthn_credential MODIFY COLUMN credential_id VARCHAR(410)") |
||||
if err != nil { |
||||
return err |
||||
} |
||||
case schemas.ORACLE: |
||||
_, err := x.Exec("ALTER TABLE webauthn_credential MODIFY credential_id VARCHAR(410)") |
||||
if err != nil { |
||||
return err |
||||
} |
||||
case schemas.MSSQL: |
||||
// This column has an index on it. I could write all of the code to attempt to change the index OR
|
||||
// I could just use recreate table.
|
||||
sess := x.NewSession() |
||||
if err := sess.Begin(); err != nil { |
||||
_ = sess.Close() |
||||
return err |
||||
} |
||||
|
||||
if err := recreateTable(sess, new(webauthnCredential)); err != nil { |
||||
_ = sess.Close() |
||||
return err |
||||
} |
||||
if err := sess.Commit(); err != nil { |
||||
_ = sess.Close() |
||||
return err |
||||
} |
||||
if err := sess.Close(); err != nil { |
||||
return err |
||||
} |
||||
case schemas.POSTGRES: |
||||
_, err := x.Exec("ALTER TABLE webauthn_credential ALTER COLUMN credential_id TYPE VARCHAR(410)") |
||||
if err != nil { |
||||
return err |
||||
} |
||||
default: |
||||
// SQLite doesn't support ALTER COLUMN, and it already makes String _TEXT_ by default so no migration needed
|
||||
// nor is there any need to re-migrate
|
||||
} |
||||
|
||||
exist, err := x.IsTableExist("u2f_registration") |
||||
if err != nil { |
||||
return err |
||||
} |
||||
if !exist { |
||||
return nil |
||||
} |
||||
|
||||
// Now migrate the old u2f registrations to the new format
|
||||
type u2fRegistration struct { |
||||
ID int64 `xorm:"pk autoincr"` |
||||
Name string |
||||
UserID int64 `xorm:"INDEX"` |
||||
Raw []byte |
||||
Counter uint32 `xorm:"BIGINT"` |
||||
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` |
||||
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` |
||||
} |
||||
|
||||
var start int |
||||
regs := make([]*u2fRegistration, 0, 50) |
||||
for { |
||||
err := x.OrderBy("id").Limit(50, start).Find(®s) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
|
||||
err = func() error { |
||||
sess := x.NewSession() |
||||
defer sess.Close() |
||||
if err := sess.Begin(); err != nil { |
||||
return fmt.Errorf("unable to allow start session. Error: %w", err) |
||||
} |
||||
if x.Dialect().URI().DBType == schemas.MSSQL { |
||||
if _, err := sess.Exec("SET IDENTITY_INSERT `webauthn_credential` ON"); err != nil { |
||||
return fmt.Errorf("unable to allow identity insert on webauthn_credential. Error: %w", err) |
||||
} |
||||
} |
||||
for _, reg := range regs { |
||||
parsed := new(u2f.Registration) |
||||
err = parsed.UnmarshalBinary(reg.Raw) |
||||
if err != nil { |
||||
continue |
||||
} |
||||
remigrated := &webauthnCredential{ |
||||
ID: reg.ID, |
||||
Name: reg.Name, |
||||
LowerName: strings.ToLower(reg.Name), |
||||
UserID: reg.UserID, |
||||
CredentialID: base32.HexEncoding.EncodeToString(parsed.KeyHandle), |
||||
PublicKey: elliptic.Marshal(elliptic.P256(), parsed.PubKey.X, parsed.PubKey.Y), |
||||
AttestationType: "fido-u2f", |
||||
AAGUID: []byte{}, |
||||
SignCount: reg.Counter, |
||||
UpdatedUnix: reg.UpdatedUnix, |
||||
CreatedUnix: reg.CreatedUnix, |
||||
} |
||||
|
||||
has, err := sess.ID(reg.ID).Where("id = ?", reg.ID).Get(new(webauthnCredential)) |
||||
if err != nil { |
||||
return fmt.Errorf("unable to get webauthn_credential[%d]. Error: %w", reg.ID, err) |
||||
} |
||||
if !has { |
||||
_, err = sess.Insert(remigrated) |
||||
if err != nil { |
||||
return fmt.Errorf("unable to (re)insert webauthn_credential[%d]. Error: %w", reg.ID, err) |
||||
} |
||||
|
||||
continue |
||||
} |
||||
|
||||
_, err = sess.ID(remigrated.ID).AllCols().Update(remigrated) |
||||
if err != nil { |
||||
return fmt.Errorf("unable to update webauthn_credential[%d]. Error: %w", reg.ID, err) |
||||
} |
||||
} |
||||
return sess.Commit() |
||||
}() |
||||
if err != nil { |
||||
return err |
||||
} |
||||
|
||||
if len(regs) < 50 { |
||||
break |
||||
} |
||||
start += 50 |
||||
regs = regs[:0] |
||||
} |
||||
|
||||
return nil |
||||
} |
||||
Loading…
Reference in new issue