mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-13 21:02:25 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mas: minor fixes in cross_signing_keys_table files

Browse source
This commit is contained in:
Roman Isaev 2025-01-05 02:22:56 +00:00
parent 803cce882f
commit 7ffb2c1d81
No known key found for this signature in database
GPG key ID: 7BE2B6A6C89AEC7F
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
userapi/storage/postgres/cross_signing_keys_table.go
View file

@ -45,8 +45,8 @@ const upsertCrossSigningKeysForUserSQL = "" +
const updateMasterCrossSigningKeyAllowReplacementWithoutUiaSQL = "" + const updateMasterCrossSigningKeyAllowReplacementWithoutUiaSQL = "" +
"UPDATE keyserver_cross_signing_keys" + "UPDATE keyserver_cross_signing_keys" +
" SET updatable_without_uia_before_ms = $3" + " SET updatable_without_uia_before_ms = $1" +
" WHERE user_id = $1 AND key_type = $2" " WHERE user_id = $2 AND key_type = $3"
type crossSigningKeysStatements struct { type crossSigningKeysStatements struct {
db *sql.DB db *sql.DB
@ -150,7 +150,7 @@ func (s *crossSigningKeysStatements) UpsertCrossSigningKeysForUser(
func (s *crossSigningKeysStatements) UpdateMasterCrossSigningKeyAllowReplacementWithoutUIA(ctx context.Context, txn *sql.Tx, userID string, duration time.Duration) (int64, error) { func (s *crossSigningKeysStatements) UpdateMasterCrossSigningKeyAllowReplacementWithoutUIA(ctx context.Context, txn *sql.Tx, userID string, duration time.Duration) (int64, error) {
keyTypeInt, _ := types.KeyTypePurposeToInt[fclient.CrossSigningKeyPurposeMaster] keyTypeInt, _ := types.KeyTypePurposeToInt[fclient.CrossSigningKeyPurposeMaster]
ts := time.Now().Add(duration).UnixMilli() ts := time.Now().Add(duration).UnixMilli()
result, err := sqlutil.TxStmt(txn, s.updateMasterCrossSigningKeyAllowReplacementWithoutUiaStmt).ExecContext(ctx, userID, keyTypeInt, ts) result, err := sqlutil.TxStmt(txn, s.updateMasterCrossSigningKeyAllowReplacementWithoutUiaStmt).ExecContext(ctx, ts, userID, keyTypeInt)
if err != nil { if err != nil {
return -1, err return -1, err
} }

6
userapi/storage/sqlite3/cross_signing_keys_table.go
View file

@ -44,8 +44,8 @@ const upsertCrossSigningKeysForUserSQL = "" +
const updateMasterCrossSigningKeyAllowReplacementWithoutUiaSQL = "" + const updateMasterCrossSigningKeyAllowReplacementWithoutUiaSQL = "" +
"UPDATE keyserver_cross_signing_keys" + "UPDATE keyserver_cross_signing_keys" +
" SET updatable_without_uia_before_ms = $3" + " SET updatable_without_uia_before_ms = $1" +
" WHERE user_id = $1 AND key_type = $2" " WHERE user_id = $2 AND key_type = $3"
type crossSigningKeysStatements struct { type crossSigningKeysStatements struct {
db *sql.DB db *sql.DB
@ -149,7 +149,7 @@ func (s *crossSigningKeysStatements) UpsertCrossSigningKeysForUser(
func (s *crossSigningKeysStatements) UpdateMasterCrossSigningKeyAllowReplacementWithoutUIA(ctx context.Context, txn *sql.Tx, userID string, duration time.Duration) (int64, error) { func (s *crossSigningKeysStatements) UpdateMasterCrossSigningKeyAllowReplacementWithoutUIA(ctx context.Context, txn *sql.Tx, userID string, duration time.Duration) (int64, error) {
keyTypeInt, _ := types.KeyTypePurposeToInt[fclient.CrossSigningKeyPurposeMaster] keyTypeInt, _ := types.KeyTypePurposeToInt[fclient.CrossSigningKeyPurposeMaster]
ts := time.Now().Add(duration).UnixMilli() ts := time.Now().Add(duration).UnixMilli()
result, err := sqlutil.TxStmt(txn, s.updateMasterCrossSigningKeyAllowReplacementWithoutUiaStmt).ExecContext(ctx, userID, keyTypeInt, ts) result, err := sqlutil.TxStmt(txn, s.updateMasterCrossSigningKeyAllowReplacementWithoutUiaStmt).ExecContext(ctx, ts, userID, keyTypeInt)
if err != nil { if err != nil {
return -1, err return -1, err
} }