Skip to content

Commit 161520c

Browse files
committed
fix(hysteria): change auth field type in HysteriaSettings from UUID to string with random password generator
1 parent 20d3141 commit 161520c

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

app/models/proxy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ShadowsocksSettings(BaseModel):
4141

4242

4343
class HysteriaSettings(BaseModel):
44-
auth: UUID = Field(default_factory=uuid4)
44+
auth: str = Field(default_factory=random_password, min_length=1)
4545

4646

4747
class WireGuardPeerIPs(BaseModel):

dashboard/src/components/dialogs/user-modal.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2150,8 +2150,7 @@ function UserModal({ isDialogOpen, onOpenChange, form, editingUser, editingUserI
21502150
<FormField
21512151
control={form.control}
21522152
name="proxy_settings.hysteria.auth"
2153-
render={({ field, formState }) => {
2154-
const error = formState.errors.proxy_settings?.hysteria?.auth
2153+
render={({ field }) => {
21552154
return (
21562155
<FormItem className="mb-2">
21572156
<FormLabel>{t('userDialog.proxySettings.hysteriaAuth')}</FormLabel>
@@ -2178,13 +2177,13 @@ function UserModal({ isDialogOpen, onOpenChange, form, editingUser, editingUserI
21782177
form.trigger('proxy_settings.hysteria.auth')
21792178
handleFieldChange('proxy_settings.hysteria.auth', newVal)
21802179
}}
2181-
title="Generate UUID"
2180+
title="Generate auth"
21822181
>
21832182
<RefreshCcw className="h-3 w-3" />
21842183
</Button>
21852184
</div>
21862185
</FormControl>
2187-
<FormMessage>{error?.message === 'Invalid uuid' && t('validation.invalidUuid', { defaultValue: 'Invalid UUID format' })}</FormMessage>
2186+
<FormMessage />
21882187
</FormItem>
21892188
)
21902189
}}
@@ -2808,4 +2807,4 @@ function UserModal({ isDialogOpen, onOpenChange, form, editingUser, editingUserI
28082807
)
28092808
}
28102809

2811-
export default UserModal
2810+
export default UserModal

dashboard/src/components/forms/user-form.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const shadowsocksSettingsSchema = z.object({
2121
method: shadowsocksMethodsEnum.optional(),
2222
})
2323
export const hysteriaSettingsSchema = z.object({
24-
auth: z.string().uuid().optional(),
24+
auth: z.string().min(1).optional(),
2525
})
2626
export const wireguardSettingsSchema = z.object({
2727
private_key: z.string().nullable().optional(),

0 commit comments

Comments
 (0)