-
-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Increase the size of the webauthn_credential credential_id field #18739
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 7 commits
e6ac143
d82a0fa
1bb1cba
e5d049d
a2c6a27
4a12a30
862d0a7
66db70b
b9237bd
fb1ba41
3dff1ae
040de03
ba6f87b
5ca70f7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,118 @@ | ||
// 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 ( | ||
"encoding/base32" | ||
"fmt" | ||
"strings" | ||
|
||
"code.gitea.io/gitea/modules/timeutil" | ||
"github.com/tstranex/u2f" | ||
"xorm.io/xorm" | ||
"xorm.io/xorm/schemas" | ||
) | ||
|
||
func increaseCredentialIDTo410(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 | ||
} | ||
|
||
if x.Dialect().URI().DBType == schemas.SQLITE { | ||
// SQLite doesn't support ALTER COLUMN, and it seem to already makes String _TEXT_ by default so no migration needed | ||
// nor is there any need to re-migrate | ||
return nil | ||
} | ||
|
||
// 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 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not just modify the column for non-sqlite database? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. // 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Honestly it's a nightmare handling all of the hoops which the various databases would require one to jump through to handle the index. Certainly MSSQL won't allow you adjust a column that has a contraint on it already - that would need to be dropped first but I'm not sure about when you're allowed to readd the constraint. Then MYSQL - which I think will allow you to change the column if it's empty - but if it contains data I have a feeling it would need to drop the constraint. Then IIRC if I would try to readd the constraint that won't work. I think Postgres is fine simply because of cascade. |
||
_ = sess.Close() | ||
return err | ||
} | ||
if err := sess.Commit(); err != nil { | ||
_ = sess.Close() | ||
return err | ||
} | ||
if err := sess.Close(); err != nil { | ||
return err | ||
} | ||
|
||
// 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 | ||
} | ||
|
||
for _, reg := range regs { | ||
parsed := new(u2f.Registration) | ||
err = parsed.UnmarshalBinary(reg.Raw) | ||
if err != nil { | ||
continue | ||
} | ||
|
||
var cred *webauthnCredential | ||
has, err := x.ID(reg.ID).Where("id = ? AND user_id = ?", reg.ID, reg.UserID).Get(cred) | ||
if err != nil { | ||
return fmt.Errorf("unable to get webauthn_credential[%d]. Error: %v", reg.ID, err) | ||
} | ||
if !has { | ||
continue | ||
} | ||
remigratedCredID := base32.HexEncoding.EncodeToString(parsed.KeyHandle) | ||
if cred.CredentialID == remigratedCredID || (!strings.HasPrefix(remigratedCredID, cred.CredentialID) && cred.CredentialID != "") { | ||
continue | ||
} | ||
|
||
cred.CredentialID = remigratedCredID | ||
|
||
_, err = x.Update(cred) | ||
zeripath marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if err != nil { | ||
return err | ||
} | ||
} | ||
|
||
if len(regs) < 50 { | ||
break | ||
} | ||
start += 50 | ||
regs = regs[:0] | ||
} | ||
|
||
return nil | ||
} |
Uh oh!
There was an error while loading. Please reload this page.