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

fix: ignore response uri validation for signed dc api requests #44

Merged
merged 1 commit into from
Feb 25, 2025
Merged

fix: ignore response uri validation for signed dc api requests #44

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
45 changes: 29 additions & 16 deletions packages/openid4vp/src/client-identifier-scheme/parse-client-identifier-scheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export function parseClientIdentifier(
})
}

if (isDcApiRequest) {
if (isOpenid4vpAuthorizationRequestDcApi(request)) {
throw new Oauth2ServerErrorResponseError({
error: Oauth2ErrorCodes.InvalidRequest,
error_description: `The client identifier scheme 'redirect_uri' is not supported when using the dc_api response mode.`,
Expand Down Expand Up @@ -242,13 +242,15 @@ export function parseClientIdentifier(
})
}

const requestUri = (jar.authRequestParams.request_uri ?? jar.authRequestParams.response_uri) as string
if (getDomainFromUrl(requestUri) !== identifierPart) {
throw new Oauth2ServerErrorResponseError({
error: Oauth2ErrorCodes.InvalidRequest,
error_description:
'Invalid client identifier. The fully qualified domain name of the redirect_uri value MUST match the Client Identifier without the prefix x509_san_dns.',
})
if (!isOpenid4vpAuthorizationRequestDcApi(request)) {
const uri = request.redirect_uri ?? request.response_uri
if (!uri || getDomainFromUrl(uri) !== identifierPart) {
throw new Oauth2ServerErrorResponseError({
error: Oauth2ErrorCodes.InvalidRequest,
error_description:
'Invalid client identifier. The fully qualified domain name of the redirect_uri value MUST match the Client Identifier without the prefix x509_san_dns.',
})
}
}
} else if (scheme === 'x509_san_uri') {
if (!options.callbacks.getX509CertificateMetadata) {
Expand All @@ -271,11 +273,15 @@ export function parseClientIdentifier(
})
}

if ((jar.authRequestParams.request_uri ?? jar.authRequestParams.response_uri) !== identifierPart) {
throw new Oauth2ServerErrorResponseError({
error: Oauth2ErrorCodes.InvalidRequest,
error_description: 'The redirect_uri value MUST match the Client Identifier without the prefix x509_san_uri',
})
if (!isOpenid4vpAuthorizationRequestDcApi(request)) {
const uri = request.redirect_uri || request.response_uri
if (!uri || uri !== identifierPart) {
throw new Oauth2ServerErrorResponseError({
error: Oauth2ErrorCodes.InvalidRequest,
error_description:
'The redirect_uri value MUST match the Client Identifier without the prefix x509_san_uri',
})
}
}
}

Expand Down Expand Up @@ -313,7 +319,14 @@ export function parseClientIdentifier(
}

function getDomainFromUrl(url: string): string {
const regex = /[#/?]/
const domain = url.split('://')[1].split(regex)[0]
return domain
try {
const regex = /[#/?]/
const domain = url.split('://')[1].split(regex)[0]
return domain
} catch (error) {
throw new Oauth2ServerErrorResponseError({
error: Oauth2ErrorCodes.ServerError,
error_description: `Url '${url}' is not a valid URL`,
})
}
}
Loading