Skip to content

feat: allow permanently deleting keys#2847

Merged
chronark merged 1 commit intomainfrom
permanently-delete-keys
Jan 29, 2025
Merged

feat: allow permanently deleting keys#2847
chronark merged 1 commit intomainfrom
permanently-delete-keys

Conversation

@chronark
Copy link
Collaborator

@chronark chronark commented Jan 28, 2025

Summary by CodeRabbit

  • New Features

    • Added option to perform hard (permanent) deletion of keys
    • Enhanced key deletion functionality with configurable deletion mode
  • Tests

    • Added test case for hard deletion of keys
    • Verified behavior of permanent key deletion

@vercel
Copy link

vercel bot commented Jan 28, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
dashboard ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 28, 2025 3:34pm
engineering ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 28, 2025 3:34pm
play ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 28, 2025 3:34pm
www ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 28, 2025 3:34pm

@changeset-bot
Copy link

changeset-bot bot commented Jan 28, 2025

⚠️ No Changeset found

Latest commit: 11abdf9

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 28, 2025

📝 Walkthrough

Walkthrough

This pull request introduces a new feature for hard deleting keys in the API. The changes modify the deleteKey route to support an optional permanent parameter, allowing users to permanently remove keys from the database instead of just soft deleting them. The implementation includes updates to the request body schema, deletion logic, and corresponding test cases to verify both soft and hard delete operations for keys.

Changes

File Change Summary
apps/api/src/routes/v1_keys_deleteKey.ts - Added optional permanent boolean parameter to request body schema
- Updated deletion logic to support permanent deletion when permanent: true
- Modified audit log description to reflect deletion type
apps/api/src/routes/v1_keys_deleteKey.happy.test.ts - Added new test case for hard deleting a key
- Verified key is completely removed from database when permanent: true

Sequence Diagram

sequenceDiagram
    participant Client
    participant API
    participant Database
    
    Client->>API: Delete Key Request
    alt Soft Delete (default)
        API->>Database: Update deletedAt timestamp
    else Hard Delete
        API->>Database: Permanently remove key
    end
    API->>Client: Deletion Confirmation
Loading

Possibly related PRs

Suggested labels

feature, api, key-management

Suggested reviewers

  • mcstepp
  • MichaelUnkey
  • perkinsjr
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions
Copy link
Contributor

github-actions bot commented Jan 28, 2025

Thank you for following the naming conventions for pull request titles! 🙏

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (4)
apps/api/src/routes/v1_keys_deleteKey.happy.test.ts (1)

47-79: Consider reducing test duplication and adding edge cases.

The test implementation looks good but could be improved in a few areas:

  1. Consider extracting the common setup code into a helper function to reduce duplication
  2. Add test cases for edge scenarios:
    • Attempting to permanently delete an already deleted key
    • Attempting to soft delete an already deleted key

Here's a suggested refactor to reduce duplication:

async function setupTestKey(h: IntegrationHarness) {
  const keyId = newId("test");
  const key = new KeyV1({ prefix: "test", byteLength: 16 }).toString();
  await h.db.primary.insert(schema.keys).values({
    id: keyId,
    keyAuthId: h.resources.userKeyAuth.id,
    hash: await sha256(key),
    start: key.slice(0, 8),
    workspaceId: h.resources.userWorkspace.id,
    createdAt: new Date(),
  });
  return { keyId, key };
}
apps/api/src/routes/v1_keys_deleteKey.ts (3)

27-30: Consider adding a warning about permanent deletion being irreversible.

The OpenAPI description should emphasize that permanent deletion is irreversible. This helps prevent accidental permanent deletions.

 permanent: z.boolean().default(false).optional().openapi({
   description:
-    "By default Unkey soft deletes keys, so they may be recovered later. If you want to permanently delete it, set permanent=true. This might be necessary if you run into NOT_UNIQUE errors during key migration.",
+    "By default Unkey soft deletes keys, so they may be recovered later. If you want to permanently delete it, set permanent=true. WARNING: Permanent deletion is irreversible! This should only be used if you run into NOT_UNIQUE errors during key migration.",
 }),

131-138: Consider adding rate limiting for permanent deletions.

Permanent deletions are destructive operations that should be rate-limited to prevent abuse or accidental mass deletions.

Consider implementing one of these approaches:

  1. Add a separate permission for permanent deletions
  2. Implement rate limiting specifically for permanent deletions
  3. Add a confirmation mechanism for permanent deletions

Would you like me to provide an implementation for any of these approaches?


Line range hint 154-156: Consider optimizing cache invalidation.

The cache invalidation is correct but could be optimized by running the invalidations in parallel with the transaction.

-    await Promise.all([cache.keyByHash.remove(key.hash), cache.keyById.remove(key.id)]);
+    const cacheInvalidation = Promise.all([
+      cache.keyByHash.remove(key.hash),
+      cache.keyById.remove(key.id)
+    ]);
+    
+    await Promise.all([
+      cacheInvalidation,
+      db.primary.transaction(async (tx) => {
+        // ... transaction code ...
+      })
+    ]);
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ea1160b and 11abdf9.

📒 Files selected for processing (2)
  • apps/api/src/routes/v1_keys_deleteKey.happy.test.ts (1 hunks)
  • apps/api/src/routes/v1_keys_deleteKey.ts (4 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (17)
  • GitHub Check: Test Packages / Test ./packages/rbac
  • GitHub Check: Test Packages / Test ./packages/nextjs
  • GitHub Check: Test Packages / Test ./packages/hono
  • GitHub Check: Test Packages / Test ./packages/cache
  • GitHub Check: Test Packages / Test ./packages/api
  • GitHub Check: Test Packages / Test ./internal/clickhouse
  • GitHub Check: Test Packages / Test ./internal/resend
  • GitHub Check: Test Packages / Test ./internal/keys
  • GitHub Check: Test Packages / Test ./internal/id
  • GitHub Check: Test Packages / Test ./internal/hash
  • GitHub Check: Test Packages / Test ./internal/encryption
  • GitHub Check: Test Packages / Test ./internal/billing
  • GitHub Check: Test API / API Test Local
  • GitHub Check: Test GO API Local / test_agent_local
  • GitHub Check: Build / Build
  • GitHub Check: autofix
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (1)
apps/api/src/routes/v1_keys_deleteKey.ts (1)

60-60: Verify error handling for already deleted keys.

The current implementation might allow permanently deleting an already soft-deleted key. We should verify this behavior is intentional and properly handled.

Also applies to: 131-138

Copy link
Member

@perkinsjr perkinsjr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😅 - Approved

(PTSD of one frightful day in summer)

Copy link
Collaborator Author

I had an amazing time
10/10

@chronark chronark merged commit 972be94 into main Jan 29, 2025
24 of 25 checks passed
@chronark chronark deleted the permanently-delete-keys branch January 29, 2025 07:56
@coderabbitai coderabbitai bot mentioned this pull request Jul 4, 2025
18 tasks
@coderabbitai coderabbitai bot mentioned this pull request Oct 30, 2025
18 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants