TL;DR Third PR in the PLAT-480 stack, on top of #28740. Fixes a race where the same authorization code could be redeemed twice concurrently. The redeeming delete now returns the deleted row. If another request already redeemed the code, the delete returns sql.ErrNoRows and redemption fails with invalid_grant. Each redemption runs in its own transaction, so concurrent requests serialize on the code row and only one succeeds. The test now races two concurrent redemptions to verify single-use behavior. No scope logic, new endpoints, or schema changes. Depends on #28740. Stack: #28237, #28740, this PR.
261 lines
5.9 KiB
SQL
261 lines
5.9 KiB
SQL
-- name: GetOAuth2ProviderApps :many
|
|
SELECT * FROM oauth2_provider_apps ORDER BY (name, id) ASC;
|
|
|
|
-- name: GetOAuth2ProviderAppByID :one
|
|
SELECT * FROM oauth2_provider_apps WHERE id = $1;
|
|
|
|
-- name: InsertOAuth2ProviderApp :one
|
|
INSERT INTO oauth2_provider_apps (
|
|
id,
|
|
created_at,
|
|
updated_at,
|
|
name,
|
|
icon,
|
|
callback_url,
|
|
redirect_uris,
|
|
client_type,
|
|
dynamically_registered,
|
|
client_id_issued_at,
|
|
client_secret_expires_at,
|
|
grant_types,
|
|
response_types,
|
|
token_endpoint_auth_method,
|
|
scope,
|
|
contacts,
|
|
client_uri,
|
|
logo_uri,
|
|
tos_uri,
|
|
policy_uri,
|
|
jwks_uri,
|
|
jwks,
|
|
software_id,
|
|
software_version,
|
|
registration_access_token,
|
|
registration_client_uri
|
|
) VALUES(
|
|
$1,
|
|
$2,
|
|
$3,
|
|
$4,
|
|
$5,
|
|
$6,
|
|
$7,
|
|
$8,
|
|
$9,
|
|
$10,
|
|
$11,
|
|
$12,
|
|
$13,
|
|
$14,
|
|
$15,
|
|
$16,
|
|
$17,
|
|
$18,
|
|
$19,
|
|
$20,
|
|
$21,
|
|
$22,
|
|
$23,
|
|
$24,
|
|
$25,
|
|
$26
|
|
) RETURNING *;
|
|
|
|
-- name: UpdateOAuth2ProviderAppByID :one
|
|
UPDATE oauth2_provider_apps SET
|
|
updated_at = $2,
|
|
name = $3,
|
|
icon = $4,
|
|
callback_url = $5,
|
|
redirect_uris = $6,
|
|
client_type = $7,
|
|
dynamically_registered = $8,
|
|
client_secret_expires_at = $9,
|
|
grant_types = $10,
|
|
response_types = $11,
|
|
token_endpoint_auth_method = $12,
|
|
scope = $13,
|
|
contacts = $14,
|
|
client_uri = $15,
|
|
logo_uri = $16,
|
|
tos_uri = $17,
|
|
policy_uri = $18,
|
|
jwks_uri = $19,
|
|
jwks = $20,
|
|
software_id = $21,
|
|
software_version = $22
|
|
WHERE id = $1 RETURNING *;
|
|
|
|
-- name: DeleteOAuth2ProviderAppByID :exec
|
|
DELETE FROM oauth2_provider_apps WHERE id = $1;
|
|
|
|
-- name: GetOAuth2ProviderAppSecretByID :one
|
|
SELECT * FROM oauth2_provider_app_secrets WHERE id = $1;
|
|
|
|
-- name: GetOAuth2ProviderAppSecretsByAppID :many
|
|
SELECT * FROM oauth2_provider_app_secrets WHERE app_id = $1 ORDER BY (created_at, id) ASC;
|
|
|
|
-- name: GetOAuth2ProviderAppSecretByPrefix :one
|
|
SELECT * FROM oauth2_provider_app_secrets WHERE secret_prefix = $1;
|
|
|
|
-- name: InsertOAuth2ProviderAppSecret :one
|
|
INSERT INTO oauth2_provider_app_secrets (
|
|
id,
|
|
created_at,
|
|
secret_prefix,
|
|
hashed_secret,
|
|
display_secret,
|
|
app_id
|
|
) VALUES(
|
|
$1,
|
|
$2,
|
|
$3,
|
|
$4,
|
|
$5,
|
|
$6
|
|
) RETURNING *;
|
|
|
|
-- name: DeleteOAuth2ProviderAppSecretByID :exec
|
|
DELETE FROM oauth2_provider_app_secrets WHERE id = $1;
|
|
|
|
-- name: GetOAuth2ProviderAppCodeByID :one
|
|
SELECT * FROM oauth2_provider_app_codes WHERE id = $1;
|
|
|
|
-- name: GetOAuth2ProviderAppCodeByPrefix :one
|
|
SELECT * FROM oauth2_provider_app_codes WHERE secret_prefix = $1;
|
|
|
|
-- name: InsertOAuth2ProviderAppCode :one
|
|
INSERT INTO oauth2_provider_app_codes (
|
|
id,
|
|
created_at,
|
|
expires_at,
|
|
secret_prefix,
|
|
hashed_secret,
|
|
app_id,
|
|
user_id,
|
|
resource_uri,
|
|
code_challenge,
|
|
code_challenge_method,
|
|
state_hash,
|
|
redirect_uri,
|
|
scope
|
|
) VALUES(
|
|
$1,
|
|
$2,
|
|
$3,
|
|
$4,
|
|
$5,
|
|
$6,
|
|
$7,
|
|
$8,
|
|
$9,
|
|
$10,
|
|
$11,
|
|
$12,
|
|
$13
|
|
) RETURNING *;
|
|
|
|
-- name: DeleteOAuth2ProviderAppCodeByID :one
|
|
-- Returns sql.ErrNoRows when the delete removed nothing, so a caller can make
|
|
-- this the arbiter of single use. A prior read cannot arbitrate: its result is
|
|
-- stale the moment it returns.
|
|
--
|
|
-- Concurrent deletes are arbitrated at READ COMMITTED, the default isolation
|
|
-- level: the second transaction waits for the first, then removes nothing.
|
|
-- SERIALIZABLE would abort and retry it instead.
|
|
DELETE FROM oauth2_provider_app_codes WHERE id = $1 RETURNING *;
|
|
|
|
-- name: DeleteOAuth2ProviderAppCodesByAppAndUserID :exec
|
|
DELETE FROM oauth2_provider_app_codes WHERE app_id = $1 AND user_id = $2;
|
|
|
|
-- name: InsertOAuth2ProviderAppToken :one
|
|
INSERT INTO oauth2_provider_app_tokens (
|
|
id,
|
|
created_at,
|
|
expires_at,
|
|
hash_prefix,
|
|
refresh_hash,
|
|
app_id,
|
|
app_secret_id,
|
|
api_key_id,
|
|
user_id,
|
|
audience,
|
|
scope
|
|
) VALUES(
|
|
$1,
|
|
$2,
|
|
$3,
|
|
$4,
|
|
$5,
|
|
$6,
|
|
$7,
|
|
$8,
|
|
$9,
|
|
$10,
|
|
$11
|
|
) RETURNING *;
|
|
|
|
-- name: GetOAuth2ProviderAppTokenByPrefix :one
|
|
SELECT * FROM oauth2_provider_app_tokens WHERE hash_prefix = $1;
|
|
|
|
-- name: GetOAuth2ProviderAppTokenByAPIKeyID :one
|
|
SELECT * FROM oauth2_provider_app_tokens WHERE api_key_id = $1;
|
|
|
|
-- name: GetOAuth2ProviderAppsByUserID :many
|
|
-- Joins directly on oauth2_provider_app_tokens.app_id rather than through
|
|
-- app_secret_id, since app_secret_id is NULL for public (secretless) clients
|
|
-- and would silently exclude their tokens from this listing.
|
|
SELECT
|
|
COUNT(DISTINCT oauth2_provider_app_tokens.id) as token_count,
|
|
sqlc.embed(oauth2_provider_apps)
|
|
FROM oauth2_provider_app_tokens
|
|
INNER JOIN oauth2_provider_apps
|
|
ON oauth2_provider_apps.id = oauth2_provider_app_tokens.app_id
|
|
WHERE
|
|
oauth2_provider_app_tokens.user_id = $1
|
|
GROUP BY
|
|
oauth2_provider_apps.id;
|
|
|
|
-- name: DeleteOAuth2ProviderAppTokensByAppAndUserID :exec
|
|
-- Filters directly on app_id rather than joining through app_secret_id,
|
|
-- since app_secret_id is NULL for public (secretless) clients and would
|
|
-- silently exclude their tokens from this delete.
|
|
DELETE FROM
|
|
oauth2_provider_app_tokens
|
|
WHERE
|
|
oauth2_provider_app_tokens.app_id = $1
|
|
AND oauth2_provider_app_tokens.user_id = $2;
|
|
|
|
-- RFC 7591/7592 Dynamic Client Registration queries
|
|
|
|
-- name: GetOAuth2ProviderAppByClientID :one
|
|
SELECT * FROM oauth2_provider_apps WHERE id = $1;
|
|
|
|
-- name: UpdateOAuth2ProviderAppByClientID :one
|
|
UPDATE oauth2_provider_apps SET
|
|
updated_at = $2,
|
|
name = $3,
|
|
icon = $4,
|
|
callback_url = $5,
|
|
redirect_uris = $6,
|
|
client_type = $7,
|
|
client_secret_expires_at = $8,
|
|
grant_types = $9,
|
|
response_types = $10,
|
|
token_endpoint_auth_method = $11,
|
|
scope = $12,
|
|
contacts = $13,
|
|
client_uri = $14,
|
|
logo_uri = $15,
|
|
tos_uri = $16,
|
|
policy_uri = $17,
|
|
jwks_uri = $18,
|
|
jwks = $19,
|
|
software_id = $20,
|
|
software_version = $21
|
|
WHERE id = $1 RETURNING *;
|
|
|
|
-- name: DeleteOAuth2ProviderAppByClientID :exec
|
|
DELETE FROM oauth2_provider_apps WHERE id = $1;
|
|
|