Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bed2c39d8 |
@@ -3,6 +3,7 @@ dist/
|
|||||||
.*
|
.*
|
||||||
!.gitignore
|
!.gitignore
|
||||||
*.lock
|
*.lock
|
||||||
|
package-lock.json
|
||||||
paskia.sqlite
|
paskia.sqlite
|
||||||
/paskia/frontend-build
|
/paskia/frontend-build
|
||||||
/paskia/_version.py
|
/paskia/_version.py
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { ref, onMounted, onUnmounted, computed, watch } from 'vue'
|
|||||||
import Breadcrumbs from '@/components/Breadcrumbs.vue'
|
import Breadcrumbs from '@/components/Breadcrumbs.vue'
|
||||||
import CredentialList from '@/components/CredentialList.vue'
|
import CredentialList from '@/components/CredentialList.vue'
|
||||||
import UserBasicInfo from '@/components/UserBasicInfo.vue'
|
import UserBasicInfo from '@/components/UserBasicInfo.vue'
|
||||||
import RegistrationLinkModal from '@/components/RegistrationLinkModal.vue'
|
|
||||||
import StatusMessage from '@/components/StatusMessage.vue'
|
import StatusMessage from '@/components/StatusMessage.vue'
|
||||||
import LoadingView from '@/components/LoadingView.vue'
|
import LoadingView from '@/components/LoadingView.vue'
|
||||||
import AuthRequiredMessage from '@/components/AccessDenied.vue'
|
import AuthRequiredMessage from '@/components/AccessDenied.vue'
|
||||||
|
|||||||
@@ -1,15 +1,35 @@
|
|||||||
<template>
|
<template>
|
||||||
<RestrictedAuth
|
<RestrictedAuth
|
||||||
:mode="authMode"
|
:mode="authMode"
|
||||||
|
:remote-auth-token="remoteAuthToken"
|
||||||
@authenticated="handleAuthenticated"
|
@authenticated="handleAuthenticated"
|
||||||
@back="handleBack"
|
@back="handleBack"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, onMounted } from 'vue'
|
import { computed, onMounted, ref } from 'vue'
|
||||||
import RestrictedAuth from '@/components/RestrictedAuth.vue'
|
import RestrictedAuth from '@/components/RestrictedAuth.vue'
|
||||||
|
|
||||||
|
// Check if this is a remote auth URL: /auth/{token}
|
||||||
|
// The token is a 5-word passphrase like "word1.word2.word3.word4.word5"
|
||||||
|
const remoteAuthToken = ref(null)
|
||||||
|
|
||||||
|
function extractRemoteToken() {
|
||||||
|
const path = window.location.pathname
|
||||||
|
// Match /auth/{token} where token is a passphrase with dots
|
||||||
|
const match = path.match(/\/auth\/([^/]+)$/)
|
||||||
|
if (match) {
|
||||||
|
const token = match[1]
|
||||||
|
// Validate it looks like a 5-word passphrase
|
||||||
|
const parts = token.split('.')
|
||||||
|
if (parts.length === 5 && parts.every(p => p.length > 0)) {
|
||||||
|
return token
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
// Detect mode from URL hash fragment
|
// Detect mode from URL hash fragment
|
||||||
const authMode = computed(() => {
|
const authMode = computed(() => {
|
||||||
const params = new URLSearchParams(window.location.hash.slice(1))
|
const params = new URLSearchParams(window.location.hash.slice(1))
|
||||||
@@ -40,6 +60,9 @@ function handleBack() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
// Check for remote auth token in URL
|
||||||
|
remoteAuthToken.value = extractRemoteToken()
|
||||||
|
|
||||||
postToParent({
|
postToParent({
|
||||||
type: 'auth-ready'
|
type: 'auth-ready'
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -23,7 +23,6 @@
|
|||||||
|
|
||||||
<section class="section-block" v-else-if="!canRegister">
|
<section class="section-block" v-else-if="!canRegister">
|
||||||
<div class="section-body center">
|
<div class="section-body center">
|
||||||
<p>{{ errorMessage }}</p>
|
|
||||||
<div class="button-row center" style="justify-content: center;">
|
<div class="button-row center" style="justify-content: center;">
|
||||||
<button class="btn-secondary" @click="goHome">Return to sign-in</button>
|
<button class="btn-secondary" @click="goHome">Return to sign-in</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -80,7 +79,7 @@ let statusTimer = null
|
|||||||
const sessionDescriptor = computed(() => userInfo.value?.session_type || 'your enrollment')
|
const sessionDescriptor = computed(() => userInfo.value?.session_type || 'your enrollment')
|
||||||
const subtitleMessage = computed(() => {
|
const subtitleMessage = computed(() => {
|
||||||
if (initializing.value) return 'Preparing your secure enrollment…'
|
if (initializing.value) return 'Preparing your secure enrollment…'
|
||||||
if (!canRegister.value) return 'This reset link is no longer valid.'
|
if (!canRegister.value) return 'This authentication link is no longer valid.'
|
||||||
return `Finish up ${sessionDescriptor.value}. You may edit the name below if needed, and it will be saved to your passkey.`
|
return `Finish up ${sessionDescriptor.value}. You may edit the name below if needed, and it will be saved to your passkey.`
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -120,10 +119,9 @@ async function fetchUserInfo() {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to load user info', error)
|
console.error('Failed to load user info', error)
|
||||||
const message = error instanceof ApiError
|
const message = error instanceof ApiError
|
||||||
? (error.data?.detail || 'Reset link is invalid or expired.')
|
? (error.data?.detail || 'The authentication link is invalid or expired.')
|
||||||
: getUserFriendlyErrorMessage(error)
|
: getUserFriendlyErrorMessage(error)
|
||||||
errorMessage.value = message
|
errorMessage.value = message
|
||||||
showMessage(message, 'error', 0)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -132,7 +132,6 @@ async function handleTerminateSession(session) {
|
|||||||
<RegistrationLinkModal
|
<RegistrationLinkModal
|
||||||
v-if="showRegModal"
|
v-if="showRegModal"
|
||||||
:endpoint="`/auth/api/admin/orgs/${selectedUser.org_uuid}/users/${selectedUser.uuid}/create-link`"
|
:endpoint="`/auth/api/admin/orgs/${selectedUser.org_uuid}/users/${selectedUser.uuid}/create-link`"
|
||||||
:auto-copy="false"
|
|
||||||
:user-name="userDetail?.display_name || selectedUser.display_name"
|
:user-name="userDetail?.display_name || selectedUser.display_name"
|
||||||
@close="$emit('closeRegModal')"
|
@close="$emit('closeRegModal')"
|
||||||
@copied="onLinkCopied"
|
@copied="onLinkCopied"
|
||||||
|
|||||||
@@ -422,9 +422,9 @@ th {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.qr-code {
|
.qr-code {
|
||||||
border: 1px solid var(--color-border);
|
padding: 1rem;
|
||||||
padding: 0.75rem;
|
background: #fff;
|
||||||
background: var(--color-surface);
|
box-shadow: var(--shadow-soft);
|
||||||
}
|
}
|
||||||
|
|
||||||
.link-container,
|
.link-container,
|
||||||
|
|||||||
@@ -4,18 +4,17 @@
|
|||||||
<h1>📱 Add Another Device</h1>
|
<h1>📱 Add Another Device</h1>
|
||||||
<p class="view-lede">Generate a one-time link to set up passkeys on a new device.</p>
|
<p class="view-lede">Generate a one-time link to set up passkeys on a new device.</p>
|
||||||
</header>
|
</header>
|
||||||
<RegistrationLinkModal
|
|
||||||
inline
|
|
||||||
:endpoint="'/auth/api/user/create-link'"
|
|
||||||
:user-name="userName"
|
|
||||||
:auto-copy="false"
|
|
||||||
:prefix-copy-with-user-name="!!userName"
|
|
||||||
show-close-in-inline
|
|
||||||
@copied="onCopied"
|
|
||||||
/>
|
|
||||||
<div class="button-row" style="margin-top:1rem;">
|
<div class="button-row" style="margin-top:1rem;">
|
||||||
|
<button @click="showModal = true" class="btn-primary">Generate Registration Link</button>
|
||||||
<button @click="authStore.currentView = 'profile'" class="btn-secondary">Back to Profile</button>
|
<button @click="authStore.currentView = 'profile'" class="btn-secondary">Back to Profile</button>
|
||||||
</div>
|
</div>
|
||||||
|
<RegistrationLinkModal
|
||||||
|
v-if="showModal"
|
||||||
|
endpoint="/auth/api/user/create-link"
|
||||||
|
:user-name="userName"
|
||||||
|
@close="showModal = false"
|
||||||
|
@copied="onCopied"
|
||||||
|
/>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -26,9 +25,10 @@ import RegistrationLinkModal from '@/components/RegistrationLinkModal.vue'
|
|||||||
|
|
||||||
const authStore = useAuthStore()
|
const authStore = useAuthStore()
|
||||||
const userName = ref(null)
|
const userName = ref(null)
|
||||||
|
const showModal = ref(false)
|
||||||
|
|
||||||
const onCopied = () => {
|
const onCopied = () => {
|
||||||
authStore.showMessage('Link copied to clipboard!', 'success', 2500)
|
authStore.showMessage('Link copied to clipboard!', 'success', 2500)
|
||||||
authStore.currentView = 'profile'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<template>
|
<template>
|
||||||
<section class="view-root" data-view="profile">
|
<section class="view-root" data-view="profile">
|
||||||
<header class="view-header">
|
<header class="view-header">
|
||||||
<h1>👋 Welcome!</h1>
|
<h1>User Profile</h1>
|
||||||
<Breadcrumbs :entries="breadcrumbEntries" />
|
<Breadcrumbs :entries="breadcrumbEntries" />
|
||||||
<p class="view-lede">Manage your account details and passkeys.</p>
|
<p class="view-lede">Account dashboard for managing credentials and authenticating with other devices.</p>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<section class="section-block">
|
<section class="section-block">
|
||||||
@@ -17,7 +17,20 @@
|
|||||||
update-endpoint="/auth/api/user/display-name"
|
update-endpoint="/auth/api/user/display-name"
|
||||||
@saved="authStore.loadUserInfo()"
|
@saved="authStore.loadUserInfo()"
|
||||||
@edit-name="openNameDialog"
|
@edit-name="openNameDialog"
|
||||||
/>
|
>
|
||||||
|
<div class="remote-auth-inline">
|
||||||
|
<label v-if="!showDeviceInfo" class="remote-auth-label">Code words from remote device:</label>
|
||||||
|
<RemoteAuth
|
||||||
|
ref="pairingEntry"
|
||||||
|
title=""
|
||||||
|
description=""
|
||||||
|
placeholder="word word word"
|
||||||
|
@completed="handlePairingCompleted"
|
||||||
|
@error="handlePairingError"
|
||||||
|
@device-info-visible="showDeviceInfo = $event"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</UserBasicInfo>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="section-block">
|
<section class="section-block">
|
||||||
@@ -84,11 +97,8 @@
|
|||||||
</section>
|
</section>
|
||||||
<RegistrationLinkModal
|
<RegistrationLinkModal
|
||||||
v-if="showRegLink"
|
v-if="showRegLink"
|
||||||
:endpoint="'/auth/api/user/create-link'"
|
endpoint="/auth/api/user/create-link"
|
||||||
:auto-copy="false"
|
|
||||||
:prefix-copy-with-user-name="false"
|
|
||||||
@close="showRegLink = false"
|
@close="showRegLink = false"
|
||||||
@copied="showRegLink = false; authStore.showMessage('Link copied to clipboard!', 'success', 2500)"
|
|
||||||
/>
|
/>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
@@ -102,6 +112,7 @@ import Modal from '@/components/Modal.vue'
|
|||||||
import NameEditForm from '@/components/NameEditForm.vue'
|
import NameEditForm from '@/components/NameEditForm.vue'
|
||||||
import SessionList from '@/components/SessionList.vue'
|
import SessionList from '@/components/SessionList.vue'
|
||||||
import RegistrationLinkModal from '@/components/RegistrationLinkModal.vue'
|
import RegistrationLinkModal from '@/components/RegistrationLinkModal.vue'
|
||||||
|
import RemoteAuth from '@/components/RemoteAuthPermit.vue'
|
||||||
import { useAuthStore } from '@/stores/auth'
|
import { useAuthStore } from '@/stores/auth'
|
||||||
import { adminUiPath, makeUiHref } from '@/utils/settings'
|
import { adminUiPath, makeUiHref } from '@/utils/settings'
|
||||||
import passkey from '@/utils/passkey'
|
import passkey from '@/utils/passkey'
|
||||||
@@ -116,6 +127,8 @@ const newName = ref('')
|
|||||||
const saving = ref(false)
|
const saving = ref(false)
|
||||||
const hoveredCredentialUuid = ref(null)
|
const hoveredCredentialUuid = ref(null)
|
||||||
const hoveredSession = ref(null)
|
const hoveredSession = ref(null)
|
||||||
|
const showDeviceInfo = ref(false)
|
||||||
|
const pairingEntry = ref(null)
|
||||||
|
|
||||||
watch(showNameDialog, (newVal) => { if (newVal) newName.value = authStore.userInfo?.user?.user_name || '' })
|
watch(showNameDialog, (newVal) => { if (newVal) newName.value = authStore.userInfo?.user?.user_name || '' })
|
||||||
|
|
||||||
@@ -138,6 +151,19 @@ const addNewCredential = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handlePairingCompleted = () => {
|
||||||
|
authStore.showMessage('The other device is now signed in!', 'success', 4000)
|
||||||
|
// Reset the form after a delay
|
||||||
|
setTimeout(() => pairingEntry.value?.reset(), 3000)
|
||||||
|
}
|
||||||
|
|
||||||
|
const handlePairingError = (message) => {
|
||||||
|
// Error is already shown in the component, optionally show global message for severe errors
|
||||||
|
if (!message.includes('cancelled')) {
|
||||||
|
authStore.showMessage(message, 'error', 4000)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const handleDelete = async (credential) => {
|
const handleDelete = async (credential) => {
|
||||||
const credentialId = credential?.credential_uuid
|
const credentialId = credential?.credential_uuid
|
||||||
if (!credentialId) return
|
if (!credentialId) return
|
||||||
@@ -199,5 +225,7 @@ const saveName = async () => {
|
|||||||
.logout-row { gap: 1rem; }
|
.logout-row { gap: 1rem; }
|
||||||
.logout-row.single { justify-content: flex-start; }
|
.logout-row.single { justify-content: flex-start; }
|
||||||
.logout-note { margin: 0.75rem 0 0; color: var(--color-text-muted); font-size: 0.875rem; }
|
.logout-note { margin: 0.75rem 0 0; color: var(--color-text-muted); font-size: 0.875rem; }
|
||||||
|
.remote-auth-inline { display: flex; flex-direction: column; gap: 0.5rem; }
|
||||||
|
.remote-auth-label { display: block; margin: 0; font-size: 0.875rem; color: var(--color-text-muted); font-weight: 500; }
|
||||||
@media (max-width: 720px) { .logout-button { width: 100%; } }
|
@media (max-width: 720px) { .logout-button { width: 100%; } }
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -0,0 +1,161 @@
|
|||||||
|
<template>
|
||||||
|
<div class="qr-display">
|
||||||
|
<div class="qr-section">
|
||||||
|
<a :href="url" @click.prevent="copyLink" class="qr-link" title="Click to copy link">
|
||||||
|
<canvas ref="qrCanvas" class="qr-code"></canvas>
|
||||||
|
<div v-if="showLink && url" class="link-text">{{ displayUrl }}</div>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="showCopyToast" class="copy-toast">
|
||||||
|
✓ Link copied to clipboard
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import { ref, watch, nextTick, computed } from 'vue'
|
||||||
|
import QRCode from 'qrcode/lib/browser'
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
url: { type: String, required: true },
|
||||||
|
showLink: { type: Boolean, default: false }
|
||||||
|
})
|
||||||
|
|
||||||
|
const emit = defineEmits(['copied'])
|
||||||
|
|
||||||
|
const qrCanvas = ref(null)
|
||||||
|
const showCopyToast = ref(false)
|
||||||
|
|
||||||
|
let copyToastTimer = null
|
||||||
|
|
||||||
|
const displayUrl = computed(() => {
|
||||||
|
if (!props.url) return ''
|
||||||
|
return props.url.replace(/^https?:\/\//, '')
|
||||||
|
})
|
||||||
|
|
||||||
|
function drawQR() {
|
||||||
|
if (!props.url || !qrCanvas.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Clear the canvas first
|
||||||
|
const ctx = qrCanvas.value.getContext('2d')
|
||||||
|
ctx.clearRect(0, 0, qrCanvas.value.width, qrCanvas.value.height)
|
||||||
|
|
||||||
|
// Generate QR code synchronously
|
||||||
|
QRCode.toCanvas(qrCanvas.value, props.url, {
|
||||||
|
scale: 6,
|
||||||
|
margin: 0,
|
||||||
|
color: {
|
||||||
|
dark: '#000000',
|
||||||
|
light: '#FFFFFF'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// Remove any inline styles added by QRCode library immediately
|
||||||
|
qrCanvas.value.removeAttribute('style')
|
||||||
|
} catch (err) {
|
||||||
|
console.error('QR code generation failed:', err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function copyLink() {
|
||||||
|
if (!props.url) return
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(props.url)
|
||||||
|
showCopyToast.value = true
|
||||||
|
emit('copied')
|
||||||
|
|
||||||
|
if (copyToastTimer) clearTimeout(copyToastTimer)
|
||||||
|
copyToastTimer = setTimeout(() => {
|
||||||
|
showCopyToast.value = false
|
||||||
|
}, 2000)
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to copy link:', err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Watch for URL changes
|
||||||
|
watch(() => props.url, () => {
|
||||||
|
drawQR()
|
||||||
|
}, { immediate: true })
|
||||||
|
|
||||||
|
// Watch for canvas ref becoming available
|
||||||
|
watch(qrCanvas, () => {
|
||||||
|
if (qrCanvas.value && props.url) {
|
||||||
|
drawQR()
|
||||||
|
}
|
||||||
|
}, { immediate: true })
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.qr-display {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-section {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-link {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
text-decoration: none;
|
||||||
|
color: inherit;
|
||||||
|
border-radius: var(--radius-sm, 6px);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-code {
|
||||||
|
display: block;
|
||||||
|
width: 200px;
|
||||||
|
height: 200px;
|
||||||
|
max-width: 100%;
|
||||||
|
object-fit: contain;
|
||||||
|
border-radius: var(--radius-sm, 6px);
|
||||||
|
background: #ffffff;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.link-text {
|
||||||
|
padding: 0.5rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
font-family: monospace;
|
||||||
|
word-break: break-all;
|
||||||
|
line-height: 1.2;
|
||||||
|
transition: color 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qr-link:hover .link-text {
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.copy-toast {
|
||||||
|
position: absolute;
|
||||||
|
top: -2rem;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
background: var(--color-success);
|
||||||
|
color: white;
|
||||||
|
padding: 0.5rem 1rem;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
font-size: 0.875rem;
|
||||||
|
z-index: 10;
|
||||||
|
animation: fadeInOut 2s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeInOut {
|
||||||
|
0%, 100% { opacity: 0; }
|
||||||
|
10%, 90% { opacity: 1; }
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -1,147 +1,109 @@
|
|||||||
<template>
|
<template>
|
||||||
<div v-if="!inline && url" class="dialog-overlay" @keydown.esc.prevent="$emit('close')">
|
<div class="dialog-overlay" @keydown.esc.prevent="$emit('close')">
|
||||||
<div class="device-dialog" role="dialog" aria-modal="true" aria-labelledby="regTitle">
|
<div class="device-dialog" role="dialog" aria-modal="true" aria-labelledby="regTitle">
|
||||||
<div class="reg-header-row">
|
<div class="reg-header-row">
|
||||||
<h2 id="regTitle" class="reg-title">
|
<h2 id="regTitle" class="reg-title">
|
||||||
📱 <span v-if="userName">Registration for {{ userName }}</span><span v-else>Device Registration Link</span>
|
📱 <span v-if="userName">Registration for {{ userName }}</span><span v-else>Add Another Device</span>
|
||||||
</h2>
|
</h2>
|
||||||
<button class="icon-btn" @click="$emit('close')" aria-label="Close">❌</button>
|
<button class="icon-btn" @click="$emit('close')" aria-label="Close">❌</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="device-link-section">
|
<div class="device-link-section">
|
||||||
<div class="qr-container">
|
<!-- Loading state -->
|
||||||
<a :href="url" @click.prevent="copy" class="qr-link">
|
<div v-if="loading" class="loading-state">
|
||||||
<canvas ref="qrCanvas" class="qr-code"></canvas>
|
<div class="spinner-small"></div>
|
||||||
<p>{{ displayUrl }}</p>
|
<span>Generating registration link...</span>
|
||||||
</a>
|
|
||||||
<p class="reg-help">
|
|
||||||
<span v-if="userName">The user should open this link on the device where they want to register.</span>
|
|
||||||
<span v-else>Open or scan this link on the device you wish to register to your account.</span>
|
|
||||||
<br><small>{{ expirationMessage }}</small>
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Error state -->
|
||||||
|
<div v-else-if="error" class="error-state">
|
||||||
|
<p class="error-message">{{ error }}</p>
|
||||||
|
<button class="btn-secondary" @click="generateLink">Retry</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Success state with QR code and link -->
|
||||||
|
<template v-else-if="linkUrl">
|
||||||
|
<p class="reg-help">
|
||||||
|
Scan this QR code on the new device, or copy the link and open it there.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<QRCodeDisplay
|
||||||
|
:url="linkUrl"
|
||||||
|
:show-link="true"
|
||||||
|
@copied="onCopied"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<p class="expiry-note" v-if="expiresAt">
|
||||||
|
This link expires {{ formatDate(expiresAt).toLowerCase() }}.
|
||||||
|
</p>
|
||||||
|
</template>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="reg-actions">
|
<div class="reg-actions">
|
||||||
<button class="btn-secondary" @click="$emit('close')">Close</button>
|
<button class="btn-secondary" @click="$emit('close')">Close</button>
|
||||||
<button class="btn-primary" @click="copy">Copy Link</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-else-if="inline && url" class="registration-inline-wrapper">
|
|
||||||
<div class="registration-inline-block section-block">
|
|
||||||
<div class="section-header">
|
|
||||||
<h2 class="inline-heading">📱 <span v-if="userName">Registration for {{ userName }}</span><span v-else>Device Registration Link</span></h2>
|
|
||||||
</div>
|
|
||||||
<div class="section-body">
|
|
||||||
<div class="device-link-section">
|
|
||||||
<div class="qr-container">
|
|
||||||
<a :href="url" @click.prevent="copy" class="qr-link">
|
|
||||||
<canvas ref="qrCanvas" class="qr-code"></canvas>
|
|
||||||
<p>{{ displayUrl }}</p>
|
|
||||||
</a>
|
|
||||||
<p class="reg-help">
|
|
||||||
<span v-if="userName">The user should open this link on the device where they want to register.</span>
|
|
||||||
<span v-else>Open this link on the device you wish to connect with.</span>
|
|
||||||
<br><small>{{ expirationMessage }}</small>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="button-row" style="margin-top:1rem;">
|
|
||||||
<button class="btn-primary" @click="copy">Copy Link</button>
|
|
||||||
<button v-if="showCloseInInline" class="btn-secondary" @click="$emit('close')">Close</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onMounted, watch, computed, nextTick } from 'vue'
|
import { ref, onMounted } from 'vue'
|
||||||
import QRCode from 'qrcode/lib/browser'
|
import QRCodeDisplay from '@/components/QRCodeDisplay.vue'
|
||||||
|
import { apiJson } from '@/utils/api'
|
||||||
import { formatDate } from '@/utils/helpers'
|
import { formatDate } from '@/utils/helpers'
|
||||||
import { useAuthStore } from '@/stores/auth'
|
|
||||||
import { apiJson, getUserFriendlyErrorMessage, shouldShowErrorToast } from '@/utils/api'
|
|
||||||
|
|
||||||
const authStore = useAuthStore()
|
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
endpoint: { type: String, required: true },
|
endpoint: { type: String, required: true },
|
||||||
autoCopy: { type: Boolean, default: true },
|
userName: { type: String, default: '' }
|
||||||
userName: { type: String, default: null },
|
|
||||||
inline: { type: Boolean, default: false },
|
|
||||||
showCloseInInline: { type: Boolean, default: false },
|
|
||||||
prefixCopyWithUserName: { type: Boolean, default: false }
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const emit = defineEmits(['close','generated','copied'])
|
const emit = defineEmits(['close', 'copied'])
|
||||||
|
|
||||||
const url = ref(null)
|
const loading = ref(true)
|
||||||
const expires = ref(null)
|
const error = ref(null)
|
||||||
const qrCanvas = ref(null)
|
const linkUrl = ref(null)
|
||||||
|
const expiresAt = ref(null)
|
||||||
|
|
||||||
const displayUrl = computed(() => url.value ? url.value.replace(/^[^:]+:\/\//,'') : '')
|
async function generateLink() {
|
||||||
|
loading.value = true
|
||||||
|
error.value = null
|
||||||
|
linkUrl.value = null
|
||||||
|
expiresAt.value = null
|
||||||
|
|
||||||
const expirationMessage = computed(() => {
|
|
||||||
const timeStr = formatDate(expires.value)
|
|
||||||
return `⚠️ Expires ${timeStr.startsWith('In ') ? timeStr.substring(3) : timeStr} and can only be used once.`
|
|
||||||
})
|
|
||||||
|
|
||||||
async function fetchLink() {
|
|
||||||
try {
|
try {
|
||||||
const data = await apiJson(props.endpoint, { method: 'POST' })
|
const data = await apiJson(props.endpoint, { method: 'POST' })
|
||||||
url.value = data.url
|
if (data.url) {
|
||||||
expires.value = data.expires
|
linkUrl.value = data.url
|
||||||
emit('generated', { url: data.url, expires: data.expires })
|
expiresAt.value = data.expires ? new Date(data.expires) : null
|
||||||
await nextTick()
|
} else {
|
||||||
drawQR()
|
error.value = data.detail || 'Failed to generate link'
|
||||||
if (props.autoCopy) copy()
|
|
||||||
} catch (e) {
|
|
||||||
console.error('Failed to create link', e)
|
|
||||||
if (shouldShowErrorToast(e)) {
|
|
||||||
authStore.showMessage(getUserFriendlyErrorMessage(e), 'error', 4000)
|
|
||||||
}
|
}
|
||||||
// Close the dialog on any error (auth cancelled, network error, etc.)
|
} catch (err) {
|
||||||
emit('close')
|
error.value = err.message || 'Failed to generate link'
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function drawQR() {
|
function onCopied() {
|
||||||
if (!url.value) return
|
emit('copied')
|
||||||
await nextTick()
|
|
||||||
if (!qrCanvas.value) return
|
|
||||||
QRCode.toCanvas(qrCanvas.value, url.value, { scale: 8 }, err => { if (err) console.error(err) })
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function copy() {
|
onMounted(() => {
|
||||||
if (!url.value) return
|
generateLink()
|
||||||
let text = url.value
|
})
|
||||||
if (props.prefixCopyWithUserName && props.userName) {
|
|
||||||
text = `${props.userName} ${text}`
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
await navigator.clipboard.writeText(text)
|
|
||||||
emit('copied', text)
|
|
||||||
if (!props.inline) emit('close')
|
|
||||||
} catch (_) {
|
|
||||||
/* ignore */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(fetchLink)
|
|
||||||
watch(url, () => drawQR(), { flush: 'post' })
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.icon-btn { background:none; border:none; cursor:pointer; font-size:1rem; opacity:.6; }
|
.icon-btn { background: none; border: none; cursor: pointer; font-size: 1rem; opacity: .6; }
|
||||||
.icon-btn:hover { opacity:1; }
|
.icon-btn:hover { opacity: 1; }
|
||||||
/* Minimal extra styling; main look comes from global styles */
|
.reg-header-row { display: flex; justify-content: space-between; align-items: center; gap: .75rem; margin-bottom: .75rem; }
|
||||||
.qr-link { text-decoration:none; color:inherit; }
|
.reg-title { margin: 0; font-size: 1.25rem; font-weight: 600; }
|
||||||
.reg-header-row { display:flex; justify-content:space-between; align-items:center; gap:.75rem; margin-bottom:.75rem; }
|
.device-dialog { background: var(--color-surface); padding: 1.25rem 1.25rem 1rem; border-radius: var(--radius-md); max-width: 480px; width: 100%; box-shadow: 0 6px 28px rgba(0,0,0,.25); }
|
||||||
.reg-title { margin:0; font-size:1.25rem; font-weight:600; }
|
.reg-help { margin: .5rem 0 .75rem; font-size: .85rem; line-height: 1.4; text-align: center; color: var(--color-text-muted); }
|
||||||
.device-dialog { background: var(--color-surface); padding: 1.25rem 1.25rem 1rem; border-radius: var(--radius-md); max-width:480px; width:100%; box-shadow:0 6px 28px rgba(0,0,0,.25); }
|
.reg-actions { display: flex; justify-content: flex-end; gap: .5rem; margin-top: 1rem; }
|
||||||
.qr-container { display:flex; flex-direction:column; align-items:center; gap:.5rem; }
|
.loading-state { display: flex; align-items: center; justify-content: center; gap: .5rem; padding: 2rem 0; color: var(--color-text-muted); }
|
||||||
.qr-code { display:block; }
|
.error-state { text-align: center; padding: 1rem 0; }
|
||||||
.reg-help { margin-top:.5rem; margin-bottom:.75rem; font-size:.85rem; line-height:1.25rem; text-align:center; }
|
.error-message { color: var(--color-danger-text); margin-bottom: 1rem; }
|
||||||
.reg-actions { display:flex; justify-content:flex-end; gap:.5rem; margin-top:.25rem; }
|
.expiry-note { font-size: .75rem; color: var(--color-text-muted); text-align: center; margin-top: .75rem; }
|
||||||
.registration-inline-block .qr-container { align-items:flex-start; }
|
|
||||||
.registration-inline-block .reg-help { text-align:left; }
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -0,0 +1,894 @@
|
|||||||
|
<template>
|
||||||
|
<div class="pairing-entry">
|
||||||
|
<form @submit.prevent="submitCode" class="pairing-form">
|
||||||
|
<!-- Code input (shown when device info not yet received) -->
|
||||||
|
<div v-if="!deviceInfo" class="input-row">
|
||||||
|
<div class="input-wrapper" :class="{ 'has-error': serverError, 'is-complete': deviceInfo && !serverError, 'focused': isFocused }">
|
||||||
|
<!-- Visual slot-machine display overlay -->
|
||||||
|
<div class="slot-machine" :class="{ 'has-error': serverError, 'is-complete': deviceInfo && !serverError }" aria-hidden="true">
|
||||||
|
<div v-for="(word, index) in displayWords" :key="index" class="slot-reel" :class="{ 'invalid-word': word.invalid, 'empty': !word.text && !word.typedPrefix }">
|
||||||
|
<div class="slot-word">
|
||||||
|
<template v-if="word.typedPrefix">
|
||||||
|
<span class="typed-prefix">{{ word.typedPrefix }}</span><span class="hint-suffix">{{ word.hintSuffix }}</span>
|
||||||
|
<span v-if="word.hasCursor" class="cursor-overlay" :style="{ '--cursor-pos': word.cursorCharIndex, '--word-len': word.wordLen }"></span>
|
||||||
|
</template>
|
||||||
|
<template v-else-if="word.text">
|
||||||
|
{{ word.text }}
|
||||||
|
<span v-if="word.hasCursor" class="cursor-overlay" :style="{ '--cursor-pos': word.cursorCharIndex, '--word-len': word.wordLen }"></span>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<span v-if="word.hasCursor" class="cursor-overlay" :style="{ '--cursor-pos': 0, '--word-len': 0 }"></span>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- Hidden input for actual text entry -->
|
||||||
|
<input
|
||||||
|
ref="inputRef"
|
||||||
|
v-model="code"
|
||||||
|
type="text"
|
||||||
|
:placeholder="placeholder"
|
||||||
|
autocomplete="off"
|
||||||
|
autocapitalize="none"
|
||||||
|
autocorrect="off"
|
||||||
|
spellcheck="false"
|
||||||
|
class="pairing-input hidden-input"
|
||||||
|
@input="handleInput"
|
||||||
|
@keydown="deferUpdateCursor"
|
||||||
|
@mouseup="updateCursorPos"
|
||||||
|
@focus="isFocused = true"
|
||||||
|
@blur="isFocused = false"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<!-- Processing status beside input -->
|
||||||
|
<div v-if="processingStatus" class="processing-status">
|
||||||
|
<span class="processing-icon">{{ processingStatus === 'pow' ? '🔐' : '📡' }}</span>
|
||||||
|
<span class="processing-spinner-small"></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Device info display (shown when 3 words match a request) -->
|
||||||
|
<div v-else-if="deviceInfo" class="device-info">
|
||||||
|
<p class="device-permit-text">Permit {{ deviceInfo.action === 'register' ? 'registration' : 'login' }} to <strong>{{ deviceInfo.host }}</strong></p>
|
||||||
|
<p class="device-meta">{{ deviceInfo.user_agent_pretty }}</p>
|
||||||
|
|
||||||
|
<p v-if="error" class="error-message" style="margin-top: 0.5rem;">{{ error }}</p>
|
||||||
|
|
||||||
|
<div class="button-row" style="margin-top: 0.75rem; display: flex; gap: 0.5rem;">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="btn-secondary"
|
||||||
|
:disabled="loading"
|
||||||
|
@click="deny"
|
||||||
|
style="flex: 1;"
|
||||||
|
>
|
||||||
|
Deny
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
ref="submitBtnRef"
|
||||||
|
type="submit"
|
||||||
|
:disabled="loading"
|
||||||
|
class="btn-primary"
|
||||||
|
style="flex: 1;"
|
||||||
|
>
|
||||||
|
{{ loading ? 'Authenticating…' : 'Authorize' }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p v-if="error && !deviceInfo" class="error-message">{{ error }}</p>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
|
||||||
|
import { startAuthentication } from '@simplewebauthn/browser'
|
||||||
|
import aWebSocket from '@/utils/awaitable-websocket'
|
||||||
|
import { dec as b64dec, enc as b64enc } from '@/utils/base64url'
|
||||||
|
import { getSettings } from '@/utils/settings'
|
||||||
|
import { getUniqueMatch, isValidWord, isValidPrefix } from '@/utils/wordlist'
|
||||||
|
import { solvePoW } from '@/utils/pow'
|
||||||
|
import { useAuthStore } from '@/stores/auth'
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
title: { type: String, default: 'Help Another Device Sign In' },
|
||||||
|
description: { type: String, default: 'Enter the code shown on the device that needs to sign in.' },
|
||||||
|
placeholder: { type: String, default: 'Enter three words' },
|
||||||
|
action: { type: String, default: 'login' } // 'login' or 'register'
|
||||||
|
})
|
||||||
|
|
||||||
|
const emit = defineEmits(['completed', 'error', 'cancelled', 'back', 'register', 'deviceInfoVisible'])
|
||||||
|
|
||||||
|
// State
|
||||||
|
const loading = ref(false)
|
||||||
|
const error = ref(null)
|
||||||
|
const settings = ref(null)
|
||||||
|
let ws = null
|
||||||
|
let authStore = null
|
||||||
|
|
||||||
|
// Try to get authStore (might fail if Pinia not installed in this app instance)
|
||||||
|
try { authStore = useAuthStore() } catch (e) { /* ignore */ }
|
||||||
|
|
||||||
|
const inputRef = ref(null)
|
||||||
|
const submitBtnRef = ref(null)
|
||||||
|
const code = ref('')
|
||||||
|
const isProcessing = ref(false)
|
||||||
|
const processingStatus = ref('')
|
||||||
|
const deviceInfo = ref(null)
|
||||||
|
const autocompleteHint = ref('')
|
||||||
|
|
||||||
|
// Watch deviceInfo and emit visibility change
|
||||||
|
watch(deviceInfo, (newVal) => {
|
||||||
|
emit('deviceInfoVisible', !!newVal)
|
||||||
|
})
|
||||||
|
|
||||||
|
const hasInvalidWord = ref(false)
|
||||||
|
const serverError = ref(false)
|
||||||
|
const cursorPos = ref(0)
|
||||||
|
const isFocused = ref(false)
|
||||||
|
let wsConnecting = false
|
||||||
|
let currentChallenge = null
|
||||||
|
let currentWork = null
|
||||||
|
let powPromise = null
|
||||||
|
let powSolution = null
|
||||||
|
let lookupTimeout = null
|
||||||
|
let lastLookedUpCode = null
|
||||||
|
|
||||||
|
// --- Helpers ---
|
||||||
|
|
||||||
|
function showMessage(message, type = 'info', duration = 3000) {
|
||||||
|
if (authStore) {
|
||||||
|
authStore.showMessage(message, type, duration)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchSettings() {
|
||||||
|
try {
|
||||||
|
const data = await getSettings()
|
||||||
|
settings.value = data
|
||||||
|
} catch (err) {
|
||||||
|
console.warn('Unable to load settings', err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Input Mode Logic ---
|
||||||
|
|
||||||
|
function getWordAtCursor(input, cursor) {
|
||||||
|
if (!input || cursor < 0) return { word: '', start: 0, end: 0 }
|
||||||
|
let start = cursor, end = cursor
|
||||||
|
while (start > 0 && /[a-zA-Z]/.test(input[start - 1])) start--
|
||||||
|
while (end < input.length && /[a-zA-Z]/.test(input[end])) end++
|
||||||
|
return { word: input.slice(start, end), start, end }
|
||||||
|
}
|
||||||
|
|
||||||
|
function getWords(input) {
|
||||||
|
return input.trim().split(/[.\s]+/).filter(w => w.length > 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
function countCompleteWords(input) {
|
||||||
|
const endsWithSeparator = /[.\s]$/.test(input)
|
||||||
|
const words = getWords(input)
|
||||||
|
return endsWithSeparator ? words.length : Math.max(0, words.length - 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
function analyzeWords(input) {
|
||||||
|
if (!input) return { valid: true, segments: [] }
|
||||||
|
const segments = []
|
||||||
|
const endsWithSeparator = /[.\s]$/.test(input)
|
||||||
|
let match, regex = /([a-zA-Z]+)|([.\s]+)/g
|
||||||
|
while ((match = regex.exec(input)) !== null) {
|
||||||
|
if (match[1]) segments.push({ text: match[1], isWord: true, start: match.index })
|
||||||
|
else if (match[2]) segments.push({ text: match[2], isWord: false, start: match.index })
|
||||||
|
}
|
||||||
|
const words = segments.filter(s => s.isWord)
|
||||||
|
let allValid = true
|
||||||
|
words.forEach((wordSeg, idx) => {
|
||||||
|
const isLastWord = idx === words.length - 1
|
||||||
|
const word = wordSeg.text.toLowerCase()
|
||||||
|
if (isLastWord && !endsWithSeparator) wordSeg.invalid = !isValidPrefix(word)
|
||||||
|
else wordSeg.invalid = !isValidWord(word)
|
||||||
|
if (wordSeg.invalid) allValid = false
|
||||||
|
})
|
||||||
|
return { valid: allValid, segments }
|
||||||
|
}
|
||||||
|
|
||||||
|
const coloredSegments = computed(() => {
|
||||||
|
const { segments } = analyzeWords(code.value)
|
||||||
|
return segments.map(s => ({ text: s.text, invalid: s.invalid || false }))
|
||||||
|
})
|
||||||
|
|
||||||
|
function checkWordsValidity(input) { return analyzeWords(input).valid }
|
||||||
|
function allWordsValid(input) { return getWords(input).length > 0 && getWords(input).every(w => isValidWord(w)) }
|
||||||
|
|
||||||
|
// Get the current partial word being typed (not yet a complete word)
|
||||||
|
function getCurrentPartialWord(input) {
|
||||||
|
const endsWithSeparator = /[.\s]$/.test(input)
|
||||||
|
if (endsWithSeparator) return ''
|
||||||
|
const match = input.match(/[a-zA-Z]+$/)
|
||||||
|
return match ? match[0].toLowerCase() : ''
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate cursor position in the normalized display (wordIndex, charIndex within word)
|
||||||
|
// Returns { wordIndex: number, charIndex: number } where charIndex is position within the word text
|
||||||
|
function calcDisplayCursor(input, rawCursorPos) {
|
||||||
|
if (!input || rawCursorPos === 0) {
|
||||||
|
return { wordIndex: 0, charIndex: 0 }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse input to find word boundaries
|
||||||
|
const beforeCursor = input.slice(0, rawCursorPos)
|
||||||
|
const wordMatches = [...beforeCursor.matchAll(/[a-zA-Z]+/g)]
|
||||||
|
|
||||||
|
// Check if cursor is in whitespace after words
|
||||||
|
const endsWithSeparator = /[.\s]$/.test(beforeCursor)
|
||||||
|
|
||||||
|
if (wordMatches.length === 0) {
|
||||||
|
// No words before cursor, cursor is at start of first word
|
||||||
|
return { wordIndex: 0, charIndex: 0 }
|
||||||
|
}
|
||||||
|
|
||||||
|
const lastMatch = wordMatches[wordMatches.length - 1]
|
||||||
|
const lastMatchEnd = lastMatch.index + lastMatch[0].length
|
||||||
|
|
||||||
|
if (endsWithSeparator || rawCursorPos > lastMatchEnd) {
|
||||||
|
// Cursor is after the last word (in whitespace), so it's at start of next word
|
||||||
|
return { wordIndex: Math.min(wordMatches.length, 2), charIndex: 0 }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cursor is within the last word
|
||||||
|
const charIndex = rawCursorPos - lastMatch.index
|
||||||
|
return { wordIndex: wordMatches.length - 1, charIndex: charIndex }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compute display words for slot-machine overlay (always 3 slots)
|
||||||
|
const displayWords = computed(() => {
|
||||||
|
const words = getWords(code.value)
|
||||||
|
const result = []
|
||||||
|
|
||||||
|
// Get analysis for validation
|
||||||
|
const { segments } = analyzeWords(code.value)
|
||||||
|
const wordSegments = segments.filter(s => s.isWord)
|
||||||
|
|
||||||
|
// Get current partial word and autocomplete hint
|
||||||
|
const partialWord = getCurrentPartialWord(code.value)
|
||||||
|
const hint = autocompleteHint.value
|
||||||
|
const endsWithSeparator = /[.\s]$/.test(code.value)
|
||||||
|
|
||||||
|
// Calculate where cursor should be displayed
|
||||||
|
const cursor = calcDisplayCursor(code.value, cursorPos.value)
|
||||||
|
|
||||||
|
// Always show exactly 3 slots
|
||||||
|
for (let i = 0; i < 3; i++) {
|
||||||
|
const isCursorSlot = cursor.wordIndex === i
|
||||||
|
|
||||||
|
if (i < words.length) {
|
||||||
|
const word = words[i].toLowerCase()
|
||||||
|
const isInvalid = wordSegments[i]?.invalid || false
|
||||||
|
const isLastWord = i === words.length - 1
|
||||||
|
|
||||||
|
if (isLastWord && !endsWithSeparator && hint && partialWord) {
|
||||||
|
// Show typed prefix + hint suffix in the same slot
|
||||||
|
// Total visible length is the full hint word
|
||||||
|
const totalLen = hint.length
|
||||||
|
result.push({
|
||||||
|
text: '',
|
||||||
|
typedPrefix: partialWord,
|
||||||
|
hintSuffix: hint.slice(partialWord.length),
|
||||||
|
invalid: isInvalid,
|
||||||
|
hasCursor: isCursorSlot,
|
||||||
|
cursorCharIndex: isCursorSlot ? cursor.charIndex : -1,
|
||||||
|
wordLen: totalLen
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
// Complete word - show cursor at appropriate position
|
||||||
|
result.push({
|
||||||
|
text: word,
|
||||||
|
invalid: isInvalid,
|
||||||
|
hasCursor: isCursorSlot,
|
||||||
|
cursorCharIndex: isCursorSlot ? cursor.charIndex : -1,
|
||||||
|
wordLen: word.length
|
||||||
|
})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Empty slot
|
||||||
|
result.push({
|
||||||
|
text: '',
|
||||||
|
invalid: false,
|
||||||
|
hasCursor: isCursorSlot,
|
||||||
|
cursorCharIndex: 0,
|
||||||
|
wordLen: 0
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result
|
||||||
|
})
|
||||||
|
|
||||||
|
const hasThreeValidWords = computed(() => {
|
||||||
|
const words = getWords(code.value)
|
||||||
|
return words.length === 3 && words.every(w => isValidWord(w))
|
||||||
|
})
|
||||||
|
|
||||||
|
function normalizeCode(input) {
|
||||||
|
return input.trim().toLowerCase().split(/[.\s]+/).filter(w => w).join('.')
|
||||||
|
}
|
||||||
|
|
||||||
|
function startPowSolving() {
|
||||||
|
if (!currentChallenge || powPromise) return
|
||||||
|
const challenge = b64dec(currentChallenge)
|
||||||
|
powPromise = solvePoW(challenge, currentWork).then(solution => {
|
||||||
|
powSolution = solution
|
||||||
|
powPromise = null
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getPowSolution() {
|
||||||
|
if (powSolution) { const s = powSolution; powSolution = null; return s }
|
||||||
|
if (powPromise) { await powPromise; const s = powSolution; powSolution = null; return s }
|
||||||
|
if (!currentChallenge) throw new Error('No PoW challenge available')
|
||||||
|
const challenge = b64dec(currentChallenge)
|
||||||
|
return await solvePoW(challenge, currentWork)
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateChallenge(pow) {
|
||||||
|
if (pow?.challenge) {
|
||||||
|
currentChallenge = pow.challenge
|
||||||
|
currentWork = pow.work
|
||||||
|
powSolution = null
|
||||||
|
powPromise = null
|
||||||
|
startPowSolving()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function ensureConnection() {
|
||||||
|
if (ws || wsConnecting) return
|
||||||
|
wsConnecting = true
|
||||||
|
try {
|
||||||
|
const authHost = settings.value?.auth_host
|
||||||
|
const wsPath = '/auth/ws/remote-auth/pair'
|
||||||
|
const wsUrl = authHost && location.host !== authHost ? `//${authHost}${wsPath}` : wsPath
|
||||||
|
ws = await aWebSocket(wsUrl)
|
||||||
|
const msg = await ws.receive_json()
|
||||||
|
if (msg.status && msg.detail) throw new Error(msg.detail)
|
||||||
|
if (!msg.pow?.challenge) throw new Error('Server did not send PoW challenge')
|
||||||
|
updateChallenge(msg.pow)
|
||||||
|
} catch (err) {
|
||||||
|
console.error('WebSocket connection error:', err)
|
||||||
|
ws = null
|
||||||
|
throw err
|
||||||
|
} finally {
|
||||||
|
wsConnecting = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Defer cursor position update to after browser processes the key
|
||||||
|
function deferUpdateCursor(event) {
|
||||||
|
// Handle Tab/Space for autocomplete immediately
|
||||||
|
if (event.key === 'Tab' || event.key === ' ') {
|
||||||
|
handleKeydown(event)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Defer cursor update to next tick
|
||||||
|
setTimeout(updateCursorPos, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update cursor position from input
|
||||||
|
function updateCursorPos() {
|
||||||
|
cursorPos.value = inputRef.value?.selectionStart ?? code.value.length
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateAutocomplete() {
|
||||||
|
cursorPos.value = inputRef.value?.selectionStart ?? code.value.length
|
||||||
|
const { word, end } = getWordAtCursor(code.value, cursorPos.value)
|
||||||
|
const completeWordCount = countCompleteWords(code.value)
|
||||||
|
if (completeWordCount >= 3 || !word || word.length < 1 || cursorPos.value !== end) {
|
||||||
|
autocompleteHint.value = ''
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const match = getUniqueMatch(word.toLowerCase())
|
||||||
|
if (match && match !== word.toLowerCase()) autocompleteHint.value = match
|
||||||
|
else autocompleteHint.value = ''
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyAutocomplete() {
|
||||||
|
if (!autocompleteHint.value) return false
|
||||||
|
const { word, start, end } = getWordAtCursor(code.value, cursorPos.value)
|
||||||
|
if (!word) return false
|
||||||
|
const before = code.value.slice(0, start)
|
||||||
|
const wordsBefore = getWords(before).length
|
||||||
|
const isThirdWord = wordsBefore === 2
|
||||||
|
const suffix = isThirdWord ? '' : ' '
|
||||||
|
const after = code.value.slice(end)
|
||||||
|
code.value = before + autocompleteHint.value + suffix + after.trimStart()
|
||||||
|
const newPos = start + autocompleteHint.value.length + suffix.length
|
||||||
|
nextTick(() => {
|
||||||
|
inputRef.value?.setSelectionRange(newPos, newPos)
|
||||||
|
cursorPos.value = newPos
|
||||||
|
})
|
||||||
|
autocompleteHint.value = ''
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try to split concatenated words (e.g., "alienalien" -> "alien alien")
|
||||||
|
function trySplitWords(input) {
|
||||||
|
// Only process if there's a continuous string of letters at the end
|
||||||
|
const match = input.match(/^(.*?)([a-zA-Z]+)$/)
|
||||||
|
if (!match) return input
|
||||||
|
|
||||||
|
const prefix = match[1] // Everything before the letter sequence
|
||||||
|
const letters = match[2].toLowerCase()
|
||||||
|
|
||||||
|
// Try to find valid word boundaries in the letter sequence
|
||||||
|
const foundWords = []
|
||||||
|
let remaining = letters
|
||||||
|
|
||||||
|
while (remaining.length > 0) {
|
||||||
|
let foundWord = null
|
||||||
|
|
||||||
|
// Try to find the longest valid word from the start
|
||||||
|
for (let len = Math.min(remaining.length, 6); len >= 3; len--) {
|
||||||
|
const candidate = remaining.slice(0, len)
|
||||||
|
if (isValidWord(candidate)) {
|
||||||
|
foundWord = candidate
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (foundWord) {
|
||||||
|
foundWords.push(foundWord)
|
||||||
|
remaining = remaining.slice(foundWord.length)
|
||||||
|
|
||||||
|
// Stop after 3 words
|
||||||
|
if (foundWords.length >= 3) {
|
||||||
|
remaining = ''
|
||||||
|
break
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// No valid word found, keep the remaining as-is
|
||||||
|
foundWords.push(remaining)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only return split version if we found at least one complete word
|
||||||
|
// and there's a clear boundary (more than one segment, or the segment is a complete word)
|
||||||
|
if (foundWords.length > 1 || (foundWords.length === 1 && isValidWord(foundWords[0]) && remaining === '')) {
|
||||||
|
return prefix + foundWords.join(' ')
|
||||||
|
}
|
||||||
|
|
||||||
|
return input
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleInput() {
|
||||||
|
// Immediately update cursor position
|
||||||
|
cursorPos.value = inputRef.value?.selectionStart ?? code.value.length
|
||||||
|
|
||||||
|
// First, try to auto-split concatenated words
|
||||||
|
const splitCode = trySplitWords(code.value)
|
||||||
|
if (splitCode !== code.value) {
|
||||||
|
code.value = splitCode
|
||||||
|
nextTick(() => {
|
||||||
|
const newLen = splitCode.length
|
||||||
|
inputRef.value?.setSelectionRange(newLen, newLen)
|
||||||
|
cursorPos.value = newLen
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const words = getWords(code.value)
|
||||||
|
if (words.length >= 3) {
|
||||||
|
const normalized = words.slice(0, 3).join(' ')
|
||||||
|
if (code.value !== normalized) {
|
||||||
|
const cursorWasAtEnd = cursorPos.value >= code.value.length
|
||||||
|
code.value = normalized
|
||||||
|
if (cursorWasAtEnd) {
|
||||||
|
nextTick(() => {
|
||||||
|
inputRef.value?.setSelectionRange(normalized.length, normalized.length)
|
||||||
|
cursorPos.value = normalized.length
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
updateAutocomplete()
|
||||||
|
if (lookupTimeout) { clearTimeout(lookupTimeout); lookupTimeout = null }
|
||||||
|
deviceInfo.value = null
|
||||||
|
error.value = null
|
||||||
|
serverError.value = false
|
||||||
|
hasInvalidWord.value = !checkWordsValidity(code.value)
|
||||||
|
const currentWords = getWords(code.value)
|
||||||
|
if (currentWords.length >= 1 && !ws && !wsConnecting) ensureConnection()
|
||||||
|
if (currentWords.length === 3) {
|
||||||
|
if (!allWordsValid(code.value)) return
|
||||||
|
lookupTimeout = setTimeout(() => { lookupDeviceInfo() }, 150)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function lookupDeviceInfo() {
|
||||||
|
if (isProcessing.value || loading.value) return
|
||||||
|
if (!hasThreeValidWords.value) return
|
||||||
|
const normalizedCode = normalizeCode(code.value)
|
||||||
|
if (normalizedCode === lastLookedUpCode && deviceInfo.value) return
|
||||||
|
|
||||||
|
isProcessing.value = true
|
||||||
|
processingStatus.value = 'pow'
|
||||||
|
error.value = null
|
||||||
|
serverError.value = false
|
||||||
|
|
||||||
|
try {
|
||||||
|
await ensureConnection()
|
||||||
|
if (!ws) throw new Error('Failed to connect')
|
||||||
|
const solution = await getPowSolution()
|
||||||
|
const powB64 = b64enc(solution)
|
||||||
|
const currentCode = normalizeCode(code.value)
|
||||||
|
if (!hasThreeValidWords.value) return
|
||||||
|
processingStatus.value = 'server'
|
||||||
|
ws.send_json({ code: currentCode, pow: powB64 })
|
||||||
|
const res = await ws.receive_json()
|
||||||
|
updateChallenge(res.pow)
|
||||||
|
if (typeof res.status === 'number' && res.status >= 400) {
|
||||||
|
error.value = res.detail || 'Request failed'
|
||||||
|
serverError.value = true
|
||||||
|
deviceInfo.value = null
|
||||||
|
lastLookedUpCode = null
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (res.status === 'found' && res.host) {
|
||||||
|
code.value = currentCode.replace(/\./g, ' ')
|
||||||
|
deviceInfo.value = {
|
||||||
|
host: res.host,
|
||||||
|
user_agent_pretty: res.user_agent_pretty,
|
||||||
|
client_ip: res.client_ip,
|
||||||
|
action: res.action || 'login'
|
||||||
|
}
|
||||||
|
lastLookedUpCode = currentCode
|
||||||
|
nextTick(() => { submitBtnRef.value?.focus() })
|
||||||
|
} else {
|
||||||
|
error.value = 'Unexpected response from server'
|
||||||
|
serverError.value = true
|
||||||
|
deviceInfo.value = null
|
||||||
|
lastLookedUpCode = null
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Lookup error:', err)
|
||||||
|
error.value = err.message || 'Lookup failed'
|
||||||
|
serverError.value = true
|
||||||
|
deviceInfo.value = null
|
||||||
|
lastLookedUpCode = null
|
||||||
|
if (ws) { ws.close(); ws = null }
|
||||||
|
} finally {
|
||||||
|
isProcessing.value = false
|
||||||
|
processingStatus.value = ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleKeydown(event) {
|
||||||
|
if (event.key === 'Tab') {
|
||||||
|
if (autocompleteHint.value) {
|
||||||
|
const applied = applyAutocomplete()
|
||||||
|
if (applied) { event.preventDefault(); handleInput(); return }
|
||||||
|
}
|
||||||
|
if (code.value.trim()) event.preventDefault()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (event.key === ' ' && autocompleteHint.value) {
|
||||||
|
const applied = applyAutocomplete()
|
||||||
|
if (applied) { event.preventDefault(); handleInput() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submitCode() {
|
||||||
|
if (!deviceInfo.value || loading.value) return
|
||||||
|
loading.value = true
|
||||||
|
error.value = null
|
||||||
|
try {
|
||||||
|
if (!ws) await ensureConnection()
|
||||||
|
if (!ws) throw new Error('Failed to connect')
|
||||||
|
const solution = await getPowSolution()
|
||||||
|
const powB64 = b64enc(solution)
|
||||||
|
ws.send_json({ authenticate: true, pow: powB64 })
|
||||||
|
const res = await ws.receive_json()
|
||||||
|
if (typeof res.status === 'number' && res.status >= 400) throw new Error(res.detail || 'Authentication failed')
|
||||||
|
if (!res.optionsJSON) throw new Error(res.detail || 'Failed to get authentication options')
|
||||||
|
const authResponse = await startAuthentication(res)
|
||||||
|
ws.send_json(authResponse)
|
||||||
|
const result = await ws.receive_json()
|
||||||
|
if (typeof result.status === 'number' && result.status >= 400) throw new Error(result.detail || 'Authentication failed')
|
||||||
|
if (result.status === 'success') {
|
||||||
|
showMessage('Device authenticated successfully!', 'success', 3000)
|
||||||
|
emit('completed')
|
||||||
|
reset()
|
||||||
|
} else {
|
||||||
|
throw new Error(result.detail || 'Authentication failed')
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Pairing error:', err)
|
||||||
|
const message = err.name === 'NotAllowedError'
|
||||||
|
? 'Passkey authentication was cancelled'
|
||||||
|
: (err.message || 'Authentication failed')
|
||||||
|
error.value = message
|
||||||
|
// Don't show toast - error is shown in dialog
|
||||||
|
emit('error', message)
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
if (ws) { ws.close(); ws = null }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function deny() {
|
||||||
|
// Send deny message to server before closing websocket
|
||||||
|
if (ws) {
|
||||||
|
try {
|
||||||
|
ws.send_json({ deny: true })
|
||||||
|
// Give the server a moment to process the denial
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 100))
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Error sending deny message:', e)
|
||||||
|
}
|
||||||
|
ws.close()
|
||||||
|
ws = null
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset to initial state
|
||||||
|
reset()
|
||||||
|
}
|
||||||
|
|
||||||
|
function reset() {
|
||||||
|
code.value = ''
|
||||||
|
error.value = null
|
||||||
|
serverError.value = false
|
||||||
|
deviceInfo.value = null
|
||||||
|
isProcessing.value = false
|
||||||
|
processingStatus.value = ''
|
||||||
|
autocompleteHint.value = ''
|
||||||
|
hasInvalidWord.value = false
|
||||||
|
lastLookedUpCode = null
|
||||||
|
if (ws) { ws.close(); ws = null }
|
||||||
|
currentChallenge = null
|
||||||
|
currentWork = null
|
||||||
|
powPromise = null
|
||||||
|
powSolution = null
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Lifecycle ---
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
await fetchSettings()
|
||||||
|
inputRef.value?.focus()
|
||||||
|
// Initialize cursor position
|
||||||
|
nextTick(() => {
|
||||||
|
cursorPos.value = inputRef.value?.selectionStart ?? 0
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (lookupTimeout) { clearTimeout(lookupTimeout); lookupTimeout = null }
|
||||||
|
if (ws) { ws.close(); ws = null }
|
||||||
|
})
|
||||||
|
|
||||||
|
defineExpose({ reset, deny, code, handleInput, loading, error })
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
/* Input Mode Styles */
|
||||||
|
.pairing-entry {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pairing-form {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-wrapper {
|
||||||
|
position: relative;
|
||||||
|
display: flex;
|
||||||
|
width: 280px;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Slot machine visual display (matches RemoteAuthInline) */
|
||||||
|
.slot-machine {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
padding: 0.875rem 1rem;
|
||||||
|
background: var(--color-surface-hover, rgba(0, 0, 0, 0.03));
|
||||||
|
border: 2px solid var(--color-border);
|
||||||
|
border-radius: var(--radius-sm, 6px);
|
||||||
|
font-family: 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
|
||||||
|
display: flex;
|
||||||
|
gap: 0;
|
||||||
|
align-items: center;
|
||||||
|
user-select: none;
|
||||||
|
pointer-events: none;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
box-sizing: border-box;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-machine.has-error {
|
||||||
|
border-color: var(--color-error, #ef4444);
|
||||||
|
background: var(--color-error-bg, rgba(239, 68, 68, 0.05));
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-machine.is-complete {
|
||||||
|
border-color: var(--color-success, #10b981);
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-reel {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
flex: 1 1 33.333%;
|
||||||
|
min-width: 0;
|
||||||
|
height: 1.8em;
|
||||||
|
overflow: visible;
|
||||||
|
position: relative;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-reel:not(:last-child) {
|
||||||
|
margin-right: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-word {
|
||||||
|
font-size: 1.25rem;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
text-align: center;
|
||||||
|
width: 100%;
|
||||||
|
color: var(--color-text);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-word .typed-prefix {
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-word .hint-suffix {
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
opacity: 0.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cursor-overlay {
|
||||||
|
position: absolute;
|
||||||
|
width: 2px;
|
||||||
|
height: 1.2em;
|
||||||
|
background: var(--color-text);
|
||||||
|
animation: none;
|
||||||
|
pointer-events: none;
|
||||||
|
/* Position based on character index - calculate from center of slot */
|
||||||
|
left: calc(50% + (var(--cursor-pos) - var(--word-len, 0) / 2) * 0.65em);
|
||||||
|
transform: translateX(-1px);
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-wrapper.focused .cursor-overlay {
|
||||||
|
opacity: 1;
|
||||||
|
animation: cursorBlink 1s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes cursorBlink {
|
||||||
|
0%, 49% {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
50%, 100% {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-reel.invalid-word .slot-word {
|
||||||
|
color: var(--color-error, #ef4444);
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-reel.invalid-word .slot-word .typed-prefix {
|
||||||
|
color: var(--color-error, #ef4444);
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-reel.invalid-word .cursor-overlay {
|
||||||
|
background: var(--color-error, #ef4444);
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-reel.empty .slot-word {
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hidden input - keeps focus and handles keyboard input */
|
||||||
|
.pairing-input {
|
||||||
|
flex: 1;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
padding: 0.875rem 1rem;
|
||||||
|
font-size: 1rem;
|
||||||
|
font-family: inherit;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-sm, 6px);
|
||||||
|
background: transparent;
|
||||||
|
color: transparent;
|
||||||
|
caret-color: transparent;
|
||||||
|
outline: none;
|
||||||
|
box-sizing: border-box;
|
||||||
|
position: relative;
|
||||||
|
z-index: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pairing-input.hidden-input {
|
||||||
|
color: transparent;
|
||||||
|
caret-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pairing-input:disabled {
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pairing-input::placeholder {
|
||||||
|
color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.processing-status {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.25rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.processing-icon {
|
||||||
|
font-size: 0.875rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.processing-spinner-small {
|
||||||
|
width: 12px;
|
||||||
|
height: 12px;
|
||||||
|
border: 2px solid var(--color-border);
|
||||||
|
border-top-color: var(--color-primary);
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: spin 0.8s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
to { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.device-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.device-permit-text {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.device-meta {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
font-family: 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-message {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
color: var(--color-error, #ef4444);
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,535 @@
|
|||||||
|
<template>
|
||||||
|
<div class="remote-auth-inline">
|
||||||
|
<!-- Success state -->
|
||||||
|
<div v-if="completed" class="success-section">
|
||||||
|
<p class="success-message">✅ {{ successMessage }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Error state -->
|
||||||
|
<div v-else-if="error" class="error-section">
|
||||||
|
<p class="error-message">{{ error }}</p>
|
||||||
|
<button class="btn-primary" @click="retry" style="margin-top: 0.75rem;">Try Again</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Connecting phase -->
|
||||||
|
<div v-else-if="phase === 'connecting'" class="auth-display">
|
||||||
|
<div class="auth-content">
|
||||||
|
<div class="pairing-code-section">
|
||||||
|
<p class="pairing-label">Enter the code words:</p>
|
||||||
|
<div class="slot-machine" aria-hidden="true">
|
||||||
|
<div class="slot-reel" v-for="(word, index) in animatedWords" :key="index">
|
||||||
|
<div class="slot-word">{{ word }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class="site-url">{{ siteUrlDisplay }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="waiting-indicator">
|
||||||
|
<div class="spinner-small"></div>
|
||||||
|
<span>Generating code…</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Waiting/Authenticating phase - show codes -->
|
||||||
|
<div v-else class="auth-display">
|
||||||
|
<div class="auth-content">
|
||||||
|
<div v-if="pairingCode" class="pairing-code-section">
|
||||||
|
<p class="pairing-label">Enter the code words:</p>
|
||||||
|
<div class="slot-machine stopped">
|
||||||
|
<div class="slot-reel" v-for="(word, index) in displayCode.split(' ')" :key="index">
|
||||||
|
<div class="slot-word">{{ word }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class="site-url">{{ siteUrlDisplay }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="waiting-indicator">
|
||||||
|
<div class="spinner-small"></div>
|
||||||
|
<span>{{ waitingMessage }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import { ref, computed, watch, onMounted, onUnmounted } from 'vue'
|
||||||
|
import aWebSocket from '@/utils/awaitable-websocket'
|
||||||
|
import { dec as b64dec, enc as b64enc } from '@/utils/base64url'
|
||||||
|
import { getSettings } from '@/utils/settings'
|
||||||
|
import { solvePoW } from '@/utils/pow'
|
||||||
|
import { words } from '@/utils/wordlist'
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
active: { type: Boolean, default: false }
|
||||||
|
})
|
||||||
|
|
||||||
|
const emit = defineEmits(['authenticated', 'cancelled', 'error', 'register'])
|
||||||
|
|
||||||
|
const pairingCode = ref(null)
|
||||||
|
const completed = ref(false)
|
||||||
|
const error = ref(null)
|
||||||
|
const phase = ref('connecting')
|
||||||
|
const settings = ref(null)
|
||||||
|
const animatedWords = ref(['', '', ''])
|
||||||
|
let ws = null
|
||||||
|
let wordAnimationTimer = null
|
||||||
|
|
||||||
|
const displayCode = computed(() => pairingCode.value ? pairingCode.value.replace(/\./g, ' ') : '')
|
||||||
|
|
||||||
|
const siteUrlDisplay = computed(() => {
|
||||||
|
if (!settings.value) return ''
|
||||||
|
const authSiteUrl = settings.value.auth_site_url || `${location.protocol}//${location.host}/auth/`
|
||||||
|
// Remove the protocol and any trailing slash
|
||||||
|
const withoutProtocol = authSiteUrl.replace(/^https?:\/\//, '')
|
||||||
|
return withoutProtocol.endsWith('/') ? withoutProtocol.slice(0, -1) : withoutProtocol
|
||||||
|
})
|
||||||
|
|
||||||
|
const waitingMessage = computed(() => {
|
||||||
|
return phase.value === 'authenticating'
|
||||||
|
? 'Complete on another device…'
|
||||||
|
: 'Waiting for authentication…'
|
||||||
|
})
|
||||||
|
|
||||||
|
const successMessage = computed(() => 'Authenticated successfully!')
|
||||||
|
|
||||||
|
function getRandomWord() {
|
||||||
|
return words[Math.floor(Math.random() * words.length)]
|
||||||
|
}
|
||||||
|
|
||||||
|
function startWordAnimation() {
|
||||||
|
// Initialize with random words
|
||||||
|
animatedWords.value = [getRandomWord(), getRandomWord(), getRandomWord()]
|
||||||
|
|
||||||
|
let updateCount = 0
|
||||||
|
const maxUpdates = 20 // Number of cycles before stopping
|
||||||
|
|
||||||
|
// Different intervals for each slot to spin independently
|
||||||
|
const intervals = [
|
||||||
|
setInterval(() => {
|
||||||
|
const newWords = [...animatedWords.value]
|
||||||
|
newWords[0] = getRandomWord()
|
||||||
|
animatedWords.value = newWords
|
||||||
|
}, 140),
|
||||||
|
setInterval(() => {
|
||||||
|
const newWords = [...animatedWords.value]
|
||||||
|
newWords[1] = getRandomWord()
|
||||||
|
animatedWords.value = newWords
|
||||||
|
}, 170),
|
||||||
|
setInterval(() => {
|
||||||
|
const newWords = [...animatedWords.value]
|
||||||
|
newWords[2] = getRandomWord()
|
||||||
|
animatedWords.value = newWords
|
||||||
|
}, 200)
|
||||||
|
]
|
||||||
|
|
||||||
|
wordAnimationTimer = intervals
|
||||||
|
|
||||||
|
// Stop all after max updates
|
||||||
|
setTimeout(() => {
|
||||||
|
intervals.forEach(interval => clearInterval(interval))
|
||||||
|
wordAnimationTimer = null
|
||||||
|
}, maxUpdates * 170) // Average interval time
|
||||||
|
}
|
||||||
|
|
||||||
|
function stopWordAnimation() {
|
||||||
|
if (wordAnimationTimer) {
|
||||||
|
if (Array.isArray(wordAnimationTimer)) {
|
||||||
|
wordAnimationTimer.forEach(interval => clearInterval(interval))
|
||||||
|
} else {
|
||||||
|
clearInterval(wordAnimationTimer)
|
||||||
|
}
|
||||||
|
wordAnimationTimer = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function startRemoteAuth() {
|
||||||
|
error.value = null
|
||||||
|
completed.value = false
|
||||||
|
pairingCode.value = null
|
||||||
|
phase.value = 'connecting'
|
||||||
|
|
||||||
|
// Start word animation
|
||||||
|
startWordAnimation()
|
||||||
|
|
||||||
|
try {
|
||||||
|
settings.value = await getSettings()
|
||||||
|
const authHost = settings.value?.auth_host
|
||||||
|
const wsPath = '/auth/ws/remote-auth/request'
|
||||||
|
const wsUrl = authHost && location.host !== authHost ? `//${authHost}${wsPath}` : wsPath
|
||||||
|
|
||||||
|
ws = await aWebSocket(wsUrl)
|
||||||
|
|
||||||
|
// PoW challenge
|
||||||
|
const powChallenge = await ws.receive_json()
|
||||||
|
if (powChallenge.pow) {
|
||||||
|
const challenge = b64dec(powChallenge.pow.challenge)
|
||||||
|
const nonces = await solvePoW(challenge, powChallenge.pow.work)
|
||||||
|
ws.send_json({ pow: b64enc(nonces), action: 'login' })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Receive the pairing code
|
||||||
|
const res = await ws.receive_json()
|
||||||
|
|
||||||
|
if (res.status) {
|
||||||
|
throw new Error(res.detail || `Failed to create remote auth request: ${res.status}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
pairingCode.value = res.pairing_code
|
||||||
|
|
||||||
|
// Stop word animation
|
||||||
|
stopWordAnimation()
|
||||||
|
|
||||||
|
phase.value = 'waiting'
|
||||||
|
|
||||||
|
// Wait for authentication
|
||||||
|
while (true) {
|
||||||
|
const msg = await ws.receive_json()
|
||||||
|
|
||||||
|
if (msg.status === 'locked') {
|
||||||
|
// Someone has entered the code and is authenticating
|
||||||
|
phase.value = 'authenticating'
|
||||||
|
} else if (msg.status === 'paired') {
|
||||||
|
// Legacy/compatibility: Device paired, now authenticating
|
||||||
|
phase.value = 'authenticating'
|
||||||
|
} else if (msg.status === 'authenticated') {
|
||||||
|
// Success
|
||||||
|
completed.value = true
|
||||||
|
emit('authenticated', { session_token: msg.session_token })
|
||||||
|
break
|
||||||
|
} else if (msg.status === 'denied') {
|
||||||
|
// Explicitly denied by the authenticating device
|
||||||
|
throw new Error('Access denied')
|
||||||
|
} else if (msg.status === 'completed') {
|
||||||
|
// Registration flow
|
||||||
|
if (msg.reset_token) {
|
||||||
|
completed.value = true
|
||||||
|
emit('register', msg.reset_token)
|
||||||
|
}
|
||||||
|
break
|
||||||
|
} else if (msg.status === 'error' || msg.detail) {
|
||||||
|
throw new Error(msg.detail || 'Remote authentication failed')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Remote authentication error:', err)
|
||||||
|
const message = err.message || 'Authentication failed'
|
||||||
|
error.value = message
|
||||||
|
emit('error', message)
|
||||||
|
} finally {
|
||||||
|
if (ws) {
|
||||||
|
ws.close()
|
||||||
|
ws = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function retry() {
|
||||||
|
startRemoteAuth()
|
||||||
|
}
|
||||||
|
|
||||||
|
function cancel() {
|
||||||
|
if (ws) {
|
||||||
|
ws.close()
|
||||||
|
ws = null
|
||||||
|
}
|
||||||
|
emit('cancelled')
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(() => props.active, (newVal) => {
|
||||||
|
if (newVal && !pairingCode.value && !error.value && !completed.value) {
|
||||||
|
startRemoteAuth()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
if (props.active) {
|
||||||
|
startRemoteAuth()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (ws) {
|
||||||
|
ws.close()
|
||||||
|
ws = null
|
||||||
|
}
|
||||||
|
stopWordAnimation()
|
||||||
|
})
|
||||||
|
|
||||||
|
defineExpose({ retry, cancel })
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.remote-auth-inline {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1rem;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-section {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
padding: 2rem 1rem;
|
||||||
|
min-height: 180px;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-section p {
|
||||||
|
margin: 0;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
font-size: 0.95rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinner {
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
border: 3px solid var(--color-border);
|
||||||
|
border-top-color: var(--color-primary);
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: spin 0.8s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
to { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-display {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1.25rem;
|
||||||
|
width: 100%;
|
||||||
|
min-height: 180px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-content {
|
||||||
|
display: flex;
|
||||||
|
gap: 2rem;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-placeholder {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
width: 100%;
|
||||||
|
padding: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-placeholder p {
|
||||||
|
margin: 0;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
font-size: 0.95rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pairing-code-section {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
width: 280px;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pairing-label {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
font-weight: 500;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-machine {
|
||||||
|
padding: 0.875rem 1rem;
|
||||||
|
background: var(--color-surface-hover, rgba(0, 0, 0, 0.03));
|
||||||
|
border: 2px solid var(--color-border);
|
||||||
|
border-radius: var(--radius-sm, 6px);
|
||||||
|
font-family: 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
user-select: none;
|
||||||
|
pointer-events: none;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-reel {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
height: 1.8em;
|
||||||
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
|
background: var(--color-surface, rgba(255, 255, 255, 0.5));
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-machine:not(.stopped) .slot-reel:nth-child(1) {
|
||||||
|
animation: slotSpin 0.14s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-machine:not(.stopped) .slot-reel:nth-child(2) {
|
||||||
|
animation: slotSpin 0.17s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-machine:not(.stopped) .slot-reel:nth-child(3) {
|
||||||
|
animation: slotSpin 0.20s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-word {
|
||||||
|
font-size: 1.25rem;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
text-align: center;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-machine:not(.stopped) .slot-reel:nth-child(1) .slot-word {
|
||||||
|
animation: wordRoll 0.14s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-machine:not(.stopped) .slot-reel:nth-child(2) .slot-word {
|
||||||
|
animation: wordRoll 0.17s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slot-machine:not(.stopped) .slot-reel:nth-child(3) .slot-word {
|
||||||
|
animation: wordRoll 0.20s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes slotSpin {
|
||||||
|
0% {
|
||||||
|
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
box-shadow: inset 0 4px 8px rgba(0, 0, 0, 0.2);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes wordRoll {
|
||||||
|
0% {
|
||||||
|
transform: translateY(-30%) scale(0.9);
|
||||||
|
opacity: 0.4;
|
||||||
|
filter: blur(1.5px);
|
||||||
|
}
|
||||||
|
25% {
|
||||||
|
transform: translateY(-10%) scale(0.95);
|
||||||
|
opacity: 0.6;
|
||||||
|
filter: blur(1px);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
transform: translateY(0) scale(1);
|
||||||
|
opacity: 1;
|
||||||
|
filter: blur(0);
|
||||||
|
}
|
||||||
|
75% {
|
||||||
|
transform: translateY(10%) scale(0.95);
|
||||||
|
opacity: 0.6;
|
||||||
|
filter: blur(1px);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
transform: translateY(30%) scale(0.9);
|
||||||
|
opacity: 0.4;
|
||||||
|
filter: blur(1.5px);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.site-url {
|
||||||
|
margin: 0.5rem 0 0;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
text-align: center;
|
||||||
|
font-family: 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.waiting-indicator {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
padding: 0.75rem;
|
||||||
|
background: var(--color-surface-hover, rgba(0, 0, 0, 0.02));
|
||||||
|
border-radius: var(--radius-sm, 6px);
|
||||||
|
font-size: 0.875rem;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinner-small {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
border: 2px solid var(--color-border);
|
||||||
|
border-top-color: var(--color-primary);
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: spin 0.8s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.success-section {
|
||||||
|
padding: 1rem;
|
||||||
|
text-align: center;
|
||||||
|
min-height: 180px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.success-message {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 1rem;
|
||||||
|
color: var(--color-success, #10b981);
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-section {
|
||||||
|
padding: 1rem;
|
||||||
|
text-align: center;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
min-height: 180px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-message {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
color: var(--color-error, #ef4444);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Responsive adjustments */
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.auth-content {
|
||||||
|
gap: 1.5rem;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pairing-code-section {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 280px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 480px) {
|
||||||
|
.pairing-code {
|
||||||
|
font-size: 1.1rem;
|
||||||
|
padding: 0.75rem 0.875rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pairing-code-section {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -11,27 +11,41 @@
|
|||||||
<header class="view-header center">
|
<header class="view-header center">
|
||||||
<h1>{{ headingTitle }}</h1>
|
<h1>{{ headingTitle }}</h1>
|
||||||
<p v-if="isAuthenticated" class="user-line">👤 {{ userDisplayName }}</p>
|
<p v-if="isAuthenticated" class="user-line">👤 {{ userDisplayName }}</p>
|
||||||
<p class="view-lede">{{ headerMessage }}</p>
|
<p class="view-lede" v-html="headerMessage"></p>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<section class="section-block">
|
<section class="section-block">
|
||||||
<div class="section-body center">
|
<div class="section-body center">
|
||||||
<div class="button-row center">
|
<!-- Local passkey authentication view -->
|
||||||
<slot name="actions"
|
<div v-if="authView === 'local'" class="auth-view">
|
||||||
:loading="loading"
|
<div class="button-row center">
|
||||||
:can-authenticate="canAuthenticate"
|
<slot name="actions"
|
||||||
:is-authenticated="isAuthenticated"
|
:loading="loading"
|
||||||
:authenticate="authenticateUser"
|
:can-authenticate="canAuthenticate"
|
||||||
:logout="logoutUser"
|
:is-authenticated="isAuthenticated"
|
||||||
:mode="mode">
|
:authenticate="authenticateUser"
|
||||||
<!-- Default actions -->
|
:logout="logoutUser"
|
||||||
<button class="btn-secondary" :disabled="loading" @click="$emit('back')">Back</button>
|
:mode="mode">
|
||||||
<button v-if="canAuthenticate" class="btn-primary" :disabled="loading" @click="authenticateUser">
|
<!-- Default actions -->
|
||||||
{{ loading ? (mode === 'reauth' ? 'Verifying…' : 'Signing in…') : (mode === 'reauth' ? 'Verify' : 'Login') }}
|
<button class="btn-secondary" :disabled="loading" @click="$emit('back')">Back</button>
|
||||||
</button>
|
<button v-if="canAuthenticate" class="btn-primary" :disabled="loading" @click="authenticateUser">
|
||||||
<button v-if="isAuthenticated && mode !== 'reauth'" class="btn-danger" :disabled="loading" @click="logoutUser">Logout</button>
|
{{ loading ? (mode === 'reauth' ? 'Verifying…' : 'Signing in…') : (mode === 'reauth' ? 'Verify' : 'Login') }}
|
||||||
<button v-if="isAuthenticated && mode !== 'reauth'" class="btn-primary" :disabled="loading" @click="openProfile">Profile</button>
|
</button>
|
||||||
</slot>
|
<button v-if="isAuthenticated && mode !== 'reauth'" class="btn-danger" :disabled="loading" @click="logoutUser">Logout</button>
|
||||||
|
<button v-if="isAuthenticated && mode !== 'reauth'" class="btn-primary" :disabled="loading" @click="openProfile">Profile</button>
|
||||||
|
</slot>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Remote authentication view (request new remote auth) -->
|
||||||
|
<div v-else-if="authView === 'remote'" class="auth-view">
|
||||||
|
<RemoteAuthInline
|
||||||
|
:active="authView === 'remote'"
|
||||||
|
@authenticated="handleRemoteAuthenticated"
|
||||||
|
@register="handleRemoteRegistration"
|
||||||
|
@cancelled="switchToLocal"
|
||||||
|
@error="handleRemoteAuthError"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
@@ -41,10 +55,11 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, onMounted, reactive, ref } from 'vue'
|
import { computed, onMounted, onUnmounted, reactive, ref } from 'vue'
|
||||||
import passkey from '@/utils/passkey'
|
import passkey from '@/utils/passkey'
|
||||||
import { getSettings } from '@/utils/settings'
|
import { getSettings, uiBasePath } from '@/utils/settings'
|
||||||
import { fetchJson, getUserFriendlyErrorMessage } from '@/utils/api'
|
import { fetchJson, getUserFriendlyErrorMessage } from '@/utils/api'
|
||||||
|
import RemoteAuthInline from '@/components/RemoteAuthRequest.vue'
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
mode: {
|
mode: {
|
||||||
@@ -62,17 +77,15 @@ const loading = ref(false)
|
|||||||
const settings = ref(null)
|
const settings = ref(null)
|
||||||
const userInfo = ref(null)
|
const userInfo = ref(null)
|
||||||
const currentView = ref('initial') // 'initial', 'login', 'forbidden'
|
const currentView = ref('initial') // 'initial', 'login', 'forbidden'
|
||||||
|
const authView = ref('local') // 'local' or 'remote'
|
||||||
let statusTimer = null
|
let statusTimer = null
|
||||||
|
|
||||||
const isAuthenticated = computed(() => !!userInfo.value?.authenticated)
|
const isAuthenticated = computed(() => !!userInfo.value?.authenticated)
|
||||||
|
|
||||||
const canAuthenticate = computed(() => {
|
const canAuthenticate = computed(() => {
|
||||||
if (initializing.value) return false
|
if (initializing.value) return false
|
||||||
// In reauth mode, allow authentication even if already authenticated
|
|
||||||
if (props.mode === 'reauth') return true
|
if (props.mode === 'reauth') return true
|
||||||
// In forbidden view (authenticated but lacking permissions), don't allow authentication
|
|
||||||
if (currentView.value === 'forbidden') return false
|
if (currentView.value === 'forbidden') return false
|
||||||
// In login view or initial state, allow authentication
|
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -91,6 +104,12 @@ const headerMessage = computed(() => {
|
|||||||
if (currentView.value === 'forbidden') {
|
if (currentView.value === 'forbidden') {
|
||||||
return 'You lack the required permissions.'
|
return 'You lack the required permissions.'
|
||||||
}
|
}
|
||||||
|
if (authView.value === 'remote') {
|
||||||
|
return 'Confirm from your other device. Or <a href="#" class="inline-link" data-action="local">this device</a>.'
|
||||||
|
}
|
||||||
|
if (canAuthenticate.value && props.mode !== 'reauth') {
|
||||||
|
return 'Please sign in with your passkey. Or use <a href="#" class="inline-link" data-action="remote">another device</a>.'
|
||||||
|
}
|
||||||
return 'Please sign in with your passkey.'
|
return 'Please sign in with your passkey.'
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -122,7 +141,6 @@ async function fetchSettings() {
|
|||||||
async function fetchUserInfo() {
|
async function fetchUserInfo() {
|
||||||
try {
|
try {
|
||||||
userInfo.value = await fetchJson('/auth/api/user-info', { method: 'POST' })
|
userInfo.value = await fetchJson('/auth/api/user-info', { method: 'POST' })
|
||||||
// Determine view based on authentication status
|
|
||||||
if (isAuthenticated.value && props.mode !== 'reauth') {
|
if (isAuthenticated.value && props.mode !== 'reauth') {
|
||||||
currentView.value = 'forbidden'
|
currentView.value = 'forbidden'
|
||||||
emit('forbidden', userInfo.value)
|
emit('forbidden', userInfo.value)
|
||||||
@@ -131,7 +149,6 @@ async function fetchUserInfo() {
|
|||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to load user info', error)
|
console.error('Failed to load user info', error)
|
||||||
// For 401/403 just go to login, for other errors show message
|
|
||||||
if (error.status !== 401 && error.status !== 403) {
|
if (error.status !== 401 && error.status !== 403) {
|
||||||
showMessage(getUserFriendlyErrorMessage(error), 'error', 4000)
|
showMessage(getUserFriendlyErrorMessage(error), 'error', 4000)
|
||||||
}
|
}
|
||||||
@@ -170,7 +187,6 @@ async function logoutUser() {
|
|||||||
try {
|
try {
|
||||||
await fetchJson('/auth/api/logout', { method: 'POST' })
|
await fetchJson('/auth/api/logout', { method: 'POST' })
|
||||||
userInfo.value = null
|
userInfo.value = null
|
||||||
// Switch to login view after logout
|
|
||||||
currentView.value = 'login'
|
currentView.value = 'login'
|
||||||
showMessage('Logged out. You can sign in with a different account.', 'info', 3000)
|
showMessage('Logged out. You can sign in with a different account.', 'info', 3000)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -181,7 +197,6 @@ async function logoutUser() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function openProfile() {
|
function openProfile() {
|
||||||
// Open profile in a new window with a specific name to reuse the same tab
|
|
||||||
const profileWindow = window.open('/auth/', 'passkey_auth_profile')
|
const profileWindow = window.open('/auth/', 'passkey_auth_profile')
|
||||||
if (profileWindow) profileWindow.focus()
|
if (profileWindow) profileWindow.focus()
|
||||||
}
|
}
|
||||||
@@ -196,10 +211,61 @@ async function setSessionCookie(result) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function switchToRemote() {
|
||||||
|
authView.value = 'remote'
|
||||||
|
}
|
||||||
|
|
||||||
|
function switchToLocal() {
|
||||||
|
authView.value = 'local'
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleRemoteAuthenticated(result) {
|
||||||
|
showMessage('Authenticated from another device!', 'success', 2000)
|
||||||
|
try {
|
||||||
|
await setSessionCookie(result)
|
||||||
|
} catch (error) {
|
||||||
|
const message = error?.message || 'Failed to establish session'
|
||||||
|
showMessage(message, 'error', 4000)
|
||||||
|
emit('auth-error', { message, cancelled: false })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
emit('authenticated', result)
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleRemoteRegistration(token) {
|
||||||
|
showMessage('Registration approved! Redirecting...', 'success', 2000)
|
||||||
|
const basePath = uiBasePath() || '/auth/'
|
||||||
|
window.location.href = `${basePath}${token}`
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleRemoteAuthError(errorMsg) {
|
||||||
|
// Error is already shown in the RemoteAuth component, don't show toast
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleHeaderLinkClick(event) {
|
||||||
|
const target = event.target
|
||||||
|
if (target.tagName === 'A' && target.classList.contains('inline-link')) {
|
||||||
|
event.preventDefault()
|
||||||
|
const action = target.dataset.action
|
||||||
|
if (action === 'remote') {
|
||||||
|
switchToRemote()
|
||||||
|
} else if (action === 'local') {
|
||||||
|
switchToLocal()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
await fetchSettings()
|
await fetchSettings()
|
||||||
await fetchUserInfo()
|
await fetchUserInfo()
|
||||||
initializing.value = false
|
initializing.value = false
|
||||||
|
|
||||||
|
// Add click handler for inline links
|
||||||
|
document.addEventListener('click', handleHeaderLinkClick)
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
document.removeEventListener('click', handleHeaderLinkClick)
|
||||||
})
|
})
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
@@ -210,9 +276,8 @@ defineExpose({
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.button-row.center { display: flex; justify-content: center; gap: 0.75rem; }
|
.button-row.center { display: flex; justify-content: center; gap: 0.75rem; flex-wrap: wrap; }
|
||||||
.user-line { margin: 0.5rem 0 0; font-weight: 500; color: var(--color-text); }
|
.user-line { margin: 0.5rem 0 0; font-weight: 500; color: var(--color-text); }
|
||||||
/* Vertically center the restricted "dialog" surface in the viewport */
|
|
||||||
main.view-root { min-height: 100vh; align-items: center; justify-content: center; padding: 2rem 1rem; }
|
main.view-root { min-height: 100vh; align-items: center; justify-content: center; padding: 2rem 1rem; }
|
||||||
.surface.surface--tight {
|
.surface.surface--tight {
|
||||||
max-width: 520px;
|
max-width: 520px;
|
||||||
@@ -222,4 +287,24 @@ main.view-root { min-height: 100vh; align-items: center; justify-content: center
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 1.75rem;
|
gap: 1.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.auth-view {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1rem;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.view-lede :deep(.inline-link) {
|
||||||
|
color: var(--color-primary);
|
||||||
|
text-decoration: none;
|
||||||
|
transition: opacity 0.15s;
|
||||||
|
font-weight: 400;
|
||||||
|
}
|
||||||
|
|
||||||
|
.view-lede :deep(.inline-link:hover) {
|
||||||
|
opacity: 0.8;
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div v-if="userLoaded" class="user-info">
|
<div v-if="userLoaded" class="user-info" :class="{ 'has-extra': $slots.default }">
|
||||||
<h3 class="user-name-heading">
|
<h3 class="user-name-heading">
|
||||||
<span class="icon">👤</span>
|
<span class="icon">👤</span>
|
||||||
<span class="user-name-row">
|
<span class="user-name-row">
|
||||||
@@ -11,12 +11,15 @@
|
|||||||
<div class="org-line" v-if="orgDisplayName">{{ orgDisplayName }}</div>
|
<div class="org-line" v-if="orgDisplayName">{{ orgDisplayName }}</div>
|
||||||
<div class="role-line" v-if="roleName">{{ roleName }}</div>
|
<div class="role-line" v-if="roleName">{{ roleName }}</div>
|
||||||
</div>
|
</div>
|
||||||
<span><strong>Visits:</strong></span>
|
<span class="info-label"><strong>Visits:</strong></span>
|
||||||
<span>{{ visits || 0 }}</span>
|
<span class="info-value">{{ visits || 0 }}</span>
|
||||||
<span><strong>Registered:</strong></span>
|
<span class="info-label"><strong>Registered:</strong></span>
|
||||||
<span>{{ formatDate(createdAt) }}</span>
|
<span class="info-value">{{ formatDate(createdAt) }}</span>
|
||||||
<span><strong>Last seen:</strong></span>
|
<span class="info-label"><strong>Last seen:</strong></span>
|
||||||
<span>{{ formatDate(lastSeen) }}</span>
|
<span class="info-value">{{ formatDate(lastSeen) }}</span>
|
||||||
|
<div v-if="$slots.default" class="user-info-extra">
|
||||||
|
<slot></slot>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -44,13 +47,50 @@ const userLoaded = computed(() => !!props.name)
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.user-info { display: grid; grid-template-columns: auto 1fr; gap: 10px; }
|
.user-info.has-extra {
|
||||||
.user-info h3 { grid-column: span 2; }
|
grid-template-columns: auto 1fr;
|
||||||
.org-role-sub { grid-column: span 2; display:flex; flex-direction:column; margin: -0.15rem 0 0.25rem; }
|
grid-template-areas:
|
||||||
|
"heading heading"
|
||||||
|
"org org"
|
||||||
|
"label1 value1"
|
||||||
|
"label2 value2"
|
||||||
|
"label3 value3"
|
||||||
|
"extra extra";
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-info:not(.has-extra) {
|
||||||
|
grid-template-columns: auto 1fr;
|
||||||
|
grid-template-areas:
|
||||||
|
"heading heading"
|
||||||
|
"org org"
|
||||||
|
"label1 value1"
|
||||||
|
"label2 value2"
|
||||||
|
"label3 value3";
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 769px) {
|
||||||
|
.user-info.has-extra {
|
||||||
|
grid-template-columns: auto 1fr 2fr;
|
||||||
|
grid-template-areas:
|
||||||
|
"heading heading extra"
|
||||||
|
"org org extra"
|
||||||
|
"label1 value1 extra"
|
||||||
|
"label2 value2 extra"
|
||||||
|
"label3 value3 extra";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-name-heading { grid-area: heading; display: flex; align-items: center; gap: 0.4rem; flex-wrap: wrap; margin: 0 0 0.25rem 0; }
|
||||||
|
.org-role-sub { grid-area: org; display:flex; flex-direction:column; margin: -0.15rem 0 0.25rem; }
|
||||||
.org-line { font-size: .7rem; font-weight:600; line-height:1.1; color: var(--color-text-muted); text-transform: uppercase; letter-spacing: 0.05em; }
|
.org-line { font-size: .7rem; font-weight:600; line-height:1.1; color: var(--color-text-muted); text-transform: uppercase; letter-spacing: 0.05em; }
|
||||||
.role-line { font-size:.65rem; color: var(--color-text-muted); line-height:1.1; }
|
.role-line { font-size:.65rem; color: var(--color-text-muted); line-height:1.1; }
|
||||||
.user-info span { text-align: left; }
|
.info-label:nth-of-type(1) { grid-area: label1; }
|
||||||
.user-name-heading { display: flex; align-items: center; gap: 0.4rem; flex-wrap: wrap; margin: 0 0 0.25rem 0; }
|
.info-value:nth-of-type(2) { grid-area: value1; }
|
||||||
|
.info-label:nth-of-type(3) { grid-area: label2; }
|
||||||
|
.info-value:nth-of-type(4) { grid-area: value2; }
|
||||||
|
.info-label:nth-of-type(5) { grid-area: label3; }
|
||||||
|
.info-value:nth-of-type(6) { grid-area: value3; }
|
||||||
|
.user-info-extra { grid-area: extra; padding-left: 2rem; border-left: 1px solid var(--color-border); }
|
||||||
.user-name-row { display: inline-flex; align-items: center; gap: 0.35rem; max-width: 100%; }
|
.user-name-row { display: inline-flex; align-items: center; gap: 0.35rem; max-width: 100%; }
|
||||||
.user-name-row.editing { flex: 1 1 auto; }
|
.user-name-row.editing { flex: 1 1 auto; }
|
||||||
.icon { flex: 0 0 auto; }
|
.icon { flex: 0 0 auto; }
|
||||||
@@ -62,5 +102,6 @@ const userLoaded = computed(() => !!props.name)
|
|||||||
.mini-btn:hover:not(:disabled) { background: var(--color-accent-soft); color: var(--color-accent); }
|
.mini-btn:hover:not(:disabled) { background: var(--color-accent-soft); color: var(--color-accent); }
|
||||||
.mini-btn:active:not(:disabled) { transform: translateY(1px); }
|
.mini-btn:active:not(:disabled) { transform: translateY(1px); }
|
||||||
.mini-btn:disabled { opacity: 0.5; cursor: not-allowed; }
|
.mini-btn:disabled { opacity: 0.5; cursor: not-allowed; }
|
||||||
|
@media (max-width: 768px) { .user-info-extra { padding-left: 0; padding-top: 1rem; border-left: none; border-top: 1px solid var(--color-border); } }
|
||||||
@media (max-width: 480px) { .user-name-heading { flex-direction: column; align-items: flex-start; } .user-name-row.editing { width: 100%; } .display-name { max-width: 100%; } }
|
@media (max-width: 480px) { .user-name-heading { flex-direction: column; align-items: flex-start; } .user-name-row.editing { width: 100%; } .display-name { max-width: 100%; } }
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -18,12 +18,36 @@ class AwaitableWebSocket extends WebSocket {
|
|||||||
}
|
}
|
||||||
this.onclose = e => {
|
this.onclose = e => {
|
||||||
if (!this.#opened) {
|
if (!this.#opened) {
|
||||||
reject(new Error(`WebSocket ${this.url} failed to connect, code ${e.code}`))
|
reject(new Error(`Failed to connect to server (code ${e.code})`))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.#err = e.wasClean
|
// Create user-friendly close messages
|
||||||
? new Error(`Websocket ${this.url} closed ${e.code}`)
|
let message
|
||||||
: new Error(`WebSocket ${this.url} closed with error ${e.code}`)
|
if (e.wasClean) {
|
||||||
|
// Standard close codes
|
||||||
|
switch (e.code) {
|
||||||
|
case 1000: message = 'Connection closed normally'; break
|
||||||
|
case 1001: message = 'Server is going away'; break
|
||||||
|
case 1002: message = 'Protocol error'; break
|
||||||
|
case 1003: message = 'Unsupported data received'; break
|
||||||
|
case 1006: message = 'Connection lost unexpectedly'; break
|
||||||
|
case 1007: message = 'Invalid data received'; break
|
||||||
|
case 1008: message = 'Policy violation'; break
|
||||||
|
case 1009: message = 'Message too large'; break
|
||||||
|
case 1010: message = 'Extension negotiation failed'; break
|
||||||
|
case 1011: message = 'Server encountered an error'; break
|
||||||
|
case 1012: message = 'Server is restarting'; break
|
||||||
|
case 1013: message = 'Server is overloaded, try again later'; break
|
||||||
|
case 1014: message = 'Bad gateway'; break
|
||||||
|
case 1015: message = 'TLS handshake failed'; break
|
||||||
|
default: message = `Connection closed (code ${e.code})`
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
message = e.code === 1006
|
||||||
|
? 'Connection lost unexpectedly'
|
||||||
|
: `Connection closed with error (code ${e.code})`
|
||||||
|
}
|
||||||
|
this.#err = new Error(message)
|
||||||
this.#waiting.splice(0).forEach(p => p.reject(this.#err))
|
this.#waiting.splice(0).forEach(p => p.reject(this.#err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
/**
|
||||||
|
* URL-safe Base64 encoding/decoding utilities.
|
||||||
|
*
|
||||||
|
* These functions handle base64url format (RFC 4648) which uses:
|
||||||
|
* - '-' instead of '+'
|
||||||
|
* - '_' instead of '/'
|
||||||
|
* - No padding '=' characters
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Decode a base64url string to Uint8Array.
|
||||||
|
* Handles both standard base64 and URL-safe base64 (with or without padding).
|
||||||
|
* @param {string} str - Base64url encoded string
|
||||||
|
* @returns {Uint8Array} - Decoded bytes
|
||||||
|
*/
|
||||||
|
export function dec(str) {
|
||||||
|
// Convert URL-safe characters to standard base64
|
||||||
|
const base64 = str.replace(/-/g, '+').replace(/_/g, '/')
|
||||||
|
// Add padding if needed
|
||||||
|
const padded = base64 + '='.repeat((4 - base64.length % 4) % 4)
|
||||||
|
return Uint8Array.from(atob(padded), c => c.charCodeAt(0))
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Encode a Uint8Array to base64url string.
|
||||||
|
* @param {Uint8Array} bytes - Bytes to encode
|
||||||
|
* @returns {string} - Base64url encoded string (no padding)
|
||||||
|
*/
|
||||||
|
export function enc(bytes) {
|
||||||
|
const base64 = btoa(String.fromCharCode(...bytes))
|
||||||
|
// Convert to URL-safe and remove padding
|
||||||
|
return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { solvePoW, verifyPoW } from './pow.js'
|
||||||
|
|
||||||
|
const TRIALS = 5
|
||||||
|
const WORK = 10
|
||||||
|
|
||||||
|
async function test() {
|
||||||
|
console.log(`Running ${TRIALS} trials with ${WORK} work units...\n`)
|
||||||
|
|
||||||
|
const times = []
|
||||||
|
|
||||||
|
for (let trial = 1; trial <= TRIALS; trial++) {
|
||||||
|
const challenge = crypto.getRandomValues(new Uint8Array(8))
|
||||||
|
|
||||||
|
const start = performance.now()
|
||||||
|
const solution = await solvePoW(challenge, WORK)
|
||||||
|
const elapsed = performance.now() - start
|
||||||
|
|
||||||
|
const valid = await verifyPoW(challenge, solution, WORK)
|
||||||
|
|
||||||
|
times.push(elapsed)
|
||||||
|
|
||||||
|
console.log(`Trial ${trial.toString().padStart(2)}: ${(elapsed / 1000).toFixed(3)}s, valid=${valid}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const avgTime = times.reduce((a, b) => a + b, 0) / times.length
|
||||||
|
const minTime = Math.min(...times)
|
||||||
|
const maxTime = Math.max(...times)
|
||||||
|
|
||||||
|
console.log('\n--- Summary ---')
|
||||||
|
console.log(`Trials: ${TRIALS}`)
|
||||||
|
console.log(`Work units: ${WORK}`)
|
||||||
|
console.log(`Avg time: ${(avgTime / 1000).toFixed(3)}s`)
|
||||||
|
console.log(`Min time: ${(minTime / 1000).toFixed(3)}s`)
|
||||||
|
console.log(`Max time: ${(maxTime / 1000).toFixed(3)}s`)
|
||||||
|
}
|
||||||
|
|
||||||
|
test()
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
/**
|
||||||
|
* Proof of Work utility using PBKDF2-SHA512
|
||||||
|
*
|
||||||
|
* The PoW requires finding nonces where PBKDF2(challenge, nonce) produces
|
||||||
|
* output with a zero first byte. Each work unit requires finding one such nonce.
|
||||||
|
* All valid nonces are concatenated into a solution for server verification.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Solve a Proof of Work challenge
|
||||||
|
*
|
||||||
|
* @param {Uint8Array|ArrayBuffer} challenge - 8-byte server-provided challenge
|
||||||
|
* @param {number} work - Number of PBKDF2 work units required
|
||||||
|
* @param {object} [options] - Optional parameters
|
||||||
|
* @param {AbortSignal} [options.signal] - AbortSignal to cancel the operation
|
||||||
|
* @returns {Promise<Uint8Array>} Solution: concatenated 8-byte nonces (8 * work bytes)
|
||||||
|
* @throws {Error} If challenge is invalid or operation is aborted
|
||||||
|
*/
|
||||||
|
export async function solvePoW(challenge, work, options = {}) {
|
||||||
|
const { signal } = options
|
||||||
|
const startTime = performance.now()
|
||||||
|
|
||||||
|
// Validate inputs
|
||||||
|
const challengeBytes = challenge instanceof ArrayBuffer
|
||||||
|
? new Uint8Array(challenge)
|
||||||
|
: challenge
|
||||||
|
|
||||||
|
if (!(challengeBytes instanceof Uint8Array) || challengeBytes.length !== 8) {
|
||||||
|
throw new Error('Challenge must be exactly 8 bytes')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Import challenge as PBKDF2 key material
|
||||||
|
const baseKey = await crypto.subtle.importKey('raw', challengeBytes, 'PBKDF2', false, ['deriveBits'])
|
||||||
|
|
||||||
|
// Build solution from found nonces
|
||||||
|
const solution = new Uint8Array(8 * work)
|
||||||
|
let totalIterations = 0
|
||||||
|
const mask = 0x7FF // The client must work 2048x harder than the server
|
||||||
|
|
||||||
|
// Sequential nonce starting at zero (little-endian, using Uint32Array for efficient increment)
|
||||||
|
const nonce = new Uint32Array(2)
|
||||||
|
|
||||||
|
for (let i = 0; i < work; i++) {
|
||||||
|
if (signal?.aborted) {
|
||||||
|
throw new DOMException('PoW operation aborted', 'AbortError')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find a nonce where PBKDF2 output passes the mask check
|
||||||
|
let result
|
||||||
|
do {
|
||||||
|
totalIterations++
|
||||||
|
if (++nonce[0] === 0x100000000) ++nonce[1] // Increment 64-bit little-endian nonce
|
||||||
|
result = new Uint32Array(await crypto.subtle.deriveBits(
|
||||||
|
{ name: 'PBKDF2', salt: nonce, iterations: 128, hash: 'SHA-512'},
|
||||||
|
baseKey,
|
||||||
|
32
|
||||||
|
))
|
||||||
|
} while (result[0] & mask)
|
||||||
|
solution.set(new Uint8Array(nonce.buffer), i * 8)
|
||||||
|
}
|
||||||
|
|
||||||
|
const elapsed = (performance.now() - startTime) / 1000
|
||||||
|
const expectedIterations = work * (mask + 1)
|
||||||
|
const luckRatio = (totalIterations / expectedIterations).toFixed(1)
|
||||||
|
const bench = totalIterations / ((mask + 1) * elapsed)
|
||||||
|
console.log(`PoW work=${work} solved in ${elapsed.toFixed(2)}s (${luckRatio}x expected ${bench.toFixed(1)} work/s)`)
|
||||||
|
return solution
|
||||||
|
}
|
||||||
File diff suppressed because one or more lines are too long
+10
-2
@@ -53,18 +53,26 @@ export default defineConfig(({ command }) => ({
|
|||||||
base: '/',
|
base: '/',
|
||||||
server: {
|
server: {
|
||||||
port: 4403,
|
port: 4403,
|
||||||
|
allowedHosts: true,
|
||||||
fs: {
|
fs: {
|
||||||
allow: ['..']
|
allow: ['..']
|
||||||
},
|
},
|
||||||
proxy: {
|
proxy: {
|
||||||
// Only proxy these two specific backend API paths
|
// Only proxy these two specific backend API paths
|
||||||
'/auth/api': {
|
'/auth/api': {
|
||||||
target: 'http://localhost:4402',
|
target: 'http://localhost:4402'
|
||||||
headers: { connection: 'close' }
|
|
||||||
},
|
},
|
||||||
'/auth/ws': {
|
'/auth/ws': {
|
||||||
target: 'http://localhost:4402',
|
target: 'http://localhost:4402',
|
||||||
ws: true
|
ws: true
|
||||||
|
},
|
||||||
|
// Passphrase links: /auth/word1.word2.word3.word4.word5
|
||||||
|
'^/auth/[a-z]+\\.[a-z]+\\.[a-z]+\\.[a-z]+\\.[a-z]+$': {
|
||||||
|
target: 'http://localhost:4402'
|
||||||
|
},
|
||||||
|
// Passphrase links: /word1.word2.word3.word4.word5
|
||||||
|
'^/[a-z]+\\.[a-z]+\\.[a-z]+\\.[a-z]+\\.[a-z]+$': {
|
||||||
|
target: 'http://localhost:4402'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ async def get_reset(token: str) -> ResetToken:
|
|||||||
record = await db.instance.get_reset_token(reset_key(token))
|
record = await db.instance.get_reset_token(reset_key(token))
|
||||||
if record and record.expiry >= datetime.now(timezone.utc):
|
if record and record.expiry >= datetime.now(timezone.utc):
|
||||||
return record
|
return record
|
||||||
raise ValueError("This reset link is invalid or has expired")
|
raise ValueError("This authentication link is no longer valid.")
|
||||||
|
|
||||||
|
|
||||||
async def get_session(token: str, host: str | None = None) -> Session:
|
async def get_session(token: str, host: str | None = None) -> Session:
|
||||||
|
|||||||
@@ -273,7 +273,7 @@ def main():
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Dev mode: enable reload when PASKIA_DEVMODE is set
|
# Dev mode: enable reload when PASKIA_DEVMODE is set
|
||||||
devmode = os.environ.get("PASKIA_DEVMODE") == "1"
|
devmode = bool(os.environ.get("PASKIA_DEVMODE"))
|
||||||
if devmode:
|
if devmode:
|
||||||
# Security: dev mode must run on localhost:4402 to prevent
|
# Security: dev mode must run on localhost:4402 to prevent
|
||||||
# accidental public exposure of the Vite dev server
|
# accidental public exposure of the Vite dev server
|
||||||
@@ -281,6 +281,8 @@ def main():
|
|||||||
raise SystemExit(f"Dev mode requires localhost:4402, got {host}:{port}")
|
raise SystemExit(f"Dev mode requires localhost:4402, got {host}:{port}")
|
||||||
run_kwargs["reload"] = True
|
run_kwargs["reload"] = True
|
||||||
run_kwargs["reload_dirs"] = ["paskia"]
|
run_kwargs["reload_dirs"] = ["paskia"]
|
||||||
|
# Suppress uvicorn startup messages in dev mode
|
||||||
|
run_kwargs["log_level"] = "warning"
|
||||||
|
|
||||||
if uds:
|
if uds:
|
||||||
run_kwargs["uds"] = uds
|
run_kwargs["uds"] = uds
|
||||||
|
|||||||
+27
-1
@@ -200,11 +200,37 @@ async def get_settings():
|
|||||||
"rp_id": pk.rp_id,
|
"rp_id": pk.rp_id,
|
||||||
"rp_name": pk.rp_name,
|
"rp_name": pk.rp_name,
|
||||||
"ui_base_path": base_path,
|
"ui_base_path": base_path,
|
||||||
"auth_host": hostutil.configured_auth_host(),
|
"auth_host": hostutil.dedicated_auth_host(),
|
||||||
|
"auth_site_url": hostutil.auth_site_url(),
|
||||||
"session_cookie": AUTH_COOKIE_NAME,
|
"session_cookie": AUTH_COOKIE_NAME,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/token-info")
|
||||||
|
async def api_token_info(token: str):
|
||||||
|
"""Get information about a reset token.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
- type: "reset"
|
||||||
|
- user_name: display name of the user
|
||||||
|
- token_type: type of reset token
|
||||||
|
"""
|
||||||
|
if not passphrase.is_well_formed(token):
|
||||||
|
raise HTTPException(status_code=404, detail="Invalid token")
|
||||||
|
|
||||||
|
# Check if this is a reset token
|
||||||
|
try:
|
||||||
|
reset_token = await get_reset(token)
|
||||||
|
user = await db.instance.get_user_by_uuid(reset_token.user_uuid)
|
||||||
|
return {
|
||||||
|
"type": "reset",
|
||||||
|
"user_name": user.display_name,
|
||||||
|
"token_type": reset_token.token_type,
|
||||||
|
}
|
||||||
|
except (ValueError, Exception):
|
||||||
|
raise HTTPException(status_code=404, detail="Token not found or expired")
|
||||||
|
|
||||||
|
|
||||||
@app.post("/user-info")
|
@app.post("/user-info")
|
||||||
async def api_user_info(
|
async def api_user_info(
|
||||||
request: Request,
|
request: Request,
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ def redirect_to_root_on_auth_host(request: Request, cur: str, path: str) -> Resp
|
|||||||
|
|
||||||
async def redirect_middleware(request: Request, call_next):
|
async def redirect_middleware(request: Request, call_next):
|
||||||
"""Middleware to handle auth host redirects."""
|
"""Middleware to handle auth host redirects."""
|
||||||
cfg = hostutil.configured_auth_host()
|
cfg = hostutil.dedicated_auth_host()
|
||||||
if not cfg:
|
if not cfg:
|
||||||
return await call_next(request)
|
return await call_next(request)
|
||||||
|
|
||||||
|
|||||||
@@ -42,8 +42,12 @@ async def lifespan(app: FastAPI): # pragma: no cover - startup path
|
|||||||
# Re-raise to fail fast
|
# Re-raise to fail fast
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
# Restore info level logging after startup (suppressed during uvicorn init in dev mode)
|
||||||
|
if frontend.is_dev_mode():
|
||||||
|
logging.getLogger("uvicorn").setLevel(logging.INFO)
|
||||||
|
logging.getLogger("uvicorn.access").setLevel(logging.INFO)
|
||||||
|
|
||||||
yield
|
yield
|
||||||
# (Optional) add shutdown cleanup here later
|
|
||||||
|
|
||||||
|
|
||||||
app = FastAPI(lifespan=lifespan)
|
app = FastAPI(lifespan=lifespan)
|
||||||
@@ -113,10 +117,14 @@ async def examples_page():
|
|||||||
|
|
||||||
|
|
||||||
# Note: this catch-all handler must be the last route defined
|
# Note: this catch-all handler must be the last route defined
|
||||||
@app.get("/{reset}")
|
@app.get("/{token}")
|
||||||
@app.get("/auth/{reset}")
|
@app.get("/auth/{token}")
|
||||||
async def reset_link(reset: str):
|
async def token_link(token: str):
|
||||||
"""Serve the reset app directly with an injected reset token."""
|
"""Serve the reset app for reset tokens (password reset / device addition).
|
||||||
if not passphrase.is_well_formed(reset):
|
|
||||||
|
The frontend will validate the token via /auth/api/token-info.
|
||||||
|
"""
|
||||||
|
if not passphrase.is_well_formed(token):
|
||||||
raise HTTPException(status_code=404)
|
raise HTTPException(status_code=404)
|
||||||
|
|
||||||
return Response(*await frontend.read("/int/reset/index.html"))
|
return Response(*await frontend.read("/int/reset/index.html"))
|
||||||
|
|||||||
@@ -0,0 +1,504 @@
|
|||||||
|
"""
|
||||||
|
Remote authentication WebSocket endpoints.
|
||||||
|
|
||||||
|
This module handles cross-device authentication where one device (requesting)
|
||||||
|
wants to log in and another device (authenticating) provides the passkey.
|
||||||
|
|
||||||
|
Endpoints:
|
||||||
|
- /request: Called by the device wanting to be authenticated
|
||||||
|
- /pair: Called by the authenticating device to complete the request
|
||||||
|
"""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
|
import base64url
|
||||||
|
from fastapi import FastAPI, WebSocket, WebSocketDisconnect
|
||||||
|
|
||||||
|
from paskia import remoteauth
|
||||||
|
from paskia.authsession import create_session
|
||||||
|
from paskia.fastapi.session import infodict
|
||||||
|
from paskia.fastapi.wsutil import validate_origin, websocket_error_handler
|
||||||
|
from paskia.globals import db, passkey
|
||||||
|
from paskia.util import passphrase, pow
|
||||||
|
|
||||||
|
# Create a FastAPI subapp for remote auth WebSocket endpoints
|
||||||
|
app = FastAPI()
|
||||||
|
|
||||||
|
|
||||||
|
@app.websocket("/request")
|
||||||
|
@websocket_error_handler
|
||||||
|
async def websocket_remote_auth_request(ws: WebSocket):
|
||||||
|
"""Request authentication from another device.
|
||||||
|
|
||||||
|
This endpoint is called by the device that wants to be authenticated.
|
||||||
|
It creates a remote auth request and waits for another device to authenticate.
|
||||||
|
|
||||||
|
Flow:
|
||||||
|
1. Client connects
|
||||||
|
2. Server sends HARD PoW challenge, client solves and responds
|
||||||
|
3. Server creates a 3-word pairing code and sends it with expiry
|
||||||
|
4. Server waits for another device to authenticate via /remote-auth/pair
|
||||||
|
5. When auth completes, server sends session_token to this client
|
||||||
|
6. Client can then use the session token to set a cookie
|
||||||
|
7. Connection times out after 5 minutes with explicit timeout message
|
||||||
|
"""
|
||||||
|
origin = validate_origin(ws)
|
||||||
|
host = origin.split("://", 1)[1]
|
||||||
|
|
||||||
|
if remoteauth.instance is None:
|
||||||
|
raise ValueError("Remote authentication is not available")
|
||||||
|
|
||||||
|
# Track this WebSocket connection for load-based PoW difficulty
|
||||||
|
remoteauth.instance.increment_connections()
|
||||||
|
try:
|
||||||
|
# Send PoW challenge immediately with dynamic difficulty based on load
|
||||||
|
challenge = pow.generate_challenge()
|
||||||
|
work = remoteauth.instance.get_pow_difficulty()
|
||||||
|
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"pow": {
|
||||||
|
"challenge": base64url.enc(challenge),
|
||||||
|
"work": work,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Receive client response with PoW solution and action
|
||||||
|
response = await ws.receive_json()
|
||||||
|
|
||||||
|
# Verify PoW (required for this endpoint - SECURITY)
|
||||||
|
solution_b64 = response.get("pow")
|
||||||
|
if not solution_b64:
|
||||||
|
raise ValueError("PoW solution required")
|
||||||
|
|
||||||
|
try:
|
||||||
|
solution = base64url.dec(solution_b64)
|
||||||
|
except Exception:
|
||||||
|
raise ValueError("Invalid PoW solution encoding")
|
||||||
|
|
||||||
|
pow.verify_pow(challenge, solution, work)
|
||||||
|
|
||||||
|
# Extract action from the same message
|
||||||
|
action = response.get("action", "login")
|
||||||
|
if action not in ("login", "register"):
|
||||||
|
action = "login"
|
||||||
|
|
||||||
|
metadata = infodict(ws, "remote-auth-request")
|
||||||
|
|
||||||
|
# Create the remote auth request
|
||||||
|
pairing_code, expiry = await remoteauth.instance.create_request(
|
||||||
|
host=host,
|
||||||
|
ip=metadata.get("ip") or "",
|
||||||
|
user_agent=metadata.get("user_agent") or "",
|
||||||
|
action=action,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Send the pairing code to the client
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"pairing_code": pairing_code,
|
||||||
|
"expires": expiry.isoformat().replace("+00:00", "Z"),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Set up async notification for completion
|
||||||
|
result_event = asyncio.Event()
|
||||||
|
result_data: dict = {}
|
||||||
|
|
||||||
|
def on_complete(
|
||||||
|
session_token: str | None,
|
||||||
|
user_uuid: UUID | None,
|
||||||
|
credential_uuid: UUID | None,
|
||||||
|
reset_token: str | None,
|
||||||
|
):
|
||||||
|
# Check if this was an explicit denial (UUID(int=0) is the signal)
|
||||||
|
was_denied = user_uuid is not None and user_uuid == UUID(int=0)
|
||||||
|
result_data["session_token"] = session_token
|
||||||
|
result_data["user_uuid"] = user_uuid
|
||||||
|
result_data["credential_uuid"] = credential_uuid
|
||||||
|
result_data["reset_token"] = reset_token
|
||||||
|
result_data["was_denied"] = was_denied
|
||||||
|
result_event.set()
|
||||||
|
|
||||||
|
await remoteauth.instance.set_notify_callback(pairing_code, on_complete)
|
||||||
|
|
||||||
|
# Set up async notification for action lock
|
||||||
|
locked_event = asyncio.Event()
|
||||||
|
locked_data: dict = {}
|
||||||
|
|
||||||
|
def on_action_locked(action: str):
|
||||||
|
locked_data["action"] = action
|
||||||
|
locked_event.set()
|
||||||
|
|
||||||
|
await remoteauth.instance.set_action_locked_callback(
|
||||||
|
pairing_code, on_action_locked
|
||||||
|
)
|
||||||
|
|
||||||
|
# 5 minute timeout for the entire remote auth flow
|
||||||
|
timeout_seconds = 5 * 60
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Wait for either:
|
||||||
|
# 1. Authentication to complete (result_event set)
|
||||||
|
# 2. Action locked (locked_event set)
|
||||||
|
# 3. Client to disconnect
|
||||||
|
# 4. Client to send a cancel or update_action message
|
||||||
|
# 5. Timeout after 5 minutes
|
||||||
|
|
||||||
|
async with asyncio.timeout(timeout_seconds):
|
||||||
|
while True:
|
||||||
|
# Use asyncio.wait to handle events and websocket
|
||||||
|
receive_task = asyncio.create_task(ws.receive_json())
|
||||||
|
result_wait_task = asyncio.create_task(result_event.wait())
|
||||||
|
locked_wait_task = asyncio.create_task(locked_event.wait())
|
||||||
|
|
||||||
|
tasks = [receive_task, result_wait_task]
|
||||||
|
# Only wait for locked event if not already locked
|
||||||
|
if not locked_event.is_set():
|
||||||
|
tasks.append(locked_wait_task)
|
||||||
|
|
||||||
|
done, pending = await asyncio.wait(
|
||||||
|
tasks,
|
||||||
|
return_when=asyncio.FIRST_COMPLETED,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Cancel pending tasks
|
||||||
|
for task in pending:
|
||||||
|
task.cancel()
|
||||||
|
try:
|
||||||
|
await task
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if result_wait_task in done:
|
||||||
|
# Authentication completed (or expired/cancelled/denied)
|
||||||
|
was_denied = result_data.get("was_denied", False)
|
||||||
|
if result_data.get("session_token") or result_data.get(
|
||||||
|
"reset_token"
|
||||||
|
):
|
||||||
|
response = {
|
||||||
|
"status": "authenticated",
|
||||||
|
"user_uuid": str(result_data["user_uuid"]),
|
||||||
|
}
|
||||||
|
if result_data.get("session_token"):
|
||||||
|
response["session_token"] = result_data["session_token"]
|
||||||
|
if result_data.get("reset_token"):
|
||||||
|
response["reset_token"] = result_data["reset_token"]
|
||||||
|
await ws.send_json(response)
|
||||||
|
else:
|
||||||
|
# Check if it was explicitly denied
|
||||||
|
if was_denied:
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": "denied",
|
||||||
|
"detail": "Access denied",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": "expired",
|
||||||
|
"detail": "Remote authentication request expired or was cancelled",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
if locked_wait_task in done:
|
||||||
|
# Action was locked by the authenticating device
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": "locked",
|
||||||
|
"action": locked_data.get("action", "login"),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
# Continue waiting for result
|
||||||
|
|
||||||
|
if receive_task in done:
|
||||||
|
# Client sent a message
|
||||||
|
msg = receive_task.result()
|
||||||
|
if msg.get("action") == "cancel":
|
||||||
|
await remoteauth.instance.cancel_request(pairing_code)
|
||||||
|
await ws.send_json({"status": "cancelled"})
|
||||||
|
return
|
||||||
|
elif msg.get("action") == "update_action":
|
||||||
|
# Update the action (login/register) if not locked
|
||||||
|
new_action = "register" if msg.get("register") else "login"
|
||||||
|
await remoteauth.instance.update_action(
|
||||||
|
pairing_code, new_action
|
||||||
|
)
|
||||||
|
# Ignore other messages
|
||||||
|
|
||||||
|
except TimeoutError:
|
||||||
|
# 5 minute timeout reached
|
||||||
|
await remoteauth.instance.cancel_request(pairing_code)
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": "timeout",
|
||||||
|
"detail": "Remote authentication request timed out after 5 minutes",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
except WebSocketDisconnect:
|
||||||
|
# Client disconnected, cancel the request and mark as denied
|
||||||
|
await remoteauth.instance.cancel_request(pairing_code, denied=True)
|
||||||
|
except Exception:
|
||||||
|
await remoteauth.instance.cancel_request(pairing_code)
|
||||||
|
raise
|
||||||
|
finally:
|
||||||
|
# Decrement connection count
|
||||||
|
remoteauth.instance.decrement_connections()
|
||||||
|
|
||||||
|
|
||||||
|
@app.websocket("/pair")
|
||||||
|
@websocket_error_handler
|
||||||
|
async def websocket_remote_auth_pair(ws: WebSocket):
|
||||||
|
"""Complete a remote authentication request using a 3-word pairing code.
|
||||||
|
|
||||||
|
This endpoint is called from the user's profile on the authenticating device.
|
||||||
|
The user enters the pairing code displayed on the requesting device.
|
||||||
|
|
||||||
|
Protocol:
|
||||||
|
1. Server sends PoW challenge immediately on connect
|
||||||
|
2. Client sends {code: "word.word.word", pow: "<base64>"} for 3-word pairing code
|
||||||
|
3. Server validates PoW and code:
|
||||||
|
- If invalid code/PoW: {status: 4xx, detail: "...", pow: {challenge, work}}
|
||||||
|
- If valid: {status: "found", host: "...", user_agent_pretty: "...", pow: {challenge, work}}
|
||||||
|
4. Client can then send {authenticate: true} to start WebAuthn
|
||||||
|
5. Server sends {optionsJSON: ...}
|
||||||
|
6. Client sends WebAuthn response
|
||||||
|
7. Server sends {status: "success", message: "..."}
|
||||||
|
"""
|
||||||
|
from paskia.util import useragent
|
||||||
|
|
||||||
|
origin = validate_origin(ws)
|
||||||
|
|
||||||
|
if remoteauth.instance is None:
|
||||||
|
raise ValueError("Remote authentication is not available")
|
||||||
|
|
||||||
|
# Generate initial PoW challenge (always NORMAL for authenticated users)
|
||||||
|
challenge = pow.generate_challenge()
|
||||||
|
work = pow.NORMAL
|
||||||
|
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"pow": {
|
||||||
|
"challenge": base64url.enc(challenge),
|
||||||
|
"work": work,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
request = None
|
||||||
|
webauthn_challenge = None
|
||||||
|
explicitly_denied = False
|
||||||
|
|
||||||
|
try:
|
||||||
|
while True:
|
||||||
|
msg = await ws.receive_json()
|
||||||
|
|
||||||
|
# Handle deny request first (no PoW needed - already validated during lookup)
|
||||||
|
if msg.get("deny") and request is not None:
|
||||||
|
# Cancel the request and mark it as denied
|
||||||
|
explicitly_denied = True
|
||||||
|
await remoteauth.instance.cancel_request(request.key, denied=True)
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": "denied",
|
||||||
|
"message": "Request denied",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
break
|
||||||
|
|
||||||
|
# Handle authenticate request (no PoW needed - already validated during lookup)
|
||||||
|
if msg.get("authenticate") and request is not None:
|
||||||
|
# Generate authentication options
|
||||||
|
options, webauthn_challenge = passkey.instance.auth_generate_options(
|
||||||
|
credential_ids=None
|
||||||
|
)
|
||||||
|
await ws.send_json({"optionsJSON": options})
|
||||||
|
|
||||||
|
# Wait for WebAuthn response
|
||||||
|
credential = passkey.instance.auth_parse(await ws.receive_json())
|
||||||
|
|
||||||
|
# Fetch and verify credential
|
||||||
|
try:
|
||||||
|
stored_cred = await db.instance.get_credential_by_id(
|
||||||
|
credential.raw_id
|
||||||
|
)
|
||||||
|
except ValueError:
|
||||||
|
raise ValueError(
|
||||||
|
f"This passkey is no longer registered with {passkey.instance.rp_name}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Verify the credential
|
||||||
|
passkey.instance.auth_verify(
|
||||||
|
credential, webauthn_challenge, stored_cred, origin
|
||||||
|
)
|
||||||
|
|
||||||
|
# Update credential last_used
|
||||||
|
await db.instance.login(stored_cred.user_uuid, stored_cred)
|
||||||
|
|
||||||
|
# Create a session for the REQUESTING device
|
||||||
|
assert stored_cred.uuid is not None
|
||||||
|
|
||||||
|
session_token = None
|
||||||
|
reset_token = None
|
||||||
|
|
||||||
|
if request.action == "register":
|
||||||
|
# For registration, create a reset token for device addition
|
||||||
|
from paskia.authsession import expires
|
||||||
|
from paskia.util import tokens
|
||||||
|
|
||||||
|
token_str = passphrase.generate()
|
||||||
|
expiry = expires()
|
||||||
|
await db.instance.create_reset_token(
|
||||||
|
user_uuid=stored_cred.user_uuid,
|
||||||
|
key=tokens.reset_key(token_str),
|
||||||
|
expiry=expiry,
|
||||||
|
token_type="device addition",
|
||||||
|
)
|
||||||
|
reset_token = token_str
|
||||||
|
# Also create a session so the device is logged in?
|
||||||
|
# User requested: "We can make the flow always create a new session, but make additional tokens for other possibilities."
|
||||||
|
session_token = await create_session(
|
||||||
|
user_uuid=stored_cred.user_uuid,
|
||||||
|
credential_uuid=stored_cred.uuid,
|
||||||
|
host=request.host,
|
||||||
|
ip=request.ip,
|
||||||
|
user_agent=request.user_agent,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# Default login action
|
||||||
|
session_token = await create_session(
|
||||||
|
user_uuid=stored_cred.user_uuid,
|
||||||
|
credential_uuid=stored_cred.uuid,
|
||||||
|
host=request.host,
|
||||||
|
ip=request.ip,
|
||||||
|
user_agent=request.user_agent,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Complete the remote auth request (notifies the waiting device)
|
||||||
|
completed = await remoteauth.instance.complete_request(
|
||||||
|
token=request.key,
|
||||||
|
session_token=session_token,
|
||||||
|
user_uuid=stored_cred.user_uuid,
|
||||||
|
credential_uuid=stored_cred.uuid,
|
||||||
|
reset_token=reset_token,
|
||||||
|
)
|
||||||
|
|
||||||
|
if not completed:
|
||||||
|
raise ValueError("Failed to complete remote authentication")
|
||||||
|
|
||||||
|
msg = "Authentication successful."
|
||||||
|
if request.action == "register":
|
||||||
|
msg += " The other device can now register a passkey."
|
||||||
|
else:
|
||||||
|
msg += " The other device is now logged in."
|
||||||
|
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": "success",
|
||||||
|
"message": msg,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
break
|
||||||
|
|
||||||
|
# Handle code lookup request - requires PoW validation
|
||||||
|
code = msg.get("code", "")
|
||||||
|
|
||||||
|
# Validate PoW for pairing codes
|
||||||
|
solution_b64 = msg.get("pow")
|
||||||
|
if not solution_b64:
|
||||||
|
raise ValueError("PoW solution required")
|
||||||
|
|
||||||
|
try:
|
||||||
|
solution = base64url.dec(solution_b64)
|
||||||
|
except Exception:
|
||||||
|
raise ValueError("Invalid PoW solution encoding")
|
||||||
|
|
||||||
|
try:
|
||||||
|
pow.verify_pow(challenge, solution, work)
|
||||||
|
except ValueError as e:
|
||||||
|
# Invalid PoW - send new challenge
|
||||||
|
challenge = pow.generate_challenge()
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": 400,
|
||||||
|
"detail": str(e),
|
||||||
|
"pow": {
|
||||||
|
"challenge": base64url.enc(challenge),
|
||||||
|
"work": work,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
|
||||||
|
if not code:
|
||||||
|
raise ValueError("Pairing code required")
|
||||||
|
|
||||||
|
# Look up the remote auth request by pairing code
|
||||||
|
request = await remoteauth.instance.get_request(code)
|
||||||
|
|
||||||
|
# Generate new challenge for next request (always NORMAL for authenticated users)
|
||||||
|
challenge = pow.generate_challenge()
|
||||||
|
|
||||||
|
if request is None:
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": 404,
|
||||||
|
"detail": "Code not found",
|
||||||
|
"pow": {
|
||||||
|
"challenge": base64url.enc(challenge),
|
||||||
|
"work": work,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
request = None # Reset for next attempt
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Valid code found - lock the action so it can't be changed anymore
|
||||||
|
# This also notifies the requesting device
|
||||||
|
locked_action = await remoteauth.instance.lock_action(request.key)
|
||||||
|
if locked_action is None:
|
||||||
|
# Already locked by another device
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": 409,
|
||||||
|
"detail": "This request is already being processed in another window",
|
||||||
|
"pow": {
|
||||||
|
"challenge": base64url.enc(challenge),
|
||||||
|
"work": work,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
request = None # Reset for next attempt
|
||||||
|
continue
|
||||||
|
|
||||||
|
request.action = locked_action # Update local copy with locked value
|
||||||
|
|
||||||
|
# Send device info to the authenticating device
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": "found",
|
||||||
|
"host": request.host,
|
||||||
|
"user_agent_pretty": useragent.compact_user_agent(
|
||||||
|
request.user_agent
|
||||||
|
),
|
||||||
|
"client_ip": request.ip,
|
||||||
|
"action": request.action,
|
||||||
|
"pow": {
|
||||||
|
"challenge": base64url.enc(challenge),
|
||||||
|
"work": work,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
# If websocket disconnects without explicit denial, unlock the request
|
||||||
|
if request and not explicitly_denied:
|
||||||
|
# Unlock the request so the code can be used again
|
||||||
|
async with remoteauth.instance._lock:
|
||||||
|
req = remoteauth.instance._requests.get(request.key)
|
||||||
|
if req and req.locked:
|
||||||
|
req.locked = False
|
||||||
|
raise
|
||||||
+4
-44
@@ -1,59 +1,19 @@
|
|||||||
import logging
|
|
||||||
from functools import wraps
|
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import FastAPI, WebSocket, WebSocketDisconnect
|
from fastapi import FastAPI, WebSocket
|
||||||
from webauthn.helpers.exceptions import InvalidAuthenticationResponse
|
|
||||||
|
|
||||||
from paskia.authsession import create_session, get_reset, get_session
|
from paskia.authsession import create_session, get_reset, get_session
|
||||||
from paskia.fastapi import authz
|
from paskia.fastapi import authz
|
||||||
from paskia.fastapi.session import AUTH_COOKIE, infodict
|
from paskia.fastapi.session import AUTH_COOKIE, infodict
|
||||||
|
from paskia.fastapi.wsutil import validate_origin, websocket_error_handler
|
||||||
from paskia.globals import db, passkey
|
from paskia.globals import db, passkey
|
||||||
from paskia.util import passphrase
|
from paskia.util import passphrase
|
||||||
from paskia.util.tokens import create_token, session_key
|
from paskia.util.tokens import create_token, session_key
|
||||||
|
|
||||||
|
|
||||||
# WebSocket error handling decorator
|
|
||||||
def websocket_error_handler(func):
|
|
||||||
@wraps(func)
|
|
||||||
async def wrapper(ws: WebSocket, *args, **kwargs):
|
|
||||||
try:
|
|
||||||
await ws.accept()
|
|
||||||
return await func(ws, *args, **kwargs)
|
|
||||||
except WebSocketDisconnect:
|
|
||||||
pass
|
|
||||||
except authz.AuthException as e:
|
|
||||||
await ws.send_json(
|
|
||||||
{
|
|
||||||
"status": e.status_code,
|
|
||||||
**(await authz.auth_error_content(e)),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
except (ValueError, InvalidAuthenticationResponse) as e:
|
|
||||||
await ws.send_json({"status": 401, "detail": str(e)})
|
|
||||||
except Exception:
|
|
||||||
logging.exception("Internal Server Error")
|
|
||||||
await ws.send_json({"status": 500, "detail": "Internal Server Error"})
|
|
||||||
|
|
||||||
return wrapper
|
|
||||||
|
|
||||||
|
|
||||||
# Create a FastAPI subapp for WebSocket endpoints
|
# Create a FastAPI subapp for WebSocket endpoints
|
||||||
app = FastAPI()
|
app = FastAPI()
|
||||||
|
|
||||||
|
|
||||||
def _validate_origin(ws: WebSocket) -> str:
|
|
||||||
"""Extract and validate origin from WebSocket request headers.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
ValueError: If origin header is missing or not in allowed list
|
|
||||||
"""
|
|
||||||
origin = ws.headers.get("origin")
|
|
||||||
if not origin:
|
|
||||||
raise ValueError("Origin header is required for WebSocket connections")
|
|
||||||
return passkey.instance.validate_origin(origin)
|
|
||||||
|
|
||||||
|
|
||||||
async def register_chat(
|
async def register_chat(
|
||||||
ws: WebSocket,
|
ws: WebSocket,
|
||||||
user_uuid: UUID,
|
user_uuid: UUID,
|
||||||
@@ -86,7 +46,7 @@ async def websocket_register_add(
|
|||||||
- Normal session via auth cookie (requires recent authentication)
|
- Normal session via auth cookie (requires recent authentication)
|
||||||
- Reset token supplied as ?reset=... (auth cookie ignored)
|
- Reset token supplied as ?reset=... (auth cookie ignored)
|
||||||
"""
|
"""
|
||||||
origin = _validate_origin(ws)
|
origin = validate_origin(ws)
|
||||||
host = origin.split("://", 1)[1]
|
host = origin.split("://", 1)[1]
|
||||||
if reset is not None:
|
if reset is not None:
|
||||||
if not passphrase.is_well_formed(reset):
|
if not passphrase.is_well_formed(reset):
|
||||||
@@ -142,7 +102,7 @@ async def websocket_register_add(
|
|||||||
@app.websocket("/authenticate")
|
@app.websocket("/authenticate")
|
||||||
@websocket_error_handler
|
@websocket_error_handler
|
||||||
async def websocket_authenticate(ws: WebSocket, auth=AUTH_COOKIE):
|
async def websocket_authenticate(ws: WebSocket, auth=AUTH_COOKIE):
|
||||||
origin = _validate_origin(ws)
|
origin = validate_origin(ws)
|
||||||
host = origin.split("://", 1)[1]
|
host = origin.split("://", 1)[1]
|
||||||
|
|
||||||
# If there's an existing session, restrict to that user's credentials (reauth)
|
# If there's an existing session, restrict to that user's credentials (reauth)
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
"""
|
||||||
|
Shared WebSocket utilities for FastAPI endpoints.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from functools import wraps
|
||||||
|
|
||||||
|
import base64url
|
||||||
|
from fastapi import WebSocket, WebSocketDisconnect
|
||||||
|
from webauthn.helpers.exceptions import InvalidAuthenticationResponse
|
||||||
|
|
||||||
|
from paskia.fastapi import authz
|
||||||
|
from paskia.globals import passkey
|
||||||
|
from paskia.util import pow
|
||||||
|
|
||||||
|
|
||||||
|
def websocket_error_handler(func):
|
||||||
|
"""Decorator for WebSocket endpoints that handles common errors."""
|
||||||
|
|
||||||
|
@wraps(func)
|
||||||
|
async def wrapper(ws: WebSocket, *args, **kwargs):
|
||||||
|
try:
|
||||||
|
await ws.accept()
|
||||||
|
return await func(ws, *args, **kwargs)
|
||||||
|
except WebSocketDisconnect:
|
||||||
|
pass
|
||||||
|
except authz.AuthException as e:
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"status": e.status_code,
|
||||||
|
**(await authz.auth_error_content(e)),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
except (ValueError, InvalidAuthenticationResponse) as e:
|
||||||
|
await ws.send_json({"status": 401, "detail": str(e)})
|
||||||
|
except Exception:
|
||||||
|
logging.exception("Internal Server Error")
|
||||||
|
await ws.send_json({"status": 500, "detail": "Internal Server Error"})
|
||||||
|
|
||||||
|
return wrapper
|
||||||
|
|
||||||
|
|
||||||
|
async def require_pow(ws: WebSocket, work: int | None = None) -> None:
|
||||||
|
"""Send a PoW challenge and verify the client's solution.
|
||||||
|
|
||||||
|
Sends: {"pow": {"challenge": "<base64>", "work": 10}}
|
||||||
|
Expects: {"pow": "<base64-solution>"}
|
||||||
|
|
||||||
|
Args:
|
||||||
|
ws: WebSocket connection
|
||||||
|
work: PoW difficulty level (default: pow.DEFAULT_WORK)
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
ValueError: If the PoW solution is invalid
|
||||||
|
"""
|
||||||
|
challenge = pow.generate_challenge()
|
||||||
|
if work is None:
|
||||||
|
work = pow.DEFAULT_WORK
|
||||||
|
|
||||||
|
await ws.send_json(
|
||||||
|
{
|
||||||
|
"pow": {
|
||||||
|
"challenge": base64url.enc(challenge),
|
||||||
|
"work": work,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
response = await ws.receive_json()
|
||||||
|
solution_b64 = response.get("pow")
|
||||||
|
if not solution_b64:
|
||||||
|
raise ValueError("PoW solution required")
|
||||||
|
|
||||||
|
try:
|
||||||
|
solution = base64url.dec(solution_b64)
|
||||||
|
except Exception:
|
||||||
|
raise ValueError("Invalid PoW solution encoding")
|
||||||
|
|
||||||
|
pow.verify_pow(challenge, solution, work)
|
||||||
|
|
||||||
|
|
||||||
|
def validate_origin(ws: WebSocket) -> str:
|
||||||
|
"""Extract and validate origin from WebSocket request headers.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
ValueError: If origin header is missing or not in allowed list
|
||||||
|
"""
|
||||||
|
origin = ws.headers.get("origin")
|
||||||
|
if not origin:
|
||||||
|
raise ValueError("Origin header is required for WebSocket connections")
|
||||||
|
return passkey.instance.validate_origin(origin)
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<title>Admin</title>
|
|
||||||
<script type="module" crossorigin src="/auth/assets/admin-D8zxJOk4.js"></script>
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/_plugin-vue_export-helper-R4vr2A9I.js">
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/helpers-CU0-cyzg.js">
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/AccessDenied-guOGfNm-.js">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/_plugin-vue_export-helper-Bx2cFCEC.css">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/AccessDenied-TAST_piX.css">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/admin-DIOoLLHy.css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="admin-app"></div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
import{_ as z,G as E,r as g,c as y,o as L,d,e as h,i as f,f as n,t as _,n as N,R as O,C as Y,Y as w,V as T,p as D}from"./_plugin-vue_export-helper-R4vr2A9I.js";const q={class:"app-shell"},G={key:0,class:"global-status",style:{display:"block"}},J={class:"view-root"},W={key:0,class:"surface surface--tight"},j={class:"view-header center"},H={key:0,class:"user-line"},K={class:"view-lede"},Q={class:"section-block"},X={class:"section-body center"},Z={class:"button-row center"},ee=["disabled"],te=["disabled"],ae=["disabled"],se=["disabled"],ne={__name:"RestrictedAuth",props:{mode:{type:String,default:"login",validator:o=>["login","reauth","forbidden"].includes(o)}},emits:["authenticated","forbidden","logout","back","home","auth-error"],setup(o,{expose:V,emit:$}){const v=o,m=$,i=E({show:!1,message:"",type:"info"}),b=g(!0),t=g(!1),S=g(null),r=g(null),l=g("initial");let p=null;const u=y(()=>!!r.value?.authenticated),k=y(()=>b.value?!1:v.mode==="reauth"?!0:l.value!=="forbidden"),U=y(()=>v.mode==="reauth"?"🔐 Additional Authentication":l.value==="forbidden"?"🚫 Forbidden":`🔐 ${S.value?.rp_name||location.origin}`),B=y(()=>v.mode==="reauth"?"Please verify your identity to continue with this action.":l.value==="forbidden"?"You lack the required permissions.":"Please sign in with your passkey."),F=y(()=>r.value?.user?.user_name||"User");function c(e,a="info",s=3e3){i.show=!0,i.message=e,i.type=a,p&&clearTimeout(p),s>0&&(p=setTimeout(()=>{i.show=!1},s))}async function I(){try{const e=await Y();if(S.value=e,e?.rp_name){const a=v.mode==="reauth"?"Verify Identity":u.value?"Forbidden":"Sign In";document.title=`${e.rp_name} · ${a}`}}catch(e){console.warn("Unable to load settings",e)}}async function M(){try{r.value=await w("/auth/api/user-info",{method:"POST"}),u.value&&v.mode!=="reauth"?(l.value="forbidden",m("forbidden",r.value)):l.value="login"}catch(e){console.error("Failed to load user info",e),e.status!==401&&e.status!==403&&c(T(e),"error",4e3),r.value=null,l.value="login"}}async function A(){if(!k.value||t.value)return;t.value=!0,c("Starting authentication…","info");let e;try{e=await D.authenticate()}catch(a){t.value=!1;const s=a?.message||"Passkey authentication cancelled",P=s==="Passkey authentication cancelled";c(s,P?"info":"error",4e3),m("auth-error",{message:s,cancelled:P});return}try{await x(e)}catch(a){t.value=!1;const s=a?.message||"Failed to establish session";c(s,"error",4e3),m("auth-error",{message:s,cancelled:!1});return}t.value=!1,m("authenticated",e)}async function C(){if(!t.value){t.value=!0;try{await w("/auth/api/logout",{method:"POST"}),r.value=null,l.value="login",c("Logged out. You can sign in with a different account.","info",3e3)}catch(e){c(T(e),"error",4e3)}finally{t.value=!1}m("logout")}}function R(){const e=window.open("/auth/","passkey_auth_profile");e&&e.focus()}async function x(e){if(!e?.session_token)throw console.error("setSessionCookie called with missing session_token:",e),new Error("Authentication response missing session_token");return await w("/auth/api/set-session",{method:"POST",headers:{Authorization:`Bearer ${e.session_token}`}})}return L(async()=>{await I(),await M(),b.value=!1}),V({showMessage:c,isAuthenticated:u,userInfo:r}),(e,a)=>(h(),d("div",q,[i.show?(h(),d("div",G,[n("div",{class:N(["status",i.type])},_(i.message),3)])):f("",!0),n("main",J,[b.value?f("",!0):(h(),d("div",W,[n("header",j,[n("h1",null,_(U.value),1),u.value?(h(),d("p",H,"👤 "+_(F.value),1)):f("",!0),n("p",K,_(B.value),1)]),n("section",Q,[n("div",X,[n("div",Z,[O(e.$slots,"actions",{loading:t.value,canAuthenticate:k.value,isAuthenticated:u.value,authenticate:A,logout:C,mode:o.mode},()=>[n("button",{class:"btn-secondary",disabled:t.value,onClick:a[0]||(a[0]=s=>e.$emit("back"))},"Back",8,ee),k.value?(h(),d("button",{key:0,class:"btn-primary",disabled:t.value,onClick:A},_(t.value?o.mode==="reauth"?"Verifying…":"Signing in…":o.mode==="reauth"?"Verify":"Login"),9,te)):f("",!0),u.value&&o.mode!=="reauth"?(h(),d("button",{key:1,class:"btn-danger",disabled:t.value,onClick:C},"Logout",8,ae)):f("",!0),u.value&&o.mode!=="reauth"?(h(),d("button",{key:2,class:"btn-primary",disabled:t.value,onClick:R},"Profile",8,se)):f("",!0)])])])])]))])]))}},ie=z(ne,[["__scopeId","data-v-d00079a6"]]);export{ie as R};
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
.button-row.center[data-v-d00079a6]{display:flex;justify-content:center;gap:.75rem}.user-line[data-v-d00079a6]{margin:.5rem 0 0;font-weight:500;color:var(--color-text)}main.view-root[data-v-d00079a6]{min-height:100vh;align-items:center;justify-content:center;padding:2rem 1rem}.surface.surface--tight[data-v-d00079a6]{max-width:520px;margin:0 auto;width:100%;display:flex;flex-direction:column;gap:1.75rem}
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
.view-lede[data-v-0cc830bd]{margin:0;color:var(--color-text-muted);font-size:1rem}.section-header[data-v-0cc830bd]{display:flex;flex-direction:column;gap:.4rem}.section-description[data-v-0cc830bd]{margin:0;color:var(--color-text-muted)}.empty-state[data-v-0cc830bd]{margin:0;color:var(--color-text-muted);text-align:center;padding:1rem 0}.logout-button[data-v-0cc830bd]{align-self:flex-start}.logout-row[data-v-0cc830bd]{gap:1rem}.logout-row.single[data-v-0cc830bd]{justify-content:flex-start}.logout-note[data-v-0cc830bd]{margin:.75rem 0 0;color:var(--color-text-muted);font-size:.875rem}@media(max-width:720px){.logout-button[data-v-0cc830bd]{width:100%}}.host-view[data-v-88828278]{padding:3rem 1.5rem 4rem}.host-actions[data-v-88828278]{display:flex;flex-direction:column;gap:.75rem}.host-actions .button-row[data-v-88828278]{gap:.75rem;flex-wrap:wrap}.host-actions .button-row button[data-v-88828278]{flex:0 0 auto}.note[data-v-88828278],.empty-state[data-v-88828278]{margin:0;color:var(--color-text-muted)}@media(max-width:600px){.host-actions .button-row[data-v-88828278]{flex-direction:column}.host-actions .button-row button[data-v-88828278]{width:100%}}
|
|
||||||
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
import{c as o,W as d,o as i,h as s,e as m,u as l,v as h}from"./_plugin-vue_export-helper-R4vr2A9I.js";import{R as p}from"./RestrictedAuth-BIGLs28V.js";import{g as n}from"./helpers-CU0-cyzg.js";const f={__name:"RestrictedForward",setup(w){const a=o(()=>d()),r=o(()=>{const t=document.documentElement.getAttribute("data-mode");return t==="reauth"?"reauth":t==="forbidden"?"forbidden":"login"});function c(){location.reload()}function u(){const e=a.value||"/auth/";window.location.pathname!==e&&history.replaceState(null,"",e),window.location.href=e}return i(()=>{window.addEventListener("keydown",e=>{e.key==="Escape"&&n()})}),(e,t)=>(m(),s(p,{mode:r.value,onAuthenticated:c,onBack:l(n),onHome:u},null,8,["mode","onBack"]))}};h(f).mount("#app");
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
function f(r){if(!r)return"Never";const s=new Date(r),u=s-new Date,e=u>0,a=Math.abs(u),n=Math.round(a/(1e3*60)),o=Math.round(a/(1e3*60*60)),t=Math.round(a/(1e3*60*60*24));return a<1e3*60?"Now":n<=60?e?`In ${n} minute${n===1?"":"s"}`:n===1?"a minute ago":`${n} minutes ago`:o<=24?e?`In ${o} hour${o===1?"":"s"}`:o===1?"an hour ago":`${o} hours ago`:t<=14?e?`In ${t} day${t===1?"":"s"}`:t===1?"a day ago":`${t} days ago`:s.toLocaleDateString(void 0,{year:"numeric",month:"long",day:"numeric"})}const c=()=>history.back()||window.close();export{f,c as g};
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
.center[data-v-4f202f9a]{text-align:center}.button-row.center[data-v-4f202f9a]{display:flex;justify-content:center}.section-body[data-v-4f202f9a]{gap:1.25rem}.name-edit span[data-v-4f202f9a]{color:var(--color-text-muted);font-size:.9rem}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
import{_ as M,G as F,r as i,c as v,W as b,o as U,d as c,e as u,i as V,f as t,t as g,n as $,z,A as E,S as I,C as N,q as R,X as D,V as K,p as O,v as j}from"./_plugin-vue_export-helper-R4vr2A9I.js";const q={class:"app-shell"},G={key:0,class:"global-status",style:{display:"block"}},H={class:"view-root"},J={class:"surface surface--tight",style:{"max-width":"560px",margin:"0 auto",width:"100%"}},L={class:"view-header",style:{"text-align":"center"}},W={class:"view-lede"},X={key:0,class:"section-block"},Y={key:1,class:"section-block"},Q={class:"section-body center"},Z={key:2,class:"section-block"},ee={class:"section-body"},se={class:"name-edit"},te=["disabled"],ae=["disabled"],ne={__name:"ResetApp",setup(ie){const o=F({show:!1,message:"",type:"info"}),d=i(!0),n=i(!1),r=i(""),x=i(null),p=i(null),f=i(""),m=i("");let h=null;const P=v(()=>p.value?.session_type||"your enrollment"),S=v(()=>d.value?"Preparing your secure enrollment…":y.value?`Finish up ${P.value}. You may edit the name below if needed, and it will be saved to your passkey.`:"This reset link is no longer valid.");v(()=>b());const y=v(()=>!!(r.value&&p.value));function l(e,s="info",a=3e3){o.show=!0,o.message=e,o.type=s,h&&clearTimeout(h),a>0&&(h=setTimeout(()=>{o.show=!1},a))}async function T(){try{const e=await N();x.value=e,e?.rp_name&&(document.title=`${e.rp_name} · Passkey Setup`)}catch(e){console.warn("Unable to load settings",e)}}async function C(){if(r.value)try{p.value=await R(`/auth/api/user-info?reset=${encodeURIComponent(r.value)}`,{method:"POST"}),f.value=p.value?.user?.user_name||""}catch(e){console.error("Failed to load user info",e);const s=e instanceof D?e.data?.detail||"Reset link is invalid or expired.":K(e);m.value=s,l(s,"error",0)}}async function _(){if(!y.value||n.value)return;n.value=!0,l("Starting passkey registration…","info");let e;try{const s=f.value.trim()||null;e=await O.register(r.value,s)}catch(s){n.value=!1;const a=s?.message||"Passkey registration cancelled",k=a==="Passkey registration cancelled";l(k?a:`Registration failed: ${a}`,k?"info":"error",4e3);return}try{await A(e)}catch(s){n.value=!1;const a=s?.message||"Failed to establish session";l(a,"error",4e3);return}l("Passkey registered successfully!","success",800),setTimeout(()=>{n.value=!1,w()},800)}async function A(e){if(!e?.session_token)throw new Error("Registration response missing session_token");return await R("/auth/api/set-session",{method:"POST",headers:{Authorization:`Bearer ${e.session_token}`}})}function w(){const e=b.value||"/auth/";window.location.pathname!==e&&history.replaceState(null,"",e),window.location.reload()}function B(){const e=window.location.pathname.split("/").filter(Boolean);if(!e.length)return"";const s=e[e.length-1],a=e.slice(0,-1);return a.length>1||a.length===1&&a[0]!=="auth"||!s.includes(".")?"":s}return U(async()=>{if(r.value=B(),await T(),!r.value){const e="Reset link is missing or malformed.";m.value=e,l(e,"error",0),d.value=!1;return}await C(),d.value=!1}),(e,s)=>(u(),c("div",q,[o.show?(u(),c("div",G,[t("div",{class:$(["status",o.type])},g(o.message),3)])):V("",!0),t("main",H,[t("div",J,[t("header",L,[s[1]||(s[1]=t("h1",null,"🔑 Registration",-1)),t("p",W,g(S.value),1)]),d.value?(u(),c("section",X,[...s[2]||(s[2]=[t("div",{class:"section-body center"},[t("p",null,"Loading reset details…")],-1)])])):y.value?(u(),c("section",Z,[t("div",ee,[t("label",se,[s[3]||(s[3]=t("span",null,"👤 Name",-1)),z(t("input",{type:"text","onUpdate:modelValue":s[0]||(s[0]=a=>f.value=a),disabled:n.value,maxlength:"64",onKeyup:I(_,["enter"])},null,40,te),[[E,f.value]])]),t("button",{class:"btn-primary",disabled:n.value,onClick:_},g(n.value?"Registering…":"Register Passkey"),9,ae)])])):(u(),c("section",Y,[t("div",Q,[t("p",null,g(m.value),1),t("div",{class:"button-row center",style:{"justify-content":"center"}},[t("button",{class:"btn-secondary",onClick:w},"Return to sign-in")])])]))])])]))}},oe=M(ne,[["__scopeId","data-v-4f202f9a"]]);j(oe).mount("#app");
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
import{c as r,o as c,h as i,e as d,v as u}from"./_plugin-vue_export-helper-R4vr2A9I.js";import{R as p}from"./RestrictedAuth-BIGLs28V.js";const h={__name:"RestrictedApi",setup(m){const a=r(()=>{const n=new URLSearchParams(window.location.hash.slice(1)).get("mode");return n==="reauth"?"reauth":n==="forbidden"?"forbidden":"login"});function t(e){window.parent&&window.parent!==window&&window.parent.postMessage(e,"*")}function s(e){t({type:"auth-success",authenticated:!0,sessionToken:e.session_token})}function o(){t({type:"auth-back"})}return c(()=>{t({type:"auth-ready"}),window.addEventListener("keydown",e=>{e.key==="Escape"&&o()})}),(e,n)=>(d(),i(p,{mode:a.value,onAuthenticated:s,onBack:o},null,8,["mode"]))}};u(h).mount("#app");
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Auth Profile</title>
|
|
||||||
<script type="module" crossorigin src="/auth/assets/auth-a0yJ_sei.js"></script>
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/_plugin-vue_export-helper-R4vr2A9I.js">
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/helpers-CU0-cyzg.js">
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/AccessDenied-guOGfNm-.js">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/_plugin-vue_export-helper-Bx2cFCEC.css">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/AccessDenied-TAST_piX.css">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/auth-CBojJKUK.css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="app"></div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
<html style="background: transparent">
|
|
||||||
<script type="module" crossorigin src="/auth/assets/restricted-DVCvYFGN.js"></script>
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/_plugin-vue_export-helper-R4vr2A9I.js">
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/RestrictedAuth-BIGLs28V.js">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/_plugin-vue_export-helper-Bx2cFCEC.css">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/RestrictedAuth-CMHKrNJh.css">
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<div id="app"></div>
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Access Restricted</title>
|
|
||||||
<script type="module" crossorigin src="/auth/assets/forward-BHNzlQhM.js"></script>
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/_plugin-vue_export-helper-R4vr2A9I.js">
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/RestrictedAuth-BIGLs28V.js">
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/helpers-CU0-cyzg.js">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/_plugin-vue_export-helper-Bx2cFCEC.css">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/RestrictedAuth-CMHKrNJh.css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="app"></div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Complete Passkey Setup</title>
|
|
||||||
<script type="module" crossorigin src="/auth/assets/reset-YnZxhnI5.js"></script>
|
|
||||||
<link rel="modulepreload" crossorigin href="/auth/assets/_plugin-vue_export-helper-R4vr2A9I.js">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/_plugin-vue_export-helper-Bx2cFCEC.css">
|
|
||||||
<link rel="stylesheet" crossorigin href="/auth/assets/reset-DXzuKgh6.css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="app"></div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -0,0 +1,359 @@
|
|||||||
|
"""
|
||||||
|
Cross-device (remote) authentication support.
|
||||||
|
|
||||||
|
This module manages the flow for authenticating from another device:
|
||||||
|
1. Device A (requesting) creates a remote auth request and displays QR/link
|
||||||
|
2. Device B (authenticating) opens the link and authenticates with passkey
|
||||||
|
3. Device A receives the session via WebSocket notification
|
||||||
|
|
||||||
|
Alternative flow (initiated from profile/authenticating device):
|
||||||
|
1. Device A (requesting) creates request and displays short pairing code
|
||||||
|
2. Device B (authenticating) enters the pairing code in their profile
|
||||||
|
3. Device B authenticates, Device A receives the session
|
||||||
|
|
||||||
|
The requests are stored in-memory with short expiration (5 minutes).
|
||||||
|
The link uses the same /{token} endpoint as reset tokens, but the server
|
||||||
|
distinguishes between them by checking if the token exists in remoteauth first.
|
||||||
|
The first 3 words of the token serve as the pairing code for manual entry.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import logging
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
from typing import Callable
|
||||||
|
from uuid import UUID
|
||||||
|
|
||||||
|
from paskia.util import passphrase
|
||||||
|
|
||||||
|
# Remote auth requests expire after this duration
|
||||||
|
REMOTE_AUTH_LIFETIME = timedelta(minutes=5)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class RemoteAuthRequest:
|
||||||
|
"""A pending remote authentication request."""
|
||||||
|
|
||||||
|
key: str # The 3-word passphrase code
|
||||||
|
created_at: datetime
|
||||||
|
host: str # The host where the session should be created
|
||||||
|
ip: str # IP of the requesting device
|
||||||
|
user_agent: str # User agent of the requesting device
|
||||||
|
action: str = "login" # "login" or "register"
|
||||||
|
locked: bool = False # True once the authenticating device has entered the code
|
||||||
|
# Callback to notify the requesting device when auth completes
|
||||||
|
# Takes (session_token, user_uuid, credential_uuid, reset_token) or (None, None, None, None) on cancel/expire
|
||||||
|
notify: (
|
||||||
|
Callable[[str | None, UUID | None, UUID | None, str | None], None] | None
|
||||||
|
) = None
|
||||||
|
# Callback to notify the requesting device when action is locked
|
||||||
|
# Takes (action) to confirm what action was locked
|
||||||
|
action_locked_notify: Callable[[str], None] | None = None
|
||||||
|
# Set when authentication completes
|
||||||
|
completed: bool = False
|
||||||
|
denied: bool = False # True if explicitly denied by the authenticating device
|
||||||
|
session_token: str | None = None
|
||||||
|
user_uuid: UUID | None = None
|
||||||
|
credential_uuid: UUID | None = None
|
||||||
|
reset_token: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class RemoteAuthManager:
|
||||||
|
"""Manages pending remote authentication requests."""
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self._requests: dict[str, RemoteAuthRequest] = {} # keyed by 3-word code
|
||||||
|
self._cleanup_task: asyncio.Task | None = None
|
||||||
|
self._lock = asyncio.Lock()
|
||||||
|
|
||||||
|
async def start(self):
|
||||||
|
"""Start the cleanup background task."""
|
||||||
|
if self._cleanup_task is None:
|
||||||
|
self._cleanup_task = asyncio.create_task(self._cleanup_loop())
|
||||||
|
|
||||||
|
async def stop(self):
|
||||||
|
"""Stop the cleanup background task."""
|
||||||
|
if self._cleanup_task:
|
||||||
|
self._cleanup_task.cancel()
|
||||||
|
try:
|
||||||
|
await self._cleanup_task
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
pass
|
||||||
|
self._cleanup_task = None
|
||||||
|
|
||||||
|
async def _cleanup_loop(self):
|
||||||
|
"""Periodically clean up expired requests."""
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
await asyncio.sleep(60) # Check every minute
|
||||||
|
await self._cleanup_expired()
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
break
|
||||||
|
except Exception:
|
||||||
|
logging.exception("Error in remote auth cleanup loop")
|
||||||
|
|
||||||
|
async def _cleanup_expired(self):
|
||||||
|
"""Remove expired requests and notify waiting clients."""
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
|
expired_keys = []
|
||||||
|
async with self._lock:
|
||||||
|
for key, req in self._requests.items():
|
||||||
|
if now > req.created_at + REMOTE_AUTH_LIFETIME:
|
||||||
|
expired_keys.append(key)
|
||||||
|
for key in expired_keys:
|
||||||
|
req = self._requests.pop(key)
|
||||||
|
if req.notify and not req.completed:
|
||||||
|
try:
|
||||||
|
req.notify(None, None, None, None)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
async def create_request(
|
||||||
|
self,
|
||||||
|
host: str,
|
||||||
|
ip: str,
|
||||||
|
user_agent: str,
|
||||||
|
action: str = "login",
|
||||||
|
) -> tuple[str, datetime]:
|
||||||
|
"""Create a new remote auth request.
|
||||||
|
|
||||||
|
The code is a 3-word passphrase.
|
||||||
|
We ensure uniqueness across concurrent requests.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
(code, expiry) - The 3-word passphrase code and expiration time
|
||||||
|
"""
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
|
expiry = now + REMOTE_AUTH_LIFETIME
|
||||||
|
|
||||||
|
async with self._lock:
|
||||||
|
# Generate unique 3-word code
|
||||||
|
max_attempts = 100
|
||||||
|
for _ in range(max_attempts):
|
||||||
|
code = passphrase.generate(n=passphrase.N_WORDS_SHORT)
|
||||||
|
if code not in self._requests:
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
# Extremely unlikely but handle gracefully
|
||||||
|
raise ValueError("Unable to generate unique code")
|
||||||
|
|
||||||
|
request = RemoteAuthRequest(
|
||||||
|
key=code,
|
||||||
|
created_at=now,
|
||||||
|
host=host,
|
||||||
|
ip=ip,
|
||||||
|
user_agent=user_agent,
|
||||||
|
action=action,
|
||||||
|
)
|
||||||
|
|
||||||
|
self._requests[code] = request
|
||||||
|
|
||||||
|
return code, expiry
|
||||||
|
|
||||||
|
async def get_request(self, code: str) -> RemoteAuthRequest | None:
|
||||||
|
"""Get a pending request by code, if valid and not expired."""
|
||||||
|
# Normalize: lowercase, dot-separated words
|
||||||
|
normalized = code.lower().strip().replace(" ", ".")
|
||||||
|
if not passphrase.is_well_formed(normalized, n=passphrase.N_WORDS_SHORT):
|
||||||
|
return None
|
||||||
|
async with self._lock:
|
||||||
|
req = self._requests.get(normalized)
|
||||||
|
if req is None:
|
||||||
|
return None
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
|
if now > req.created_at + REMOTE_AUTH_LIFETIME:
|
||||||
|
# Expired
|
||||||
|
del self._requests[normalized]
|
||||||
|
return None
|
||||||
|
return req
|
||||||
|
|
||||||
|
async def set_notify_callback(
|
||||||
|
self,
|
||||||
|
token: str,
|
||||||
|
callback: Callable[[str | None, UUID | None, UUID | None, str | None], None],
|
||||||
|
) -> bool:
|
||||||
|
"""Set the notification callback for a request.
|
||||||
|
|
||||||
|
Returns True if the request exists and callback was set.
|
||||||
|
"""
|
||||||
|
async with self._lock:
|
||||||
|
req = self._requests.get(token)
|
||||||
|
if req is None:
|
||||||
|
return False
|
||||||
|
req.notify = callback
|
||||||
|
return True
|
||||||
|
|
||||||
|
async def set_action_locked_callback(
|
||||||
|
self,
|
||||||
|
token: str,
|
||||||
|
callback: Callable[[str], None],
|
||||||
|
) -> bool:
|
||||||
|
"""Set the callback for when the action is locked.
|
||||||
|
|
||||||
|
Returns True if the request exists and callback was set.
|
||||||
|
"""
|
||||||
|
async with self._lock:
|
||||||
|
req = self._requests.get(token)
|
||||||
|
if req is None:
|
||||||
|
return False
|
||||||
|
req.action_locked_notify = callback
|
||||||
|
return True
|
||||||
|
|
||||||
|
async def update_action(
|
||||||
|
self,
|
||||||
|
token: str,
|
||||||
|
action: str,
|
||||||
|
) -> bool:
|
||||||
|
"""Update the action for a request (only if not locked).
|
||||||
|
|
||||||
|
Returns True if the request exists and was updated.
|
||||||
|
"""
|
||||||
|
if action not in ("login", "register"):
|
||||||
|
return False
|
||||||
|
async with self._lock:
|
||||||
|
req = self._requests.get(token)
|
||||||
|
if req is None or req.locked:
|
||||||
|
return False
|
||||||
|
req.action = action
|
||||||
|
return True
|
||||||
|
|
||||||
|
async def lock_action(
|
||||||
|
self,
|
||||||
|
token: str,
|
||||||
|
) -> str | None:
|
||||||
|
"""Lock the action for a request (called when authenticating device enters code).
|
||||||
|
|
||||||
|
Returns the locked action, or None if request doesn't exist or is already locked.
|
||||||
|
Notifies the requesting device via action_locked_notify callback.
|
||||||
|
"""
|
||||||
|
async with self._lock:
|
||||||
|
req = self._requests.get(token)
|
||||||
|
if req is None:
|
||||||
|
return None
|
||||||
|
if req.locked:
|
||||||
|
# Already locked by another authenticating device
|
||||||
|
return None
|
||||||
|
req.locked = True
|
||||||
|
action = req.action
|
||||||
|
if req.action_locked_notify:
|
||||||
|
try:
|
||||||
|
req.action_locked_notify(action)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
return action
|
||||||
|
|
||||||
|
async def complete_request(
|
||||||
|
self,
|
||||||
|
token: str,
|
||||||
|
session_token: str | None,
|
||||||
|
user_uuid: UUID,
|
||||||
|
credential_uuid: UUID,
|
||||||
|
reset_token: str | None = None,
|
||||||
|
) -> bool:
|
||||||
|
"""Mark a request as completed with the authentication result.
|
||||||
|
|
||||||
|
The request is removed after notifying the waiting client.
|
||||||
|
Returns True if the request existed and was completed.
|
||||||
|
"""
|
||||||
|
async with self._lock:
|
||||||
|
req = self._requests.pop(token, None)
|
||||||
|
if req is None:
|
||||||
|
return False
|
||||||
|
if req.notify:
|
||||||
|
try:
|
||||||
|
req.notify(session_token, user_uuid, credential_uuid, reset_token)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
return True
|
||||||
|
|
||||||
|
async def cancel_request(
|
||||||
|
self, token: str, *, denied: bool = False
|
||||||
|
) -> RemoteAuthRequest | None:
|
||||||
|
"""Cancel and remove a request.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
token: The request token
|
||||||
|
denied: If True, marks this as an explicit denial (not just timeout/disconnect)
|
||||||
|
|
||||||
|
Returns the removed request if it existed, None otherwise.
|
||||||
|
"""
|
||||||
|
async with self._lock:
|
||||||
|
req = self._requests.pop(token, None)
|
||||||
|
if req is None:
|
||||||
|
return None
|
||||||
|
if denied:
|
||||||
|
req.denied = True
|
||||||
|
if req.notify and not req.completed:
|
||||||
|
try:
|
||||||
|
# Pass denied status through a special UUID value (all zeros means denied)
|
||||||
|
if denied:
|
||||||
|
req.notify(None, UUID(int=0), None, None)
|
||||||
|
else:
|
||||||
|
req.notify(None, None, None, None)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
return req
|
||||||
|
|
||||||
|
def get_connection_count(self) -> int:
|
||||||
|
"""Get the current count of open WebSocket connections.
|
||||||
|
|
||||||
|
This is used to determine PoW difficulty based on load.
|
||||||
|
"""
|
||||||
|
# Count is maintained externally by the WebSocket endpoints
|
||||||
|
return getattr(self, "_ws_count", 0)
|
||||||
|
|
||||||
|
def increment_connections(self) -> None:
|
||||||
|
"""Increment the WebSocket connection counter."""
|
||||||
|
self._ws_count = getattr(self, "_ws_count", 0) + 1
|
||||||
|
|
||||||
|
def decrement_connections(self) -> None:
|
||||||
|
"""Decrement the WebSocket connection counter."""
|
||||||
|
self._ws_count = max(0, getattr(self, "_ws_count", 0) - 1)
|
||||||
|
|
||||||
|
def get_pow_difficulty(self) -> int:
|
||||||
|
"""Get PoW difficulty based on current WebSocket connection count.
|
||||||
|
|
||||||
|
Uses NORMAL difficulty with low load (< 10 connections),
|
||||||
|
HARD difficulty with high load (>= 10 connections).
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
PoW work units (pow.NORMAL or pow.HARD)
|
||||||
|
"""
|
||||||
|
from paskia.util import pow
|
||||||
|
|
||||||
|
count = self.get_connection_count()
|
||||||
|
return pow.HARD if count >= 10 else pow.NORMAL
|
||||||
|
|
||||||
|
async def consume_request(self, token: str) -> RemoteAuthRequest | None:
|
||||||
|
"""Get and remove a request (for use by the authenticating device)."""
|
||||||
|
if not passphrase.is_well_formed(token, n=passphrase.N_WORDS_SHORT):
|
||||||
|
return None
|
||||||
|
async with self._lock:
|
||||||
|
req = self._requests.get(token)
|
||||||
|
if req is None:
|
||||||
|
return None
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
|
if now > req.created_at + REMOTE_AUTH_LIFETIME:
|
||||||
|
del self._requests[token]
|
||||||
|
return None
|
||||||
|
# Don't remove yet - wait until completion
|
||||||
|
return req
|
||||||
|
|
||||||
|
|
||||||
|
# Global instance
|
||||||
|
instance: RemoteAuthManager | None = None
|
||||||
|
|
||||||
|
|
||||||
|
async def init():
|
||||||
|
"""Initialize the global remote auth manager."""
|
||||||
|
global instance
|
||||||
|
instance = RemoteAuthManager()
|
||||||
|
await instance.start()
|
||||||
|
|
||||||
|
|
||||||
|
async def shutdown():
|
||||||
|
"""Shutdown the global remote auth manager."""
|
||||||
|
global instance
|
||||||
|
if instance:
|
||||||
|
await instance.stop()
|
||||||
|
instance = None
|
||||||
@@ -8,7 +8,10 @@ import httpx
|
|||||||
|
|
||||||
__all__ = ["path", "file", "read", "is_dev_mode"]
|
__all__ = ["path", "file", "read", "is_dev_mode"]
|
||||||
|
|
||||||
DEV_SERVER = "http://localhost:4403"
|
|
||||||
|
def _get_dev_server() -> str | None:
|
||||||
|
"""Get the dev server URL from environment, or None if not in dev mode."""
|
||||||
|
return os.environ.get("PASKIA_DEVMODE") or None
|
||||||
|
|
||||||
|
|
||||||
def _resolve_static_dir() -> Path:
|
def _resolve_static_dir() -> Path:
|
||||||
@@ -34,7 +37,7 @@ def file(*parts: str) -> Path:
|
|||||||
|
|
||||||
def is_dev_mode() -> bool:
|
def is_dev_mode() -> bool:
|
||||||
"""Check if we're running in dev mode (Vite frontend server)."""
|
"""Check if we're running in dev mode (Vite frontend server)."""
|
||||||
return os.environ.get("PASKIA_DEVMODE") == "1"
|
return bool(_get_dev_server())
|
||||||
|
|
||||||
|
|
||||||
async def read(filepath: str) -> tuple[bytes, int, dict[str, str]]:
|
async def read(filepath: str) -> tuple[bytes, int, dict[str, str]]:
|
||||||
@@ -51,8 +54,9 @@ async def read(filepath: str) -> tuple[bytes, int, dict[str, str]]:
|
|||||||
FastAPI Response(*args) or Sanic raw response.
|
FastAPI Response(*args) or Sanic raw response.
|
||||||
"""
|
"""
|
||||||
if is_dev_mode():
|
if is_dev_mode():
|
||||||
|
dev_server = _get_dev_server()
|
||||||
async with httpx.AsyncClient() as client:
|
async with httpx.AsyncClient() as client:
|
||||||
resp = await client.get(f"{DEV_SERVER}{filepath}")
|
resp = await client.get(f"{dev_server}{filepath}")
|
||||||
resp.raise_for_status()
|
resp.raise_for_status()
|
||||||
mime = resp.headers.get("content-type", "application/octet-stream")
|
mime = resp.headers.get("content-type", "application/octet-stream")
|
||||||
# Strip charset suffix if present
|
# Strip charset suffix if present
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ def is_root_mode() -> bool:
|
|||||||
return _load_config().get("auth_host") is not None
|
return _load_config().get("auth_host") is not None
|
||||||
|
|
||||||
|
|
||||||
def configured_auth_host() -> str | None:
|
def dedicated_auth_host() -> str | None:
|
||||||
"""Return configured auth_host netloc, or None."""
|
"""Return configured auth_host netloc, or None."""
|
||||||
auth_host = _load_config().get("auth_host")
|
auth_host = _load_config().get("auth_host")
|
||||||
if not auth_host:
|
if not auth_host:
|
||||||
@@ -34,7 +34,7 @@ def ui_base_path() -> str:
|
|||||||
return "/" if is_root_mode() else "/auth/"
|
return "/" if is_root_mode() else "/auth/"
|
||||||
|
|
||||||
|
|
||||||
def auth_site_base_url() -> str:
|
def auth_site_url() -> str:
|
||||||
"""Return the base URL for the auth site UI (computed at startup)."""
|
"""Return the base URL for the auth site UI (computed at startup)."""
|
||||||
cfg = _load_config()
|
cfg = _load_config()
|
||||||
return cfg.get("site_url", "https://localhost") + cfg.get("site_path", "/auth/")
|
return cfg.get("site_url", "https://localhost") + cfg.get("site_path", "/auth/")
|
||||||
@@ -42,7 +42,7 @@ def auth_site_base_url() -> str:
|
|||||||
|
|
||||||
def reset_link_url(token: str) -> str:
|
def reset_link_url(token: str) -> str:
|
||||||
"""Generate a reset link URL for the given token."""
|
"""Generate a reset link URL for the given token."""
|
||||||
return f"{auth_site_base_url()}{token}"
|
return f"{auth_site_url()}{token}"
|
||||||
|
|
||||||
|
|
||||||
def normalize_origin(origin: str) -> str:
|
def normalize_origin(origin: str) -> str:
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import secrets
|
|||||||
from paskia.util.wordlist import words
|
from paskia.util.wordlist import words
|
||||||
|
|
||||||
N_WORDS = 5
|
N_WORDS = 5
|
||||||
|
N_WORDS_SHORT = 3
|
||||||
|
|
||||||
wset = set(words)
|
wset = set(words)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
"""
|
||||||
|
Proof of Work utility using PBKDF2-SHA512.
|
||||||
|
|
||||||
|
The PoW requires finding nonces where PBKDF2(challenge, nonce) produces
|
||||||
|
output with a zero first byte. Each work unit requires finding one such nonce.
|
||||||
|
All valid nonces are concatenated into a solution for server verification.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import secrets
|
||||||
|
|
||||||
|
EASY = 2 # Around 0.25s
|
||||||
|
NORMAL = 8 # Around 1s
|
||||||
|
HARD = 32 # Around 4s
|
||||||
|
|
||||||
|
|
||||||
|
def generate_challenge() -> bytes:
|
||||||
|
"""Generate a random 8-byte challenge."""
|
||||||
|
return secrets.token_bytes(8)
|
||||||
|
|
||||||
|
|
||||||
|
def verify_pow(challenge: bytes, solution: bytes, work: int = NORMAL) -> None:
|
||||||
|
"""Verify a Proof of Work solution.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
challenge: 8-byte server-provided challenge
|
||||||
|
solution: Concatenated 8-byte nonces (8 * work bytes)
|
||||||
|
work: Number of work units expected
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
ValueError: If the solution is invalid
|
||||||
|
"""
|
||||||
|
if len(challenge) != 8:
|
||||||
|
raise ValueError("Invalid challenge length")
|
||||||
|
|
||||||
|
if len(solution) != 8 * work:
|
||||||
|
raise ValueError("Invalid solution length")
|
||||||
|
|
||||||
|
# Verify each work unit - check that PBKDF2 output starts with 0x00
|
||||||
|
for i in range(work):
|
||||||
|
nonce = solution[i * 8 : (i + 1) * 8]
|
||||||
|
# Require first byte of PBKDF2-SHA512 to be zero
|
||||||
|
result = hashlib.pbkdf2_hmac("sha512", challenge, nonce, 128, 2)
|
||||||
|
if result[0] or result[1] & 0x07:
|
||||||
|
raise ValueError("Invalid PoW solution")
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
import base64
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import secrets
|
import secrets
|
||||||
|
|
||||||
|
import base64url
|
||||||
|
|
||||||
from paskia.util.passphrase import is_well_formed
|
from paskia.util.passphrase import is_well_formed
|
||||||
|
|
||||||
|
|
||||||
@@ -12,21 +13,20 @@ def create_token() -> str:
|
|||||||
def session_key(token: str) -> bytes:
|
def session_key(token: str) -> bytes:
|
||||||
if len(token) != 16:
|
if len(token) != 16:
|
||||||
raise ValueError("Session token must be exactly 16 characters long")
|
raise ValueError("Session token must be exactly 16 characters long")
|
||||||
return b"sess" + base64.urlsafe_b64decode(token)
|
return b"sess" + base64url.dec(token)
|
||||||
|
|
||||||
|
|
||||||
def encode_session_key(key: bytes) -> str:
|
def encode_session_key(key: bytes) -> str:
|
||||||
"""Encode an opaque session key for external representation."""
|
"""Encode an opaque session key for external representation."""
|
||||||
return base64.urlsafe_b64encode(key).decode().rstrip("=")
|
return base64url.enc(key)
|
||||||
|
|
||||||
|
|
||||||
def decode_session_key(encoded: str) -> bytes:
|
def decode_session_key(encoded: str) -> bytes:
|
||||||
"""Decode an opaque session key from its public representation."""
|
"""Decode an opaque session key from its public representation."""
|
||||||
if not encoded:
|
if not encoded:
|
||||||
raise ValueError("Invalid session identifier")
|
raise ValueError("Invalid session identifier")
|
||||||
padding = "=" * (-len(encoded) % 4)
|
|
||||||
try:
|
try:
|
||||||
raw = base64.urlsafe_b64decode(encoded + padding)
|
raw = base64url.dec(encoded)
|
||||||
except Exception as exc: # pragma: no cover - defensive
|
except Exception as exc: # pragma: no cover - defensive
|
||||||
raise ValueError("Invalid session identifier") from exc
|
raise ValueError("Invalid session identifier") from exc
|
||||||
if not raw.startswith(b"sess"):
|
if not raw.startswith(b"sess"):
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ dev = [
|
|||||||
"pytest>=9.0.1",
|
"pytest>=9.0.1",
|
||||||
"pytest-asyncio>=1.3.0",
|
"pytest-asyncio>=1.3.0",
|
||||||
"pytest-cov>=7.0.0",
|
"pytest-cov>=7.0.0",
|
||||||
|
"ruff>=0.14.8",
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.scripts]
|
[project.scripts]
|
||||||
|
|||||||
-156
@@ -1,156 +0,0 @@
|
|||||||
#!/usr/bin/env -S uv run
|
|
||||||
"""Run Vite development server for frontend and FastAPI backend with auto-reload.
|
|
||||||
|
|
||||||
This script is only available when running from the git repository source,
|
|
||||||
not from the installed package. It starts both the Vite frontend dev server
|
|
||||||
and the FastAPI backend with auto-reload enabled.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
uv run scripts/dev.py [host:port] [options...]
|
|
||||||
|
|
||||||
The optional host:port argument sets where the Vite frontend listens.
|
|
||||||
All other options are forwarded to `paskia serve`.
|
|
||||||
Backend always listens on localhost:4402.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import atexit
|
|
||||||
import os
|
|
||||||
import shutil
|
|
||||||
import signal
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
from pathlib import Path
|
|
||||||
from sys import stderr
|
|
||||||
from threading import Thread
|
|
||||||
|
|
||||||
from paskia.fastapi.__main__ import parse_endpoint
|
|
||||||
|
|
||||||
DEFAULT_VITE_PORT = 4403 # overrides by CLI option
|
|
||||||
BACKEND_PORT = 4402 # hardcoded, also in vite.config.ts
|
|
||||||
|
|
||||||
NO_FRONTEND_TOOL = """\
|
|
||||||
┃ ⚠️ deno, npm or bunx needed to run the frontend server.
|
|
||||||
"""
|
|
||||||
|
|
||||||
BUN_BUG = """\
|
|
||||||
┃ ⚠️ Bun cannot correctly proxy API requests to the backend.
|
|
||||||
┃ Bug report: https://github.com/oven-sh/bun/issues/9882
|
|
||||||
┃
|
|
||||||
┃ Options:
|
|
||||||
┃ - sudo caddy run --config caddy/Caddyfile.dev
|
|
||||||
┃ - Install deno or npm instead
|
|
||||||
┃
|
|
||||||
┃ Caddy will skip the Vite for API calls and serve everything at port 443.
|
|
||||||
┃ Otherwise Vite serves at port 8077 and proxies to backend (broken with bun).
|
|
||||||
"""
|
|
||||||
|
|
||||||
NO_FRONTEND = """\
|
|
||||||
┃
|
|
||||||
┃ The backend will still try reaching Vite at {vite_url}
|
|
||||||
┃ for various frontend assets, so make sure to start it manually.
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
def run_vite(vite_url: str, vite_host: str | None, vite_port: int):
|
|
||||||
"""Spawn the frontend dev server (deno, npm, or bunx) as a background process."""
|
|
||||||
devpath = Path(__file__).parent.parent / "frontend"
|
|
||||||
if not (devpath / "package.json").exists():
|
|
||||||
stderr.write(
|
|
||||||
f"┃ ⚠️ Frontend source not found at {devpath}\n"
|
|
||||||
+ NO_FRONTEND.format(vite_url=vite_url)
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
options = [
|
|
||||||
("deno", "run", "dev"),
|
|
||||||
("npm", "run", "dev", "--"),
|
|
||||||
("bunx", "--bun", "vite"),
|
|
||||||
]
|
|
||||||
cmd = None
|
|
||||||
tool_name = None
|
|
||||||
for option in options:
|
|
||||||
if tool := shutil.which(option[0]):
|
|
||||||
cmd = [tool, *option[1:]]
|
|
||||||
tool_name = option[0]
|
|
||||||
break
|
|
||||||
|
|
||||||
# Add Vite CLI args for host/port
|
|
||||||
vite_args = ["--port", str(vite_port)]
|
|
||||||
if vite_host:
|
|
||||||
vite_args.extend(["--host", vite_host])
|
|
||||||
|
|
||||||
vite_process = None
|
|
||||||
|
|
||||||
def start_vite():
|
|
||||||
nonlocal vite_process
|
|
||||||
if cmd is None:
|
|
||||||
stderr.write(NO_FRONTEND_TOOL + NO_FRONTEND.format(vite_url=vite_url))
|
|
||||||
return
|
|
||||||
assert tool_name is not None
|
|
||||||
try:
|
|
||||||
if tool_name == "bunx":
|
|
||||||
stderr.write(BUN_BUG)
|
|
||||||
|
|
||||||
full_cmd = cmd + vite_args
|
|
||||||
stderr.write(f">>> {' '.join([tool_name, *full_cmd[1:]])}\n")
|
|
||||||
vite_process = subprocess.Popen(full_cmd, cwd=str(devpath), shell=False)
|
|
||||||
except Exception as e:
|
|
||||||
stderr.write(
|
|
||||||
f"┃ ⚠️ Vite couldn't start: {e}\n"
|
|
||||||
+ NO_FRONTEND.format(vite_url=vite_url)
|
|
||||||
)
|
|
||||||
|
|
||||||
def cleanup():
|
|
||||||
if vite_process:
|
|
||||||
vite_process.terminate()
|
|
||||||
vite_process.wait()
|
|
||||||
|
|
||||||
# Start Vite in a separate thread
|
|
||||||
vite_thread = Thread(target=start_vite, daemon=True)
|
|
||||||
vite_thread.start()
|
|
||||||
|
|
||||||
atexit.register(cleanup)
|
|
||||||
signal.signal(signal.SIGTERM, lambda *_: cleanup())
|
|
||||||
signal.signal(signal.SIGINT, lambda *_: cleanup())
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
# Parse optional hostport argument for Vite frontend
|
|
||||||
parser = argparse.ArgumentParser(add_help=False)
|
|
||||||
parser.add_argument("hostport", nargs="?", default=None)
|
|
||||||
args, remaining = parser.parse_known_args()
|
|
||||||
|
|
||||||
# Parse Vite endpoint
|
|
||||||
vite_host, vite_port, vite_uds, all_ifaces = parse_endpoint(
|
|
||||||
args.hostport, DEFAULT_VITE_PORT
|
|
||||||
)
|
|
||||||
|
|
||||||
if vite_uds:
|
|
||||||
raise SystemExit("┃ ⚠️ Unix sockets are not supported for Vite frontend")
|
|
||||||
|
|
||||||
# Handle all-interfaces case (:port syntax)
|
|
||||||
# Vite uses 0.0.0.0 to listen on all interfaces (IPv4 only, sufficient for dev)
|
|
||||||
if all_ifaces:
|
|
||||||
vite_host = "0.0.0.0"
|
|
||||||
|
|
||||||
# Build Vite URL for PASKIA_DEVMODE (always use localhost for URL)
|
|
||||||
vite_url = f"http://localhost:{vite_port}"
|
|
||||||
|
|
||||||
# Start Vite dev server
|
|
||||||
run_vite(vite_url, vite_host, vite_port)
|
|
||||||
|
|
||||||
# Set dev mode with Vite URL
|
|
||||||
os.environ["PASKIA_DEVMODE"] = vite_url
|
|
||||||
|
|
||||||
# Import CLI after environment is set up
|
|
||||||
from paskia.fastapi.__main__ import main as cli_main
|
|
||||||
|
|
||||||
# Build argv for the main CLI in Dev mode
|
|
||||||
# Backend always listens on localhost only (Vite proxies API requests)
|
|
||||||
sys.argv = ["paskia", "serve", f"localhost:{BACKEND_PORT}"] + remaining
|
|
||||||
cli_main()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
Executable
+463
@@ -0,0 +1,463 @@
|
|||||||
|
#!/usr/bin/env -S uv run
|
||||||
|
"""Run Vite development server for frontend and FastAPI backend with auto-reload.
|
||||||
|
|
||||||
|
This script is only available when running from the git repository source,
|
||||||
|
not from the installed package. It starts both the Vite frontend dev server
|
||||||
|
and the FastAPI backend with auto-reload enabled.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
uv run scripts/dev.py [host:port] [options...]
|
||||||
|
|
||||||
|
The optional host:port argument sets where the Vite frontend listens.
|
||||||
|
All other options are forwarded to `paskia serve`.
|
||||||
|
Backend always listens on localhost:4402.
|
||||||
|
|
||||||
|
Options:
|
||||||
|
--caddy Run Caddy as HTTPS proxy on port 443 (requires sudo)
|
||||||
|
--rp-id HOST Relying Party ID (used as hostname for Caddy)
|
||||||
|
--origin URL Allowed origin(s), passed to backend
|
||||||
|
--auth-host H Dedicated auth host, passed to backend
|
||||||
|
"""
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import atexit
|
||||||
|
import ipaddress
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
import signal
|
||||||
|
import subprocess
|
||||||
|
from pathlib import Path
|
||||||
|
from sys import stderr
|
||||||
|
from threading import Thread
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
DEFAULT_VITE_PORT = 4403 # overrides by CLI option
|
||||||
|
BACKEND_PORT = 4402 # hardcoded, also in vite.config.ts
|
||||||
|
CADDY_PORT = 443 # HTTPS port for Caddy proxy
|
||||||
|
CADDY_HTTP_PORT = 80 # HTTP port for ACME challenges
|
||||||
|
DEFAULT_HOST = "localhost"
|
||||||
|
|
||||||
|
NO_FRONTEND_TOOL = """\
|
||||||
|
┃ ⚠️ deno, npm or bunx needed to run the frontend server.
|
||||||
|
"""
|
||||||
|
|
||||||
|
BUN_BUG = """\
|
||||||
|
┃ ⚠️ Bun cannot correctly proxy API requests to the backend.
|
||||||
|
┃ Bug report: https://github.com/oven-sh/bun/issues/9882
|
||||||
|
┃
|
||||||
|
┃ Options:
|
||||||
|
┃ - sudo caddy run --config caddy/Caddyfile.dev
|
||||||
|
┃ - Install deno or npm instead
|
||||||
|
┃
|
||||||
|
┃ Caddy will skip the Vite for API calls and serve everything at port 443.
|
||||||
|
┃ Otherwise Vite serves at port 8077 and proxies to backend (broken with bun).
|
||||||
|
"""
|
||||||
|
|
||||||
|
NO_FRONTEND = """\
|
||||||
|
┃
|
||||||
|
┃ The backend will still try reaching Vite at {vite_url}
|
||||||
|
┃ for various frontend assets, so make sure to start it manually.
|
||||||
|
"""
|
||||||
|
|
||||||
|
CADDYFILE_SITE_BLOCK = """\
|
||||||
|
SITE_ADDR {
|
||||||
|
# WebSockets bypass directly to backend (workaround for bun proxy bug)
|
||||||
|
handle /auth/ws/* {
|
||||||
|
reverse_proxy localhost:BACKEND_PORT
|
||||||
|
}
|
||||||
|
# Everything else goes to or via Vite
|
||||||
|
handle {
|
||||||
|
reverse_proxy localhost:VITE_PORT
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
def parse_endpoint(
|
||||||
|
value: str | None, default_port: int
|
||||||
|
) -> tuple[str | None, int | None, str | None, bool]:
|
||||||
|
"""Parse an endpoint for Vite (simplified version for dev.py).
|
||||||
|
|
||||||
|
Returns (host, port, uds_path, all_ifaces).
|
||||||
|
"""
|
||||||
|
if not value:
|
||||||
|
return DEFAULT_HOST, default_port, None, False
|
||||||
|
|
||||||
|
# Port only (numeric) -> localhost:port
|
||||||
|
if value.isdigit():
|
||||||
|
return DEFAULT_HOST, int(value), None, False
|
||||||
|
|
||||||
|
# Leading colon :port -> bind all interfaces
|
||||||
|
if value.startswith(":") and value != ":":
|
||||||
|
port_part = value[1:]
|
||||||
|
if not port_part.isdigit():
|
||||||
|
raise SystemExit(f"Invalid port in '{value}'")
|
||||||
|
return None, int(port_part), None, True
|
||||||
|
|
||||||
|
# UNIX domain socket
|
||||||
|
if value.startswith("unix:"):
|
||||||
|
uds_path = value[5:] or None
|
||||||
|
if uds_path is None:
|
||||||
|
raise SystemExit("unix: path must not be empty")
|
||||||
|
return None, None, uds_path, False
|
||||||
|
|
||||||
|
# Unbracketed IPv6 (cannot safely contain a port)
|
||||||
|
if value.count(":") > 1 and not value.startswith("["):
|
||||||
|
try:
|
||||||
|
ipaddress.IPv6Address(value)
|
||||||
|
except ValueError as e:
|
||||||
|
raise SystemExit(f"Invalid IPv6 address '{value}': {e}")
|
||||||
|
return value, default_port, None, False
|
||||||
|
|
||||||
|
# Use urllib.parse for everything else
|
||||||
|
parsed = urlparse(f"//{value}")
|
||||||
|
host = parsed.hostname or DEFAULT_HOST
|
||||||
|
port = parsed.port or default_port
|
||||||
|
|
||||||
|
return host, port, None, False
|
||||||
|
|
||||||
|
|
||||||
|
def run_vite(vite_url: str, vite_host: str | None, vite_port: int):
|
||||||
|
"""Spawn the frontend dev server (deno, npm, or bunx) as a background process."""
|
||||||
|
devpath = Path(__file__).parent.parent / "frontend"
|
||||||
|
if not (devpath / "package.json").exists():
|
||||||
|
stderr.write(
|
||||||
|
f"┃ ⚠️ Frontend source not found at {devpath}\n"
|
||||||
|
+ NO_FRONTEND.format(vite_url=vite_url)
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
options = [
|
||||||
|
("deno", "run", "dev"),
|
||||||
|
("npm", "--silent", "run", "dev", "--"),
|
||||||
|
("bunx", "--bun", "vite"),
|
||||||
|
]
|
||||||
|
cmd = None
|
||||||
|
tool_name = None
|
||||||
|
for option in options:
|
||||||
|
if tool := shutil.which(option[0]):
|
||||||
|
cmd = [tool, *option[1:]]
|
||||||
|
tool_name = option[0]
|
||||||
|
break
|
||||||
|
|
||||||
|
# Add Vite CLI args for host/port
|
||||||
|
vite_args = ["--port", str(vite_port), "--logLevel", "silent"]
|
||||||
|
if vite_host:
|
||||||
|
vite_args.extend(["--host", vite_host])
|
||||||
|
|
||||||
|
vite_process = None
|
||||||
|
|
||||||
|
def start_vite():
|
||||||
|
nonlocal vite_process
|
||||||
|
if cmd is None:
|
||||||
|
stderr.write(NO_FRONTEND_TOOL + NO_FRONTEND.format(vite_url=vite_url))
|
||||||
|
return
|
||||||
|
assert tool_name is not None
|
||||||
|
try:
|
||||||
|
if tool_name == "bunx":
|
||||||
|
stderr.write(BUN_BUG)
|
||||||
|
|
||||||
|
full_cmd = cmd + vite_args
|
||||||
|
stderr.write(f">>> {' '.join([tool_name, *full_cmd[1:]])}\n")
|
||||||
|
vite_process = subprocess.Popen(full_cmd, cwd=str(devpath), shell=False)
|
||||||
|
except Exception as e:
|
||||||
|
stderr.write(
|
||||||
|
f"┃ ⚠️ Vite couldn't start: {e}\n"
|
||||||
|
+ NO_FRONTEND.format(vite_url=vite_url)
|
||||||
|
)
|
||||||
|
|
||||||
|
def cleanup():
|
||||||
|
if vite_process:
|
||||||
|
vite_process.terminate()
|
||||||
|
vite_process.wait()
|
||||||
|
|
||||||
|
# Start Vite in a separate thread
|
||||||
|
vite_thread = Thread(target=start_vite, daemon=True)
|
||||||
|
vite_thread.start()
|
||||||
|
|
||||||
|
atexit.register(cleanup)
|
||||||
|
signal.signal(signal.SIGTERM, lambda *_: cleanup())
|
||||||
|
signal.signal(signal.SIGINT, lambda *_: cleanup())
|
||||||
|
|
||||||
|
|
||||||
|
def run_caddy(origins: list[str], vite_port: int) -> subprocess.Popen | None:
|
||||||
|
"""Spawn Caddy as HTTPS reverse proxy for the given origins."""
|
||||||
|
caddy_path = shutil.which("caddy")
|
||||||
|
if not caddy_path:
|
||||||
|
stderr.write("┃ ⚠️ Caddy not found. Install it to use --caddy option.\n")
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Build Caddyfile with a site block for each origin
|
||||||
|
caddyfile_parts = []
|
||||||
|
for origin in origins:
|
||||||
|
parsed = urlparse(origin)
|
||||||
|
# Extract scheme://host:port from origin URL
|
||||||
|
scheme = parsed.scheme or "https"
|
||||||
|
host = parsed.hostname or parsed.path # handle case without scheme
|
||||||
|
port = parsed.port or (CADDY_HTTP_PORT if scheme == "http" else CADDY_PORT)
|
||||||
|
# Use standard ports without explicit port in address (cleaner URLs)
|
||||||
|
if port in (80, 443):
|
||||||
|
site_addr = f"{scheme}://{host}"
|
||||||
|
else:
|
||||||
|
site_addr = f"{scheme}://{host}:{port}"
|
||||||
|
block = (
|
||||||
|
CADDYFILE_SITE_BLOCK.replace("SITE_ADDR", site_addr)
|
||||||
|
.replace("BACKEND_PORT", str(BACKEND_PORT))
|
||||||
|
.replace("VITE_PORT", str(vite_port))
|
||||||
|
)
|
||||||
|
caddyfile_parts.append(block)
|
||||||
|
|
||||||
|
caddyfile = "\n".join(caddyfile_parts)
|
||||||
|
caddy_process = None
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Use sudo to bind to privileged ports (80/443) for ACME certificate fetching
|
||||||
|
cmd = ["sudo", caddy_path, "run", "--config", "-", "--adapter", "caddyfile"]
|
||||||
|
caddy_process = subprocess.Popen(
|
||||||
|
cmd,
|
||||||
|
stdin=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
)
|
||||||
|
caddy_process.stdin.write(caddyfile.encode())
|
||||||
|
caddy_process.stdin.close()
|
||||||
|
except Exception as e:
|
||||||
|
stderr.write(f"┃ ⚠️ Caddy couldn't start: {e}\n")
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Helper to parse Caddy log line (JSON or plain text) into (level, logger, msg)
|
||||||
|
def parse_caddy_log(line: str) -> tuple[str, str, str] | None:
|
||||||
|
"""Parse a Caddy log line, return (level, logger, msg) or None if unparseable."""
|
||||||
|
line = line.rstrip("\n")
|
||||||
|
if not line:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Try JSON format first
|
||||||
|
try:
|
||||||
|
log = json.loads(line)
|
||||||
|
return (
|
||||||
|
log.get("level", ""),
|
||||||
|
log.get("logger", ""),
|
||||||
|
log.get("msg", ""),
|
||||||
|
)
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Plain text format: "2025/12/06 22:59:41.390 INFO logger msg..."
|
||||||
|
# or "2025/12/06 22:59:41.390 INFO msg..." (no logger)
|
||||||
|
parts = line.split("\t")
|
||||||
|
if len(parts) >= 2:
|
||||||
|
# First part is "timestamp LEVEL", rest are logger and/or message
|
||||||
|
first = parts[0].rsplit(None, 1) # split off the level from timestamp
|
||||||
|
if len(first) == 2:
|
||||||
|
level = first[1].lower()
|
||||||
|
if len(parts) == 2:
|
||||||
|
return (level, "", parts[1])
|
||||||
|
else:
|
||||||
|
return (level, parts[1], "\t".join(parts[2:]))
|
||||||
|
|
||||||
|
# Unparseable - return as-is with no level/logger
|
||||||
|
return ("", "", line)
|
||||||
|
|
||||||
|
def strip_caddy_verbose(msg: str) -> str:
|
||||||
|
"""Remove verbose prefixes from Caddy error messages."""
|
||||||
|
return msg.replace("loading initial config: loading new config: ", "")
|
||||||
|
|
||||||
|
def format_caddy_log(level: str, logger: str, msg: str) -> str:
|
||||||
|
"""Format a parsed Caddy log for display."""
|
||||||
|
msg = strip_caddy_verbose(msg)
|
||||||
|
if logger:
|
||||||
|
return f"┃ [{level.upper()}] {logger}: {msg}\n"
|
||||||
|
else:
|
||||||
|
return f"┃ [{level.upper()}] {msg}\n"
|
||||||
|
|
||||||
|
# Read stderr line by line until Caddy signals it's ready or exits
|
||||||
|
# Caddy outputs logs; "serving initial configuration" means it's ready
|
||||||
|
while True:
|
||||||
|
exit_code = caddy_process.poll()
|
||||||
|
if exit_code is not None:
|
||||||
|
# Process exited - read remaining stderr and report failure
|
||||||
|
remaining = (
|
||||||
|
caddy_process.stderr.read().decode() if caddy_process.stderr else ""
|
||||||
|
)
|
||||||
|
if remaining:
|
||||||
|
for line in remaining.splitlines():
|
||||||
|
if line:
|
||||||
|
parsed = parse_caddy_log(line)
|
||||||
|
if parsed:
|
||||||
|
level, logger, msg = parsed
|
||||||
|
if level:
|
||||||
|
stderr.write(format_caddy_log(level, logger, msg))
|
||||||
|
else:
|
||||||
|
stderr.write(f"┃ {strip_caddy_verbose(msg)}\n")
|
||||||
|
else:
|
||||||
|
stderr.write(f"┃ {strip_caddy_verbose(line)}\n")
|
||||||
|
stderr.write(f"┃ ⚠️ Caddy startup failed (exit code {exit_code})\n")
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Read one line from stderr (blocks until data available)
|
||||||
|
line = caddy_process.stderr.readline().decode()
|
||||||
|
if not line:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Check for ready signal
|
||||||
|
if "serving initial configuration" in line:
|
||||||
|
break
|
||||||
|
|
||||||
|
parsed = parse_caddy_log(line)
|
||||||
|
if not parsed:
|
||||||
|
continue
|
||||||
|
|
||||||
|
level, logger, msg = parsed
|
||||||
|
|
||||||
|
# Filter out info-level and admin messages
|
||||||
|
if level == "info" or logger == "admin":
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Show errors/fatal to user
|
||||||
|
if level in ("error", "fatal"):
|
||||||
|
stderr.write(format_caddy_log(level, logger, msg))
|
||||||
|
elif not level:
|
||||||
|
# Unparseable non-empty line (e.g., sudo prompt) - pass through with prefix
|
||||||
|
stderr.write(f"┃ {strip_caddy_verbose(msg)}\n")
|
||||||
|
stderr.flush()
|
||||||
|
|
||||||
|
# Start a background thread to drain stderr and show errors
|
||||||
|
def drain_stderr():
|
||||||
|
while True:
|
||||||
|
line = caddy_process.stderr.readline().decode()
|
||||||
|
if not line:
|
||||||
|
break
|
||||||
|
|
||||||
|
parsed = parse_caddy_log(line)
|
||||||
|
if not parsed:
|
||||||
|
continue
|
||||||
|
|
||||||
|
level, logger, msg = parsed
|
||||||
|
|
||||||
|
# Filter out info-level and admin messages
|
||||||
|
if level == "info" or logger == "admin":
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Show errors/warnings to user
|
||||||
|
if level in ("error", "fatal", "warn"):
|
||||||
|
stderr.write(format_caddy_log(level, logger, msg))
|
||||||
|
elif not level:
|
||||||
|
# Unparseable line - pass through with prefix
|
||||||
|
stderr.write(f"┃ {strip_caddy_verbose(msg)}\n")
|
||||||
|
|
||||||
|
drain_thread = Thread(target=drain_stderr, daemon=True)
|
||||||
|
drain_thread.start()
|
||||||
|
|
||||||
|
def cleanup():
|
||||||
|
if caddy_process:
|
||||||
|
caddy_process.terminate()
|
||||||
|
caddy_process.wait()
|
||||||
|
|
||||||
|
atexit.register(cleanup)
|
||||||
|
|
||||||
|
return caddy_process
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
# Parse optional hostport argument for Vite frontend
|
||||||
|
parser = argparse.ArgumentParser(add_help=False)
|
||||||
|
parser.add_argument("hostport", nargs="?", default=None)
|
||||||
|
parser.add_argument("--caddy", action="store_true", help="Run Caddy as HTTPS proxy")
|
||||||
|
parser.add_argument("--rp-id", default="localhost", help="Relying Party ID")
|
||||||
|
parser.add_argument(
|
||||||
|
"--origin", action="append", dest="origins", help="Allowed origin(s)"
|
||||||
|
)
|
||||||
|
parser.add_argument("--auth-host", help="Dedicated auth host")
|
||||||
|
args, remaining = parser.parse_known_args()
|
||||||
|
|
||||||
|
# Parse Vite endpoint
|
||||||
|
vite_host, vite_port, vite_uds, all_ifaces = parse_endpoint(
|
||||||
|
args.hostport, DEFAULT_VITE_PORT
|
||||||
|
)
|
||||||
|
|
||||||
|
if vite_uds:
|
||||||
|
raise SystemExit("┃ ⚠️ Unix sockets are not supported for Vite frontend")
|
||||||
|
|
||||||
|
# Handle all-interfaces case (:port syntax)
|
||||||
|
# Vite uses 0.0.0.0 to listen on all interfaces (IPv4 only, sufficient for dev)
|
||||||
|
if all_ifaces:
|
||||||
|
vite_host = "0.0.0.0"
|
||||||
|
|
||||||
|
# Build Vite URL for PASKIA_DEVMODE (always use localhost for URL)
|
||||||
|
vite_url = f"http://localhost:{vite_port}"
|
||||||
|
|
||||||
|
# Compute origins for Caddy (user-specified or auto-generated)
|
||||||
|
caddy_origins = []
|
||||||
|
if args.origins:
|
||||||
|
# User specified explicit origins - use those
|
||||||
|
caddy_origins = args.origins
|
||||||
|
elif args.caddy:
|
||||||
|
# Caddy mode without explicit origins: add https origin for the hostname
|
||||||
|
if args.auth_host:
|
||||||
|
# auth-host is the primary origin
|
||||||
|
auth_host = args.auth_host
|
||||||
|
if "://" not in auth_host:
|
||||||
|
auth_host = f"https://{auth_host}"
|
||||||
|
caddy_origins.append(auth_host)
|
||||||
|
else:
|
||||||
|
# Use rp-id as the hostname (standard port 443, no port in URL)
|
||||||
|
caddy_origins.append(f"https://{args.rp_id}")
|
||||||
|
|
||||||
|
# Start Caddy if requested (after computing origins)
|
||||||
|
if args.caddy:
|
||||||
|
if not caddy_origins:
|
||||||
|
caddy_origins = [f"https://{args.rp_id}"]
|
||||||
|
stderr.write(f">>> sudo caddy @ {' '.join(caddy_origins)}\n")
|
||||||
|
if not run_caddy(caddy_origins, vite_port):
|
||||||
|
raise SystemExit(1)
|
||||||
|
|
||||||
|
# Start Vite dev server
|
||||||
|
run_vite(vite_url, vite_host, vite_port)
|
||||||
|
|
||||||
|
# Set dev mode with Vite URL in environment for subprocess
|
||||||
|
env = os.environ.copy()
|
||||||
|
env["PASKIA_DEVMODE"] = vite_url
|
||||||
|
|
||||||
|
# Build command with origin args
|
||||||
|
cmd = ["paskia", "serve", f"localhost:{BACKEND_PORT}"]
|
||||||
|
|
||||||
|
# Pass through rp-id (always pass, has default)
|
||||||
|
cmd.extend(["--rp-id", args.rp_id])
|
||||||
|
|
||||||
|
# Pass through auth-host if specified
|
||||||
|
if args.auth_host:
|
||||||
|
cmd.extend(["--auth-host", args.auth_host])
|
||||||
|
|
||||||
|
# Collect all origins: Caddy origins first (auth-host first), then user origins
|
||||||
|
# Use a set to track and avoid duplicates
|
||||||
|
all_origins = []
|
||||||
|
seen_origins = set(args.origins) if args.origins else set()
|
||||||
|
|
||||||
|
# Add Caddy origins first (they include auth-host origin if configured)
|
||||||
|
if args.caddy:
|
||||||
|
for origin in caddy_origins:
|
||||||
|
if origin not in seen_origins:
|
||||||
|
all_origins.append(origin)
|
||||||
|
seen_origins.add(origin)
|
||||||
|
|
||||||
|
# Add user-specified origins
|
||||||
|
if args.origins:
|
||||||
|
for origin in args.origins:
|
||||||
|
if origin not in seen_origins:
|
||||||
|
all_origins.append(origin)
|
||||||
|
seen_origins.add(origin)
|
||||||
|
|
||||||
|
# Pass all origins to backend
|
||||||
|
for origin in all_origins:
|
||||||
|
cmd.extend(["--origin", origin])
|
||||||
|
|
||||||
|
# Add remaining args (ones we didn't parse)
|
||||||
|
cmd.extend(remaining)
|
||||||
|
|
||||||
|
stderr.write(f">>> (devmode) {' '.join(cmd)}\n")
|
||||||
|
subprocess.run(cmd, env=env)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
Reference in New Issue
Block a user