Merge pull request #33 from ikedam/feature/JENKINS-22038_AbsoluteInPe…

…rmissionProperty [JENKINS-22038] Support absolute paths in permission property
jenkinsci · Mar 22, 2014 · 4371497 · 4371497
2 parents 9084620 + 08f5560
commit 4371497
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/copyartifact/CopyArtifactPermissionProperty.java b/src/main/java/hudson/plugins/copyartifact/CopyArtifactPermissionProperty.java
@@ -96,8 +96,10 @@ public CopyArtifactPermissionProperty(String projectNames) {
      */
     public boolean canCopiedBy(AbstractProject<?,?> copier) {
         String copierName = copier.getRelativeNameFrom(owner.getParent());
+        String absoluteName = String.format("/%s", copier.getFullName()); 
+            // Note: getFullName() returns not an absolute path, but a relative path from root...
         for (String projectName: getProjectNameList()) {
-            if (isNameMatch(copierName, projectName)) {
+            if (isNameMatch(copierName, projectName) || isNameMatch(absoluteName, projectName)) {
                 return true;
             }
         }

diff --git a/src/test/java/hudson/plugins/copyartifact/CopyArtifactPermissionPropertyTest.java b/src/test/java/hudson/plugins/copyartifact/CopyArtifactPermissionPropertyTest.java
@@ -152,6 +152,12 @@ public void testCanCopyArtifact() throws Exception {
             copiee.addProperty(new CopyArtifactPermissionProperty("sameCopier"));
 
             assertTrue(CopyArtifactPermissionProperty.canCopyArtifact(copier, copiee));
+
+            // absolute
+            copiee.removeProperty(CopyArtifactPermissionProperty.class);
+            copiee.addProperty(new CopyArtifactPermissionProperty("/folder/sameCopier"));
+
+            assertTrue(CopyArtifactPermissionProperty.canCopyArtifact(copier, copiee));
         }
 
         // parent folder
@@ -161,15 +167,27 @@ public void testCanCopyArtifact() throws Exception {
             copiee.addProperty(new CopyArtifactPermissionProperty("../parentCopier"));
 
             assertTrue(CopyArtifactPermissionProperty.canCopyArtifact(copier, copiee));
+
+            // absolute
+            copiee.removeProperty(CopyArtifactPermissionProperty.class);
+            copiee.addProperty(new CopyArtifactPermissionProperty("/parentCopier"));
+
+            assertTrue(CopyArtifactPermissionProperty.canCopyArtifact(copier, copiee));
         }
 
-        // same folder
+        // child folder
         {
             FreeStyleProject copiee = j.jenkins.createProject(FreeStyleProject.class, "childCopiee");
             FreeStyleProject copier = folder.createProject(FreeStyleProject.class, "childCopier");
             copiee.addProperty(new CopyArtifactPermissionProperty(String.format("%s/childCopier", folder.getName())));
 
             assertTrue(CopyArtifactPermissionProperty.canCopyArtifact(copier, copiee));
+
+            // absolute
+            copiee.removeProperty(CopyArtifactPermissionProperty.class);
+            copiee.addProperty(new CopyArtifactPermissionProperty("/folder/childCopier"));
+
+            assertTrue(CopyArtifactPermissionProperty.canCopyArtifact(copier, copiee));
         }
     }