Skip to content

feat(coderd): add dbcrypt package #9522

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 12 commits into from
Sep 6, 2023
Merged

feat(coderd): add dbcrypt package #9522

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fb953e4
feat(coderd): add dbcrypt package
johnstcn Sep 4, 2023
55b93e7
fix indentation
johnstcn Sep 5, 2023
f340cba
fixup! fix indentation
johnstcn Sep 5, 2023
feae634
check for primary key revocation on startup
johnstcn Sep 5, 2023
381f078
retry insert active key on tx serialization failure
johnstcn Sep 5, 2023
c42e6a6
fixup! retry insert active key on tx serialization failure
johnstcn Sep 5, 2023
6a50a43
use database.IsSerializedError
johnstcn Sep 5, 2023
46b1ff4
encryptFields: check for nil field or digest
johnstcn Sep 5, 2023
9c18168
rm insertDBCryptKeyNoLock
johnstcn Sep 5, 2023
b703758
allow operation in pass-through mode with no keys
johnstcn Sep 6, 2023
d782626
fixup! allow operation in pass-through mode with no keys
johnstcn Sep 6, 2023
5634955
Merge remote-tracking branch 'origin/main' into cj/dbcrypt_redux_1
johnstcn Sep 6, 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
fix indentation
  • Loading branch information
@johnstcn
johnstcn committed Sep 5, 2023
commit 55b93e7d60509326208bd48aa0138229be53e89e
12 changes: 6 additions & 6 deletions coderd/database/queries/gitauth.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ INSERT INTO git_auth_links (
created_at,
updated_at,
oauth_access_token,
oauth_access_token_key_id,
oauth_access_token_key_id,
oauth_refresh_token,
oauth_refresh_token_key_id,
oauth_refresh_token_key_id,
oauth_expiry
) VALUES (
$1,
Expand All @@ -23,16 +23,16 @@ INSERT INTO git_auth_links (
$5,
$6,
$7,
$8,
$9
$8,
$9
) RETURNING *;

-- name: UpdateGitAuthLink :one
UPDATE git_auth_links SET
updated_at = $3,
oauth_access_token = $4,
oauth_access_token_key_id = $5,
oauth_access_token_key_id = $5,
oauth_refresh_token = $6,
oauth_refresh_token_key_id = $7,
oauth_refresh_token_key_id = $7,
oauth_expiry = $8
WHERE provider_id = $1 AND user_id = $2 RETURNING *;