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

Jump to bottom

Defend against undefined NotOnOrAfter #289

Closed
wants to merge 2 commits into from
Closed

Defend against undefined NotOnOrAfter #289

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6625245
defend against undefined NotOnOrAfter
joshgummersall Jun 23, 2023
c20db86
better handling of undefined NotOnOrAfter
joshgummersall Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/saml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,12 +1022,16 @@ class SAML {
const _confirmData = _subjectConfirmation.SubjectConfirmationData?.[0];
if (_confirmData?.$) {
const subjectNotBefore = _confirmData.$.NotBefore;

const subjectNotOnOrAfter = _confirmData.$.NotOnOrAfter;
const maxTimeLimitMs = this.calcMaxAgeAssertionTime(
this.options.maxAssertionAgeMs,
subjectNotOnOrAfter,
assertion.$.IssueInstant
);

const maxTimeLimitMs = subjectNotOnOrAfter
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correction to this logic should be in this.calcMaxAgeAssertionTime(), not here. We should be able to handle bad data coming in and still return a proper value per the existing logic.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjbarth, checkTimestampsValidityError properly handles maxTimeLimitMs that is undefined, would you say it's acceptable to return undefined from checkTimestampsValidityError?

? this.calcMaxAgeAssertionTime(
this.options.maxAssertionAgeMs,
subjectNotOnOrAfter,
assertion.$.IssueInstant
)
: undefined;

const subjErr = this.checkTimestampsValidityError(
nowMs,
Expand Down