Validate that TRACKER_WEB url starts with https:// or http:// and ends

with a /.

Author: rouilj

roundup/configuration.py

@@ -495,6 +495,25 @@ def str2value(self, value):
         else:
             return value
 
+class WebUrlOption(Option):
+    """URL MUST start with http/https scheme and end with '/'"""
+
+    def str2value(self, value):
+        if not value:
+            raise OptionValueError(self,value,"Value must not be empty.")
+
+        error_msg = ''
+        if not value.startswith(('http://', 'https://')):
+            error_msg = "Value must start with http:// or https://.\n"
+
+        if not value.endswith('/'):
+            error_msg += "Value must end with /."
+
+        if error_msg:
+            raise OptionValueError(self,value,error_msg)
+        else:
+            return value
+
 class NullableOption(Option):
 
     """Option that is set to None if its string value is one of NULL strings
@@ -714,13 +733,13 @@ def str2value(self, value):
     ("tracker", (
         (Option, "name", "Roundup issue tracker",
             "A descriptive name for your roundup instance."),
-        (Option, "web", NODEFAULT,
+        (WebUrlOption, "web", NODEFAULT,
             "The web address that the tracker is viewable at.\n"
             "This will be included in information"
             " sent to users of the tracker.\n"
             "The URL MUST include the cgi-bin part or anything else\n"
             "that is required to get to the home page of the tracker.\n"
-            "You MUST include a trailing '/' in the URL."),
+            "URL MUST start with http/https scheme and end with '/'"),
         (MailAddressOption, "email", "issue_tracker",
             "Email address that mail to roundup should go to.\n"
             "If no domain is specified then mail_domain is added."),

test/test_config.py

@@ -50,3 +50,21 @@ def test_validConfigKeyword(self):
         """Run configure tests looking for invalid option name
         """
         self.assertEquals(config._get_option("FOO"), "value")
+
+    def testTrackerWeb(self):
+        config = configuration.CoreConfig()
+
+        self.assertEqual(None,
+             config._get_option('TRACKER_WEB').set("http://foo.example/bar/"))
+        self.assertEqual(None,
+             config._get_option('TRACKER_WEB').set("https://foo.example/bar/"))
+
+        self.assertRaises(configuration.OptionValueError,
+             config._get_option('TRACKER_WEB').set, "https://foo.example/bar")
+
+        self.assertRaises(configuration.OptionValueError,
+             config._get_option('TRACKER_WEB').set, "htt://foo.example/bar/")
+
+        self.assertRaises(configuration.OptionValueError,
+             config._get_option('TRACKER_WEB').set, "htt://foo.example/bar")
+