#15 allow groupadmin to be a role in metalnx

DICE-UNC · Nov 20, 2019 · 50270d4 · 50270d4
1 parent c97aaa4
commit 50270d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/...lnx-services/src/main/java/com/emc/metalnx/services/auth/IRODSAuthenticationProvider.java b/...lnx-services/src/main/java/com/emc/metalnx/services/auth/IRODSAuthenticationProvider.java
@@ -191,6 +191,7 @@ private AuthResponse authenticateAgainstIRODS(String username, String password,
 
 			// If the user is found
 			if (irodsUser.getUserType().equals(UserTypeEnum.RODS_ADMIN)
+					|| irodsUser.getUserType().equals(UserTypeEnum.GROUP_ADMIN)
 					|| irodsUser.getUserType().equals(UserTypeEnum.RODS_USER)) {
 
 				// If the user is not yet persisted in our database
@@ -207,6 +208,9 @@ private AuthResponse authenticateAgainstIRODS(String username, String password,
 					if (irodsUser.getUserType().equals(UserTypeEnum.RODS_ADMIN)) {
 						logger.debug("setting user type admin:{}", irodsUser.getUserType());
 						user.setUserType(UserTypeEnum.RODS_ADMIN.getTextValue());
+					} else if (irodsUser.getUserType().equals(UserTypeEnum.GROUP_ADMIN)) {
+						logger.debug("setting user type groupadmin:{}", irodsUser.getUserType());
+						user.setUserType(UserTypeEnum.GROUP_ADMIN.getTextValue());
 					} else {
 						logger.debug("setting user type rodsuser:{}", irodsUser.getUserType());
 						user.setUserType(UserTypeEnum.RODS_USER.getTextValue());
@@ -293,6 +297,8 @@ public String getAuthority() {
 	 */
 	private class IRODSGroupadminGrantedAuthority implements GrantedAuthority {
 
+		private static final long serialVersionUID = 1L;
+
 		@Override
 		public String getAuthority() {
 			return "ROLE_GROUPADMIN";

diff --git a/emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/UserServiceImpl.java b/emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/UserServiceImpl.java
@@ -165,7 +165,7 @@ public boolean deleteUserByUsername(String username) throws DataGridConnectionRe
 	}
 
 	@Override
-	public boolean modifyUser(DataGridUser modifyUser) throws DataGridConnectionRefusedException {
+	public boolean modifyUser(DataGridUser modifyUser) throws DataGridException {
 
 		UserAO userAO = irodsServices.getUserAO();
 
@@ -249,9 +249,9 @@ public boolean modifyUser(DataGridUser modifyUser) throws DataGridConnectionRefu
 
 			return true;
 		} catch (JargonException e) {
-			e.printStackTrace();
+			logger.error("error modifying user:{}", modifyUser, e);
+			throw new DataGridException("unable to modify user", e);
 		}
-		return false;
 	}
 
 	@Override

diff --git a/irodsext-data-profiler/src/main/java/com/emc/metalnx/services/interfaces/UserService.java b/irodsext-data-profiler/src/main/java/com/emc/metalnx/services/interfaces/UserService.java
@@ -52,11 +52,11 @@ public boolean createUser(DataGridUser user, String password)
 	/**
 	 * Modify user by username
 	 *
-	 * @param username
+	 * @param modifyUser {@link DataGridUser} to be modified
 	 * @return a confirmation that the user has been modified
-	 * @throws DataGridConnectionRefusedException
+	 * @throws DataGridException {@link DataGridException}
 	 */
-	public boolean modifyUser(DataGridUser modifyUser) throws DataGridConnectionRefusedException;
+	public boolean modifyUser(DataGridUser modifyUser) throws DataGridException;
 
 	/**
 	 * Finds users by username