补充安全码加密存储及受权限约束的再次查看,增加前端验证和自动隐藏;构建已通过,云端业务验收待完成。
This commit is contained in:
1 parent
5e4ff07b1d
commit
2f24a72054
15 files changed
+411
-38
No files matched your search
@@ -4,7 +4,11 @@ import { ElMessageBox, ElNotification } from 'element-plus'
|
||||
|
||||
import lang from '../../../i18n/i18n'
|
||||
import { http } from '@/utils/axios'
|
||||
import { requestWithRecentAuthentication } from '@/utils/recentAuthentication'
|
||||
import {
|
||||
confirmRecentAuthentication,
|
||||
isRecentAuthenticationCancelled,
|
||||
requestWithRecentAuthentication,
|
||||
} from '@/utils/recentAuthentication'
|
||||
import { useGlobalStatusStore } from '@/stores/useGlobalStatusStore'
|
||||
import { normalizeCreationOptions, serializeCredential, webAuthnSupported } from '@/utils/webauthn'
|
||||
|
||||
@@ -56,6 +60,33 @@ export function usePage() {
|
||||
const questionForm = reactive({ question: '', answer: '' })
|
||||
const recoveryConfigured = ref(false)
|
||||
const generatedCodes = ref([])
|
||||
const recoveryLoading = ref(false)
|
||||
let recoveryCodeHideTimer = null
|
||||
let recoveryViewVersion = 0
|
||||
let pageActive = true
|
||||
|
||||
const clearRecoveryCodes = () => {
|
||||
recoveryViewVersion += 1
|
||||
generatedCodes.value = []
|
||||
clearTimeout(recoveryCodeHideTimer)
|
||||
recoveryCodeHideTimer = null
|
||||
}
|
||||
|
||||
const isRecoveryViewCurrent = version => (
|
||||
pageActive && selectedSection.value === 'recovery' && version === recoveryViewVersion
|
||||
)
|
||||
|
||||
const handleVisibilityChange = () => {
|
||||
if (document.hidden) clearRecoveryCodes()
|
||||
}
|
||||
|
||||
const requestRecoveryAction = (action, data, version) => (
|
||||
requestWithRecentAuthentication(() => {
|
||||
if (!isRecoveryViewCurrent(version)) return null
|
||||
return http.post(`/api/v1/security/credentials/recovery-codes/${action}`, data)
|
||||
})
|
||||
)
|
||||
|
||||
const externalEmails = ref([])
|
||||
const externalListLoading = ref(false)
|
||||
const externalDialogVisible = ref(false)
|
||||
@@ -213,30 +244,79 @@ export function usePage() {
|
||||
}
|
||||
|
||||
const generateRecoveryCodes = async () => {
|
||||
if (recoveryLoading.value) return
|
||||
clearRecoveryCodes()
|
||||
const version = recoveryViewVersion
|
||||
recoveryLoading.value = true
|
||||
try {
|
||||
await ElMessageBox.confirm('生成新恢复码会撤销当前仍有效的恢复码,请确认已准备好安全保存。', '生成离线恢复码', { type: 'warning' })
|
||||
const res = await requestWithRecentAuthentication(() => http.post('/api/v1/security/credentials/recovery-codes/generate', { count: 10 }))
|
||||
if (!isRecoveryViewCurrent(version)) return
|
||||
const res = await requestRecoveryAction('generate', { count: 10 }, version)
|
||||
if (!isRecoveryViewCurrent(version)) return
|
||||
if (res.errorNo !== 0 || !Array.isArray(res.data?.codes)) throw new Error(res.errorMsg || '离线恢复码生成失败')
|
||||
generatedCodes.value = res.data.codes
|
||||
scheduleRecoveryCodeHide()
|
||||
recoveryConfigured.value = true
|
||||
await globalStatus.refresh()
|
||||
notify('恢复码已生成,请仅保存这一次显示的内容', 'success')
|
||||
} catch (error) {
|
||||
if (isRecentAuthenticationCancelled(error) || !isRecoveryViewCurrent(version)) return
|
||||
if (error !== 'cancel' && error !== 'close') notify(error?.message || '离线恢复码生成失败')
|
||||
} finally {
|
||||
recoveryLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const scheduleRecoveryCodeHide = () => {
|
||||
clearTimeout(recoveryCodeHideTimer)
|
||||
recoveryCodeHideTimer = setTimeout(clearRecoveryCodes, 60000)
|
||||
}
|
||||
|
||||
const revealRecoveryCodes = async () => {
|
||||
if (recoveryLoading.value) return
|
||||
clearRecoveryCodes()
|
||||
const version = recoveryViewVersion
|
||||
recoveryLoading.value = true
|
||||
try {
|
||||
await confirmRecentAuthentication()
|
||||
if (!isRecoveryViewCurrent(version)) return
|
||||
const res = await requestRecoveryAction('reveal', {}, version)
|
||||
if (!isRecoveryViewCurrent(version)) return
|
||||
if (res.errorNo !== 0 || !Array.isArray(res.data?.codes) || !res.data.codes.length) {
|
||||
throw new Error(res.errorMsg || '读取安全码失败')
|
||||
}
|
||||
generatedCodes.value = res.data.codes
|
||||
scheduleRecoveryCodeHide()
|
||||
notify('安全码已显示,60 秒后自动隐藏', 'success')
|
||||
} catch (error) {
|
||||
if (isRecentAuthenticationCancelled(error) || !isRecoveryViewCurrent(version)) return
|
||||
if (error !== 'cancel' && error !== 'close') notify(error?.message || '读取安全码失败')
|
||||
} finally {
|
||||
recoveryLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const revokeRecoveryCodes = async () => {
|
||||
if (recoveryLoading.value) return
|
||||
clearRecoveryCodes()
|
||||
const version = recoveryViewVersion
|
||||
recoveryLoading.value = true
|
||||
try {
|
||||
await ElMessageBox.confirm('撤销后现有离线恢复码将立即失效,是否继续?', '撤销离线恢复码', { type: 'warning' })
|
||||
const res = await requestWithRecentAuthentication(() => http.post('/api/v1/security/credentials/recovery-codes/revoke', {}))
|
||||
if (!isRecoveryViewCurrent(version)) return
|
||||
const res = await requestRecoveryAction('revoke', {}, version)
|
||||
if (!isRecoveryViewCurrent(version)) return
|
||||
if (res.errorNo !== 0) throw new Error(res.errorMsg || '撤销恢复码失败')
|
||||
recoveryConfigured.value = false
|
||||
generatedCodes.value = []
|
||||
clearTimeout(recoveryCodeHideTimer)
|
||||
await globalStatus.refresh()
|
||||
notify('离线恢复码已撤销', 'success')
|
||||
} catch (error) {
|
||||
if (isRecentAuthenticationCancelled(error) || !isRecoveryViewCurrent(version)) return
|
||||
if (error !== 'cancel' && error !== 'close') notify(error?.message || '撤销恢复码失败')
|
||||
} finally {
|
||||
recoveryLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -332,9 +412,21 @@ export function usePage() {
|
||||
passwordChallenge.value = ''
|
||||
ruleForm.code = ''
|
||||
})
|
||||
onUnmounted(() => clearInterval(passwordTimer))
|
||||
onUnmounted(() => {
|
||||
pageActive = false
|
||||
clearRecoveryCodes()
|
||||
document.removeEventListener('visibilitychange', handleVisibilityChange)
|
||||
clearInterval(passwordTimer)
|
||||
})
|
||||
|
||||
watch(selectedSection, section => {
|
||||
if (section !== 'recovery') {
|
||||
clearRecoveryCodes()
|
||||
}
|
||||
})
|
||||
|
||||
onMounted(async () => {
|
||||
document.addEventListener('visibilitychange', handleVisibilityChange)
|
||||
await loadSecurityData()
|
||||
})
|
||||
|
||||
@@ -346,10 +438,10 @@ export function usePage() {
|
||||
lang, isSuperAdmin, supported, webAuthnEnabled, sectionOptions, selectedSection, selectSection,
|
||||
globalSecurityPolicyPage,
|
||||
passwordEmail, passwordSending, passwordSubmitting, passwordCountdown, sendPasswordCode,
|
||||
registering, credentialsLoading, credentials, securityLoading,
|
||||
registering, credentialsLoading, credentials, securityLoading, recoveryLoading,
|
||||
securityQuestion, questionForm, recoveryConfigured, generatedCodes, externalEmails, externalListLoading,
|
||||
externalDialogVisible, ruleForm, rules, submit, registerCredential, renameCredential, revokeCredential,
|
||||
saveSecurityQuestion, generateRecoveryCodes, revokeRecoveryCodes, openExternalEmailDialog,
|
||||
saveSecurityQuestion, generateRecoveryCodes, revealRecoveryCodes, revokeRecoveryCodes, openExternalEmailDialog,
|
||||
handleExternalEmailBound,
|
||||
disableExternalEmail, formatTime,
|
||||
}
|
||||
|
||||
@@ -82,15 +82,19 @@
|
||||
</section>
|
||||
|
||||
<el-divider v-if="selectedSection === 'recovery'" class="settings-divider" />
|
||||
<section v-if="selectedSection === 'recovery'" class="security-section">
|
||||
<section
|
||||
v-if="selectedSection === 'recovery'"
|
||||
v-loading="recoveryLoading"
|
||||
class="security-section"
|
||||
>
|
||||
<div class="settings-header security-key-header">
|
||||
<div><h3>安全码</h3><p class="settings-desc">安全码只在生成时显示一次,请妥善保存。</p></div>
|
||||
<div class="section-actions"><el-button type="primary" @click="generateRecoveryCodes">生成新恢复码</el-button><el-button v-if="recoveryConfigured" type="danger" plain @click="revokeRecoveryCodes">撤销</el-button></div>
|
||||
<div><h3>安全码</h3><p class="settings-desc">安全码默认隐藏,完成安全验证后可以重新查看。</p></div>
|
||||
<div class="section-actions"><el-button v-if="recoveryConfigured && !generatedCodes.length" @click="revealRecoveryCodes">验证后查看</el-button><el-button type="primary" @click="generateRecoveryCodes">生成新恢复码</el-button><el-button v-if="recoveryConfigured" type="danger" plain @click="revokeRecoveryCodes">撤销</el-button></div>
|
||||
</div>
|
||||
<el-alert v-if="recoveryConfigured" title="当前已配置有效离线恢复码" type="success" :closable="false" show-icon />
|
||||
<el-alert v-else title="当前未配置有效离线恢复码,高风险操作可能无法进行。" type="warning" :closable="false" show-icon />
|
||||
<div v-if="generatedCodes.length" class="recovery-code-panel">
|
||||
<div class="one-time-tip">以下内容只显示本次,请立即复制并妥善保存;离开页面后不会再次读取。</div>
|
||||
<div class="one-time-tip">安全码已通过安全验证显示,仅在当前页面短暂显示,请立即复制并妥善保存。</div>
|
||||
<code v-for="code in generatedCodes" :key="code" class="recovery-code">{{ code }}</code>
|
||||
</div>
|
||||
</section>
|
||||
@@ -148,10 +152,10 @@ const {
|
||||
lang, isSuperAdmin, supported, webAuthnEnabled, sectionOptions, selectedSection, selectSection,
|
||||
globalSecurityPolicyPage,
|
||||
passwordEmail, passwordSending, passwordSubmitting, passwordCountdown, sendPasswordCode,
|
||||
registering, credentialsLoading, credentials, securityLoading,
|
||||
registering, credentialsLoading, credentials, securityLoading, recoveryLoading,
|
||||
securityQuestion, questionForm, recoveryConfigured, generatedCodes, externalEmails, externalListLoading,
|
||||
externalDialogVisible, ruleForm, rules, submit, registerCredential, renameCredential, revokeCredential,
|
||||
saveSecurityQuestion, generateRecoveryCodes, revokeRecoveryCodes, openExternalEmailDialog,
|
||||
saveSecurityQuestion, generateRecoveryCodes, revealRecoveryCodes, revokeRecoveryCodes, openExternalEmailDialog,
|
||||
handleExternalEmailBound,
|
||||
disableExternalEmail, formatTime,
|
||||
} = usePage()
|
||||
|
||||
@@ -74,6 +74,7 @@
|
||||
|
||||
.recovery-dialog-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-end;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
+116
-11
@@ -1,8 +1,9 @@
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
|
||||
import { http } from '@/utils/axios'
|
||||
import {
|
||||
confirmRecentAuthentication,
|
||||
isRecentAuthenticationCancelled,
|
||||
requestWithRecentAuthentication,
|
||||
} from '@/utils/recentAuthentication'
|
||||
@@ -32,87 +33,165 @@ function assertSuccess(response, fallback) {
|
||||
export function useRecoveryCodeDialog(props, emit) {
|
||||
const configured = ref(false)
|
||||
const codes = ref([])
|
||||
const loading = ref(false)
|
||||
const revealing = ref(false)
|
||||
const revealed = ref(false)
|
||||
const generating = ref(false)
|
||||
const revoking = ref(false)
|
||||
const errorMessage = ref('')
|
||||
let hideTimer = null
|
||||
let viewVersion = 0
|
||||
let active = true
|
||||
|
||||
const clearCodes = () => {
|
||||
codes.value = []
|
||||
revealed.value = false
|
||||
clearTimeout(hideTimer)
|
||||
hideTimer = null
|
||||
}
|
||||
|
||||
const scheduleHide = () => {
|
||||
clearTimeout(hideTimer)
|
||||
hideTimer = setTimeout(clearCodes, 60000)
|
||||
}
|
||||
|
||||
const isCurrentView = (version, userID) => (
|
||||
active && props.modelValue && version === viewVersion && props.user?.ID === userID
|
||||
)
|
||||
|
||||
const visible = computed({
|
||||
get: () => props.modelValue,
|
||||
set: value => emit('update:modelValue', value),
|
||||
})
|
||||
const busy = computed(() => generating.value || revoking.value)
|
||||
const busy = computed(() => loading.value || revealing.value || generating.value || revoking.value)
|
||||
|
||||
const loadStatus = async () => {
|
||||
if (!props.user?.ID) return false
|
||||
const userID = props.user.ID
|
||||
const version = viewVersion
|
||||
loading.value = true
|
||||
errorMessage.value = ''
|
||||
try {
|
||||
const response = await requestWithRecentAuthentication(async () => {
|
||||
if (!isCurrentView(version, userID)) return null
|
||||
const result = await http.get('/api/v1/user/security/recovery-codes', {
|
||||
params: { id: props.user.ID },
|
||||
params: { id: userID },
|
||||
})
|
||||
return assertSuccess(result, '读取安全码状态失败')
|
||||
})
|
||||
if (!isCurrentView(version, userID)) return false
|
||||
configured.value = Boolean(response.data?.configured)
|
||||
return true
|
||||
} catch (error) {
|
||||
if (!isCurrentView(version, userID)) return false
|
||||
if (!isRecentAuthenticationCancelled(error)) {
|
||||
errorMessage.value = error?.message || '读取安全码状态失败'
|
||||
}
|
||||
return false
|
||||
} finally {
|
||||
if (version === viewVersion) loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const generateCodes = async () => {
|
||||
if (busy.value || !props.user?.ID) return false
|
||||
const userID = props.user.ID
|
||||
const version = viewVersion
|
||||
clearCodes()
|
||||
generating.value = true
|
||||
errorMessage.value = ''
|
||||
try {
|
||||
const response = await requestWithRecentAuthentication(async () => {
|
||||
if (!isCurrentView(version, userID)) return null
|
||||
const result = await http.post('/api/v1/user/security/recovery-codes/generate', {
|
||||
user_id: props.user.ID,
|
||||
user_id: userID,
|
||||
count: 10,
|
||||
})
|
||||
return assertSuccess(result, '安全码生成失败')
|
||||
})
|
||||
if (!isCurrentView(version, userID)) return false
|
||||
codes.value = Array.isArray(response.data?.codes) ? response.data.codes : []
|
||||
if (!codes.value.length) {
|
||||
throw new Error('服务器未返回安全码,请稍后重试')
|
||||
}
|
||||
configured.value = true
|
||||
scheduleHide()
|
||||
emit('changed')
|
||||
return true
|
||||
} catch (error) {
|
||||
if (!isCurrentView(version, userID)) return false
|
||||
if (!isRecentAuthenticationCancelled(error)) {
|
||||
errorMessage.value = error?.message || '安全码生成失败'
|
||||
}
|
||||
return false
|
||||
} finally {
|
||||
generating.value = false
|
||||
if (version === viewVersion) generating.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const revokeCodes = async () => {
|
||||
if (busy.value || !props.user?.ID) return false
|
||||
const userID = props.user.ID
|
||||
const version = viewVersion
|
||||
clearCodes()
|
||||
revoking.value = true
|
||||
errorMessage.value = ''
|
||||
try {
|
||||
await requestWithRecentAuthentication(async () => {
|
||||
if (!isCurrentView(version, userID)) return null
|
||||
const result = await http.post('/api/v1/user/security/recovery-codes/revoke', {
|
||||
user_id: props.user.ID,
|
||||
user_id: userID,
|
||||
})
|
||||
return assertSuccess(result, '安全码撤销失败')
|
||||
})
|
||||
if (!isCurrentView(version, userID)) return false
|
||||
configured.value = false
|
||||
codes.value = []
|
||||
emit('changed')
|
||||
return true
|
||||
} catch (error) {
|
||||
if (!isCurrentView(version, userID)) return false
|
||||
if (!isRecentAuthenticationCancelled(error)) {
|
||||
errorMessage.value = error?.message || '安全码撤销失败'
|
||||
}
|
||||
return false
|
||||
} finally {
|
||||
revoking.value = false
|
||||
if (version === viewVersion) revoking.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const revealCodes = async () => {
|
||||
if (busy.value || !configured.value || !props.user?.ID) return false
|
||||
const userID = props.user.ID
|
||||
const version = viewVersion
|
||||
clearCodes()
|
||||
revealing.value = true
|
||||
errorMessage.value = ''
|
||||
try {
|
||||
await confirmRecentAuthentication()
|
||||
if (!isCurrentView(version, userID)) return false
|
||||
const response = await requestWithRecentAuthentication(async () => {
|
||||
if (!isCurrentView(version, userID)) return null
|
||||
const result = await http.post('/api/v1/user/security/recovery-codes/reveal', {
|
||||
user_id: userID,
|
||||
})
|
||||
return assertSuccess(result, '读取安全码失败')
|
||||
})
|
||||
if (!isCurrentView(version, userID)) return false
|
||||
if (!Array.isArray(response.data?.codes) || !response.data.codes.length) {
|
||||
throw new Error('当前没有可查看的有效安全码')
|
||||
}
|
||||
codes.value = response.data.codes
|
||||
revealed.value = true
|
||||
scheduleHide()
|
||||
return true
|
||||
} catch (error) {
|
||||
if (isCurrentView(version, userID) && !isRecentAuthenticationCancelled(error)) {
|
||||
errorMessage.value = error?.message || '读取安全码失败'
|
||||
}
|
||||
return false
|
||||
} finally {
|
||||
if (version === viewVersion) revealing.value = false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,8 +206,13 @@ export function useRecoveryCodeDialog(props, emit) {
|
||||
}
|
||||
|
||||
const reset = () => {
|
||||
viewVersion += 1
|
||||
clearCodes()
|
||||
loading.value = false
|
||||
revealing.value = false
|
||||
generating.value = false
|
||||
revoking.value = false
|
||||
configured.value = Boolean(props.user?.RecoveryCodeConfigured)
|
||||
codes.value = []
|
||||
errorMessage.value = ''
|
||||
}
|
||||
|
||||
@@ -139,25 +223,46 @@ export function useRecoveryCodeDialog(props, emit) {
|
||||
}
|
||||
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
value => {
|
||||
[() => props.modelValue, () => props.user?.ID],
|
||||
([value]) => {
|
||||
reset()
|
||||
if (value) {
|
||||
reset()
|
||||
void loadStatus()
|
||||
}
|
||||
},
|
||||
{ immediate: true, flush: 'sync' },
|
||||
)
|
||||
|
||||
const handleVisibilityChange = () => {
|
||||
if (document.hidden) reset()
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
document.addEventListener('visibilitychange', handleVisibilityChange)
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
active = false
|
||||
viewVersion += 1
|
||||
clearCodes()
|
||||
document.removeEventListener('visibilitychange', handleVisibilityChange)
|
||||
})
|
||||
|
||||
return {
|
||||
visible,
|
||||
configured,
|
||||
codes,
|
||||
loading,
|
||||
revealing,
|
||||
revealed,
|
||||
clearCodes,
|
||||
generating,
|
||||
revoking,
|
||||
busy,
|
||||
errorMessage,
|
||||
close,
|
||||
generateCodes,
|
||||
revealCodes,
|
||||
revokeCodes,
|
||||
copyCodes,
|
||||
}
|
||||
|
||||
+23
-3
@@ -22,10 +22,14 @@
|
||||
</div>
|
||||
|
||||
<div v-if="codes.length" class="recovery-code-result">
|
||||
<div class="result-title">
|
||||
<div v-if="!revealed" class="result-title">
|
||||
<strong>新安全码仅显示这一次</strong>
|
||||
<span>请立即交给用户妥善保存,关闭弹窗后无法再次查看。</span>
|
||||
</div>
|
||||
<div v-else class="result-title">
|
||||
<strong>当前有效安全码</strong>
|
||||
<span>60 秒后自动隐藏;关闭弹窗后,需再次验证密码才能查看。</span>
|
||||
</div>
|
||||
<div class="recovery-code-grid">
|
||||
<code v-for="code in codes" :key="code">{{ code }}</code>
|
||||
</div>
|
||||
@@ -42,13 +46,24 @@
|
||||
|
||||
<template #footer>
|
||||
<div class="recovery-dialog-actions">
|
||||
<el-button
|
||||
v-if="configured && !codes.length"
|
||||
:loading="revealing"
|
||||
:disabled="loading || generating || revoking"
|
||||
@click="revealCodes"
|
||||
>
|
||||
验证后查看
|
||||
</el-button>
|
||||
<el-button v-if="codes.length" :disabled="busy" @click="clearCodes">
|
||||
隐藏安全码
|
||||
</el-button>
|
||||
<el-button :disabled="busy" @click="close">关闭</el-button>
|
||||
<el-button
|
||||
v-if="configured && !codes.length"
|
||||
type="danger"
|
||||
plain
|
||||
:loading="revoking"
|
||||
:disabled="generating"
|
||||
:disabled="generating || revealing || loading"
|
||||
@click="revokeCodes"
|
||||
>
|
||||
撤销安全码
|
||||
@@ -56,7 +71,7 @@
|
||||
<el-button
|
||||
type="primary"
|
||||
:loading="generating"
|
||||
:disabled="revoking"
|
||||
:disabled="revoking || revealing || loading"
|
||||
@click="generateCodes"
|
||||
>
|
||||
{{ configured ? '重新生成安全码' : '生成安全码' }}
|
||||
@@ -79,12 +94,17 @@ const {
|
||||
visible,
|
||||
configured,
|
||||
codes,
|
||||
loading,
|
||||
revealing,
|
||||
revealed,
|
||||
clearCodes,
|
||||
generating,
|
||||
revoking,
|
||||
busy,
|
||||
errorMessage,
|
||||
close,
|
||||
generateCodes,
|
||||
revealCodes,
|
||||
revokeCodes,
|
||||
copyCodes,
|
||||
} = useRecoveryCodeDialog(props, emit)
|
||||
|
||||
Reference in new issue
Block a user