Skip to content
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.

Sign up for GitHub

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

[management] Setup key improvements #2775

Merged
merged 14 commits into from
Oct 28, 2024
Merged

[management] Setup key improvements #2775

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a522486
migrate setup key to hashed + add delete endpoint + allow not expirin…
pascal-fischer Oct 23, 2024
682b2c8
fix migration
pascal-fischer Oct 23, 2024
be6c42f
fix migration
pascal-fischer Oct 23, 2024
7721334
fix migration test
pascal-fischer Oct 23, 2024
c36bb33
fix tests
pascal-fischer Oct 24, 2024
926d224
linter
pascal-fischer Oct 24, 2024
1171afb
create custom error types
pascal-fischer Oct 24, 2024
93927bc
fix store tests
pascal-fischer Oct 24, 2024
ec9af45
fix setup key tests
pascal-fischer Oct 24, 2024
348c33f
update api docs
pascal-fischer Oct 24, 2024
4d65752
add setup key delete test
pascal-fischer Oct 24, 2024
f392043
update api validation
pascal-fischer Oct 24, 2024
d460d47
update api validation
pascal-fischer Oct 24, 2024
9bc24da
send event on key deletion
pascal-fischer Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix store tests
  • Loading branch information
@pascal-fischer
pascal-fischer committed Oct 24, 2024
commit 93927bc343cb2eab0452e2476801d1ba9aa3cb15
21 changes: 16 additions & 5 deletions management/server/sql_store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package server

import (
"context"
"crypto/sha256"
b64 "encoding/base64"
"fmt"
"math/rand"
"net"
Expand Down Expand Up @@ -1107,12 +1109,17 @@ func TestSqlite_GetSetupKeyBySecret(t *testing.T) {

existingAccountID := "bf1c8084-ba50-4ce7-9439-34653001fc3b"

plainKey := "A2C8E62B-38F5-4553-B31E-DD66C696CEBB"
hashedKey := sha256.Sum256([]byte(plainKey))
encodedHashedKey := b64.StdEncoding.EncodeToString(hashedKey[:])

_, err = store.GetAccount(context.Background(), existingAccountID)
require.NoError(t, err)

setupKey, err := store.GetSetupKeyBySecret(context.Background(), LockingStrengthShare, "A2C8E62B-38F5-4553-B31E-DD66C696CEBB")
setupKey, err := store.GetSetupKeyBySecret(context.Background(), LockingStrengthShare, encodedHashedKey)
require.NoError(t, err)
assert.Equal(t, "A2C8E62B-38F5-4553-B31E-DD66C696CEBB", setupKey.Key)
assert.Equal(t, encodedHashedKey, setupKey.Key)
assert.Equal(t, hiddenKey(plainKey, 4), setupKey.KeySecret)
assert.Equal(t, "bf1c8084-ba50-4ce7-9439-34653001fc3b", setupKey.AccountID)
assert.Equal(t, "Default key", setupKey.Name)
}
Expand All @@ -1127,24 +1134,28 @@ func TestSqlite_incrementSetupKeyUsage(t *testing.T) {

existingAccountID := "bf1c8084-ba50-4ce7-9439-34653001fc3b"

plainKey := "A2C8E62B-38F5-4553-B31E-DD66C696CEBB"
hashedKey := sha256.Sum256([]byte(plainKey))
encodedHashedKey := b64.StdEncoding.EncodeToString(hashedKey[:])

_, err = store.GetAccount(context.Background(), existingAccountID)
require.NoError(t, err)

setupKey, err := store.GetSetupKeyBySecret(context.Background(), LockingStrengthShare, "A2C8E62B-38F5-4553-B31E-DD66C696CEBB")
setupKey, err := store.GetSetupKeyBySecret(context.Background(), LockingStrengthShare, encodedHashedKey)
require.NoError(t, err)
assert.Equal(t, 0, setupKey.UsedTimes)

err = store.IncrementSetupKeyUsage(context.Background(), setupKey.Id)
require.NoError(t, err)

setupKey, err = store.GetSetupKeyBySecret(context.Background(), LockingStrengthShare, "A2C8E62B-38F5-4553-B31E-DD66C696CEBB")
setupKey, err = store.GetSetupKeyBySecret(context.Background(), LockingStrengthShare, encodedHashedKey)
require.NoError(t, err)
assert.Equal(t, 1, setupKey.UsedTimes)

err = store.IncrementSetupKeyUsage(context.Background(), setupKey.Id)
require.NoError(t, err)

setupKey, err = store.GetSetupKeyBySecret(context.Background(), LockingStrengthShare, "A2C8E62B-38F5-4553-B31E-DD66C696CEBB")
setupKey, err = store.GetSetupKeyBySecret(context.Background(), LockingStrengthShare, encodedHashedKey)
require.NoError(t, err)
assert.Equal(t, 2, setupKey.UsedTimes)
}
Expand Down
Loading