mojiahui/webman-buildadmin-mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在环境文件中增加谷歌验证器开关

Browse Source
This commit is contained in:
zhenhui
2026-07-21 15:15:11 +08:00
parent e40de47b8b
commit a0056ff15b
11 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env-example
View File

@@ -7,6 +7,10 @@ APP_DEFAULT_TIMEZONE = Asia/Shanghai
# 语言
LANG_DEFAULT_LANG = zh-cn
# 管理员谷歌验证器（TOTP）：1=开启（登录需验证/绑定），0=关闭
ADMIN_TOTP_ENABLE=1
# Database
DATABASE_TYPE = mysql
DATABASE_HOSTNAME = 127.0.0.1

23
app/admin/controller/Index.php
View File

@@ -51,6 +51,7 @@ class Index extends Backend
'upload' => keys_to_camel_case(get_upload_config($request), ['max_size', 'save_name', 'allowed_suffixes', 'allowed_mime_types', 'forbidden_suffixes']),
'cdnUrl' => full_url(),
'cdnUrlParams' => config('buildadmin.cdn_url_params'),
'totpEnable' => AdminTotp::isEnabled(),
],
]);
}
@@ -109,6 +110,13 @@ class Index extends Backend
return $this->error($msg ?: __('Incorrect user name or password!'));
}
if (!AdminTotp::isEnabled()) {
if (!$this->auth->finalizeLogin((bool) $keep)) {
return $this->error($this->auth->getError() ?: __('Login failed'));
}
return $this->buildLoginSuccessResponse((bool) $keep);
}
if ($this->auth->hasTotpBound()) {
$tempToken = AdminTotp::createPendingToken($this->auth->id, AdminTotp::TOKEN_TYPE_VERIFY);
return $this->success(__('Please enter Google Authenticator code'), [
@@ -127,7 +135,8 @@ class Index extends Backend
}
return $this->success('', [
'captcha' => $captchaSwitch
'captcha' => $captchaSwitch,
'totpEnable' => AdminTotp::isEnabled(),
]);
}
@@ -136,6 +145,10 @@ class Index extends Backend
$response = $this->initializeBackend($request);
if ($response !== null) return $response;
if (!AdminTotp::isEnabled()) {
return $this->error(__('Google Authenticator is disabled'));
}
if ($request->method() !== 'POST') {
return $this->error(__('Method not allowed'), [], 0, ['statusCode' => 405]);
}
@@ -169,6 +182,10 @@ class Index extends Backend
$response = $this->initializeBackend($request);
if ($response !== null) return $response;
if (!AdminTotp::isEnabled()) {
return $this->error(__('Google Authenticator is disabled'));
}
if ($request->method() !== 'POST') {
return $this->error(__('Method not allowed'), [], 0, ['statusCode' => 405]);
}
@@ -223,6 +240,10 @@ class Index extends Backend
$response = $this->initializeBackend($request);
if ($response !== null) return $response;
if (!AdminTotp::isEnabled()) {
return $this->error(__('Google Authenticator is disabled'));
}
if ($request->method() !== 'POST') {
return $this->error(__('Method not allowed'), [], 0, ['statusCode' => 405]);
}

4
app/admin/controller/auth/Admin.php
View File

@@ -231,6 +231,10 @@ class Admin extends Backend
$response = $this->initializeBackend($request);
if ($response !== null) return $response;
if (!\app\common\library\AdminTotp::isEnabled()) {
return $this->error(__('Google Authenticator is disabled'));
}
if ($request->method() !== 'POST') {
return $this->error(__('Method not allowed'), [], 0, ['statusCode' => 405]);
}

1
app/admin/lang/en.php
View File

@@ -120,6 +120,7 @@ return [
'Google Authenticator not bound' => 'Google Authenticator not bound',
'Reset Google Authenticator' => 'Reset Google Authenticator',
'Google Authenticator reset successfully' => 'Google Authenticator reset. The admin must re-bind on next login',
'Google Authenticator is disabled' => 'Google Authenticator is disabled',
'Cannot reset your own authenticator, please modify in database' => 'Cannot reset your own authenticator. Super admin recovery requires database change',
'Login failed' => 'Login failed',
];

1
app/admin/lang/zh-cn.php
View File

@@ -139,6 +139,7 @@ return [
'Google Authenticator not bound' => '谷歌验证器未绑定',
'Reset Google Authenticator' => '重置谷歌验证器',
'Google Authenticator reset successfully' => '谷歌验证器已重置，该管理员下次登录需重新绑定',
'Google Authenticator is disabled' => '谷歌验证器功能已关闭',
'Cannot reset your own authenticator, please modify in database' => '不能重置自己的验证器，超管丢失验证器请在数据库中修改',
'Login failed' => '登录失败',
];

5
app/common/library/AdminTotp.php
View File

@@ -20,6 +20,11 @@ class AdminTotp
private static ?TwoFactorAuth $tfa = null;
public static function isEnabled(): bool
{
return (bool) config('buildadmin.admin_totp_enable', true);
}
private static function tfa(): TwoFactorAuth
{
if (self::$tfa === null) {

2
config/buildadmin.php
View File

@@ -10,6 +10,8 @@ return [
'user_login_captcha' => false,
// 是否开启管理员登录验证码
'admin_login_captcha' => false,
// 是否开启管理员谷歌验证器（TOTP），由 .env ADMIN_TOTP_ENABLE 控制
'admin_totp_enable' => filter_var(env('ADMIN_TOTP_ENABLE', '1'), FILTER_VALIDATE_BOOLEAN),
// 会员登录失败可重试次数,false则无限
'user_login_retry' => 10,
// 管理员登录失败可重试次数,false则无限

2
web/src/stores/interface/index.ts
View File

@@ -154,6 +154,8 @@ export interface SiteConfig {
recordNumber?: string
// 内容分发网络URL的参数，格式如 imageMogr2/format/heif
cdnUrlParams: string
// 是否开启管理员谷歌验证器
totpEnable?: boolean
// 初始化状态
initialize: boolean

1
web/src/stores/siteConfig.ts
View File

@@ -15,6 +15,7 @@ export const useSiteConfig = defineStore('siteConfig', {
headNav: [],
recordNumber: '',
cdnUrlParams: '',
totpEnable: true,
initialize: false,
userInitialize: false,
}

6
web/src/views/backend/auth/admin/index.vue
View File

@@ -26,6 +26,7 @@ import { defaultOptButtons } from '/@/components/table'
import { baTableApi } from '/@/api/common'
import { resetTotp } from '/@/api/backend/auth/admin'
import { useAdminInfo } from '/@/stores/adminInfo'
import { useSiteConfig } from '/@/stores/siteConfig'
import { useI18n } from 'vue-i18n'
defineOptions({
@@ -34,9 +35,13 @@ defineOptions({
const { t } = useI18n()
const adminInfo = useAdminInfo()
const siteConfig = useSiteConfig()
/** 超管或拥有 resetTotp 权限，且不能操作自己 */
const canManageTotp = (row: TableRow) => {
if (!siteConfig.totpEnable) {
return false
}
if (row.id == adminInfo.id) {
return false
}
@@ -114,6 +119,7 @@ const baTable = new baTableClass(
replaceValue: { true: t('auth.admin.Bound'), false: t('auth.admin.Not bound') },
operator: false,
width: 120,
show: siteConfig.totpEnable,
},
{
label: t('auth.admin.Last login'),

4
web/src/views/backend/routine/adminInfo.vue
View File

@@ -38,7 +38,7 @@
<el-form-item :label="t('routine.adminInfo.user name')">
<el-input disabled v-model="state.adminInfo.username"></el-input>
</el-form-item>
<el-form-item :label="t('routine.adminInfo.Google Authenticator')">
<el-form-item :label="t('routine.adminInfo.Google Authenticator')" v-if="siteConfig.totpEnable">
<el-tag :type="state.adminInfo.totp_bound ? 'success' : 'info'">
{{ state.adminInfo.totp_bound ? t('routine.adminInfo.Bound') : t('routine.adminInfo.Not bound') }}
</el-tag>
@@ -117,6 +117,7 @@ import { uuid } from '../../../utils/random'
import { buildValidatorData } from '/@/utils/validate'
import { fileUpload } from '/@/api/common'
import { useAdminInfo } from '/@/stores/adminInfo'
import { useSiteConfig } from '/@/stores/siteConfig'
import { isEmpty } from 'lodash-es'
defineOptions({
@@ -127,6 +128,7 @@ const { t } = useI18n()
const formRef = useTemplateRef('formRef')
const adminInfoStore = useAdminInfo()
const siteConfig = useSiteConfig()
const state: {
adminInfo: anyObj