Skip to content

fix(NODE-7477): OIDC host allowlist fix #4896

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
tadjik1 merged 6 commits into from
Mar 23, 2026
+50 −7
Merged

fix(NODE-7477): OIDC host allowlist fix #4896

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2263a0
added release-7.1 config
PavelSafronov Mar 17, 2026
a19d5e6
fix(7477): OIDC host allowlist fix
PavelSafronov Mar 17, 2026
7b42afd
Merge branch 'v7.1.x' into NODE-7477
PavelSafronov Mar 18, 2026
6ff2c1c
Merge branch 'v7.1.x' into NODE-7477
tadjik1 Mar 23, 2026
b6276b4
chore: update codeql target for v7.1.x (#4903)
dariakp Mar 23, 2026
6578333
pr feedback: added tests that verify the wildcards in default allowed…
PavelSafronov Mar 23, 2026
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
24 changes: 19 additions & 5 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,27 @@ export function isUint8Array(value: unknown): value is Uint8Array {
*/
export function hostMatchesWildcards(host: string, wildcards: string[]): boolean {
for (const wildcard of wildcards) {
if (
host === wildcard ||
(wildcard.startsWith('*.') && host?.endsWith(wildcard.substring(2, wildcard.length))) ||
(wildcard.startsWith('*/') && host?.endsWith(wildcard.substring(2, wildcard.length)))
) {
// Exact match always wins
if (host === wildcard) {
return true;
}

// Wildcard match with leading *.
if (wildcard.startsWith('*.')) {
const suffix = wildcard.substring(2);
// Exact match or strict subdomain match
if (host === suffix || host.endsWith(`.${suffix}`)) {
return true;
}
}
// Wildcard match with leading */
if (wildcard.startsWith('*/')) {
const suffix = wildcard.substring(2);
// Exact match or strict subpath match
if (host === suffix || host.endsWith(`/${suffix}`)) {
return true;
}
}
Comment thread
tadjik1 marked this conversation as resolved.
}
return false;
}
Expand Down
15 changes: 15 additions & 0 deletions test/unit/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,13 @@ describe('driver utils', function () {
});
});

context('when the wildcard starts with *.', function () {
it('returns false', function () {
expect(hostMatchesWildcards('test-mongodb.com', ['*.mongodb.com', 'test2'])).to.be
.false;
});
});

context('when the host matches a FQDN', function () {
it('returns true', function () {
expect(hostMatchesWildcards('mongodb.net', ['*.mongodb.net', 'other'])).to.be.true;
Expand Down Expand Up @@ -221,6 +228,14 @@ describe('driver utils', function () {
.to.be.false;
});
});

context('when the host does not match partial matches', function () {
it('returns false', function () {
expect(
hostMatchesWildcards('/tmp/test-mongodb-27017.sock', ['*/mongodb-27017.sock', 'test2'])
).to.be.false;
});
});
});
});

Expand Down