Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix(auth): hide passkey login when no credentials are registered
Kyle Mendellb7b568e1a691
diff --git a/AGENTS.md b/AGENTS.mdindex d9502dd68..1bf4bb214 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -20,6 +20,7 @@ headless agent modes, and a Cobra CLI.- Name every unexported Go function with an `Internal` suffix.- Put public/shared Go types in the top-level `types/` module.- Put reusable helper utilities under `backend/pkg/utils/` in the appropriate package.+- Do not add tests for handlers. Test business logic at the service layer instead.- After any change, run `just format all`, then `just lint all`, and fix every issue.Never revert formatter output.diff --git a/backend/go.mod b/backend/go.modindex 5e50cbabc..08d469bfb 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -157,7 +157,7 @@ require (github.com/felixge/httpsnoop v1.1.0 // indirectgithub.com/fogleman/ease v0.0.0-20170301025033-8da417bf1776 // indirectgithub.com/fsnotify/fsevents v0.2.0 // indirect- github.com/fvbommel/sortorder v1.1.0 // indirect+ github.com/fvbommel/sortorder v1.2.0 // indirectgithub.com/fxamacker/cbor/v2 v2.9.3 // indirectgithub.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirectgithub.com/go-git/go-billy/v5 v5.9.0 // indirectdiff --git a/backend/go.sum b/backend/go.sumindex a22218fff..67962f065 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -269,6 +269,8 @@ github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx5github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=+github.com/fvbommel/sortorder v1.2.0 h1:TRIiRiGX+djh3Yf4FVxmWmAcYfIr5dH0NbzJWOSAWZk=+github.com/fvbommel/sortorder v1.2.0/go.mod h1:LbhO04ijZIeUuvz9B9BkI/qYrpZZEn1gWhxv4QjUKVs=github.com/fxamacker/cbor/v2 v2.9.3 h1:oQBnFATpNdY8gJHTndDDv5Xl4QqNaz51G5LLEPhng3Q=github.com/fxamacker/cbor/v2 v2.9.3/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=diff --git a/backend/internal/passkey/handler.go b/backend/internal/passkey/handler.goindex e78b5b5c7..e2fb4ed2a 100644--- a/backend/internal/passkey/handler.go+++ b/backend/internal/passkey/handler.go@@ -168,6 +168,19 @@ func RegisterPasskeys(api huma.API, passkeyService *PasskeyService, authServicepublic := []map[string][]string{}interactive := []map[string][]string{{"BearerAuth": {}}}+ huma.Register(api, huma.Operation{+ OperationID: "get-passkey-login-availability",+ Method: http.MethodGet,+ Path: "/auth/passkey/login/availability",+ Summary: "Get passkey login availability",+ Tags: []string{"Auth", "Passkeys"},+ Security: public,+ Middlewares: huma.Middlewares{func(ctx huma.Context, next func(huma.Context)) {+ ctx.SetHeader("Cache-Control", "no-store")+ next(ctx)+ }},+ }, h.getLoginAvailabilityInternal)+huma.Register(api, huma.Operation{OperationID: "begin-passkey-login",Method: http.MethodPost,@@ -340,6 +353,14 @@ func RegisterPasskeys(api huma.API, passkeyService *PasskeyService, authService}, h.RegenerateRecoveryCodes)}+func (h *PasskeyHandler) getLoginAvailabilityInternal(ctx context.Context, _ *struct{}) (*handlerutil.Out[authtypes.PasskeyLoginAvailability], error) {+ available, err := h.passkeyService.LoginAvailable(ctx)+ if err != nil {+ return nil, passkeyHTTPErrorInternal(err)+ }+ return &handlerutil.Out[authtypes.PasskeyLoginAvailability]{Body: base.ApiResponse[authtypes.PasskeyLoginAvailability]{Success: true, Data: authtypes.PasskeyLoginAvailability{Available: available}}}, nil+}+func (h *PasskeyHandler) BeginPasskeyLogin(ctx context.Context, _ *struct{}) (*handlerutil.Out[passkeyBeginResponse], error) {challenge, err := h.passkeyService.BeginPasskeyLogin(ctx)if err != nil {diff --git a/backend/internal/passkey/service.go b/backend/internal/passkey/service.goindex 73beb2db2..5c97285ad 100644--- a/backend/internal/passkey/service.go+++ b/backend/internal/passkey/service.go@@ -283,6 +283,22 @@ func credentialFromModelInternal(row Passkey) webauthn.Credential {}}+// LoginAvailable reports whether a registered passkey can be used on this instance.+func (s *passkeyService) LoginAvailable(ctx context.Context) (bool, error) {+ if errors.Is(s.readyInternal(), ErrPasskeyServiceUnavailable) {+ return false, nil+ }++ credentials := s.db.WithContext(ctx).Model(&Passkey{}).Select("1").+ Joins("JOIN users ON users.id = passkeys.user_id").+ Where("passkeys.rp_id = ?", s.rpID)+ var available bool+ if err := s.db.WithContext(ctx).Raw("SELECT EXISTS (?)", credentials).Scan(&available).Error; err != nil {+ return false, errors.WrapIf(err, "failed to check passkey login availability")+ }+ return available, nil+}+func (s *passkeyService) BeginPasskeyLogin(ctx context.Context) (*PasskeyChallenge, error) {if err := s.readyInternal(); err != nil {return nil, errdiff --git a/backend/internal/passkey/service_test.go b/backend/internal/passkey/service_test.goindex e50490026..e2d73141f 100644--- a/backend/internal/passkey/service_test.go+++ b/backend/internal/passkey/service_test.go@@ -98,6 +98,39 @@ func TestPasskeyService_BeginPasskeyLoginStoresAndConsumesCeremony(t *testing.T)require.ErrorIs(t, err, ErrPasskeyCeremony)}+func TestPasskeyService_LoginAvailability(t *testing.T) {+ for _, scenario := range []string{"empty", "registered", "other RP", "missing user", "deleted", "unavailable", "database error"} {+ t.Run(scenario, func(t *testing.T) {+ db := newPasskeyServiceTestDB(t)+ service := newPasskeyServiceForTest(t, db)+ if scenario != "empty" {+ user := createPasskeyTestUser(t, db, "availability-user")+ credential := createPasskeyTestCredential(t, db, service, user.ID, "availability-passkey")+ switch scenario {+ case "other RP":+ require.NoError(t, db.Model(credential).Update("rp_id", "other.example.test").Error)+ case "missing user":+ require.NoError(t, db.Model(credential).Update("user_id", "missing-user").Error)+ case "deleted":+ require.NoError(t, db.Delete(credential).Error)+ case "unavailable":+ service = NewPasskeyService(db, &config.Config{AppUrl: ":invalid"})+ case "database error":+ require.NoError(t, db.Migrator().DropTable(&Passkey{}))+ }+ }++ available, err := service.LoginAvailable(t.Context())+ if scenario == "database error" {+ require.Error(t, err)+ } else {+ require.NoError(t, err)+ }+ require.Equal(t, scenario == "registered", available)+ })+ }+}+func TestPasskeyService_FirstEnrollmentUsesActiveSession(t *testing.T) {db := newPasskeyServiceTestDB(t)service := newPasskeyServiceForTest(t, db)diff --git a/frontend/src/lib/services/passkey-service.ts b/frontend/src/lib/services/passkey-service.tsindex 63939cf89..a45782168 100644--- a/frontend/src/lib/services/passkey-service.ts+++ b/frontend/src/lib/services/passkey-service.ts@@ -6,6 +6,7 @@ import type {MFAStatus,MobilePasskeyCompletion,Passkey,+ PasskeyLoginAvailability,PasskeyCapabilities,PasskeyChallenge,RecoveryCodesResponse,@@ -13,6 +14,10 @@ import type {} from '#lib/types/auth';class PasskeyService extends BaseAPIService {+ async getLoginAvailability(): Promise<PasskeyLoginAvailability> {+ return this.handleResponse(this.api.get('/auth/passkey/login/availability', { cache: 'no-store', timeout: 5000 }));+ }+async beginLogin(): Promise<PasskeyChallenge> {return this.handleResponse(this.api.post('/auth/passkey/login/begin'));}diff --git a/frontend/src/lib/types/auth.ts b/frontend/src/lib/types/auth.tsindex e6c0bf6a5..c08a2732e 100644--- a/frontend/src/lib/types/auth.ts+++ b/frontend/src/lib/types/auth.ts@@ -199,6 +199,10 @@ export interface LoginCredentials {export type AuthenticationStatus = 'authenticated' | 'mfa_required';+export type PasskeyLoginAvailability = {+ available: boolean;+};+export type PasskeyChallenge = {ceremonyId: string;transactionId?: string;diff --git a/frontend/src/routes/(auth)/login/+page.svelte b/frontend/src/routes/(auth)/login/+page.svelteindex 73b4bb89d..34fcc53f9 100644--- a/frontend/src/routes/(auth)/login/+page.svelte+++ b/frontend/src/routes/(auth)/login/+page.svelte@@ -32,6 +32,7 @@let password = $state('');let mfaChallenge = $state<MFAChallengeData | null>(null);let passkeySupported = $state(false);+ const showPasskeyLoginButton = $derived(passkeySupported && data.passkeyLoginAvailable === true);const queryClient = useQueryClient();const accentColor = $derived($accentColorPreviewStore);@@ -147,7 +148,7 @@await goto(data.redirectTo || getEffectiveLandingPage(), { replaceState: true });}- const showProviderRow = $derived(showOidcLoginButton || passkeySupported);+ const showProviderRow = $derived(showOidcLoginButton || showPasskeyLoginButton);const showDivider = $derived(showProviderRow && showLocalLoginForm);</script>@@ -229,7 +230,7 @@}}/>{:else}- {#if !showLocalLoginForm && !showOidcLoginButton && !passkeySupported}+ {#if !showLocalLoginForm && !showOidcLoginButton && !showPasskeyLoginButton}<Alert.Root variant="destructive"><AlertIcon class="size-4" /><Alert.Title>{m.auth_no_login_methods_title()}</Alert.Title>@@ -311,7 +312,7 @@</ArcaneButton>{/if}- {#if passkeySupported}+ {#if showPasskeyLoginButton}<ArcaneButtonaction="login"icon={ApiKeyIcon}diff --git a/frontend/src/routes/(auth)/login/+page.ts b/frontend/src/routes/(auth)/login/+page.tsindex eb83a0349..22fa2a72e 100644--- a/frontend/src/routes/(auth)/login/+page.ts+++ b/frontend/src/routes/(auth)/login/+page.ts@@ -1,5 +1,6 @@import { redirect } from '@sveltejs/kit';import { getEffectiveLandingPage } from '#lib/utils/navigation';+import { passkeyService } from '#lib/services/passkey-service';export const load = async ({ parent, url }) => {const data = await parent();@@ -15,11 +16,14 @@ export const load = async ({ parent, url }) => {throw redirect(302, redirectTo || getEffectiveLandingPage());}+ const passkeyAvailability = await passkeyService.getLoginAvailability().catch(() => null);+const error = url.searchParams.get('error');const errorMessage =url.searchParams.get('message') || url.searchParams.get('error_message') || url.searchParams.get('errorMessage');return {+ passkeyLoginAvailable: passkeyAvailability?.available === true,settings: data.settings,redirectTo,error,diff --git a/types/auth/auth.go b/types/auth/auth.goindex 2b20c9ddb..4cb04e8e7 100644--- a/types/auth/auth.go+++ b/types/auth/auth.go@@ -82,3 +82,8 @@ type AutoLoginConfig struct {Enabled bool `json:"enabled" doc:"Whether auto-login is enabled"`Username string `json:"username" doc:"Username for auto-login (only returned if enabled)"`}++// PasskeyLoginAvailability reports whether the instance has a usable passkey.+type PasskeyLoginAvailability struct {+ Available bool `json:"available" doc:"Whether a passkey is registered for the current WebAuthn domain"`+}