Merge remote-tracking branch 'origin/master' into task/JENKINS-41397

blueocean-git-pipeline/src/main/java/io/jenkins/blueocean/blueocean_git_pipeline/GitPipelineCreateRequest.java

@@ -1,6 +1,7 @@
 package io.jenkins.blueocean.blueocean_git_pipeline;
 
 import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
+import com.cloudbees.plugins.credentials.domains.Domain;
 import hudson.model.Cause;
 import hudson.model.Failure;
 import hudson.model.TopLevelItem;
@@ -55,13 +56,34 @@ public BluePipeline create(Reachable parent) throws IOException {
 
         String sourceUri = scmConfig.getUri();
 
+        if (sourceUri == null) {
+            throw new ServiceException.BadRequestExpception(new ErrorMessage(400, "Failed to create Git pipeline:"+getName())
+                    .add(new ErrorMessage.Error("scmConfig.uri", ErrorMessage.Error.ErrorCodes.MISSING.toString(), "uri is required")));
+        }
+
         TopLevelItem item = create(Jenkins.getInstance(), getName(), MODE, MultiBranchProjectDescriptor.class);
 
         if (item instanceof WorkflowMultiBranchProject) {
             WorkflowMultiBranchProject project = (WorkflowMultiBranchProject) item;
 
-            //XXX: set credentialId to empty string if null or we get NPE later on
-            String credentialId = scmConfig.getCredentialId() == null ? "" : scmConfig.getCredentialId();
+            if(StringUtils.isNotBlank(scmConfig.getCredentialId())) {
+                Domain domain = CredentialsUtils.findDomain(scmConfig.getCredentialId(), authenticatedUser);
+                if(domain == null){
+                    throw new ServiceException.BadRequestExpception(
+                            new ErrorMessage(400, "Failed to create pipeline")
+                                    .add(new ErrorMessage.Error("scm.credentialId",
+                                            ErrorMessage.Error.ErrorCodes.INVALID.toString(),
+                                            "No domain in user credentials found for credentialId: "+ scmConfig.getCredentialId())));
+                }
+                if(domain.test(new BlueOceanDomainRequirement())) { //this is blueocean specific domain
+                    project.addProperty(
+                            new BlueOceanCredentialsProvider.FolderPropertyImpl(authenticatedUser.getId(),
+                                    scmConfig.getCredentialId(),
+                                    BlueOceanCredentialsProvider.createDomain(sourceUri)));
+                }
+            }
+
+            String credentialId = StringUtils.defaultString(scmConfig.getCredentialId());
 
             project.getSourcesList().add(new BranchSource(new GitSCMSource(null, sourceUri, credentialId, "*", "", false)));
             project.scheduleBuild(new Cause.UserIdCause());

blueocean-git-pipeline/src/test/java/io/jenkins/blueocean/blueocean_git_pipeline/GitScmTest.java

@@ -5,8 +5,10 @@
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.domains.Domain;
 import com.google.common.collect.ImmutableMap;
+import com.mashape.unirest.http.exceptions.UnirestException;
 import hudson.ExtensionList;
 import hudson.model.Item;
+import hudson.model.User;
 import io.jenkins.blueocean.rest.impl.pipeline.PipelineBaseTest;
 import io.jenkins.blueocean.rest.model.scm.GitSampleRepoRule;
 import jenkins.branch.MultiBranchProject;
@@ -114,9 +116,8 @@ public void shouldGetBadRequestForBadGitUriOnCreate() throws IOException {
 
 
     @Test
-    public void shouldGetForbiddenForBadCredentialIdOnUpdate1() throws IOException {
-
-        String mbp = createMbp();
+    public void shouldGetForbiddenForBadCredentialIdOnUpdate1() throws IOException, UnirestException {
+        String mbp = createMbp(login());
 
 
         SystemCredentialsProvider.ProviderImpl system = ExtensionList.lookup(CredentialsProvider.class).get(SystemCredentialsProvider.ProviderImpl.class);
@@ -151,9 +152,8 @@ public void shouldGetForbiddenForBadCredentialIdOnUpdate1() throws IOException {
 
 
     @Test
-    public void shouldGetForbiddenForBadCredentialIdOnUpdate2() throws IOException {
-
-        String mbp = createMbp();
+    public void shouldGetForbiddenForBadCredentialIdOnUpdate2() throws IOException, UnirestException {
+        String mbp = createMbp(login());
         SystemCredentialsProvider.ProviderImpl system = ExtensionList.lookup(CredentialsProvider.class).get(SystemCredentialsProvider.ProviderImpl.class);
         CredentialsStore systemStore = system.getStore(j.getInstance());
         systemStore.addDomain(new Domain("domain1", null, null));
@@ -183,27 +183,34 @@ public void shouldGetForbiddenForBadCredentialIdOnUpdate2() throws IOException {
     }
 
     @Test
-    public void shouldGetBadRequestForBadGitUriOnUpdate() throws IOException {
+    public void shouldGetBadRequestForBadGitUriOnUpdate() throws IOException, UnirestException {
+        User user = login();
+        String mbp = createMbp(user);
 
-        String mbp = createMbp();
-        put("/organizations/jenkins/pipelines/"+mbp+"/",
-                ImmutableMap.of("name", mbp,
+        new RequestBuilder(baseUrl)
+                .status(400)
+                .jwtToken(getJwtToken(j.jenkins,user.getId(), user.getId()))
+                .put("/organizations/jenkins/pipelines/" + mbp + "/")
+                .data(ImmutableMap.of("name", mbp,
                         "$class", "io.jenkins.blueocean.blueocean_git_pipeline.GitPipelineUpdateRequest",
                         "scmConfig", ImmutableMap.of("uri", "/sdsd/sdsd/sdsd")
-                ), 400);
-
+                ))
+                .build(Map.class);
     }
 
 
     @Test
-    public void shouldCreateGitMbp(){
-
-        Map<String,Object> resp = post("/organizations/jenkins/pipelines/",
-            ImmutableMap.of("name", "demo",
-                    "$class", "io.jenkins.blueocean.blueocean_git_pipeline.GitPipelineCreateRequest",
-                    "scmConfig", ImmutableMap.of("uri", sampleRepo.fileUrl())
-                ), 201);
-
+    public void shouldCreateGitMbp() throws IOException, UnirestException {
+        login();
+        Map resp = new RequestBuilder(baseUrl)
+                .status(201)
+                .jwtToken(getJwtToken(j.jenkins,"bob", "bob"))
+                .post("/organizations/jenkins/pipelines/")
+                .data(ImmutableMap.of("name", "demo",
+                        "$class", "io.jenkins.blueocean.blueocean_git_pipeline.GitPipelineCreateRequest",
+                        "scmConfig", ImmutableMap.of("uri", sampleRepo.fileUrl())
+                ))
+                .build(Map.class);
 
         assertEquals("demo", resp.get("name"));
     }
@@ -242,9 +249,13 @@ public void shouldFailOnValidation2(){
     }
 
     @Test
-    public void shouldFailOnValidation3(){
-        Map<String,Object> resp = post("/organizations/jenkins/pipelines/",
-                ImmutableMap.of("name", "demo",
+    public void shouldFailOnValidation3() throws IOException, UnirestException {
+        login();
+        Map resp = new RequestBuilder(baseUrl)
+                .status(400)
+                .jwtToken(getJwtToken(j.jenkins,"bob", "bob"))
+                .post("/organizations/jenkins/pipelines/")
+                .data(ImmutableMap.of("name", "demo",
                         "$class", "io.jenkins.blueocean.blueocean_git_pipeline.GitPipelineCreateRequest",
                         "scmConfig", ImmutableMap.of()))
                 .build(Map.class);
@@ -261,7 +272,8 @@ public void shouldFailOnValidation3(){
 
 
     @Test
-    public void shouldFailOnValidation4(){
+    public void shouldFailOnValidation4() throws IOException, UnirestException {
+        login();
 
         Map resp = new RequestBuilder(baseUrl)
                 .status(201)
@@ -282,8 +294,8 @@ public void shouldFailOnValidation4(){
                 .post("/organizations/jenkins/pipelines/")
                 .data(ImmutableMap.of("name", "demo",
                         "$class", "io.jenkins.blueocean.blueocean_git_pipeline.GitPipelineCreateRequest",
-                        "scmConfig", ImmutableMap.of("uri", sampleRepo.fileUrl(), "credentialId", "sdsdsd")
-                ), 400);
+                        "scmConfig", ImmutableMap.of("uri", sampleRepo.fileUrl(),
+                                "credentialId", "sdsdsd"))).build(Map.class);
         List<Map<String,String>> errors = (List<Map<String,String>>) resp.get("errors");
 
         boolean nameFound = false;
@@ -316,13 +328,14 @@ public void shouldFailOnValidation5(){
         assertNull(Jenkins.getInstance().getItem("demo"));
     }
 
-    private String createMbp(){
-        Map<String,Object> resp = post("/organizations/jenkins/pipelines/",
-                ImmutableMap.of("name", "demo",
+    private String createMbp(User user) throws UnirestException {
+        Map<String,Object> resp = new RequestBuilder(baseUrl)
+                .status(201)
+                .jwtToken(getJwtToken(j.jenkins,user.getId(), user.getId()))
+                .post("/organizations/jenkins/pipelines/")
+                .data(ImmutableMap.of("name", "demo",
                         "$class", "io.jenkins.blueocean.blueocean_git_pipeline.GitPipelineCreateRequest",
-                        "scmConfig", ImmutableMap.of("uri", sampleRepo.fileUrl())
-                ), 201);
-
+                        "scmConfig", ImmutableMap.of("uri", sampleRepo.fileUrl()))).build(Map.class);
 
         assertEquals("demo", resp.get("name"));
         Item item = Jenkins.getInstance().getItem("demo");

blueocean-github-pipeline/src/main/java/io/jenkins/blueocean/blueocean_github_pipeline/GithubPipelineCreateRequest.java

@@ -136,11 +136,14 @@ static void validateCredentialId(String credentialId, AbstractFolder item) throw
                 try {
                     item.delete();
                 } catch (InterruptedException e) {
-                    throw new ServiceException.UnexpectedErrorException("No Credentials instance found for credentialId: " + credentialId + ". Failure during cleaing up folder: " + item.getName() + ". Error: " + e.getMessage(), e);
+                    throw new ServiceException.UnexpectedErrorException("Invalid credentialId: " +
+                            credentialId + ". Failure during cleaning up folder: " + item.getName() + ". Error: " +
+                            e.getMessage(), e);
                 }
                 throw new ServiceException.BadRequestExpception(new ErrorMessage(400, "Failed to create Git pipeline")
-                        .add(new ErrorMessage.Error("credentialId", ErrorMessage.Error.ErrorCodes.NOT_FOUND.toString(), "No Credentials instance found for credentialId: "+credentialId)));
-
+                        .add(new ErrorMessage.Error("credentialId",
+                                ErrorMessage.Error.ErrorCodes.NOT_FOUND.toString(),
+                                "No Credentials instance found for credentialId: "+credentialId)));
             }
         }
     }