Allow users to customize the sanity-checking regexes

third_party/buildbot_8_4p1/buildbot/status/web/builder.py

 # This file is part of Buildbot.  Buildbot is free software: you can
 # redistribute it and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation, version 2.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
 
 
 from twisted.web import html
 from twisted.web.util import Redirect
-import re, urllib, time
+import urllib, time
 from twisted.python import log
 from twisted.internet import defer
 from buildbot import interfaces
 from buildbot.status.web.base import HtmlResource, BuildLineMixin, \
     path_to_build, path_to_slave, path_to_builder, path_to_change, \
     path_to_root, getAndCheckProperties, ICurrentBox, build_get_class, \
     map_branches, path_to_authfail, ActionResource
 
 from buildbot.status.web.build import BuildsResource, StatusResourceBuild
 from buildbot import util
@@ skipping 123 matching lines @@
         # check if this is allowed
         if not auth_ok:
             if not self.getAuthz(req).actionAllowed('forceBuild', req, self.builder_status):
                 log.msg("..but not authorized")
                 return Redirect(path_to_authfail(req))
         # ensure that they've filled out the username field at least.
         if name == "<unknown>":
             log.msg("..but didn't include a username to blame")
             return Redirect(path_to_authfail(req))
 
+        master = self.getBuildmaster(req)
+
         # keep weird stuff out of the branch revision, and property strings.
-        # TODO: centralize this somewhere.
-        if not re.match(r'^[\w.+/~-]*$', branch):
+        branch_validate = master.config.validation['branch']
+        revision_validate = master.config.validation['revision']
+        if not branch_validate.match(branch):
             log.msg("bad branch '%s'" % branch)
             return Redirect(path_to_builder(req, self.builder_status))
-        if not re.match(r'^[ \w\.\-\/]*$', revision):
+        if not revision_validate.match(revision):
             log.msg("bad revision '%s'" % revision)
             return Redirect(path_to_builder(req, self.builder_status))
         properties = getAndCheckProperties(req)
         if properties is None:
             return Redirect(path_to_builder(req, self.builder_status))
         if not branch:
             branch = None
         if not revision:
             revision = None
 
-        master = self.getBuildmaster(req)
         d = master.db.sourcestamps.addSourceStamp(branch=branch,
                 revision=revision, project=project, repository=repository)
         def make_buildset(ssid):
             r = ("The web-page 'force build' button was pressed by '%s': %s\n"
                  % (html.escape(name), html.escape(reason)))
             return master.addBuildset(
                     builderNames=[self.builder_status.getName()],
                     ssid=ssid, reason=r, properties=properties.asDict())
         d.addCallback(make_buildset)
         d.addErrback(log.err, "(ignored) while trying to force build")
@@ skipping 336 matching lines @@
         if path in s.getBuilderNames():
             builder_status = s.getBuilder(path)
             return StatusResourceBuilder(builder_status)
         if path == "_all":
             return StatusResourceAllBuilders(self.getStatus(req))
         if path == "_selected":
             return StatusResourceSelectedBuilders(self.getStatus(req))
 
         return HtmlResource.getChild(self, path, req)