diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/App.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/App.java | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java index 62e06a4..3a309c5 100644 --- a/src/main/java/org/openslx/imagemaster/App.java +++ b/src/main/java/org/openslx/imagemaster/App.java @@ -1,15 +1,12 @@ package org.openslx.imagemaster; import java.io.BufferedInputStream; -import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; -import org.openslx.imagemaster.server.MasterFtpServer; import org.openslx.imagemaster.thrift.server.BinaryListener; public class App { @@ -51,39 +48,10 @@ public class App { // Create Ftp Server Thread f; - MasterFtpServer ftpServer = new MasterFtpServer(2221, "admin", - "SI*HoZCC!]V)p>B2", Globals.properties.getProperty("ftp_base_dir")); - f = new Thread(ftpServer, "FtpServer"); + f = new Thread(Globals.ftpServer, "FtpServer"); servers.add(f); f.start(); - /* - * FTP Users can be added later with: - * ftpServer.addUser(username, password, ftp_root); - * - * And removed with: - * removeUser(username); - */ - - //////////////////////////////////////////////// - SecureRandom random = new SecureRandom(); - String lettersP="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890+-$%&/()=?@"; - String lettersU="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; - String generatedUser = ""; - String generatedPass = ""; - for (int i = 0; i < 16; i++) { - int index = (int)(random.nextDouble()*lettersU.length()); - generatedUser += lettersU.substring(index, index + 1); - index = (int)(random.nextDouble()*lettersP.length()); - generatedPass += lettersP.substring(index, index + 1); - } - String dir = Globals.properties.getProperty("ftp_base_dir") + "/" + generatedUser + "/"; - if (new File(dir).mkdir()) { - ftpServer.addUser(generatedUser, generatedPass, dir, true); - log.info("Generated user/pass: " + generatedUser + "\t" + generatedPass + "\n with home dir: " + dir); - } - //////////////////////////////////////////////// - // Run more servers // ... // Wait for all servers to die @@ -99,8 +67,6 @@ public class App { } } - ftpServer.removeUser(generatedUser); - log.info("All Servers shut down, exiting..."); } } |