• changed implementation of user authentication.

• changed position of class file
• fixed some little things (not necessary to mention)

Important Notes:

•organizationID in token returns "wrong" values, therefore university is still set by client. To be fixed someday.
• userID is the value with which the user starts his log in. this value is not represented in the token! (as it is not(!) the email). To be implemented someday, as this value is represented in the masterserver.
• Feature isn't well tested.

1 files changed, 222 insertions, 155 deletions

diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index 1671b893..d9a663c4 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -28,8 +28,10 @@ import server.generated.User;
 
 import org.openslx.imagemaster.thrift.iface.ImageServer.Client;
 import org.openslx.imagemaster.thrift.iface.InvalidTokenException;
+import org.openslx.imagemaster.thrift.iface.UserInfo;
+
 import thrift.MasterThriftConnection;
-import thrift.SessionData;
+//import thrift.SessionData;
 
 import sql.SQL;
 //import util.XMLCreator;
@@ -39,57 +41,73 @@ public class ServerHandler implements Server.Iface
 	
 	private static Logger log = Logger.getLogger(ServerHandler.class);
 	static SQL sql = new SQL();
-	Client client = null;
+	
+	private Map<String,UserInfo> tokenManager = new HashMap<>(); //saves the current tokens and the mapped userdata, returning from the server
 
-	 
-	public void setTokenForSession(String token)
-	{
-		SessionData.session.setAuthToken(token);
-	}
 	
 	
-	public boolean checkSession(String authToken) throws InvalidTokenException
-	{
-		//cached proof. if session is valid, return
-		if(SessionData.session.getAuthToken().equals(authToken))
+	 
+	public boolean authenticated(String token) throws TException
+	{	
+		if(tokenManager.get(token) != null)
 		{
+			//user found in tokenManager, session was set to valid once before (cached session, no further action needed)
 			return true;
 		}
+		else
+		{
+			MasterThriftConnection thrift = new MasterThriftConnection();
+			Client client = thrift.getMasterThriftConnection();
+
+			//user not in tokenManager, check authentication, then add user to tokenManager
+			log.info("token is: "+token);
+			UserInfo ui = null;
+			if( (ui = client.getUserFromToken(token)) != null) //user authenticated by masterserver
+			{
+				//user was authenticated by the masterserver, cache the data
+				tokenManager.put(token, ui);
+				return true;
+			}
+		}
 		
-		//else, set session to current token and check against masterserver
-		//TODO change calls from functions
-		SessionData.session.setAuthToken(authToken);
-		
-		return authenticated();
+		return false;
+	}
+	
+	
+	private UserInfo getUserFromToken(String token) //local function, which gets userdata from the tokenmanager, not the masterserver
+	{											   //implemented, as there is no need for userdata in each function, so return type of authenticated should stay boolean
+		UserInfo ui = tokenManager.get(token);
+		return ui;
 	}
 	
 	
-	public boolean authenticated() throws InvalidTokenException
+	public boolean setSessionInvalid(String token)
 	{
-			//start initial authentication with the masterserver
-			MasterThriftConnection thrift = new MasterThriftConnection();
-			client = thrift.getMasterThriftConnection();
-			try {
-				if(client.getUserFromToken(SessionData.session.getAuthToken()) != null)
-				{
-					return true; 
-				}
-			} catch (TException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			log.info("User not authenticated.");
-			
+		log.info("token disabling.. round one");
+		log.info(tokenManager.get(token));
+		
+		
+		tokenManager.remove(token);
+		
+		log.info("token disabling.. round two");
+		log.info(tokenManager.get(token));
+		
+		if(tokenManager.get(token) == null) //check if deletion worked and token isn't stored anymore
+		{
+			return true;
+		}
 		return false;
 	}
+	
+
 
 
 	
 
 	@Override
-	public User getFtpUser() throws TException 
+	public User getFtpUser(String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			log.info("returning FTPUser...");
 			User user = new User();
@@ -200,20 +218,22 @@ public class ServerHandler implements Server.Iface
 		return null;
 	}
 
+	
 	@Override
-	public long DeleteFtpUser(String user) throws TException 
+	public long DeleteFtpUser(String user, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.DeleteUser(user);
 		}
 		return -1;
 	}
 
+	
 	@Override
-	public String getPathOfImage(String image_id, String version) throws TException 
+	public String getPathOfImage(String image_id, String version, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			log.info("successfully returned PathOfImage: " + sql.getPathOfImage(image_id, version));
 			return sql.getPathOfImage(image_id, version);
@@ -223,26 +243,26 @@ public class ServerHandler implements Server.Iface
 
 	
 	@Override
-	public String setInstitution(String university) throws InvalidTokenException 
+	public String setInstitution(String university, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
-		return sql.setInstitution(university);
+			return sql.setInstitution(university);
 		}
 		return null;
 	}
 
 	@Override
-	public boolean writeVLdata(String imagename, String desc, String login,
-			String firstname, String lastname, String university, String Mail,
+	public boolean writeVLdata(String imagename, String desc,
 			String Tel, String Fak, boolean license, boolean internet,
 			long ram, long cpu, String imagePath, boolean isTemplate,
-			long filesize, long shareMode, String os, String uid) throws TException 
+			long filesize, long shareMode, String os, String uid, String token, String userID) throws TException 
 	{
 		
-		if(authenticated())
+		if(authenticated(token))
 		{
 			String mode = null;
+			
 	
 			if (shareMode == 0) {
 				mode = "only_local";
@@ -264,9 +284,12 @@ public class ServerHandler implements Server.Iface
 			// sql.setImageData(pk_person, license, internet, cpu, ram,
 			// imagename,desc, imagePath, filesize,mode,pk_os);
 	
-			sql.setImageData(login, license, internet, cpu, ram, imagename, desc,
+			
+			
+			sql.setImageData(userID, license, internet, cpu, ram, imagename, desc,
 					imagePath, filesize, mode, pk_os, uid);
 	
+			log.info("userID in serverhandler was: "+userID);
 			log.info("written VLdata");
 			return true;
 		}
@@ -275,9 +298,9 @@ public class ServerHandler implements Server.Iface
 
 	
 	@Override
-	public List<Image> getImageListPermissionWrite(String userID) throws TException 
+	public List<Image> getImageListPermissionWrite(String userID, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getImageListPermissionWrite(userID);
 		}
@@ -286,9 +309,9 @@ public class ServerHandler implements Server.Iface
 
 	
 	@Override
-	public List<Image> getImageListPermissionRead(String userID) throws TException 
+	public List<Image> getImageListPermissionRead(String userID, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getImageListPermissionRead(userID);
 		}
@@ -297,9 +320,9 @@ public class ServerHandler implements Server.Iface
 
 	
 	@Override
-	public List<Image> getImageListPermissionLink(String userID) throws TException 
+	public List<Image> getImageListPermissionLink(String userID, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getImageListPermissionLink(userID);
 		}
@@ -308,9 +331,9 @@ public class ServerHandler implements Server.Iface
 	
 	
 	@Override
-	public List<Image> getImageListPermissionAdmin(String userID) throws TException 
+	public List<Image> getImageListPermissionAdmin(String userID, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getImageListPermissionAdmin(userID);
 		}
@@ -318,9 +341,9 @@ public class ServerHandler implements Server.Iface
 	}
 	
 	@Override
-	public List<Image> getImageListAllTemplates() throws TException 
+	public List<Image> getImageListAllTemplates(String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getImageListAllTemplates();
 		}
@@ -329,48 +352,72 @@ public class ServerHandler implements Server.Iface
 	
 
 	@Override
-	public List<String> getAllOS() throws TException 
+	public List<String> getAllOS(String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getAllOS();
 		}
 		return null;
 	}
 
+	//UserInfo does not return the institution, so in this case, the local method is prepared, but not yet executed, as the institution has to be added to UserInfo (or selected by institutionID)
 	@Override
-	public Map<String, String> getPersonData(String Vorname, String Nachname) throws TException 
+	public Map<String, String> getPersonData(String Vorname, String Nachname, String token) throws TException 
 	{
-		if(authenticated())
+		/*
+		if(authenticated(token))
 		{
 			return sql.getPersonData(Vorname, Nachname);
 		}
 		return null;
+		*/
+		
+		Map<String, String> map = new HashMap<>();
+		
+		UserInfo ui = getUserFromToken(token);
+		
+		map.put("mail", ui.getEMail());
+		map.put("Nachname", ui.getLastName());
+		map.put("Vorname", ui.getFirstName());
+		
+		//map.put("Hochschule", sql.getInstitutionByID(ui.getOrganizationId())); //does not deliver the correct id
+		Map<String, String> tempMap = new HashMap<>();
+		tempMap = sql.getPersonData(Vorname, Nachname);
+		map.put("Hochschule", tempMap.get("Hochschule"));
+		
+		return map;
+		
 	}
-
-	public void setPerson(String login, String lastname, String firstname,String mail, String Institution) throws InvalidTokenException 
+	
+	public void setPerson(String userID, String token, String institution) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
-			sql.setPerson(login, lastname, firstname, mail, new Date(), Institution);
+			UserInfo ui = getUserFromToken(token);
+			//String institution = sql.getInstitutionByID(ui.getOrganizationId());
+			sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), institution);
 		}
 	}
+	
+	
 
 	@Override
 	public boolean writeLecturedata(String name, String shortdesc, String desc,
 			String startDate, String endDate, boolean isActive,
-			String imageID, String login, String firstname, String lastname,
-			String university, String Mail, String Tel, String Fak, String lectureID)
+			String imageID, String token, String Tel, String Fak, String lectureID, String university)
 			throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 		
 			//String pk_image = imageID;
 			Map<String, String> map = new HashMap<String, String>();
 			int imageversion = 0;
+			//String university = sql.getInstitutionByID(ui.getOrganizationId());
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(login, lastname, firstname, Mail,
+			String pk_person = sql.setPerson(ui.getEMail(), ui.getLastName(), ui.getFirstName(), ui.getEMail(),
 					new Date(), pk_institution);
 	
 			map = sql.getImageIDandVersion(imageID);
@@ -387,9 +434,9 @@ public class ServerHandler implements Server.Iface
 	
 
 	@Override
-	public boolean startFileCopy(String filename) throws TException 
+	public boolean startFileCopy(String filename, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			// copy file from folder temp to folder prod
 			String file = Configuration.config.getAbsolute_path() + "temp/"
@@ -416,9 +463,9 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public Map<String, String> getImageData(String imageid, String imageversion) throws TException 
+	public Map<String, String> getImageData(String imageid, String imageversion, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			//log.info("returning ImageData: "+ sql.getImageData(imageid, imageversion).size() + "items.");
 			return sql.getImageData(imageid, imageversion);
@@ -430,9 +477,9 @@ public class ServerHandler implements Server.Iface
 	public boolean updateImageData(String name, String newName, String desc,
 			String image_path, boolean license, boolean internet, long ram,
 			long cpu, String id, String version, boolean isTemplate,
-			long filesize, long shareMode, String os) throws TException 
+			long filesize, long shareMode, String os, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			String mode = null;
 	
@@ -449,11 +496,12 @@ public class ServerHandler implements Server.Iface
 		}
 		return false;
 	}
+	
 
 	@Override
-	public List<Lecture> getLectureList() throws TException 
+	public List<Lecture> getLectureList(String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			//log.info("returning LectureList");
 			return sql.getLectureList();
@@ -462,35 +510,38 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public List<Lecture> getLectureListPermissionRead(String userID) throws InvalidTokenException 
+	public List<Lecture> getLectureListPermissionRead(String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 			//log.info("returning LectureListRead");
-			return sql.getLectureListPermissionRead(userID);
+			return sql.getLectureListPermissionRead(ui.getUserId());
 		}
 		return null;
 	}// end getLectureListPermissionRead
 
 	
 	@Override
-	public List<Lecture> getLectureListPermissionWrite(String userID) throws InvalidTokenException 
+	public List<Lecture> getLectureListPermissionWrite(String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 			//log.info("returning LectureListWrite");
-			return sql.getLectureListPermissionWrite(userID);
+			return sql.getLectureListPermissionWrite(ui.getUserId());
 		}
 		return null;
 	}// end getLectureListPermissionRead
 
 	@Override
-	public List<Lecture> getLectureListPermissionAdmin(String userID) throws InvalidTokenException 
+	public List<Lecture> getLectureListPermissionAdmin(String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 			//log.info("returning LectureListAdmin");
-			return sql.getLectureListPermissionAdmin(userID);
+			return sql.getLectureListPermissionAdmin(ui.getUserId());
 		}
 		return null;
 	}// end getLectureListPermissionRead
@@ -499,20 +550,22 @@ public class ServerHandler implements Server.Iface
 	@Override
 	public boolean updateLecturedata(String name, String newName,
 			String shortdesc, String desc, String startDate, String endDate,
-			boolean isActive, String imageid, String imageversion, String user,
-			String firstname, String lastname, String university, String Mail,
-			String Tel, String Fak, String id) throws TException 
+			boolean isActive, String imageid, String imageversion, String token,
+			String Tel, String Fak, String id, String university) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
+			
 			Map<String, String> map = new HashMap<String, String>();
 			map = sql.getDeleteXMLData(id);
-			sql.updateLectureData(imageid, imageversion, lastname, newName, desc,
+			sql.updateLectureData(imageid, imageversion, ui.getLastName(), newName, desc,
 					shortdesc, startDate, endDate, isActive, id);
+			
 	
 			String path = Configuration.config.getAbsolute_path() + "prod/"
 					+ map.get("date").substring(0, map.get("date").length() - 2)
-					+ "_" + university + "_" + user + "_" + map.get("name")
+					+ "_" + university + "_" + ui.getEMail() + "_" + map.get("name")
 					+ ".xml";
 			File tmpFile = new File(path);
 			try {
@@ -526,9 +579,9 @@ public class ServerHandler implements Server.Iface
 
 	
 	@Override
-	public boolean deleteImageServer(String imageid, String imageversion) throws TException 
+	public boolean deleteImageServer(String imageid, String imageversion, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			String stringFile = sql.getFile(imageid, imageversion);
 			log.info("File to Delete: " + stringFile);
@@ -552,11 +605,11 @@ public class ServerHandler implements Server.Iface
 
 	
 	@Override
-	public boolean deleteImageData(String id, String version) throws TException 
+	public boolean deleteImageData(String id, String version, String token) throws TException 
 	{
 		boolean success=false;
 		
-		if(authenticated())
+		if(authenticated(token))
 		{
 			if(sql.deleteImage(id, version)==true)
 			{
@@ -568,20 +621,24 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public boolean connectedToLecture(String id, String version) throws TException 
+	public boolean connectedToLecture(String id, String version, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.connectedToLecture(id, version);
 		}
 		return true;
 	}
 
-	public boolean deleteLecture(String id, String hs, String user) throws InvalidTokenException 
+	public boolean deleteLecture(String id, String token, String university) throws TException 
 	{
 		boolean success = false;
 		
-		if(authenticated())
+		UserInfo ui = getUserFromToken(token);
+		
+		String user = ui.getEMail();
+		
+		if(authenticated(token))
 		{
 			Map<String, String> map = new HashMap<String, String>();
 			map = sql.getDeleteXMLData(id);
@@ -591,7 +648,7 @@ public class ServerHandler implements Server.Iface
 						+ "prod/"
 						+ map.get("date")
 								.substring(0, map.get("date").length() - 2) + "_"
-						+ hs + "_" + user + "_" + map.get("name") + ".xml";
+						+ university + "_" + user + "_" + map.get("name") + ".xml";
 				File xmlFile = new File(path);
 				FileUtils.forceDelete(xmlFile);
 			} catch (IOException e) {
@@ -608,9 +665,9 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public List<String> getAllUniversities() throws TException 
+	public List<String> getAllUniversities(String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getAllUniversities();
 		}
@@ -618,9 +675,9 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public Map<String, String> getLectureData(String lectureid) throws TException 
+	public Map<String, String> getLectureData(String lectureid, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			//log.info("returning LectureData");
 			return sql.getLectureData(lectureid);
@@ -628,13 +685,13 @@ public class ServerHandler implements Server.Iface
 		return null;
 	}
 
-	public static int nthIndexOf(final String string, final String token,final int index) 
+	public static int nthIndexOf(final String string, final String searchToken,final int index) 
 	{
 		int j = 0;
 
 		for (int i = 0; i < index; i++) 
 		{
-			j = string.indexOf(token, j + 1);
+			j = string.indexOf(searchToken, j + 1);
 			if (j == -1)
 				break;
 		}
@@ -643,9 +700,9 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public boolean checkUser(String username) throws TException 
+	public boolean checkUser(String username, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.checkUser(username);
 		}
@@ -654,36 +711,35 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public boolean createUser(String loginName, String lastName,String firstName, String mail, String university) throws TException 
+	public boolean createUser(String token, String university) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(loginName, lastName, firstName, mail, new Date(), pk_institution);
+			String pk_person = sql.setPerson(ui.getEMail(), ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution);
 			return true;
 		}
 		return false;
 	}
 
 	@Override
-	public boolean writeImageRights(String imageID, String username,
-			String lastName, String firstName, String mail, String university,
-			String role) throws TException 
+	public boolean writeImageRights(String imageID, String token,
+			String role, String university, String userID) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 			String pk_image = null;
 			Map<String, String> map = new HashMap<String, String>();
-			int imageversion = 0;
+		
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(username, lastName, firstName, mail,
-					new Date(), pk_institution);
+			String pk_person = sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution);
 	
 			map = sql.getImageIDandVersion(imageID);
 	
 	
 			pk_image = map.get("GUID");
-			imageversion = Integer.parseInt(map.get("version"));
 	
 			if (role.equals("Dozent")) {
 				int read = 1;
@@ -725,17 +781,14 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public boolean writeLectureRights(String lectureID, String username,
-			String lastName, String firstName, String mail, String university,
-			String role) throws TException 
+	public boolean writeLectureRights(String lectureID, String role, String token, String university, String userID) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			//String pk_lecture = null;
-	
+			UserInfo ui = getUserFromToken(token);
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(username, lastName, firstName, mail,
-					new Date(), pk_institution);
+			String pk_person = sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution);
 			//pk_lecture = sql.getLectureID(lectureID);
 	
 			if (role.equals("Dozent")) {
@@ -774,9 +827,9 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public List<Person> getAllOtherSatelliteUsers(List<String> userID) throws TException 
+	public List<Person> getAllOtherSatelliteUsers(List<String> userID, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getAllOtherSatelliteUsers(userID);
 			// return null;
@@ -787,10 +840,10 @@ public class ServerHandler implements Server.Iface
 	//set permissions for users which are !=userID
 	public boolean writeAdditionalImageRights(String imageID, String userID,
 			boolean isRead, boolean isWrite, boolean isLinkAllowed,
-			boolean isAdmin) throws InvalidTokenException 
+			boolean isAdmin, String token) throws TException 
 	{
 		boolean success = false;
-		if(authenticated())
+		if(authenticated(token))
 		{
 
 			Map<String, String> map = new HashMap<String, String>();
@@ -806,9 +859,9 @@ public class ServerHandler implements Server.Iface
 
 	
 	public boolean writeAdditionalLectureRights(String lectureID,
-			String userID, boolean isRead, boolean isWrite, boolean isAdmin) throws InvalidTokenException 
+			String userID, boolean isRead, boolean isWrite, boolean isAdmin, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			Map<String, String> map = new HashMap<String, String>();
 			//String lectureID = sql.getLectureID(lectureID);
@@ -823,40 +876,43 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public List<Person> getPermissionForUserAndImage(String userID,
-			String imageID) throws TException 
+	public List<Person> getPermissionForUserAndImage(String token,
+			String imageID, String userID) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getPermissionForUserAndImage(userID, imageID);
 		}
 		return null;
 	}
 
-	public List<Person> getPermissionForUserAndLecture(String userID,String lectureID) throws InvalidTokenException 
+	public List<Person> getPermissionForUserAndLecture(String token,String lectureID, String userID) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 			return sql.getPermissionForUserAndLecture(userID, lectureID);
 		}
 		return null;
 	}
 
 	@Override
-	public void deleteAllAdditionalImagePermissions(String imageID,String userID) throws TException 
+	public void deleteAllAdditionalImagePermissions(String imageID, String token, String userID) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 			sql.deleteAllAdditionalImagePermissions(imageID, userID);
 		}
 		return;
 	}
 
 	@Override
-	public void deleteAllAdditionalLecturePermissions(String lectureID,String userID) throws TException 
+	public void deleteAllAdditionalLecturePermissions(String lectureID,String token, String userID) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 			sql.deleteAllAdditionalLecturePermissions(lectureID, userID);
 		}
 		
@@ -864,19 +920,20 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override 
-	public List<Image> getImageList(String userID) throws TException 
+	public List<Image> getImageList(String token) throws TException 
 	{
-		if(authenticated())
+		UserInfo ui = getUserFromToken(token);
+		if(authenticated(token))
 		{
-			return sql.getImageList(userID);
+			return sql.getImageList(ui.getEMail());
 		}
 		return null;
 	}
 
 	@Override
-	public List<String> getAdditionalImageContacts(String imageID) throws TException 
+	public List<String> getAdditionalImageContacts(String imageID, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getAdditionalImageContacts(imageID);
 		}
@@ -884,9 +941,9 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public String getOsNameForGuestOs(String guestOS) throws TException 
+	public String getOsNameForGuestOs(String guestOS, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getOsNameForGuestOs(guestOS);
 		}
@@ -895,18 +952,18 @@ public class ServerHandler implements Server.Iface
 
 	@Override
 
-	public String createRandomUUID() throws TException 
+	public String createRandomUUID(String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.createRandomUUID();
 		}
 		return null;
 	}
 
-	public Map<String, String> getItemOwner(String itemID) throws TException 
+	public Map<String, String> getItemOwner(String itemID, String token) throws TException 
 	{
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.getItemOwner(itemID);
 		}
@@ -917,11 +974,12 @@ public class ServerHandler implements Server.Iface
 
 
 	@Override
-	public boolean userIsImageAdmin(String userID, String imageID)
+	public boolean userIsImageAdmin(String imageID, String token, String userID)
 			throws TException {
 		
-		if(authenticated())
+		if(authenticated(token))
 		{
+			UserInfo ui = getUserFromToken(token);
 			return sql.userIsImageAdmin(userID,imageID);
 		}
 		return false;
@@ -931,9 +989,9 @@ public class ServerHandler implements Server.Iface
 
 
 	@Override
-	public boolean userIsLectureAdmin(String userID, String lectureID)
+	public boolean userIsLectureAdmin(String userID, String lectureID, String token)
 			throws TException {
-		if(authenticated())
+		if(authenticated(token))
 		{
 			return sql.userIsLectureAdmin(userID,lectureID);
 		}
@@ -941,5 +999,14 @@ public class ServerHandler implements Server.Iface
 	}
 
 
+	@Override
+	public String getInstitutionByID(String institutionID) throws TException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+
+
 
 }// end class