Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

exact match

Thiago Araujo da Silva4fa7b57628c3
diff --git a/backend/src/services/identity-oci-auth/identity-oci-auth-fns.test.ts b/backend/src/services/identity-oci-auth/identity-oci-auth-fns.test.ts
index 664ced69fb..60470fd46b 100644
--- a/backend/src/services/identity-oci-auth/identity-oci-auth-fns.test.ts
+++ b/backend/src/services/identity-oci-auth/identity-oci-auth-fns.test.ts
@@ -4,27 +4,59 @@ import { getOciSignerUserOcid } from "./identity-oci-auth-fns";
const tenancy = "ocid1.tenancy.oc1..aaaaaaaatenancy";
const user = "ocid1.user.oc1..aaaaaaaauser";
+const otherUser = "ocid1.user.oc1..aaaaaaaaother";
const fingerprint = "20:3b:97:13:55:1c:5b:0d:d3:37:d8:50:4e:c5:3a:34";
+const keyId = `${tenancy}/${user}/${fingerprint}`;
describe("getOciSignerUserOcid", () => {
it("extracts the user OCID from a Node SDK style header", () => {
- const header = `Signature version="1",keyId="${tenancy}/${user}/${fingerprint}",algorithm="rsa-sha256",headers="(request-target) host date",signature="abc=="`;
+ const header = `Signature version="1",keyId="${keyId}",algorithm="rsa-sha256",headers="(request-target) host date",signature="abc=="`;
expect(getOciSignerUserOcid(header)).toBe(user);
});
it("extracts the user OCID when keyId is not the first parameter", () => {
- const header = `Signature headers="date (request-target) host",keyId="${tenancy}/${user}/${fingerprint}",algorithm="rsa-pss-sha256",signature="abc==",version="1"`;
+ const header = `Signature headers="date (request-target) host",keyId="${keyId}",algorithm="rsa-pss-sha256",signature="abc==",version="1"`;
expect(getOciSignerUserOcid(header)).toBe(user);
});
it("matches the keyId parameter name case-insensitively", () => {
- const header = `Signature version="1",keyid="${tenancy}/${user}/${fingerprint}",algorithm="rsa-sha256",signature="abc=="`;
+ const header = `Signature version="1",keyid="${keyId}",algorithm="rsa-sha256",signature="abc=="`;
expect(getOciSignerUserOcid(header)).toBe(user);
});
+ it("tolerates whitespace around commas and equals signs", () => {
+ const header = `Signature version = "1", keyId = "${keyId}" , algorithm="rsa-sha256"`;
+ expect(getOciSignerUserOcid(header)).toBe(user);
+ });
+
+ it("ignores decoy parameters whose name merely ends in keyId", () => {
+ const decoy = `${tenancy}/${otherUser}/${fingerprint}`;
+ const header = `Signature version="1",notKeyId="${decoy}",keyId="${keyId}",algorithm="rsa-sha256",signature="abc=="`;
+ expect(getOciSignerUserOcid(header)).toBe(user);
+ });
+
+ it("returns null when keyId appears more than once, in any casing", () => {
+ const decoy = `${tenancy}/${otherUser}/${fingerprint}`;
+ expect(getOciSignerUserOcid(`Signature keyId="${decoy}",keyId="${keyId}",signature="abc=="`)).toBeNull();
+ expect(getOciSignerUserOcid(`Signature KEYID="${decoy}",keyId="${keyId}",signature="abc=="`)).toBeNull();
+ });
+
+ it("returns null when the header is not a Signature scheme", () => {
+ expect(getOciSignerUserOcid(`Bearer keyId="${keyId}"`)).toBeNull();
+ expect(getOciSignerUserOcid(`keyId="${keyId}"`)).toBeNull();
+ expect(getOciSignerUserOcid("")).toBeNull();
+ });
+
+ it("returns null for any malformed parameter", () => {
+ expect(getOciSignerUserOcid(`Signature keyId=${keyId},signature="abc=="`)).toBeNull();
+ expect(getOciSignerUserOcid(`Signature keyId="${keyId}",signature="abc==",garbage`)).toBeNull();
+ expect(getOciSignerUserOcid(`Signature keyId="${keyId}" signature="abc=="`)).toBeNull();
+ expect(getOciSignerUserOcid(`Signature key-Id="${keyId}"`)).toBeNull();
+ expect(getOciSignerUserOcid(`Signature keyId="${keyId}",`)).toBeNull();
+ });
+
it("returns null when the header has no keyId", () => {
expect(getOciSignerUserOcid(`Signature version="1",algorithm="rsa-sha256",signature="abc=="`)).toBeNull();
- expect(getOciSignerUserOcid("")).toBeNull();
});
it("returns null for security token key ids used by instance and resource principals", () => {
@@ -34,7 +66,7 @@ describe("getOciSignerUserOcid", () => {
it("returns null when a keyId segment is empty or the segment count is wrong", () => {
expect(getOciSignerUserOcid(`Signature keyId="${tenancy}//${fingerprint}"`)).toBeNull();
expect(getOciSignerUserOcid(`Signature keyId="${tenancy}/${user}"`)).toBeNull();
- expect(getOciSignerUserOcid(`Signature keyId="${tenancy}/${user}/${fingerprint}/extra"`)).toBeNull();
+ expect(getOciSignerUserOcid(`Signature keyId="${keyId}/extra"`)).toBeNull();
expect(getOciSignerUserOcid(`Signature keyId=""`)).toBeNull();
});
});
diff --git a/backend/src/services/identity-oci-auth/identity-oci-auth-fns.ts b/backend/src/services/identity-oci-auth/identity-oci-auth-fns.ts
index 6048223ef6..2163c17dd0 100644
--- a/backend/src/services/identity-oci-auth/identity-oci-auth-fns.ts
+++ b/backend/src/services/identity-oci-auth/identity-oci-auth-fns.ts
@@ -1,13 +1,30 @@
import RE2 from "re2";
-// OCI Signature v1 user principals sign with keyId="<tenancy-ocid>/<user-ocid>/<key-fingerprint>".
-const OCI_SIGNATURE_KEY_ID_REGEX = new RE2('keyId="([^"]*)"', "i");
+const SIGNATURE_SCHEME = "signature ";
+const SIGNATURE_PARAM_REGEX = new RE2('^([A-Za-z]+)\\s*=\\s*"([^"]*)"$');
+
+const parseOciSignatureParams = (authorizationHeader: string): Map<string, string> | null => {
+ const header = authorizationHeader.trim();
+ if (!header.slice(0, SIGNATURE_SCHEME.length).toLowerCase().startsWith(SIGNATURE_SCHEME)) return null;
+
+ const params = new Map<string, string>();
+ for (const rawParam of header.slice(SIGNATURE_SCHEME.length).split(",")) {
+ const match = SIGNATURE_PARAM_REGEX.exec(rawParam.trim());
+ if (!match) return null;
+
+ const name = match[1].toLowerCase();
+ if (params.has(name)) return null;
+ params.set(name, match[2]);
+ }
+
+ return params;
+};
export const getOciSignerUserOcid = (authorizationHeader: string): string | null => {
- const match = OCI_SIGNATURE_KEY_ID_REGEX.exec(authorizationHeader);
- if (!match) return null;
+ const keyId = parseOciSignatureParams(authorizationHeader)?.get("keyid");
+ if (!keyId) return null;
- const segments = match[1].split("/");
+ const segments = keyId.split("/");
if (segments.length !== 3) return null;
const [tenancyOcid, userOcid, fingerprint] = segments;