Skip to content

fix: Do not panic if WebAuthn.dll is missing #36859

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
codingllama merged 2 commits into from
Jan 18, 2024
Merged

fix: Do not panic if WebAuthn.dll is missing #36859

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d5bc84
fix: Do not panic if WebAuthn.dll is missing
codingllama Jan 18, 2024
22718d8
Drop checkIfDLLExistsAndGetAPIVersionNumber
codingllama Jan 18, 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
40 changes: 21 additions & 19 deletions lib/auth/webauthnwin/webauthn_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,36 @@ type nativeImpl struct {
// could change during program invocation.
// Client will be always created, even if dll is missing on system.
func newNativeImpl() *nativeImpl {
v, err := checkIfDLLExistsAndGetAPIVersionNumber()
n := &nativeImpl{
hasCompileSupport: true,
}

// Explicitly loading the module avoids a panic when calling DLL functions if
// the DLL is missing.
// https://github.com/gravitational/teleport/issues/36851
if err := modWebAuthn.Load(); err != nil {
log.
WithError(err).
Debug("WebAuthnWin: failed to load WebAuthn.dll (it's likely missing)")
return n
}

v, err := webAuthNGetApiVersionNumber()
if err != nil {
log.WithError(err).Debug("WebAuthnWin: failed to check version")
return &nativeImpl{
hasCompileSupport: true,
isAvailable: false,
}
return n
}
uvPlatform, err := isUVPlatformAuthenticatorAvailable()
n.webauthnAPIVersion = v
n.isAvailable = v > 0

n.hasPlatformUV, err = isUVPlatformAuthenticatorAvailable()
if err != nil {
// This should not happen if dll exists, however we are fine with
// to proceed without uvPlatform.
log.WithError(err).Debug("WebAuthnWin: failed to check isUVPlatformAuthenticatorAvailable")
}

return &nativeImpl{
webauthnAPIVersion: v,
hasCompileSupport: true,
hasPlatformUV: uvPlatform,
isAvailable: v > 0,
}
return n
}

func (n *nativeImpl) CheckSupport() CheckSupportResult {
Expand Down Expand Up @@ -176,13 +185,6 @@ func (n *nativeImpl) MakeCredential(origin string, in *makeCredentialRequest) (*
}, nil
}

// checkIfDLLExistsAndGetAPIVersionNumber checks if dll exists and tries to load
// it's version via API call. This function makes sure to not panic if dll is
// missing.
func checkIfDLLExistsAndGetAPIVersionNumber() (int, error) {
Copy link
Copy Markdown
Contributor Author

@codingllama codingllama Jan 18, 2024

Choose a reason for hiding this comment

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

It was right in the func name too 🤦

return webAuthNGetApiVersionNumber()
}

func getErrorNameOrLastErr(in uintptr, lastError error) error {
ret := webAuthNGetErrorName(in)
if ret == 0 {
Expand Down