Skip to content

Auth cache key fix #5949

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
merged 2 commits into from
Jan 14, 2025
Merged

Auth cache key fix #5949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
556d1f3
auth cache key fix
nischitpra Jan 14, 2025
756b0b6
Merge branch 'main' into np/cache_key_fix
nischitpra Jan 14, 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
5 changes: 4 additions & 1 deletion packages/service-utils/src/core/authorize/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
import { authorizeClient } from "./client.js";
import { authorizeService } from "./service.js";
import type { AuthorizationResult } from "./types.js";
import { hashKey } from "./utils.js";

export type AuthorizationInput = {
secretKey: string | null;
Expand Down Expand Up @@ -41,7 +42,9 @@ export async function authorize(
cacheOptions?: CacheOptions,
): Promise<AuthorizationResult> {
let teamAndProjectResponse: TeamAndProjectResponse | null = null;
const cacheKey = `key_v2_${authData.clientId ?? authData.secretKeyHash ?? authData.hashedJWT}`;
const cacheKey = hashKey(
`key_v2_:${authData.secretKeyHash}:${authData.hashedJWT}:${authData.clientId}`,
);
// TODO if we have cache options we want to check the cache first
if (cacheOptions) {
try {
Expand Down
5 changes: 5 additions & 0 deletions packages/service-utils/src/core/authorize/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import crypto from "node:crypto";

export const hashKey = (str: string): string => {
return crypto.createHash("sha256").update(str, "utf8").digest("hex");
};
Loading