create directory

Jeka1978 · JBaruch · commit e4ad93de8322 · 2014-01-19T15:43:16.000+02:00
security
permission target
diff --git a/api/src/main/java/org/jfrog/artifactory/client/Security.java b/api/src/main/java/org/jfrog/artifactory/client/Security.java
@@ -1,9 +1,12 @@
 package org.jfrog.artifactory.client;
 
+import org.jfrog.artifactory.client.model.Group;
+import org.jfrog.artifactory.client.model.PermissionTarget;
 import org.jfrog.artifactory.client.model.User;
 import org.jfrog.artifactory.client.model.builder.SecurityBuilders;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * Date: 10/18/12
@@ -15,14 +18,28 @@ public interface Security {
 
     final static String SECURITY_API = "/api/security/";
     final static String SECURITY_USERS_API = SECURITY_API + "users";
+    final static String SECURITY_PERMISSIONS = SECURITY_API + "permissions";
+    final static String SECURITY_USER_GROUPS_API = SECURITY_API + "groups";
 
     SecurityBuilders builders();
 
     Collection<String> userNames();
 
     User user(String name);
 
+    Group group(String name);
+
+    List<String> groupNames();
+
+    PermissionTarget permissionTarget(String name);
+
+    List<String> permissionTargets();
+
     void createOrUpdate(User user);
 
+    void createOrUpdateGroup(Group group);
+
     String deleteUser(String name);
+
+    String deleteGroup(String name);
 }
diff --git a/api/src/main/java/org/jfrog/artifactory/client/model/PermissionTarget.java b/api/src/main/java/org/jfrog/artifactory/client/model/PermissionTarget.java
@@ -12,5 +12,6 @@ public interface PermissionTarget {
     String getIncludesPattern();
     String getExcludesPattern();
     List<String> getRepositories();
+
     List<ItemPermission> getItemPermissions();
 }
diff --git a/api/src/main/java/org/jfrog/artifactory/client/model/builder/GroupBuilder.java b/api/src/main/java/org/jfrog/artifactory/client/model/builder/GroupBuilder.java
@@ -0,0 +1,18 @@
+package org.jfrog.artifactory.client.model.builder;
+
+import org.jfrog.artifactory.client.model.Group;
+
+/**
+ * Created by Jeka on 06/12/13.
+ */
+public interface GroupBuilder {
+
+    GroupBuilder name(String name);
+
+    GroupBuilder autoJoin(boolean autoJoin);
+
+    GroupBuilder description(String description);
+
+    Group build();
+
+}
diff --git a/api/src/main/java/org/jfrog/artifactory/client/model/builder/SecurityBuilders.java b/api/src/main/java/org/jfrog/artifactory/client/model/builder/SecurityBuilders.java
@@ -12,6 +12,8 @@
 public interface SecurityBuilders {
     UserBuilder userBuilder();
 
+    GroupBuilder groupBuilder();
+
     UserBuilder builderFrom(User from);
 
     PermissionTargetBuilder permissionTargetBuilder();
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/impl/SecurityImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/impl/SecurityImpl.groovy
@@ -3,9 +3,13 @@ package org.jfrog.artifactory.client.impl
 import com.fasterxml.jackson.core.type.TypeReference
 import groovyx.net.http.ContentType
 import org.jfrog.artifactory.client.Security
+import org.jfrog.artifactory.client.model.Group
+import org.jfrog.artifactory.client.model.PermissionTarget
 import org.jfrog.artifactory.client.model.User
 import org.jfrog.artifactory.client.model.builder.SecurityBuilders
 import org.jfrog.artifactory.client.model.builder.impl.SecurityBuildersImpl
+import org.jfrog.artifactory.client.model.impl.GroupImpl
+import org.jfrog.artifactory.client.model.impl.PermissionTargetImpl
 import org.jfrog.artifactory.client.model.impl.UserImpl
 
 /**
@@ -39,13 +43,48 @@ class SecurityImpl implements Security {
         artifactory.get("${SECURITY_USERS_API}/$name", ContentType.JSON, new TypeReference<UserImpl>() {})
     }
 
+    @Override
+    Group group(String name) {
+        artifactory.get("${SECURITY_USER_GROUPS_API}/$name", ContentType.JSON, new TypeReference<GroupImpl>() {})
+    }
+
+    @Override
+    PermissionTarget permissionTarget(String name) {
+        artifactory.get("${SECURITY_PERMISSIONS}/$name", ContentType.JSON, new TypeReference<PermissionTargetImpl>() {})
+
+    }
+
+    @Override
+    List<String> groupNames() {
+        def groups = artifactory.get("${SECURITY_USER_GROUPS_API}", ContentType.JSON)
+        def groupNames = groups.collect { it.name }
+        groupNames
+    }
+
+    @Override
+    List<String> permissionTargets() {
+        def permissionTargets = artifactory.get("${SECURITY_PERMISSIONS}", ContentType.JSON)
+        def permissionTargetNames = permissionTargets.collect { it.name }
+        return permissionTargetNames
+    }
+
     @Override
     void createOrUpdate(User user) {
         artifactory.put("${SECURITY_USERS_API}/${user.name}", [:], ContentType.ANY, null, ContentType.JSON, user)
     }
 
+    @Override
+    void createOrUpdateGroup(Group group) {
+        artifactory.put("${SECURITY_USER_GROUPS_API}/${group.name}", [:], ContentType.ANY, null, ContentType.JSON, group)
+    }
+
     @Override
     String deleteUser(String name) {
         artifactory.delete("${SECURITY_USERS_API}/$name")
     }
+
+    @Override
+    String deleteGroup(String name) {
+        artifactory.delete("${SECURITY_USER_GROUPS_API}/$name")
+    }
 }
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/builder/impl/GroupBuilderImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/builder/impl/GroupBuilderImpl.groovy
@@ -0,0 +1,37 @@
+package org.jfrog.artifactory.client.model.builder.impl
+
+import org.jfrog.artifactory.client.model.Group
+import org.jfrog.artifactory.client.model.builder.GroupBuilder
+import org.jfrog.artifactory.client.model.impl.GroupImpl
+
+/**
+ * Created by Jeka on 08/12/13.
+ */
+class GroupBuilderImpl implements GroupBuilder {
+    String name
+    String description
+    boolean autoJoin
+
+    @Override
+    GroupBuilder name(String name) {
+        this.name = name
+        this
+    }
+
+    @Override
+    GroupBuilder autoJoin(boolean autoJoin) {
+        this.autoJoin = autoJoin
+        return this
+    }
+
+    @Override
+    GroupBuilder description(String description) {
+        this.description = description
+        return this
+    }
+
+    @Override
+    Group build() {
+        new GroupImpl(name, autoJoin, description)
+    }
+}
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/builder/impl/SecurityBuildersImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/builder/impl/SecurityBuildersImpl.groovy
@@ -2,6 +2,7 @@ package org.jfrog.artifactory.client.model.builder.impl
 
 import org.jfrog.artifactory.client.model.PermissionTarget
 import org.jfrog.artifactory.client.model.User
+import org.jfrog.artifactory.client.model.builder.GroupBuilder
 import org.jfrog.artifactory.client.model.builder.PermissionTargetBuilder
 import org.jfrog.artifactory.client.model.builder.SecurityBuilders
 import org.jfrog.artifactory.client.model.builder.UserBuilder
@@ -23,7 +24,12 @@ class SecurityBuildersImpl implements SecurityBuilders {
 
     @Override
     UserBuilder userBuilder() {
-        return new UserBuilderImpl()
+        new UserBuilderImpl()
+    }
+
+    @Override
+    GroupBuilder groupBuilder() {
+        new GroupBuilderImpl()
     }
 
     @Override
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/GroupImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/GroupImpl.java
@@ -14,7 +14,11 @@ protected GroupImpl(String name) {
         super(name);
     }
 
-    public GroupImpl(String name, boolean autoJoin, String description) {
+    private GroupImpl() {
+        super(null);
+    }
+
+    private GroupImpl(String name, boolean autoJoin, String description) {
         super(name);
         this.autoJoin = autoJoin;
         this.description = description;
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/PermissionTargetImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/PermissionTargetImpl.java
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.impl;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.jfrog.artifactory.client.model.ItemPermission;
 import org.jfrog.artifactory.client.model.PermissionTarget;
 
@@ -9,13 +10,19 @@
  * @author jbaruch
  * @since 26/11/12
  */
+@JsonIgnoreProperties("principals")
 public class PermissionTargetImpl implements PermissionTarget {
 
-    private final String name;
-    private final String includesPattern;
-    private final String excludesPattern;
-    private final List<String> repositories;
-    private final List<ItemPermission> itemPermissions;
+    private String name;
+    private String includesPattern;
+    private String excludesPattern;
+    private List<String> repositories;
+    //    @JsonIgnore this 2 lines of code can be used instead of annotation above the class
+//    private  List<String> principals;
+    private List<ItemPermission> itemPermissions;
+
+    public PermissionTargetImpl() {
+    }
 
     public PermissionTargetImpl(String name, String includesPattern, String excludesPattern, List<String> repositories, List<ItemPermission> itemPermissions) {
         this.name = name;
@@ -45,4 +52,5 @@ public List<String> getRepositories() {
     public List<ItemPermission> getItemPermissions() {
         return itemPermissions;
     }
+
 }
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/UserImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/UserImpl.java
@@ -35,6 +35,11 @@ private UserImpl(String name) {
         super(name);
     }
 
+    private UserImpl() {
+        super(null);
+    }
+
+
     public String getEmail() {
         return email;
     }
diff --git a/services/src/test/java/org/jfrog/artifactory/client/SecurityTests.java b/services/src/test/java/org/jfrog/artifactory/client/SecurityTests.java
@@ -1,19 +1,16 @@
 package org.jfrog.artifactory.client;
 
-import org.jfrog.artifactory.client.model.Group;
-import org.jfrog.artifactory.client.model.ItemPermission;
-import org.jfrog.artifactory.client.model.Privilege;
-import org.jfrog.artifactory.client.model.Subject;
-import org.jfrog.artifactory.client.model.User;
+import org.jfrog.artifactory.client.model.*;
+import org.jfrog.artifactory.client.model.builder.GroupBuilder;
 import org.jfrog.artifactory.client.model.builder.UserBuilder;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.*;
 import static org.jfrog.artifactory.client.model.Privilege.*;
 
 
@@ -24,21 +21,90 @@
 public class SecurityTests extends ArtifactoryTestsBase {
 
     private static final String USER_NAME = "test" + ("" + System.currentTimeMillis()).substring(5);
+    private static final String GROUP_NAME = "test_group" + ("" + System.currentTimeMillis()).substring(5);
 
     @AfterMethod
     public void leaveItClean() {
         try {
             artifactory.security().deleteUser(USER_NAME);
+            artifactory.security().deleteGroup(GROUP_NAME);
         } catch (Exception ignore) {
         }
     }
 
+
     @Test
     public void testListUserNames() throws Exception {
         Collection<String> userNames = artifactory.security().userNames();
         assertTrue(userNames.size() > 2);
     }
 
+    @Test
+    public void testGetUser() {
+        User user = artifactory.security().user("anonymous");
+        assertEquals("anonymous", user.getName());
+    }
+
+    @Test
+    public void testUserNotFound() {
+        try {
+            artifactory.security().user("blablabla");
+        } catch (Exception e) {
+            assertEquals("Not Found", e.getMessage());
+        }
+    }
+
+    @Test
+    public void testGetGroup() {
+        Group group = artifactory.security().group("readers");
+        assertEquals("readers", group.getName());
+    }
+
+    @Test
+    public void testGroupNotFound() {
+        try {
+            artifactory.security().group("blalbabla");
+        } catch (Exception e) {
+            assertEquals("Not Found", e.getMessage());
+        }
+    }
+
+    @Test
+    public void testGroups() {
+        List<String> groupNames = artifactory.security().groupNames();
+        for (String groupName : groupNames) {
+            Group group = artifactory.security().group(groupName);
+            assertNotNull(group);
+        }
+    }
+
+    @Test
+    public void testPermissionTarget() {
+        PermissionTarget permissionTarget = artifactory.security().permissionTarget("Anything");
+        assertEquals("Anything", permissionTarget.getName());
+    }
+
+    @Test
+    public void testGetPermissionTargets() {
+        List<String> permissionTargetNames = artifactory.security().permissionTargets();
+        for (String name : permissionTargetNames) {
+            PermissionTarget permissionTarget = artifactory.security().permissionTarget(name);
+            assertNotNull(permissionTarget);
+        }
+    }
+
+
+    @Test
+    public void testCreateGroup() {
+        GroupBuilder groupBuilder = artifactory.security().builders().groupBuilder();
+        Group group = groupBuilder.name(GROUP_NAME).autoJoin(true).
+                description("new test group").
+                build();
+        artifactory.security().createOrUpdateGroup(group);
+        Group group1 = artifactory.security().group(GROUP_NAME);
+        assertEquals(group.getDescription(), group1.getDescription());
+    }
+
     @Test
     public void testCreateUser() throws Exception {
         UserBuilder userBuilder = artifactory.security().builders().userBuilder();
@@ -77,14 +143,14 @@ private void assertItemPermissions(Set<ItemPermission> itemPermissions) {
     }
 
     @Test(groups = "security", dependsOnGroups = "repositoryBasics")
-    public void testEffectiveRepoPermissions(){
+    public void testEffectiveRepoPermissions() {
         Set<ItemPermission> itemPermissions = artifactory.repository(NEW_LOCAL).effectivePermissions();
         assertItemPermissions(itemPermissions);
     }
 
 
     private void assertPermissions(ItemPermission itemPermission, boolean isGroup, Privilege[] allowedPrivileges,
-            Privilege[] notAllowedPrivileges) {
+                                   Privilege[] notAllowedPrivileges) {
         Subject subject = itemPermission.getSubject();
         assertTrue(itemPermission.isAllowedTo(allowedPrivileges));
         assertFalse(!"admin".equals(subject.getName()) && itemPermission.isAllowedTo(notAllowedPrivileges));

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ public interface PermissionTarget {`
`12`	`12`	`String getIncludesPattern();`
`13`	`13`	`String getExcludesPattern();`
`14`	`14`	`List<String> getRepositories();`
	`15`	`+`
`15`	`16`	`List<ItemPermission> getItemPermissions();`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ private UserImpl(String name) {`
`35`	`35`	`super(name);`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ private UserImpl() {`
	`39`	`+ super(null);`
	`40`	`+ }`
	`41`	`+`
	`42`	`+`
`38`	`43`	`public String getEmail() {`
`39`	`44`	`return email;`
`40`	`45`	`}`