wanwu/sub2api
1
0
Fork 0
mirror of https://gitee.com/wanwujie/sub2api synced 2026-04-02 22:42:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1090 from laukkw/main

Browse Source 
fix(setup): align install validation and expose backend errors
This commit is contained in:
Wesley Liddick
2026-03-18 16:23:06 +08:00
committed by GitHub
parent bf3d6c0e6e aa6047c460
commit 9f6ab6b817
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/internal/setup/handler.go
View File

@@ -247,6 +247,12 @@ func install(c *gin.Context) {
return
}
req.Admin.Email = strings.TrimSpace(req.Admin.Email)
req.Database.Host = strings.TrimSpace(req.Database.Host)
req.Database.User = strings.TrimSpace(req.Database.User)
req.Database.DBName = strings.TrimSpace(req.Database.DBName)
req.Redis.Host = strings.TrimSpace(req.Redis.Host)
// ========== COMPREHENSIVE INPUT VALIDATION ==========
// Database validation
if !validateHostname(req.Database.Host) {
@@ -319,13 +325,6 @@ func install(c *gin.Context) {
return
}
// Trim whitespace from string inputs
req.Admin.Email = strings.TrimSpace(req.Admin.Email)
req.Database.Host = strings.TrimSpace(req.Database.Host)
req.Database.User = strings.TrimSpace(req.Database.User)
req.Database.DBName = strings.TrimSpace(req.Database.DBName)
req.Redis.Host = strings.TrimSpace(req.Redis.Host)
cfg := &SetupConfig{
Database: req.Database,
Redis: req.Redis,

2
frontend/src/i18n/locales/en.ts
View File

@@ -218,7 +218,7 @@ export default {
email: 'Email',
password: 'Password',
confirmPassword: 'Confirm Password',
passwordPlaceholder: 'Min 6 characters',
passwordPlaceholder: 'Min 8 characters',
confirmPasswordPlaceholder: 'Confirm password',
passwordMismatch: 'Passwords do not match'
},

2
frontend/src/i18n/locales/zh.ts
View File

@@ -218,7 +218,7 @@ export default {
email: '邮箱',
password: '密码',
confirmPassword: '确认密码',
passwordPlaceholder: '至少 6 个字符',
passwordPlaceholder: '至少 8 个字符',
confirmPasswordPlaceholder: '确认密码',
passwordMismatch: '密码不匹配'
},

17
frontend/src/views/setup/SetupWizardView.vue
View File

@@ -565,7 +565,7 @@ const canProceed = computed(() => {
case 2:
return (
formData.admin.email &&
formData.admin.password.length >= 6 &&
formData.admin.password.length >= 8 &&
formData.admin.password === confirmPassword.value
)
default:
@@ -582,8 +582,9 @@ async function testDatabaseConnection() {
await testDatabase(formData.database)
dbConnected.value = true
} catch (error: unknown) {
const err = error as { response?: { data?: { detail?: string } }; message?: string }
errorMessage.value = err.response?.data?.detail || err.message || 'Connection failed'
const err = error as { response?: { data?: { detail?: string; message?: string } }; message?: string }
errorMessage.value =
err.response?.data?.detail || err.response?.data?.message || err.message || 'Connection failed'
} finally {
testingDb.value = false
}
@@ -598,8 +599,9 @@ async function testRedisConnection() {
await testRedis(formData.redis)
redisConnected.value = true
} catch (error: unknown) {
const err = error as { response?: { data?: { detail?: string } }; message?: string }
errorMessage.value = err.response?.data?.detail || err.message || 'Connection failed'
const err = error as { response?: { data?: { detail?: string; message?: string } }; message?: string }
errorMessage.value =
err.response?.data?.detail || err.response?.data?.message || err.message || 'Connection failed'
} finally {
testingRedis.value = false
}
@@ -622,8 +624,9 @@ async function performInstall() {
// Start polling for service restart
waitForServiceRestart()
} catch (error: unknown) {
const err = error as { response?: { data?: { detail?: string } }; message?: string }
errorMessage.value = err.response?.data?.detail || err.message || 'Installation failed'
const err = error as { response?: { data?: { detail?: string; message?: string } }; message?: string }
errorMessage.value =
err.response?.data?.detail || err.response?.data?.message || err.message || 'Installation failed'
} finally {
installing.value = false
}