From c27d50c575ff5867aef8f10ccf2b5f2ac43dae08 Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Fri, 28 Nov 2014 16:07:58 +0100 Subject: • 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. --- .../main/java/gui/image/FTPEditUploader_GUI.java | 62 ++++++++++++++-------- 1 file changed, 41 insertions(+), 21 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 415e3dee..18925ff7 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -113,12 +113,7 @@ public class FTPEditUploader_GUI extends JFrame implements */ public FTPEditUploader_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } + final Object[] options = { "Beenden", "Abbrechen" }; @@ -139,16 +134,34 @@ public class FTPEditUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); } task.cancel(true); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } con.closeThriftConnection(); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); }// end if choice } else { // no upload running, close window + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); }// end if taskrun }// end window closing @@ -351,7 +364,7 @@ public class FTPEditUploader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("FTP user deleted."); } catch (TException e1) { e1.printStackTrace(); @@ -417,7 +430,7 @@ public class FTPEditUploader_GUI extends JFrame implements if (taskrun == true) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); @@ -447,7 +460,7 @@ public class FTPEditUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); } @@ -455,7 +468,7 @@ public class FTPEditUploader_GUI extends JFrame implements // not loading files, go back one page try { - if(client.userIsImageAdmin(person.verantwortlicher.getUserID(), Image.image.getImageId()) == true){ + if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true){ //user is admin and may change permissions PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c); ei.setVisible(true); @@ -483,7 +496,10 @@ public class FTPEditUploader_GUI extends JFrame implements JOptionPane.YES_NO_OPTION); if (selectedOption == JOptionPane.YES_OPTION) { try { - if(client.userIsImageAdmin(person.verantwortlicher.getUserID(), Image.image.getImageId()) == true){ + System.out.println("userID in editimageuploader is : "+person.verantwortlicher.getUserID()); + + if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true) + { //user is admin and may change permissions PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c); ei.setVisible(true); @@ -587,7 +603,7 @@ public class FTPEditUploader_GUI extends JFrame implements try { //LOGGER.info("Getting FTP-User..."); - user = client.getFtpUser(); + user = client.getFtpUser(SessionData.session.getAuthToken()); LOGGER.info("Received FTP user."); //LOGGER.debug("FTP name: " + user.userName); //LOGGER.debug("FTP path: " + user.path); @@ -704,9 +720,11 @@ public class FTPEditUploader_GUI extends JFrame implements Image.image.isVorlage(), Image.image.getFilesize(), Image.image.getShareMode(), - Image.image.getOS()); + Image.image.getOS(), + SessionData.session.getAuthToken() + ); if (fileupload == true) { - client.startFileCopy(Image.image.getNewName()); + client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); } } else { //no new file uploaded and old file name stays @@ -727,10 +745,12 @@ public class FTPEditUploader_GUI extends JFrame implements Image.image.isVorlage(), Image.image.getFilesize(), Image.image.getShareMode(), - Image.image.getOS()); + Image.image.getOS(), + SessionData.session.getAuthToken() + ); if (fileupload == true) { - client.startFileCopy(Image.image.getNewName()); + client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); // client.startFileCopy(Image.image.getImagename()); } } @@ -738,9 +758,7 @@ public class FTPEditUploader_GUI extends JFrame implements // remove all additional user permissions on first stage - client.deleteAllAdditionalImagePermissions( - Image.image.getImageId(), - person.verantwortlicher.getUserID()); + client.deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()); // then, add user permissions as they have been set new for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) @@ -758,7 +776,9 @@ public class FTPEditUploader_GUI extends JFrame implements RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(), - RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()); + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(), + SessionData.session.getAuthToken() + ); }// end for -- cgit v1.2.3-55-g7522