Skip to content

Fix soft-deleted webhooks being accessible #184

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

Open
Makisuo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix soft-deleted webhooks being accessible #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 40 additions & 4 deletions apps/backend/src/repositories/channel-webhook-repo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,26 @@ export class ChannelWebhookRepo extends Effect.Service<ChannelWebhookRepo>()("Ch
)
const db = yield* Database.Database

// Override findById to filter by deletedAt = NULL (respect soft deletes)
const findById = (id: ChannelWebhookId, tx?: TxFn) =>
db
.makeQuery(
(execute, data: { id: ChannelWebhookId }) =>
execute((client) =>
client
.select()
.from(schema.channelWebhooksTable)
.where(
and(
eq(schema.channelWebhooksTable.id, data.id),
isNull(schema.channelWebhooksTable.deletedAt),
),
)
.limit(1),
).pipe(Effect.map((results) => Option.fromNullable(results[0]))),
policyRequire("ChannelWebhook", "select"),
)({ id }, tx)

// Find all webhooks for a channel
const findByChannel = (channelId: ChannelId, tx?: TxFn) =>
db.makeQuery(
Expand Down Expand Up @@ -66,7 +86,12 @@ export class ChannelWebhookRepo extends Effect.Service<ChannelWebhookRepo>()("Ch
client
.update(schema.channelWebhooksTable)
.set({ lastUsedAt: new Date(), updatedAt: new Date() })
.where(eq(schema.channelWebhooksTable.id, data.id))
.where(
and(
eq(schema.channelWebhooksTable.id, data.id),
isNull(schema.channelWebhooksTable.deletedAt),
),
)
.returning(),
),
policyRequire("ChannelWebhook", "update"),
Expand All @@ -84,13 +109,18 @@ export class ChannelWebhookRepo extends Effect.Service<ChannelWebhookRepo>()("Ch
tokenSuffix: data.tokenSuffix,
updatedAt: new Date(),
})
.where(eq(schema.channelWebhooksTable.id, data.id))
.where(
and(
eq(schema.channelWebhooksTable.id, data.id),
isNull(schema.channelWebhooksTable.deletedAt),
),
)
.returning(),
),
policyRequire("ChannelWebhook", "update"),
)({ id, tokenHash, tokenSuffix }, tx)

// Soft delete webhook
// Soft delete webhook (only if not already deleted)
const softDelete = (id: ChannelWebhookId, tx?: TxFn) =>
db.makeQuery(
(execute, data: { id: ChannelWebhookId }) =>
Expand All @@ -101,7 +131,12 @@ export class ChannelWebhookRepo extends Effect.Service<ChannelWebhookRepo>()("Ch
deletedAt: new Date(),
updatedAt: new Date(),
})
.where(eq(schema.channelWebhooksTable.id, data.id))
.where(
and(
eq(schema.channelWebhooksTable.id, data.id),
isNull(schema.channelWebhooksTable.deletedAt),
),
)
.returning(),
),
policyRequire("ChannelWebhook", "delete"),
Expand All @@ -127,6 +162,7 @@ export class ChannelWebhookRepo extends Effect.Service<ChannelWebhookRepo>()("Ch

return {
...baseRepo,
findById,
findByChannel,
findByTokenHash,
updateLastUsed,
Expand Down