Skip to content

Wrap inflation errors #500

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Wrap inflation errors #500

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
10 changes: 8 additions & 2 deletions src/flow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { inflateString, base64Decode } from './utility';
import { inflateString, base64Decode, WrappedError } from './utility';
import { verifyTime } from './validator';
import libsaml from './libsaml';
import {
Expand Down Expand Up @@ -67,7 +67,13 @@ async function redirectFlow(options): Promise<FlowResult> {
return Promise.reject('ERR_REDIRECT_FLOW_BAD_ARGS');
}

const xmlString = inflateString(decodeURIComponent(content));
let xmlString: string

try {
xmlString = inflateString(decodeURIComponent(content));
} catch (cause) {
throw new WrappedError('ERR_FAILED_INFLATION', { cause })
}

// validate the xml
try {
Expand Down
15 changes: 15 additions & 0 deletions src/utility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,21 @@ import { inflate, deflate } from 'pako';

const BASE64_STR = 'base64';

/**
* An Error class with a "cause".
*
* This can be replaced by the native option, once the minimum supported version is >=16.9.0.
* https://nodejs.org/docs/latest-v16.x/api/errors.html#errorcause
*/
export class WrappedError extends Error {
public cause: any;

constructor(message: string, options: { cause: any }) {
super(message);
this.cause = options.cause;
}
}

/**
* @desc Mimic lodash.zipObject
* @param arr1 {string[]}
Expand Down
8 changes: 8 additions & 0 deletions test/flow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,3 +1382,11 @@ test.serial('should not throw ERR_SUBJECT_UNCONFIRMED for the expired SAML respo
}

});

test('should throw ERR_FAILED_INFLATION when pako is unable to inflate a redirect login request', async t => {
const query = { SAMLRequest: 'foo', Signature: 'bar', SigAlg: 'baz' };
const error = await t.throwsAsync<any>(idp.parseLoginRequest(sp, 'redirect', { query }));

t.is(error.message, 'ERR_FAILED_INFLATION');
t.is(error.cause, 'invalid block type'); // pako throws strings instead of Error instances for bad input
});