Fix 31299

gui/middleware/form.py

@@ -28,7 +28,11 @@ def handle_middleware_validation(form, excep):
                 if list_field_name in form.fields:
                     list_index = int(field_name.split('.')[-2])
                     field_name = list_field_name
-                    error_message = repr(form.cleaned_data[field_name][list_index]) + f": {error_message}"
+                    if isinstance(form.cleaned_data[field_name], list):
+                        list_ = form.cleaned_data[field_name]
+                    else:
+                        list_ = form.cleaned_data[field_name].split()
+                    error_message = repr(list_[list_index]) + f": {error_message}"
         if field_name not in form.fields:
             field_name = '__all__'
 

gui/services/forms.py

@@ -424,8 +424,8 @@ class Meta:
         model = models.RsyncMod
 
     def middleware_clean(self, update):
-        update['hostsallow'] = list(filter(None, re.split(r"\s+", update["hostsallow"])))
-        update['hostsdeny'] = list(filter(None, re.split(r"\s+", update["hostsdeny"])))
+        update['hostsallow'] = update["hostsallow"].split()
+        update['hostsdeny'] = update["hostsdeny"].split()
         return update
 
 
@@ -478,7 +478,7 @@ def clean(self):
         return cdata
 
     def middleware_clean(self, update):
-        update["domain"] = list(filter(None, re.split(r"\s+", update["domain"])))
+        update["domain"] = update["domain"].split()
         return update
 
 
@@ -1492,7 +1492,7 @@ class Meta:
 
     def middleware_clean(self, update):
         update["powermode"] = update["powermode"].upper()
-        update["email"] = list(filter(None, re.split(r"\s+", update["email"])))
+        update["email"] = update["email"].split()
         return update
 
 

gui/services/models.py

@@ -2039,7 +2039,7 @@ class SMART(Model):
         max_length=255,
         blank=True,
         help_text=_("Destination email address. Separate email addresses "
-                    "with commas."),
+                    "with spaces."),
     )
 
     class Meta:

gui/services/utils.py

@@ -48,7 +48,7 @@ def __enter__(self):
             with open(self.SMART_FILE, 'rb') as f:
                 try:
                     self.data = pickle.loads(f.read())
-                except:
+                except Exception:
                     pass
         return self
 

gui/services/views.py

@@ -193,7 +193,7 @@ def enable(request, svc):
 def services_cifs(request):
     try:
         cifs = models.CIFS.objects.all()[0]
-    except:
+    except Exception:
         cifs = models.CIFS()
 
     try:
@@ -344,7 +344,7 @@ def fibrechanneltotarget(request):
 def services_s3(request):
     try:
         s3 = models.S3.objects.all()[0]
-    except:
+    except Exception:
         s3 = models.S3()
 
     if request.method == "POST":

gui/tasks/forms.py

@@ -1,6 +1,5 @@
 import json
 import logging
-import re
 
 from django.utils.translation import ugettext_lazy as _
 
@@ -295,7 +294,9 @@ def __init__(self, *args, **kwargs):
         )
 
     def middleware_clean(self, update):
-        update['extra'] = list(filter(None, re.split(r"\s+", update["extra"])))
+        update['month'] = self.data.getlist("rsync_month")
+        update['dayweek'] = self.data.getlist("rsync_dayweek")
+        update['extra'] = update["extra"].split()
         update['schedule'] = {
             'minute': update.pop('minute'),
             'hour': update.pop('hour'),

src/middlewared/middlewared/plugins/dyndns.py

@@ -1,5 +1,3 @@
-import re
-
 from middlewared.schema import accepts, Bool, Dict, Int, List, Str
 from middlewared.service import SystemServiceService, private
 
@@ -14,7 +12,7 @@ class Config:
     @private
     async def dyndns_extend(self, dyndns):
         dyndns["password"] = await self.middleware.call("notifier.pwenc_decrypt", dyndns["password"])
-        dyndns["domain"] = list(filter(None, re.split(r"\s+", dyndns["domain"])))
+        dyndns["domain"] = dyndns["domain"].split()
         return dyndns
 
     @accepts(Dict(

src/middlewared/middlewared/plugins/smart.py

@@ -1,4 +1,3 @@
-import re
 from itertools import chain
 
 from middlewared.schema import accepts, Cron, Dict, Int, List, Patch, Str
@@ -168,7 +167,7 @@ class Config:
     @private
     async def smart_extend(self, smart):
         smart["powermode"] = smart["powermode"].upper()
-        smart["email"] = list(filter(None, re.split(r"\s+", smart["email"])))
+        smart["email"] = smart["email"].split(",")
         return smart
 
     @accepts(Dict(
@@ -187,7 +186,7 @@ async def do_update(self, data):
         new.update(data)
 
         new["powermode"] = new["powermode"].lower()
-        new["email"] = " ".join(new["email"])
+        new["email"] = ",".join([email.strip() for email in new["email"]])
 
         await self._update_service(old, new)