diff options
author | Nils Schwabe | 2014-04-23 15:10:36 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-04-23 15:10:36 +0200 |
commit | f71e8a5bcd2d7f85f58fedf3f6ea8dc8c7f89b63 (patch) | |
tree | 5a79e7f320e6ca76ade3cf8039079d182f0178ad /src/main/java/org/openslx/imagemaster/server | |
parent | Fix some issues with FtpCredentialsScheduler (diff) | |
download | masterserver-f71e8a5bcd2d7f85f58fedf3f6ea8dc8c7f89b63.tar.gz masterserver-f71e8a5bcd2d7f85f58fedf3f6ea8dc8c7f89b63.tar.xz masterserver-f71e8a5bcd2d7f85f58fedf3f6ea8dc8c7f89b63.zip |
Reformat all files with simon's new layout
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/server')
4 files changed, 108 insertions, 89 deletions
diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java index f4511fe..30fb0a8 100644 --- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java +++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java @@ -39,8 +39,9 @@ import org.openslx.imagemaster.thrift.iface.UserInfo; * This will be accessed from multiple threads, so use synchronization when * needed (or in doubt) */ -public class ApiServer { - private static Logger log = Logger.getLogger(ApiServer.class); +public class ApiServer +{ + private static Logger log = Logger.getLogger( ApiServer.class ); /** * Request for authentication @@ -50,17 +51,18 @@ public class ApiServer { * @return SessionData struct with session id/token iff login successful * @throws AuthenticationException if login not successful */ - public static SessionData authenticate(String login, String password) - throws AuthenticationException { - if (login == null || password == null) { + public static SessionData authenticate( String login, String password ) + throws AuthenticationException + { + if ( login == null || password == null ) { throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, - "Empty username or password!"); + "Empty username or password!" ); } - final User user = Authenticator.authenticate(login, password); + final User user = Authenticator.authenticate( login, password ); - final Session session = new Session(user); - return SessionManager.addSession(session); + final Session session = new Session( user ); + return SessionManager.addSession( session ); } /** @@ -70,121 +72,131 @@ public class ApiServer { * @return UserInfo struct for given token's user * @throws InvalidTokenException if no user matches the given token */ - public static UserInfo getUserFromToken(String token) - throws InvalidTokenException { - final Session session = SessionManager.getSession(token); - if (session == null) + public static UserInfo getUserFromToken( String token ) + throws InvalidTokenException + { + final Session session = SessionManager.getSession( token ); + if ( session == null ) throw new InvalidTokenException(); - return new UserInfo(session.getUserId(), session.getFirstName(), - session.getLastName(), session.getEMail()); + return new UserInfo( session.getUserId(), session.getFirstName(), + session.getLastName(), session.getEMail() ); } /** * Request ftp credentials to upload a new image to the masterserver. + * * @param imageDescription MetaData of the new image * @param serverSessionData the session data of the authenticated uni/hs server * @return the genereated ftp credentials * @throws AuthorizationException if the uni/hs server has no valid session * @throws TException */ - public static FtpCredentials submitImage(String serverSessionId, - ImageData imageDescription) throws AuthorizationException, - TException { - if (ServerSessionManager.getSession(serverSessionId) == null) { - throw new AuthorizationException(AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessionData"); + public static FtpCredentials submitImage( String serverSessionId, + ImageData imageDescription ) throws AuthorizationException, + TException + { + if ( ServerSessionManager.getSession( serverSessionId ) == null ) { + throw new AuthorizationException( AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessionData" ); } - + // create new user - FtpCredentials ftpCredentials = Globals.ftpServer.addUser(serverSessionId); - - if (ftpCredentials == null) { - log.error("Could not create ftp credentials"); + FtpCredentials ftpCredentials = Globals.ftpServer.addUser( serverSessionId ); + + if ( ftpCredentials == null ) { + log.error( "Could not create ftp credentials" ); return null; } - - if (!ImageProcessor.addImageDataToProcess(imageDescription, ftpCredentials.username)) { - Globals.ftpServer.removeUser(serverSessionId); - throw new TException("ImageData is not valid."); + + if ( !ImageProcessor.addImageDataToProcess( imageDescription, ftpCredentials.username ) ) { + Globals.ftpServer.removeUser( serverSessionId ); + throw new TException( "ImageData is not valid." ); } - + return ftpCredentials; } /** * Start the server authentication of a uni/hs satellite server. + * * @param organization the organization that the server belongs to * @return a random string that needs to be encrypted with the private - * key of the requesting satellite server + * key of the requesting satellite server * @throws ServerAuthenticationException when organization is invalid/unknown */ - public static String startServerAuthentication(String organization) - throws ServerAuthenticationException { - if (organization == null || organization == "") { - throw new ServerAuthenticationException(ServerAuthenticationError.INVALID_ORGANIZATION, "Empty organization"); + public static String startServerAuthentication( String organization ) + throws ServerAuthenticationException + { + if ( organization == null || organization == "" ) { + throw new ServerAuthenticationException( ServerAuthenticationError.INVALID_ORGANIZATION, "Empty organization" ); } - if (DbSatellite.fromOrganization(organization) == null) { - throw new ServerAuthenticationException(ServerAuthenticationError.INVALID_ORGANIZATION, "Unknown organization"); + if ( DbSatellite.fromOrganization( organization ) == null ) { + throw new ServerAuthenticationException( ServerAuthenticationError.INVALID_ORGANIZATION, "Unknown organization" ); } - return ServerAuthenticator.startServerAuthentication(organization); + return ServerAuthenticator.startServerAuthentication( organization ); } /** * Authenticate the uni/hs satellite server with the encrypted string. + * * @param organization the organization that the server belongs to * @param challengeResponse the encrypted string * @return session data iff the authentication was successful * @throws AuthenticationException * @throws TException */ - public static ServerSessionData serverAuthenticate(String organization, - String challengeResponse) throws AuthenticationException, - TException { - if (organization == null || challengeResponse == null) { - throw new ServerAuthenticationException(ServerAuthenticationError.INVALID_ORGANIZATION, "Empty organization or challengeResponse"); + public static ServerSessionData serverAuthenticate( String organization, + String challengeResponse ) throws AuthenticationException, + TException + { + if ( organization == null || challengeResponse == null ) { + throw new ServerAuthenticationException( ServerAuthenticationError.INVALID_ORGANIZATION, "Empty organization or challengeResponse" ); } - DbSatellite satellite = DbSatellite.fromOrganization(organization); - if (satellite == null) { - throw new ServerAuthenticationException(ServerAuthenticationError.INVALID_ORGANIZATION, "Unknown organization"); + DbSatellite satellite = DbSatellite.fromOrganization( organization ); + if ( satellite == null ) { + throw new ServerAuthenticationException( ServerAuthenticationError.INVALID_ORGANIZATION, "Unknown organization" ); } final ServerUser serverUser = ServerAuthenticator.serverAuthenticate( - organization, satellite.getAddress(), challengeResponse); - - final ServerSession session = new ServerSession(serverUser); - return ServerSessionManager.addSession(session); + organization, satellite.getAddress(), challengeResponse ); + + final ServerSession session = new ServerSession( serverUser ); + return ServerSessionManager.addSession( session ); } /** * Tell the masterserver that the image upload finished. + * * @param serverSessionId The session id of the hs/uni server * @param imageDescription the description of the uploaded image * @return if nothing went wrong * @throws AuthorizationException if no valid session exists */ - public static boolean finishedUpload(String serverSessionId, - ImageData imageDescription) throws AuthorizationException { + public static boolean finishedUpload( String serverSessionId, + ImageData imageDescription ) throws AuthorizationException + { // check if valid session exists - if (ServerSessionManager.getSession(serverSessionId) == null) { - throw new AuthorizationException(AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessionData"); + if ( ServerSessionManager.getSession( serverSessionId ) == null ) { + throw new AuthorizationException( AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessionData" ); } - + // process the image - String username = Globals.ftpServer.getCredentialsFromSessionId(serverSessionId).username; - - File userDirectory = new File(Globals.getPropertyString( Globals.PropString.FTPBASEDIR ) + "/" + username); + String username = Globals.ftpServer.getCredentialsFromSessionId( serverSessionId ).username; + + File userDirectory = new File( Globals.getPropertyString( Globals.PropString.FTPBASEDIR ) + "/" + username ); File[] list = userDirectory.listFiles(); - - if (list.length != 1) return false; - - log.info(username + " is done with upload"); - + + if ( list.length != 1 ) + return false; + + log.info( username + " is done with upload" ); + // remove user that is not needed anymore - Globals.ftpServer.removeUser(username); - log.info("Removed user: " + username); - - ImageProcessor.processImageAfterUpload(username, list[0].getName()); - - Globals.ftpServer.removeUser(serverSessionId); - + Globals.ftpServer.removeUser( username ); + log.info( "Removed user: " + username ); + + ImageProcessor.processImageAfterUpload( username, list[0].getName() ); + + Globals.ftpServer.removeUser( serverSessionId ); + return true; } diff --git a/src/main/java/org/openslx/imagemaster/server/FtpCredentialsScheduler.java b/src/main/java/org/openslx/imagemaster/server/FtpCredentialsScheduler.java index 88e70f8..c5fad4f 100644 --- a/src/main/java/org/openslx/imagemaster/server/FtpCredentialsScheduler.java +++ b/src/main/java/org/openslx/imagemaster/server/FtpCredentialsScheduler.java @@ -30,7 +30,7 @@ public class FtpCredentialsScheduler extends TimerTask File[] list = dir.listFiles(); if ( list.length == 1 ) { if ( ( new Date().getTime() - list[0].lastModified() ) >= timeout ) { - log.info(username + "'s files are too old. Deleting him and his folder."); + log.info( username + "'s files are too old. Deleting him and his folder." ); Util.deleteFolder( dir ); Globals.ftpServer.removeUser( sessionId ); } diff --git a/src/main/java/org/openslx/imagemaster/server/MasterFtpServer.java b/src/main/java/org/openslx/imagemaster/server/MasterFtpServer.java index 5f5dd79..f68e909 100644 --- a/src/main/java/org/openslx/imagemaster/server/MasterFtpServer.java +++ b/src/main/java/org/openslx/imagemaster/server/MasterFtpServer.java @@ -24,7 +24,6 @@ import org.openslx.imagemaster.util.RandomString; public class MasterFtpServer implements Runnable { - private static Logger log = Logger.getLogger( MasterFtpServer.class ); private FtpServer server; private UserManager userManager; @@ -34,10 +33,11 @@ public class MasterFtpServer implements Runnable public final HashMap<String, Date> timeouts = new HashMap<>(); private boolean ini = false; - public void init(int port) + public void init( int port ) { - if (ini) return; - + if ( ini ) + return; + FtpServerFactory serverFactory = new FtpServerFactory(); ListenerFactory factory = new ListenerFactory(); // set the port of the listener diff --git a/src/main/java/org/openslx/imagemaster/server/MasterFtplet.java b/src/main/java/org/openslx/imagemaster/server/MasterFtplet.java index 559197c..a8c1cbe 100644 --- a/src/main/java/org/openslx/imagemaster/server/MasterFtplet.java +++ b/src/main/java/org/openslx/imagemaster/server/MasterFtplet.java @@ -11,45 +11,52 @@ import org.apache.ftpserver.ftplet.FtpletContext; import org.apache.ftpserver.ftplet.FtpletResult; import org.apache.log4j.Logger; -public class MasterFtplet implements Ftplet { - private static Logger log = Logger.getLogger(Ftplet.class); +public class MasterFtplet implements Ftplet +{ + private static Logger log = Logger.getLogger( Ftplet.class ); @Override - public void init(FtpletContext ftpletContext) throws FtpException { + public void init( FtpletContext ftpletContext ) throws FtpException + { // not used } @Override - public void destroy() { + public void destroy() + { // not used } @Override - public FtpletResult beforeCommand(FtpSession session, FtpRequest request) - throws FtpException, IOException { - if (session.getUser() != null) { - log.info(session.getUser().getName() + " issued command: " + request.getRequestLine()); + public FtpletResult beforeCommand( FtpSession session, FtpRequest request ) + throws FtpException, IOException + { + if ( session.getUser() != null ) { + log.info( session.getUser().getName() + " issued command: " + request.getRequestLine() ); } return null; } @Override - public FtpletResult afterCommand(FtpSession session, FtpRequest request, - FtpReply reply) throws FtpException, IOException { + public FtpletResult afterCommand( FtpSession session, FtpRequest request, + FtpReply reply ) throws FtpException, IOException + { // not used return null; } @Override - public FtpletResult onConnect(FtpSession session) throws FtpException, - IOException { + public FtpletResult onConnect( FtpSession session ) throws FtpException, + IOException + { // not used return null; } @Override - public FtpletResult onDisconnect(FtpSession session) throws FtpException, - IOException { + public FtpletResult onDisconnect( FtpSession session ) throws FtpException, + IOException + { // not used return null; } |