Changeset 10676 for main/waeup.kofa/trunk/src/waeup/kofa/browser

Timestamp:

31 Oct 2013, 17:51:25 (11 years ago)

Author:

uli

Message:

Check uploaded CSV files more thoroughly before processing.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/browser

Files:

• pages.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -69 +69 @@
 from waeup.kofa.authentication import LocalRoleSetEvent
 from waeup.kofa.widgets.htmlwidget import HTMLDisplayWidget
-from waeup.kofa.utils.helpers import get_user_account
+from waeup.kofa.utils.helpers import get_user_account, check_csv_charset
 from waeup.kofa.mandates.mandate import PasswordMandate
 from waeup.kofa.datacenter import DataCenterFile
@@ -1065 +1065 @@
 
             # Forbid certain characters in import files.
-            for element in filecontent:
-                try:
-                    if ord(element) in FORBIDDEN_CHARACTERS:
-                      self.flash(_(
-                          "Your file contains forbidden characters. "
-                          "Please replace."))
-                      logger.info('%s - invalid file uploaded: %s' %
-                          (ob_class, target))
-                      return
-                except TypeError:
-                    self.flash(_(
-                        "Your file contains forbidden characters. "
-                        "Please replace."))
-                    logger.info('%s - invalid file uploaded: %s' %
-                        (ob_class, target))
-                    return
+            invalid_line = check_csv_charset(filecontent.splitlines())
+            if invalid_line:
+                self.flash(_(
+                    "Your file contains forbidden characters or "
+                    "has invalid CSV format. "
+                    "First problematic line detected: line %s. "
+                    "Please replace." % invalid_line))
+                logger.info('%s - invalid file uploaded: %s' %
+                            (ob_class, target))
+                return
 
             open(target, 'wb').write(filecontent)

main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py

@@ -157 +157 @@
         self.browser.getControl('Upload').click()
         self.assertTrue(
-            'Your file contains forbidden characters. Please replace.'
+            'Your file contains forbidden characters or'
             in self.browser.contents)
         logfile = os.path.join(