Skip to content

fix(enterprise/dbcrypt): do not skip deleted users when encrypting or deleting #9694

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

Merged
merged 11 commits into from
Sep 15, 2023
Merged

fix(enterprise/dbcrypt): do not skip deleted users when encrypting or deleting #9694

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
355b2c1
add some more logging to test
johnstcn Sep 15, 2023
39aa29e
validate working with multiple user statuses
johnstcn Sep 15, 2023
3950c09
fmt query
johnstcn Sep 15, 2023
49b9d90
create deleted users
johnstcn Sep 15, 2023
5c1b687
robustificate data generation
johnstcn Sep 15, 2023
9bb1a5d
only dump on test failure
johnstcn Sep 15, 2023
7da5972
more logging
johnstcn Sep 15, 2023
2f63e43
do not skip deleted users when encrypting or decrypting
johnstcn Sep 15, 2023
11f85bf
make AllUserIDs a fully-fledged query citizen
johnstcn Sep 15, 2023
0c11d6c
fixup! make AllUserIDs a fully-fledged query citizen
johnstcn Sep 15, 2023
0f164a3
fixup! fixup! make AllUserIDs a fully-fledged query citizen
johnstcn Sep 15, 2023
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
robustificate data generation
  • Loading branch information
@johnstcn
johnstcn committed Sep 15, 2023
commit 5c1b687a34c5d0da9cb258b79aaf7aa95335b979
69 changes: 36 additions & 33 deletions enterprise/cli/server_dbcrypt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestServerDBCrypt(t *testing.T) {
db := database.New(sqlDB)

// Populate the database with some unencrypted data.
users := genData(t, db, 10)
users := genData(t, db)
dumpUsers(t, sqlDB, "NOT ENCRYPTED")

// Setup an initial cipher A
Expand All @@ -56,13 +56,14 @@ func TestServerDBCrypt(t *testing.T) {
require.NoError(t, err)

// Populate the database with some encrypted data using cipher A.
users = append(users, genData(t, cryptdb, 10)...)
newUsers := genData(t, cryptdb)
dumpUsers(t, sqlDB, "PARTIALLY ENCRYPTED A")

// Validate that newly created users were encrypted with cipher A
for _, usr := range users[10:] {
for _, usr := range newUsers {
requireEncryptedWithCipher(ctx, t, db, cipherA[0], usr.ID)
}
users = append(users, newUsers...)

// Encrypt all the data with the initial cipher.
inv, _ := newCLI(t, "server", "dbcrypt", "rotate",
Expand All @@ -86,6 +87,10 @@ func TestServerDBCrypt(t *testing.T) {
cipherBA, err := dbcrypt.NewCiphers([]byte(keyB), []byte(keyA))
require.NoError(t, err)

// Generate some more encrypted data using the new cipher
users = append(users, genData(t, db)...)
dumpUsers(t, sqlDB, "ENCRYPTED AB")

inv, _ = newCLI(t, "server", "dbcrypt", "rotate",
"--postgres-url", connectionURL,
"--new-key", base64.StdEncoding.EncodeToString([]byte(keyB)),
Expand Down Expand Up @@ -204,38 +209,33 @@ func TestServerDBCrypt(t *testing.T) {
}
}

func genData(t *testing.T, db database.Store, n int) []database.User {
func genData(t *testing.T, db database.Store) []database.User {
t.Helper()
var users []database.User
// Make some users
for i := 0; i < n; i++ {
var deleted bool
status := database.UserStatusActive
if i%2 == 0 {
status = database.UserStatusSuspended
} else if i%3 == 0 {
status = database.UserStatusDormant
} else if i%5 == 0 {
deleted = true
for _, status := range database.AllUserStatusValues() {
for _, loginType := range database.AllLoginTypeValues() {
for _, deleted := range []bool{false, true} {
usr := dbgen.User(t, db, database.User{
LoginType: loginType,
Status: status,
Deleted: deleted,
})
_ = dbgen.GitAuthLink(t, db, database.GitAuthLink{
UserID: usr.ID,
ProviderID: "fake",
OAuthAccessToken: "access-" + usr.ID.String(),
OAuthRefreshToken: "refresh-" + usr.ID.String(),
})
_ = dbgen.UserLink(t, db, database.UserLink{
UserID: usr.ID,
LoginType: usr.LoginType,
OAuthAccessToken: "access-" + usr.ID.String(),
OAuthRefreshToken: "refresh-" + usr.ID.String(),
})
users = append(users, usr)
}
}
usr := dbgen.User(t, db, database.User{
LoginType: database.LoginTypeOIDC,
Status: status,
Deleted: deleted,
})
_ = dbgen.UserLink(t, db, database.UserLink{
UserID: usr.ID,
LoginType: usr.LoginType,
OAuthAccessToken: "access-" + usr.ID.String(),
OAuthRefreshToken: "refresh-" + usr.ID.String(),
})
_ = dbgen.GitAuthLink(t, db, database.GitAuthLink{
UserID: usr.ID,
ProviderID: "fake",
OAuthAccessToken: "access-" + usr.ID.String(),
OAuthRefreshToken: "refresh-" + usr.ID.String(),
})
users = append(users, usr)
}
return users
}
Expand All @@ -244,6 +244,7 @@ func dumpUsers(t *testing.T, db *sql.DB, header string) {
t.Logf("%s %s %s", strings.Repeat("=", 20), header, strings.Repeat("=", 20))
rows, err := db.QueryContext(context.Background(), `SELECT
u.id,
u.login_type,
u.status,
u.deleted,
ul.oauth_access_token_key_id AS uloatkid,
Expand All @@ -259,6 +260,7 @@ ORDER BY u.created_at ASC;`)
for rows.Next() {
var (
id string
loginType string
status string
deleted bool
UlOatKid sql.NullString
Expand All @@ -268,15 +270,16 @@ ORDER BY u.created_at ASC;`)
)
require.NoError(t, rows.Scan(
&id,
&loginType,
&status,
&deleted,
&UlOatKid,
&UlOrtKid,
&GalOatKid,
&GalOrtKid,
))
t.Logf("user: id:%s status:%-9s deleted:%-5t ul_kids{at:%-7s rt:%-7s} gal_kids{at:%-7s rt:%-7s}",
id, status, deleted, UlOatKid.String, UlOrtKid.String, GalOatKid.String, GalOrtKid.String,
t.Logf("user: id:%s login_type:%-8s status:%-9s deleted:%-5t ul_kids{at:%-7s rt:%-7s} gal_kids{at:%-7s rt:%-7s}",
id, loginType, status, deleted, UlOatKid.String, UlOrtKid.String, GalOatKid.String, GalOrtKid.String,
)
}
}
Expand Down