Skip to content

feat: add user_secrets table #19162

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

Merged
merged 22 commits into from
Aug 7, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
104bf21
feat: add user_secrets table
evgeniy-scherbina Aug 4, 2025
b677273
feat: add SQL queries
evgeniy-scherbina Aug 4, 2025
a826dd3
feat: add DBAuthz wrappers and UserSecret resource type
evgeniy-scherbina Aug 5, 2025
540f2e2
feat: add DBAuthz tests
evgeniy-scherbina Aug 5, 2025
363173c
test: fix role-permissions test
evgeniy-scherbina Aug 5, 2025
e152648
test: fix migration test
evgeniy-scherbina Aug 5, 2025
49ac807
fix: change user-secret permissions
evgeniy-scherbina Aug 5, 2025
85b4f4c
fix: add unit-tests for sql queries
evgeniy-scherbina Aug 6, 2025
3f04a15
test: improve unit-tests for sql queries
evgeniy-scherbina Aug 6, 2025
d7605f6
refactor: use table-test approach for secrets-authz test
evgeniy-scherbina Aug 6, 2025
b55be78
refactor: minor refactor in tests
evgeniy-scherbina Aug 6, 2025
3090d52
fix: formatting
evgeniy-scherbina Aug 6, 2025
789a5eb
fix: formatting
evgeniy-scherbina Aug 6, 2025
12b6c2e
ci: run make gen and make fmt
evgeniy-scherbina Aug 6, 2025
317708b
refactor: CR's fixes
evgeniy-scherbina Aug 7, 2025
72faf7a
Update coderd/database/dbauthz/dbauthz.go
evgeniy-scherbina Aug 7, 2025
a715310
Update coderd/database/dbauthz/dbauthz.go
evgeniy-scherbina Aug 7, 2025
8ea3cda
refactor: CR's fixes
evgeniy-scherbina Aug 7, 2025
b21f07c
refactor: CR's fixes
evgeniy-scherbina Aug 7, 2025
0f47bae
refactor: CR's fixes
evgeniy-scherbina Aug 7, 2025
1d6f2fa
refactor: CR's fixes
evgeniy-scherbina Aug 7, 2025
b24599c
Merge remote-tracking branch 'origin/main' into yevhenii/secrets-db-s…
evgeniy-scherbina Aug 7, 2025
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
Next Next commit
feat: add user_secrets table
  • Loading branch information
evgeniy-scherbina committed Aug 4, 2025
commit 104bf2124ce121e176cf7d32156eca7063354d7d
24 changes: 24 additions & 0 deletions coderd/database/dump.sql

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions coderd/database/foreign_key_constraint.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions coderd/database/migrations/000356_add_user_secrets.down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- Drop the unique indexes first (in reverse order of creation)
DROP INDEX IF EXISTS user_secrets_user_file_path_idx;
DROP INDEX IF EXISTS user_secrets_user_env_name_idx;
DROP INDEX IF EXISTS user_secrets_user_name_idx;

-- Drop the table
DROP TABLE IF EXISTS user_secrets;
34 changes: 34 additions & 0 deletions coderd/database/migrations/000356_add_user_secrets.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
-- Stores encrypted user secrets (global, available across all organizations)
CREATE TABLE user_secrets (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
name TEXT NOT NULL,
description TEXT NOT NULL,

-- The encrypted secret value (base64-encoded encrypted data)
value TEXT NOT NULL,

-- Auto-injection settings
-- Environment variable name (e.g., "DATABASE_PASSWORD", "API_KEY")
-- Empty string means don't inject as env var
env_name TEXT NOT NULL DEFAULT '',

-- File path where secret should be written (e.g., "/home/coder/.ssh/id_rsa")
-- Empty string means don't inject as file
file_path TEXT NOT NULL DEFAULT '',

-- Timestamps
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP NOT NULL,
updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP NOT NULL
);

-- Unique constraint: user can't have duplicate secret names
CREATE UNIQUE INDEX user_secrets_user_name_idx ON user_secrets(user_id, name);

-- Unique constraint: user can't have duplicate env names
CREATE UNIQUE INDEX user_secrets_user_env_name_idx ON user_secrets(user_id, env_name)
WHERE env_name != '';

-- Unique constraint: user can't have duplicate file paths
CREATE UNIQUE INDEX user_secrets_user_file_path_idx ON user_secrets(user_id, file_path)
WHERE file_path != '';
12 changes: 12 additions & 0 deletions coderd/database/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions coderd/database/unique_constraint.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading