Metalnx fixes 1

emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/entity/enums/DataGridPermType.java

@@ -9,8 +9,19 @@
  * */
 
 public enum DataGridPermType {
-
-    OWN("OWN"), WRITE("WRITE"), READ("READ"), IRODS_ADMIN("ADMIN"), NONE("NONE");
+
+	NONE("NONE"),
+	READ_METADATA("READ_METADATA"),
+	READ_OBJECT("READ_OBJECT"),
+	READ("READ"),
+	CREATE_METADATA("CREATE_METADATA"),
+	MODIFY_METADATA("MODIFY_METADATA"),
+	DELETE_METADATA("DELETE_METADATA"),
+	CREATE_OBJECT("CREATE_OBJECT"),
+	MODIFY_OBJECT("MODIFY_OBJECT"),
+	WRITE("WRITE"),
+	DELETE_OBJECT("DELETE_OBJECT"),
+	OWN("OWN");
 
     private String stringType;
 

emc-metalnx-services/src/main/java/com/emc/metalnx/services/configuration/ConfigServiceImpl.java

@@ -86,6 +86,9 @@ public class ConfigServiceImpl implements ConfigService {
 
 	@Value("${pluggableshoppingcart.enabled}")
 	private boolean pluggableShoppingCartEnabled = false;
+
+	@Value("${sidebar.show.public:false}")
+	private boolean publicSidebarLinkEnabled;
 
 	/**
 	 * Indicates whether the old file props and AVU search is visible in the menu
@@ -134,6 +137,7 @@ public GlobalConfig getGlobalConfig() {
 		globalConfig.setPluggableSearchEnabled(pluggableSearchEnabled);
 		globalConfig.setPluggableShoppingCartEnabled(pluggableShoppingCartEnabled);
 		globalConfig.setClassicSearchEnabled(classicSearchEnabled);
+		globalConfig.setPublicSidebarLinkEnabled(publicSidebarLinkEnabled);
 		logger.debug("globalConfig:{}", globalConfig);
 		return globalConfig;
 	}
@@ -462,4 +466,15 @@ public void setPopulateMsiEnabled(boolean populateMsiEnabled) {
 	public void setDownloadLimit(long downloadLimit) {
 		this.downloadLimit = downloadLimit;
 	}
+
+	@Override
+	public boolean isPublicSidebarLinkEnabled() {
+		return publicSidebarLinkEnabled;
+	}
+
+	@Override
+	public void setPublicSidebarLinkEnabled(boolean publicSidebarLinkEnabled) {
+		this.publicSidebarLinkEnabled = publicSidebarLinkEnabled;
+	}
+
 }

emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/CollectionServiceImpl.java

@@ -600,13 +600,13 @@ public boolean modifyCollectionAndDataObject(String previousPath, String newPath
 	@Override
 	public Set<String> listReadPermissionsForPathAndUser(String path, String userName)
 			throws DataGridConnectionRefusedException {
-		return listCollectionsWithPermissionsForUser(path, userName, FilePermissionEnum.READ);
+		return listCollectionsWithPermissionsForUser(path, userName, FilePermissionEnum.READ_OBJECT);
 	}
 
 	@Override
 	public Set<String> listWritePermissionsForPathAndUser(String path, String userName)
 			throws DataGridConnectionRefusedException {
-		return listCollectionsWithPermissionsForUser(path, userName, FilePermissionEnum.WRITE);
+		return listCollectionsWithPermissionsForUser(path, userName, FilePermissionEnum.MODIFY_OBJECT);
 	}
 
 	@Override
@@ -618,13 +618,13 @@ public Set<String> listOwnershipForPathAndUser(String path, String userName)
 	@Override
 	public Set<String> listReadPermissionsForPathAndGroup(String path, String groupName)
 			throws DataGridConnectionRefusedException {
-		return listCollectionsWithPermissionsForGroup(path, groupName, FilePermissionEnum.READ);
+		return listCollectionsWithPermissionsForGroup(path, groupName, FilePermissionEnum.READ_OBJECT);
 	}
 
 	@Override
 	public Set<String> listWritePermissionsForPathAndGroup(String path, String groupName)
 			throws DataGridConnectionRefusedException {
-		return listCollectionsWithPermissionsForGroup(path, groupName, FilePermissionEnum.WRITE);
+		return listCollectionsWithPermissionsForGroup(path, groupName, FilePermissionEnum.MODIFY_OBJECT);
 	}
 
 	@Override

emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/PermissionsServiceImpl.java

@@ -71,10 +71,24 @@ public DataGridPermType findMostRestrictivePermission(String... paths) throws Da
 
 		if (permissions.contains("none")) {
 			mostRestrictivePermission = DataGridPermType.NONE;
+		} else if (permissions.contains("read_metadata")) {
+			mostRestrictivePermission = DataGridPermType.READ_METADATA;
 		} else if (permissions.contains("read")) {
 			mostRestrictivePermission = DataGridPermType.READ;
-		} else if (permissions.contains("write")) {
-			mostRestrictivePermission = DataGridPermType.WRITE;
+		} else if (permissions.contains("read_object")) {
+			mostRestrictivePermission = DataGridPermType.READ_OBJECT;
+		} else if (permissions.contains("create_metadata")) {
+			mostRestrictivePermission = DataGridPermType.CREATE_METADATA;
+		} else if (permissions.contains("modify_metadata")) {
+			mostRestrictivePermission = DataGridPermType.MODIFY_METADATA;
+		} else if (permissions.contains("delete_metadata")) {
+			mostRestrictivePermission = DataGridPermType.DELETE_METADATA;
+		} else if (permissions.contains("create_object")) {
+			mostRestrictivePermission = DataGridPermType.CREATE_OBJECT;
+		} else if (permissions.contains("write") || permissions.contains("modify_object")) {
+			mostRestrictivePermission = DataGridPermType.MODIFY_OBJECT;
+		} else if (permissions.contains("delete_object")) {
+			mostRestrictivePermission = DataGridPermType.DELETE_OBJECT;
 		} else if (permissions.contains("own")) {
 			mostRestrictivePermission = DataGridPermType.OWN;
 		}
@@ -119,7 +133,7 @@ public boolean canLoggedUserModifyPermissionOnPath(String path) throws DataGridC
 				resultingPermission = irodsFileSystemAO.getFilePermissionsForGivenUser(fileObj, userName);
 			}
 
-			return resultingPermission > FilePermissionEnum.WRITE.getPermissionNumericValue();
+			return resultingPermission > FilePermissionEnum.DELETE_OBJECT.getPermissionNumericValue();
 
 		} catch (final Exception e) {
 			logger.error("Could not get permissions for current user: {}", e.getMessage());
@@ -229,18 +243,10 @@ private boolean chmodCollection(DataGridPermType permType, String path, boolean
 			if (!inAdminMode) {
 				FilePermissionEnum filePermission = FilePermissionEnum.valueOf(permType.toString());
 				collectionAO.setAccessPermission(currentZone, path, uName, recursive, filePermission);
-			} else if (permType.equals(DataGridPermType.READ))
-				collectionAO.setAccessPermissionReadAsAdmin(currentZone, path, uName, recursive);
-
-			else if (permType.equals(DataGridPermType.WRITE))
-				collectionAO.setAccessPermissionWriteAsAdmin(currentZone, path, uName, recursive);
-
-			else if (permType.equals(DataGridPermType.OWN))
-				collectionAO.setAccessPermissionOwnAsAdmin(currentZone, path, uName, recursive);
-
-			else
-				collectionAO.removeAccessPermissionForUserAsAdmin(currentZone, path, uName, recursive);
-
+			} else {
+				FilePermissionEnum filePermission = FilePermissionEnum.valueOf(permType.toString());
+				collectionAO.setAccessPermissionAsAdmin(currentZone, path, uName, recursive, filePermission);
+			}
 			isPermissionSet = true;
 		} catch (JargonException e) {
 			logger.error("Could not set {} permission on path {} for user/group {}", permType, path, uName, e);
@@ -262,17 +268,10 @@ private boolean chmodDataObject(DataGridPermType permType, String path, String u
 			if (!inAdminMode) {
 				FilePermissionEnum filePermission = FilePermissionEnum.valueOf(permType.toString());
 				dataObjectAO.setAccessPermission(currentZone, path, uName, filePermission);
-			} else if (permType.equals(DataGridPermType.READ))
-				dataObjectAO.setAccessPermissionReadInAdminMode(currentZone, path, uName);
-
-			else if (permType.equals(DataGridPermType.WRITE))
-				dataObjectAO.setAccessPermissionWriteInAdminMode(currentZone, path, uName);
-
-			else if (permType.equals(DataGridPermType.OWN))
-				dataObjectAO.setAccessPermissionOwnInAdminMode(currentZone, path, uName);
-
-			else
-				dataObjectAO.removeAccessPermissionsForUserInAdminMode(currentZone, path, uName);
+			} else {
+				FilePermissionEnum filePermission = FilePermissionEnum.valueOf(permType.toString());
+				dataObjectAO.setAccessPermissionAsAdmin(currentZone, path, uName, filePermission);
+			}
 
 			isPermissionSet = true;
 		} catch (JargonException e) {
@@ -456,7 +455,16 @@ private DataGridFilePermission mapToDataGridFilePermission(UserFilePermission uf
 		DataGridFilePermission dgfp = new DataGridFilePermission();
 		dgfp.setUserId(ufp.getUserId());
 		dgfp.setUsername(ufp.getUserName());
-		dgfp.setPermission(ufp.getFilePermissionEnum().toString());
+
+		// Translate WRITE and READ to the new strings MODIFY_OBJECT and READ_OBJECT
+		if ("WRITE".equals(ufp.getFilePermissionEnum().toString())) {
+			dgfp.setPermission("MODIFY_OBJECT");
+		} else if ("READ".equals(ufp.getFilePermissionEnum().toString())) {
+			dgfp.setPermission("READ_OBJECT");
+		} else {
+			dgfp.setPermission(ufp.getFilePermissionEnum().toString());
+		}
+
 		dgfp.setUserType(ufp.getUserType().getTextValue());
 		dgfp.setUserZone(ufp.getUserZone());
 		return dgfp;

emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/UploadServiceImpl.java

@@ -64,8 +64,7 @@ public boolean upload(MultipartFile file, String targetPath, boolean computeChec
 
 		logger.info("upload()");
 
-		if (file == null || file.isEmpty() || "".equals(targetPath) || targetPath == null || "".equals(destResc)
-				|| destResc == null) {
+		if (file == null || file.isEmpty() || targetPath == null || "".equals(targetPath)) {
 			logger.error("File could not be sent to the data grid.");
 			return false;
 		}
@@ -75,7 +74,7 @@ public boolean upload(MultipartFile file, String targetPath, boolean computeChec
 		logger.info("computeCheckSum:{}", computeCheckSum);
 		logger.info("replicateFile:{}", replicateFile);
 		logger.info("replicationResc:{}", replicationResc);
-		logger.info("destResc:{}", destResc);
+		logger.info("destResc:{}", destResc == null ? "null" : destResc);
 		logger.info("overwrite:{}", overwrite);
 
 		InputStream inputStream;
@@ -90,7 +89,9 @@ public boolean upload(MultipartFile file, String targetPath, boolean computeChec
 		logger.info("Setting default resource to {}", destResc);
 
 		// Setting temporarily the defaultStorageResource for the logged user
-		is.setDefaultStorageResource(destResc);
+		if (destResc != null && !("".equals(destResc))) {
+			is.setDefaultStorageResource(destResc);
+		}
 
 		boolean isFileUploaded;
 

emc-metalnx-services/src/main/java/com/emc/metalnx/services/irods/UserServiceImpl.java

@@ -440,9 +440,9 @@ public boolean updateOwnership(DataGridUser user, Map<String, Boolean> addCollec
 	public List<String> listUserTypes() {
 		List<String> userTypes = new ArrayList<String>();
 
+		userTypes.add(UserTypeEnum.RODS_USER.getTextValue());
 		userTypes.add(UserTypeEnum.RODS_ADMIN.getTextValue());
 		userTypes.add(UserTypeEnum.GROUP_ADMIN.getTextValue());
-		userTypes.add(UserTypeEnum.RODS_USER.getTextValue());
 
 		return userTypes;
 	}

emc-metalnx-services/src/test/java/com/emc/metalnx/services/tests/permissions/TestReadPermissionOnFiles.java

@@ -76,12 +76,12 @@ public void tearDown() throws DataGridException {
 
     @Test
     public void testSetReadPermissionOnFiles() throws DataGridConnectionRefusedException {
-        assertPermissionFiles(DataGridPermType.READ, false, false);
+        assertPermissionFiles(DataGridPermType.READ_OBJECT, false, false);
     }
 
     @Test
     public void testSetWritePermissionOnFiles() throws DataGridConnectionRefusedException {
-        assertPermissionFiles(DataGridPermType.WRITE, false, false);
+        assertPermissionFiles(DataGridPermType.MODIFY_OBJECT, false, false);
     }
 
     @Test

irodsext-data-profiler/src/main/java/com/emc/metalnx/services/configuration/GlobalConfig.java

@@ -54,6 +54,8 @@ public class GlobalConfig {
 	 */
 	private boolean handleNoAccessViaProxy = false;
 
+	private boolean publicSidebarLinkEnabled;
+
 	public boolean isTicketsEnabled() {
 		return ticketsEnabled;
 	}
@@ -134,4 +136,14 @@ public void setClassicSearchEnabled(boolean classicSearchEnabled) {
 		this.classicSearchEnabled = classicSearchEnabled;
 	}
 
+	public void setPublicSidebarLinkEnabled(boolean publicSidebarLinkEnabled) {
+		this.publicSidebarLinkEnabled = publicSidebarLinkEnabled;
+
+	}
+
+	public boolean isPublicSidebarLinkEnabled() {
+		return publicSidebarLinkEnabled;
+	}
+
+
 }

irodsext-data-profiler/src/main/java/com/emc/metalnx/services/interfaces/ConfigService.java

@@ -141,6 +141,14 @@ public interface ConfigService {
 	 *         {@link AuthScheme}
 	 */
 	String getDefaultIrodsAuthScheme();
+
+	/**
+	 * Global setting turning on or off the public sidebar link
+	 *
+	 * @return <code>boolean</code> that is <code>true</code> when the public sidebar
+	 *         link is enabled
+	 */
+	boolean isPublicSidebarLinkEnabled();
 
 
 	/**
@@ -166,4 +174,5 @@ public interface ConfigService {
 	void setIrods41MSIsExpected(String irods41msIsExpected);
 	void setMlxMSIsExpected(String mlxMSIsExpected);
 	void setMsiAPIVersionSupported(String msiAPIVersionSupported);
+	void setPublicSidebarLinkEnabled(boolean publicSidebarLinkEnabled);
 }

pom.xml

@@ -11,9 +11,9 @@
 	<properties>
 		<javassist.version>3.12.1.GA</javassist.version>
 		<!-- Spring -->
-		<spring.version>4.3.18.RELEASE</spring.version>
-		<spring.security.version>3.2.10.RELEASE</spring.security.version>
-		<spring.batch.version>3.0.8.RELEASE</spring.batch.version>
+		<spring.version>5.3.39</spring.version>
+		<spring.security.version>5.8.16</spring.security.version>
+		<spring.batch.version>4.3.10</spring.batch.version>
 		<postgresql.version>8.4-702.jdbc4</postgresql.version>
 		<!-- Javax el version -->
 		<el.version>2.2</el.version>
@@ -91,42 +91,42 @@
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-aop</artifactId>
-				<version>${spring.core.version}</version>
+				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-test</artifactId>
-				<version>${spring.core.version}</version>
+				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-beans</artifactId>
-				<version>${spring.core.version}</version>
+				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-context</artifactId>
-				<version>${spring.core.version}</version>
+				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-jdbc</artifactId>
-				<version>${spring.core.version}</version>
+				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-orm</artifactId>
-				<version>${spring.core.version}</version>
+				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-core</artifactId>
-				<version>${spring.core.version}</version>
+				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-tx</artifactId>
-				<version>${spring.core.version}</version>
+				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
@@ -136,7 +136,7 @@
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-expression</artifactId>
-				<version>${spring.core.version}</version>
+				<version>${spring.version}</version>
 			</dependency>
 			<!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->
 			<dependency>