Skip to content

Allow ak2 API Keys #11

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
Madh93 merged 4 commits into from
Oct 8, 2025
Merged

Allow ak2 API Keys #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8907cd0
Allow the newer ak2 version api key
phillprice Oct 6, 2025
5567b23
Requested api key length changes
phillprice Oct 7, 2025
027f537
fixups
phillprice Oct 7, 2025
3db8d2e
fixups
phillprice Oct 8, 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
2 changes: 1 addition & 1 deletion internal/validation/karakeep.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
func ValidateKarakeepToken(token secret.String) error {
// Define the pattern for a valid Karakeep API Key
// See: https://github.com/karakeep-app/karakeep/blob/v0.20.0/packages/trpc/auth.ts#L14
pattern := `^ak1_[a-f0-9]{20}_[a-f0-9]{20}$`
pattern := `^ak1_[a-f0-9]{20}_[a-f0-9]{20}$|^ak2_[a-f0-9]{20}_[a-f0-9]{32}$`
re := regexp.MustCompile(pattern)

// Check if the token matches the defined pattern
Expand Down
16 changes: 9 additions & 7 deletions internal/validation/karakeep_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ func TestValidateKarakeepToken(t *testing.T) {
token secret.String
expected bool
}{
{secret.New("ak1_1fa4507e4b58b5850672_13cb03dc5372fbe200d5"), true}, // Valid token
{secret.New("ak1_cc2109516bfc2282a2bb_d7ad539acb2401b3f4b8"), true}, // Valid token
{secret.New("ak2_628336a9531f92a42f55_08835688ea5708f0b83b"), false}, // Invalid prefix
{secret.New("ak1_12345_67890"), false}, // Invalid format (too short)
{secret.New("ak1_4d22ace06b233b9d2d22_c96e719"), false}, // Invalid (too short for second segment)
{secret.New("ak1_eca9dd7db9a4d7585f61b3063337d_054ef423745a72c0a7a8"), false}, // Invalid (too long for first segment)
{secret.New("invalidtoken"), false}, // Completely invalid
{secret.New("ak1_1fa4507e4b58b5850672_13cb03dc5372fbe200d5"), true}, // Valid token
{secret.New("ak1_cc2109516bfc2282a2bb_d7ad539acb2401b3f4b8"), true}, // Valid token
{secret.New("ak2_1495f2286c3b9ce53369_c01b55fbfe220e010337c68fd93a672e"), true}, // Valid token
{secret.New("ak2_1495f2286c3b9ce53369_c01b55fbfe220e010337"), false}, // Invalid token length
{secret.New("ak3_628336a9531f92a42f55_08835688ea5708f0b83b"), false}, // Invalid prefix
{secret.New("ak1_12345_67890"), false}, // Invalid format (too short)
{secret.New("ak1_4d22ace06b233b9d2d22_c96e719"), false}, // Invalid (too short for second segment)
{secret.New("ak1_eca9dd7db9a4d7585f61b3063337d_054ef423745a72c0a7a8"), false}, // Invalid (too long for first segment)
{secret.New("invalidtoken"), false}, // Completely invalid
}

// Iterate over the test cases
Expand Down
1 change: 1 addition & 0 deletions internal/validation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//
// - ValidateKarakeepToken: Validates the format of the Karakeep API Key,
// ensuring it follows the expected pattern of `ak1_{20_hex_characters}_{20_hex_characters}`.
// or the newer `ak2_{20_hex_characters}_{32_hex_characters}`.
//
// - ValidateTelegramToken: Validates the format of a Telegram bot token,
// ensuring it matches the required pattern of `8-10 digits:followed by a 35-character string`.
Expand Down