Merge remote-tracking branch 'origin/buxfix/searchCaseSensitive' into feature-merge

2 files changed, 38 insertions, 8 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
index ca4c3e3c..99e90099 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
@@ -87,7 +87,21 @@ public class DbImage {
 	public static ImageDetailsRead getImageDetails(UserInfo user, String imageBaseId)
 			throws TNotFoundException, SQLException {
 		try (MysqlConnection connection = Database.getConnection()) {
-			MysqlStatement stmt = connection.prepareStatement("SELECT i.imagebaseid, i.latestversionid,"
+
+			// if Student is trying to download only needed information is filled
+			MysqlStatement stmt = null;
+			if (user.role.equals("STUDENT")) 
+			{
+				stmt = connection.prepareStatement("SELECT i.imagebaseid, i.latestversionid,"
+					+ " null, null, null, null, null, null, null, null,"
+					+ " null, null,"
+					+ " null, null, null, null,"
+					+ " null, null, null, null"
+					+ " FROM imagebase i"
+					+ " LEFT JOIN imagepermission perm ON (i.imagebaseid = perm.imagebaseid AND perm.userid = :userid)"
+					+ " WHERE i.imagebaseid = :imagebaseid");
+			} else {
+				stmt = connection.prepareStatement("SELECT i.imagebaseid, i.latestversionid,"
 					+ " i.displayname, i.description, i.osid, i.virtid, i.createtime, i.updatetime, i.ownerid, i.updaterid,"
 					+ " i.sharemode, i.istemplate,"
 					+ " i.canlinkdefault, i.candownloaddefault, i.caneditdefault, i.canadmindefault,"
@@ -95,6 +109,13 @@ public class DbImage {
 					+ " FROM imagebase i"
 					+ " LEFT JOIN imagepermission perm ON (i.imagebaseid = perm.imagebaseid AND perm.userid = :userid)"
 					+ " WHERE i.imagebaseid = :imagebaseid");
+			}
+
+			
+
+			// if Student is trying to download only needed information is filled
+			
+
 			stmt.setString("userid", user == null ? "-" : user.userId);
 			stmt.setString("imagebaseid", imageBaseId);
 			ResultSet rs = stmt.executeQuery();
@@ -102,7 +123,7 @@ public class DbImage {
 				throw new TNotFoundException();
 			// Exists:
 			List<String> tags = DbSoftwareTag.getImageTags(connection, imageBaseId);
-			List<ImageVersionDetails> versions = getImageVersions(connection, imageBaseId);
+			List<ImageVersionDetails> versions = getImageVersions(connection, imageBaseId, user);
 			ImagePermissions defaultPermissions = DbImagePermissions.fromResultSetDefault(rs);
 			ImageDetailsRead image = new ImageDetailsRead(rs.getString("imagebaseid"),
 					rs.getString("latestversionid"), versions, rs.getString("displayname"),
@@ -247,13 +268,22 @@ public class DbImage {
 		return resultSetToSummary(user, rs);
 	}
 
-	protected static List<ImageVersionDetails> getImageVersions(MysqlConnection connection, String imageBaseId)
+	protected static List<ImageVersionDetails> getImageVersions(MysqlConnection connection, String imageBaseId, UserInfo user)
 			throws SQLException {
 		List<ImageVersionDetails> versionList = new ArrayList<>();
-		MysqlStatement stmt = connection.prepareStatement("SELECT"
-				+ " imageversionid, createtime, expiretime, filesize, uploaderid,"
-				+ " isrestricted, isvalid, isprocessed" + " FROM imageversion"
-				+ " WHERE imagebaseid = :imagebaseid");
+		MysqlStatement stmt = null;	
+		if (user.role.equals("STUDENT")) {
+			stmt = connection.prepareStatement("SELECT"
+			+ " imageversionid, createtime, expiretime, filesize, null,"
+			+ " isrestricted, isvalid, isprocessed" + " FROM imageversion"
+			+ " WHERE imagebaseid = :imagebaseid");
+		} else {
+			stmt = connection.prepareStatement("SELECT"
+			+ " imageversionid, createtime, expiretime, filesize, uploaderid,"
+			+ " isrestricted, isvalid, isprocessed" + " FROM imageversion"
+			+ " WHERE imagebaseid = :imagebaseid");
+
+		}
 		stmt.setString("imagebaseid", imageBaseId);
 		ResultSet rs = stmt.executeQuery();
 		while (rs.next()) {
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
index 06c1e5a7..4910ec4c 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
@@ -303,7 +303,7 @@ public class ServerHandler implements SatelliteServer.Iface {
 	public ImageDetailsRead getImageDetails(String userToken, String imageBaseId)
 			throws TAuthorizationException, TNotFoundException, TInvocationException {
 		UserInfo user = SessionManager.getOrFail(userToken);
-		User.canSeeImageDetailsOrFail(user);
+		
 		try {
 			return DbImage.getImageDetails(user, imageBaseId);
 		} catch (SQLException e) {