Merge pull request #659 from pavelpikta/fix/Matrix.138

fix(settings): enhance ProxyHosts handling and input validation

Author: YouROK

Dockerfile

@@ -21,7 +21,7 @@ RUN yarn run build
 
 
 ### BUILD TORRSERVER MULTIARCH START ###
-FROM --platform=$BUILDPLATFORM golang:1.24.0-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.26.0-alpine AS builder
 
 COPY . /opt/src
 COPY --from=front /app/build /opt/src/web/build
@@ -35,11 +35,11 @@ ENV GOARCH=$TARGETARCH
 
 # Build torrserver
 RUN apk add --update g++ \
-&& go run gen_web.go \
-&& cd server \
-&& go mod tidy \
-&& go clean -i -r -cache \
-&& go build -ldflags '-w -s' --o "torrserver" ./cmd
+    && go run gen_web.go \
+    && cd server \
+    && go mod tidy \
+    && go clean -i -r -cache \
+    && go build -ldflags '-w -s' --o "torrserver" ./cmd
 ### BUILD TORRSERVER MULTIARCH END ###
 
 

web/src/components/Settings/SecondarySettingsComponent.jsx

@@ -1,22 +1,22 @@
-import {useTranslation} from 'react-i18next'
+import { useTranslation } from 'react-i18next'
 import TextField from '@material-ui/core/TextField'
 import {
-    Box,
-    Button,
-    CircularProgress,
-    FormControlLabel,
-    FormGroup,
-    FormHelperText,
-    InputAdornment,
-    InputLabel,
-    MenuItem,
-    Select,
-    Switch,
+  Box,
+  Button,
+  CircularProgress,
+  FormControlLabel,
+  FormGroup,
+  FormHelperText,
+  InputAdornment,
+  InputLabel,
+  MenuItem,
+  Select,
+  Switch,
 } from '@material-ui/core'
-import {styled} from '@material-ui/core/styles'
-import {useEffect, useMemo, useState} from 'react'
+import { styled } from '@material-ui/core/styles'
+import { useEffect, useMemo, useState } from 'react'
 
-import {SecondarySettingsContent, SettingSectionLabel} from './style'
+import { SecondarySettingsContent, SettingSectionLabel } from './style'
 
 // Create a styled status message component
 const StatusMessage = styled('div')(({ theme, severity }) => ({
@@ -72,6 +72,15 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
     ProxyHosts,
   } = settings || {}
 
+  // Local state for ProxyHosts text input
+  const [proxyHostsText, setProxyHostsText] = useState('')
+
+  // Sync proxyHostsText with ProxyHosts when settings change
+  useEffect(() => {
+    const textValue = Array.isArray(ProxyHosts) ? ProxyHosts.join(', ') : ProxyHosts || ''
+    setProxyHostsText(textValue)
+  }, [ProxyHosts])
+
   // Use useMemo to compute basePath once
   const basePath = useMemo(() => {
     if (typeof window !== 'undefined') {
@@ -443,39 +452,47 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
           </StatusMessage>
         )}
       </Box>
-        {/* ProxyP2P */}
-        <SettingSectionLabel style={{ marginTop: '20px' }}>{t('Proxy')}</SettingSectionLabel>
-        <FormGroup>
-            <FormControlLabel
-                control={<Switch checked={EnableProxy} onChange={inputForm} id='EnableProxy' color='secondary' />}
-                label={t('SettingsDialog.EnableProxy')}
-                labelPlacement='start'
-            />
-            <FormHelperText margin='none'>{t('SettingsDialog.EnableProxyHint')}</FormHelperText>
-        </FormGroup>
-        {/* Proxy hosts */}
-        <TextField
-            onChange={(e) => {
-                const hostsArray = e.target.value
-                    .split(',')
-                    .map((s) => s.trim());
-
-                inputForm({
-                    target: {
-                        id: 'ProxyHosts',
-                        value: hostsArray,
-                    },
-                });
-            }}
-            margin='normal'
-            id='ProxyHosts'
-            label={t('SettingsDialog.ProxyHosts')}
-            helperText={t('SettingsDialog.ProxyHostsHint')}
-            value={Array.isArray(ProxyHosts) ? ProxyHosts.join(', ') : ''}
-            type='text'
-            variant='outlined'
-            fullWidth
+      {/* ProxyP2P */}
+      <SettingSectionLabel style={{ marginTop: '20px' }}>{t('Proxy')}</SettingSectionLabel>
+      <FormGroup>
+        <FormControlLabel
+          control={<Switch checked={EnableProxy} onChange={inputForm} id='EnableProxy' color='secondary' />}
+          label={t('SettingsDialog.EnableProxy')}
+          labelPlacement='start'
         />
+        <FormHelperText margin='none'>{t('SettingsDialog.EnableProxyHint')}</FormHelperText>
+      </FormGroup>
+      {/* Proxy hosts */}
+      <TextField
+        onChange={e => {
+          setProxyHostsText(e.target.value)
+        }}
+        onBlur={e => {
+          const inputValue = e.target.value.trim()
+          const hostsArray =
+            inputValue === ''
+              ? []
+              : inputValue
+                  .split(',')
+                  .map(s => s.trim())
+                  .filter(s => s !== '')
+
+          inputForm({
+            target: {
+              id: 'ProxyHosts',
+              value: hostsArray,
+            },
+          })
+        }}
+        margin='normal'
+        id='ProxyHosts'
+        label={t('SettingsDialog.ProxyHosts')}
+        helperText={t('SettingsDialog.ProxyHostsHint')}
+        value={proxyHostsText}
+        type='text'
+        variant='outlined'
+        fullWidth
+      />
     </SecondarySettingsContent>
   )
 }

web/src/components/Settings/SettingsDialog.jsx

@@ -78,6 +78,9 @@ export default function SettingsDialog({ handleClose }) {
       else sets[id] = Boolean(checked)
     } else if (type === 'url' || type === 'text') {
       sets[id] = value
+    } else if (!type && value !== undefined) {
+      // Fallback for custom handlers that don't provide type (e.g., ProxyHosts array)
+      sets[id] = value
     }
     setSettings(sets)
   }

web/src/components/Settings/defaultSettings.js

@@ -29,6 +29,6 @@ export default {
   SslKey: '',
   ShowFSActiveTorr: true,
   StoreSettingsInJson: true,
-  EnableProxy:false,
-  ProxyHosts: ["*themoviedb.org", "*tmdb.org", "rutor.info"],
+  EnableProxy: false,
+  ProxyHosts: ['*themoviedb.org', '*tmdb.org', 'rutor.info'],
 }