[BACKLOG-23041] Enforces job names strategy to be of pattern [a-z0-9-…

…\.]{3,50}
pentaho · May 4, 2018 · e5fff6f · e5fff6f
1 parent 15839cb
commit e5fff6f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/docker/jenkins/bootstrap/configureGlobalSettings.groovy b/docker/jenkins/bootstrap/configureGlobalSettings.groovy
@@ -18,11 +18,13 @@
      - CSRF Protection
      - Disable CLI remoting
      - Markup Formatter
+     - Project name restrictions
  */
 import hudson.markup.RawHtmlMarkupFormatter
 import hudson.security.csrf.DefaultCrumbIssuer
 import jenkins.CLI
 import jenkins.model.Jenkins
+import jenkins.model.ProjectNamingStrategy
 import jenkins.security.s2m.AdminWhitelistRule
 import org.apache.commons.io.FileUtils
 
@@ -69,7 +71,7 @@ if (!jenkins.isQuietingDown()) {
         /*
             Prevent Cross Site Request Forgery exploits
          */
-        jenkins.setCrumbIssuer(new DefaultCrumbIssuer(true))
+        jenkins.crumbIssuer = new DefaultCrumbIssuer(true)
         logger.info 'Configured CSRF Protection'
 
         /*
@@ -80,6 +82,9 @@ if (!jenkins.isQuietingDown()) {
             logger.info 'Configured Markup Formatter'
         }
 
+        jenkins.projectNamingStrategy =
+            new ProjectNamingStrategy.PatternProjectNamingStrategy('[a-z0-9-\\.]{3,50}',"", true)
+
         jenkins.save()
 
         CLI.get().setEnabled(false)

diff --git a/docker/jenkins/bootstrap/configureSamplePipelineJob.groovy b/docker/jenkins/bootstrap/configureSamplePipelineJob.groovy
@@ -18,7 +18,7 @@ import org.jenkinsci.plugins.workflow.job.WorkflowJob
 
 def jenkins = Jenkins.getInstance()
 // workdir names with spaces causes problems in javascript builds
-def jobName = 'sample_pipeline'
+def jobName = 'sample-pipeline'
 def env = System.getenv()
 
 if (!jenkins.isQuietingDown()) {

diff --git a/docker/jenkins/go.sh b/docker/jenkins/go.sh
@@ -114,8 +114,7 @@ while [[ $# -gt 0 ]]; do
       export force="ok"
       ;;
     * )
-      echo "Unknown option: $opt"
-      exit 1
+      die "Unknown option: $opt"
       ;;
   esac
   shift;