Skip to content
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

don't decode inside parseSAMLRequest #518

Merged
merged 1 commit into from
Feb 3, 2024
Merged

don't decode inside parseSAMLRequest #518

Show file tree
Hide file tree
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
14 changes: 7 additions & 7 deletions lib/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
};

// Parse XML
const parseXML = (xml: string): Promise<Record<string, any>> => {

Check warning on line 75 in lib/request.ts

View workflow job for this annotation

GitHub Actions / build (20) 

Unexpected any. Specify a different type
return new Promise((resolve, reject) => {
xml2js.parseString(
xml,
Expand All @@ -80,7 +80,7 @@
tagNameProcessors: [xml2js.processors.stripPrefix],
strict: true,
},
(err: Error | null, result: any) => {

Check warning on line 83 in lib/request.ts

View workflow job for this annotation

GitHub Actions / build (20) 

Unexpected any. Specify a different type
if (err) {
reject(err);
}
Expand All @@ -99,11 +99,8 @@
};

// Parse SAMLRequest attributes
const parseSAMLRequest = async (request: string, isPost = true) => {
// if the request is a POST, it will be not be deflated
const decodedRequest = await decodeBase64(request, !isPost);

const result = await parseXML(decodedRequest);
const parseSAMLRequest = async (rawRequest: string, isPost = true) => {
const result = await parseXML(rawRequest);

const attributes = result['AuthnRequest']['$'];
const issuer = result['AuthnRequest']['Issuer'];
Expand All @@ -112,6 +109,10 @@
? result['AuthnRequest']['Signature'][0]['KeyInfo'][0]['X509Data'][0]['X509Certificate'][0]
: null;

if (!issuer) {
throw new Error("Missing 'Issuer' in SAML Request.");
}

if (!publicKey && isPost) {
throw new Error('Missing signature');
}
Expand All @@ -122,8 +123,7 @@
providerName: attributes.ProviderName,
audience: issuer[0]['_'] ?? issuer[0], // also known as entityID
publicKey,
decodedRequest,
};
};

export { request, parseSAMLRequest };
export { request, parseSAMLRequest, decodeBase64 };
14 changes: 7 additions & 7 deletions test/lib/request.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import assert from 'assert';
import fs from 'fs';
import { parseSAMLRequest, request } from '../../lib/request';
import { decodeBase64, parseSAMLRequest, request } from '../../lib/request';

const request1 = fs.readFileSync('./test/assets/request1.xml').toString();
const request2 = fs.readFileSync('./test/assets/request2.xml').toString();
Expand Down Expand Up @@ -30,30 +30,30 @@ describe('request.ts', function () {
});

it('parseSAMLRequest sample 1 ok', async function () {
const res1 = await parseSAMLRequest(request1, false);
const decodedRequest1 = await decodeBase64(request1, true);
const res1 = await parseSAMLRequest(decodedRequest1, false);
assert.strictEqual(res1.id, 'id-6888523066678369812_-1');
assert.strictEqual(res1.acsUrl, 'https://test1.snowflakecomputing.com/fed/login');
assert.strictEqual(res1.audience, 'https://test1.snowflakecomputing.com');
assert.strictEqual(res1.publicKey, null);
assert(res1.decodedRequest);
});

it('parseSAMLRequest sample 2 ok', async function () {
const res2 = await parseSAMLRequest(request2, false);
const decodedRequest2 = await decodeBase64(request2, true);
const res2 = await parseSAMLRequest(decodedRequest2, false);
assert.strictEqual(res2.id, '_aa4df01f-3911-4de7-ae9a-a793a7f6c12c');
assert.strictEqual(res2.acsUrl, undefined);
assert.strictEqual(res2.audience, 'https://fivetran.com');
assert.strictEqual(res2.publicKey, null);
assert(res2.decodedRequest);
});

it('parseSAMLRequest sample 3 ok', async function () {
const res3 = await parseSAMLRequest(request3, false);
const decodedRequest3 = await decodeBase64(request3, true);
const res3 = await parseSAMLRequest(decodedRequest3, false);
assert.strictEqual(res3.id, 'ONELOGIN_c6bc2360-ea7d-45ca-b206-4220a4f5b978');
assert.strictEqual(res3.acsUrl, 'https://iam.twilio.com/v1/Accounts/abcdef/saml2');
assert.strictEqual(res3.audience, 'https://iam.twilio.com/v1/Accounts/abcdef/saml2/metadata');
assert.strictEqual(res3.publicKey, null);
assert.strictEqual(res3.providerName, 'Twilio');
assert(res3.decodedRequest);
});
});
Loading