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

Add a null check to getMfaChallengeResponse #50570

Merged
merged 3 commits into from
Dec 30, 2024
Merged

Add a null check to getMfaChallengeResponse #50570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6b64f9
Add a null check to getMfaChallengeResponse.
Joerger Dec 24, 2024
5e13f45
Add other null checks, just in case.
Joerger Dec 24, 2024
f335581
Update signatures to include undefined, consistently return undefined
ravicious Dec 30, 2024
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
2 changes: 1 addition & 1 deletion web/packages/teleport/src/Account/ChangePasswordWizard/ChangePasswordWizard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function ChangePasswordWizard({
const reauthState = useReAuthenticate({
challengeScope: MfaChallengeScope.CHANGE_PASSWORD,
onMfaResponse: async mfaResponse =>
setWebauthnResponse(mfaResponse.webauthn_response),
setWebauthnResponse(mfaResponse?.webauthn_response),
});

const [reauthMethod, setReauthMethod] = useState<ReauthenticationMethod>();
Expand Down
6 changes: 3 additions & 3 deletions web/packages/teleport/src/lib/term/tty.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ class Tty extends EventEmitterMfaSender {
this.socket.send(bytearray.buffer);
}

sendChallengeResponse(data: MfaChallengeResponse) {
sendChallengeResponse(resp: MfaChallengeResponse) {
// we want to have the backend listen on a single message type
// for any responses. so our data will look like data.webauthn, data.sso, etc
// but to be backward compatible, we need to still spread the existing webauthn only fields
// as "top level" fields so old proxies can still respond to webauthn challenges.
// in 19, we can just pass "data" without this extra step
// TODO (avatus): DELETE IN 19.0.0
const backwardCompatibleData = {
...data.webauthn_response,
...data,
...resp?.webauthn_response,
...resp,
};
const encoded = this._proto.encodeChallengeResponse(
JSON.stringify(backwardCompatibleData)
Expand Down
10 changes: 6 additions & 4 deletions web/packages/teleport/src/services/auth/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ const auth = {
.then(res => {
const request = {
action: 'accept',
webauthnAssertionResponse: res.webauthn_response,
webauthnAssertionResponse: res?.webauthn_response,
};

return api.put(cfg.getHeadlessSsoPath(transactionId), request);
Expand Down Expand Up @@ -281,7 +281,9 @@ const auth = {
challenge: MfaAuthenticateChallenge,
mfaType?: DeviceType,
totpCode?: string
): Promise<MfaChallengeResponse> {
): Promise<MfaChallengeResponse | undefined> {
if (!challenge) return;
ravicious marked this conversation as resolved.
Show resolved Hide resolved

// TODO(Joerger): If mfaType is not provided by a parent component, use some global context
// to display a component, similar to the one used in useMfa. For now we just default to
// whichever method we can succeed with first.
Expand Down Expand Up @@ -310,7 +312,7 @@ const auth = {
}

// No viable challenge, return empty response.
return null;
return;
},

async getWebAuthnChallengeResponse(
Expand Down Expand Up @@ -439,7 +441,7 @@ const auth = {
return auth
.getMfaChallenge({ scope, allowReuse, isMfaRequiredRequest }, abortSignal)
.then(challenge => auth.getMfaChallengeResponse(challenge, 'webauthn'))
.then(res => res.webauthn_response);
.then(res => res?.webauthn_response);
},

getMfaChallengeResponseForAdminAction(allowReuse?: boolean) {
Expand Down
4 changes: 2 additions & 2 deletions web/packages/teleport/src/services/mfa/makeMfa.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ export function parseMfaRegistrationChallengeJson(
// parseMfaChallengeJson formats fetched authenticate challenge JSON.
export function parseMfaChallengeJson(
challenge: MfaAuthenticateChallengeJson
): MfaAuthenticateChallenge {
): MfaAuthenticateChallenge | undefined {
if (
!challenge.sso_challenge &&
!challenge.webauthn_challenge &&
!challenge.totp_challenge
) {
return null;
return;
ravicious marked this conversation as resolved.
Show resolved Hide resolved
}

// WebAuthn challenge contains Base64URL(byte) fields that needs to
Expand Down
Loading