From 4acda73b9fe642681cd7d1e60ace3bd5341f6d14 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 13 May 2014 13:50:12 +0200 Subject: FTP-Server nicht mehr hard-coded sondern ausgelesen + diverse Kleinigkeiten --- Dozentenmodulserver/src/server/ServerHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Dozentenmodulserver/src/server/ServerHandler.java') diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 95b261d3..e9bf43a7 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -230,8 +230,7 @@ public class ServerHandler implements Server.Iface { // der übergebene Filename ist falsch - hier muss der generierte // name geholt werden, nicht der ursprüngliche name. wo wird dieser // eingelesen? - //FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/" - // + tmpFile.getName())); + FileUtils.moveFile(tmpFile, new File(Configuration.config.getAbsolute_path()+"prod/"+filename)); int ret=sql.UpdateImagePath(con, filename); log.info(new Date() + " - update "+ret); -- cgit v1.2.3-55-g7522 From fd0287db425350886a384b6c3ea15dcdbacbdc6e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 15 May 2014 09:07:58 +0200 Subject: Check ob Ordner /temp vorhanden ist --- Dozentenmodulserver/bin/server/ServerHandler.class | Bin 15199 -> 16278 bytes Dozentenmodulserver/src/server/ServerHandler.java | 99 +++++++++++++++------ 2 files changed, 72 insertions(+), 27 deletions(-) (limited to 'Dozentenmodulserver/src/server/ServerHandler.java') diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 052ffd4a..6ad23978 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index e9bf43a7..568ea714 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -3,6 +3,9 @@ package server; import java.io.File; import java.io.IOException; import java.math.BigInteger; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.sql.Connection; @@ -14,17 +17,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; - import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; - import models.Configuration; - import org.apache.commons.io.FileUtils; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import org.ini4j.Wini; - import sql.SQL; import util.XMLCreator; @@ -32,9 +30,7 @@ public class ServerHandler implements Server.Iface { static SQL sql = new SQL(); static Connection con = sql.getConnection(); private static Logger log = Logger.getLogger(ServerHandler.class); - - @Override public User getFtpUser() throws TException { log.info(new Date() + " - returing FTPUser..."); @@ -45,10 +41,52 @@ public class ServerHandler implements Server.Iface { user.setPath(Configuration.config.getAbsolute_path()); SQL sql = new SQL(); Connection con = sql.getConnection(); - sql.writeFTPUser(con, user.getUserName(), user.getPassword()); - return user; + // check if folder temp exists + //if (folderTempExists() == true) { + sql.writeFTPUser(con, user.getUserName(), user.getPassword()); + return user; + //} else { + // log.info(new Date() + " - returning null user"); + // return null; + //} } + public boolean folderTempExists() { + // check if folder temp exists, otherwise create it + Path path = Paths + .get(Configuration.config.getAbsolute_path() + "/temp"); + if (Files.exists(path) == true) { + log.info(new Date() + " - folder '" + path + + "' exists, no further action"); + return true; + } else { + // create directory and set permissions + boolean success = (new File(path + "")).mkdirs(); + //File dir = new File(path + ""); + //dir.setExecutable(true); + //dir.setReadable(true); + //dir.setWritable(true); + + if (!success) { + log.info(new Date() + " - failed to create folder '" + path + + "'"); + return false; + } else { + //set permissions + try { + Runtime.getRuntime().exec("chmod 777 "+path); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + log.info(new Date() + " - folder '" + path + + "' successfully created"); + return true; + } + } + + }// end folderTempExists() + public String getEncodedSha1Sum(String key) { try { MessageDigest md = MessageDigest.getInstance("SHA1"); @@ -89,7 +127,8 @@ public class ServerHandler implements Server.Iface { public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, - long ram, long cpu, String imagePath, boolean isTemplate ,long filesize) throws TException { + long ram, long cpu, String imagePath, boolean isTemplate, + long filesize) throws TException { String pk_institution = sql.setInstitution(con, university); @@ -97,7 +136,7 @@ public class ServerHandler implements Server.Iface { new Date(), pk_institution); sql.setImageData(con, pk_person, license, internet, cpu, ram, - imagename, imagePath,isTemplate ,filesize); + imagename, imagePath, isTemplate, filesize); log.info(new Date() + " - written VLdata"); // TODO Auto-generated method stub @@ -221,19 +260,24 @@ public class ServerHandler implements Server.Iface { @Override public boolean startFileCopy(String filename) throws TException { - String file=Configuration.config.getAbsolute_path()+"temp/"+filename; + String file = Configuration.config.getAbsolute_path() + "temp/" + + filename; File tmpFile = new File(file); - - log.info(new Date() + " - Trying to move file to '/srv/openslx/nfs/prod/"+tmpFile.getName() +"'"); + + log.info(new Date() + + " - Trying to move file to '/srv/openslx/nfs/prod/" + + tmpFile.getName() + "'"); try { // der übergebene Filename ist falsch - hier muss der generierte // name geholt werden, nicht der ursprüngliche name. wo wird dieser // eingelesen? - FileUtils.moveFile(tmpFile, new File(Configuration.config.getAbsolute_path()+"prod/"+filename)); - int ret=sql.UpdateImagePath(con, filename); - log.info(new Date() + " - update "+ret); + FileUtils.moveFile(tmpFile, + new File(Configuration.config.getAbsolute_path() + "prod/" + + filename)); + int ret = sql.UpdateImagePath(con, filename); + log.info(new Date() + " - update " + ret); log.info(new Date() + " - file moved"); } catch (IOException e) { @@ -278,11 +322,12 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean updateImageData(String name, String newName, String image_path, - boolean license, boolean internet, long ram, long cpu, String id, - String version, boolean isTemplate, long filesize) throws TException { - sql.UpdateImageData(con, name, newName,image_path, license, internet, cpu, ram, - id, version, isTemplate, filesize); + public boolean updateImageData(String name, String newName, + String image_path, boolean license, boolean internet, long ram, + long cpu, String id, String version, boolean isTemplate, + long filesize) throws TException { + sql.UpdateImageData(con, name, newName, image_path, license, internet, + cpu, ram, id, version, isTemplate, filesize); return false; } @@ -351,8 +396,8 @@ public class ServerHandler implements Server.Iface { e.printStackTrace(); } - //sql.updateLectureData(con, pk_image, imageversion, lastname, newName, - // desc, shortdesc, startDate, endDate, isActive, id); + // sql.updateLectureData(con, pk_image, imageversion, lastname, newName, + // desc, shortdesc, startDate, endDate, isActive, id); return false; } @@ -363,7 +408,8 @@ public class ServerHandler implements Server.Iface { String stringFile = sql.getFile(con, imageid, imageversion); log.info(new Date() + " - File to Delete: " + stringFile); - File tmpFile = new File(Configuration.config.getAbsolute_path()+stringFile); + File tmpFile = new File(Configuration.config.getAbsolute_path() + + stringFile); try { // File wird von Server gelöscht @@ -399,7 +445,7 @@ public class ServerHandler implements Server.Iface { String date = rs.getString("admin_createTime").replace(" ", "") .replace("-", "").replace(":", ""); String name = rs.getString("name"); - String path = Configuration.config.getAbsolute_path()+"temp/" + String path = Configuration.config.getAbsolute_path() + "temp/" + date.substring(0, date.length() - 2) + "_" + hs + "_" + user + "_" + name + ".xml"; File xmlFile = new File(path); @@ -415,5 +461,4 @@ public class ServerHandler implements Server.Iface { } - } -- cgit v1.2.3-55-g7522 From d6aa4290b083676f0e2c38eb2ddebce3a6516eaa Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 15 May 2014 09:19:40 +0200 Subject: t --- Dozentenmodul/bin/ftp/UploadTask.class | Bin 3474 -> 3496 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 13293 -> 13316 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 9658 -> 9626 bytes Dozentenmodul/src/ftp/UploadTask.java | 3 ++- .../src/gui/image/FTPCreateUploader_GUI.java | 2 ++ Dozentenmodul/src/gui/intro/Login_GUI.java | 3 +-- Dozentenmodulserver/bin/server/ServerHandler.class | Bin 15199 -> 15199 bytes Dozentenmodulserver/src/server/ServerHandler.java | 1 + 8 files changed, 6 insertions(+), 3 deletions(-) (limited to 'Dozentenmodulserver/src/server/ServerHandler.java') diff --git a/Dozentenmodul/bin/ftp/UploadTask.class b/Dozentenmodul/bin/ftp/UploadTask.class index 2b62ba67..101ff93b 100644 Binary files a/Dozentenmodul/bin/ftp/UploadTask.class and b/Dozentenmodul/bin/ftp/UploadTask.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index 6c4219ce..704bd616 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 683a9b1a..aff3176d 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java index 2dbeff8d..06d76dc8 100644 --- a/Dozentenmodul/src/ftp/UploadTask.java +++ b/Dozentenmodul/src/ftp/UploadTask.java @@ -49,6 +49,7 @@ public class UploadTask extends SwingWorker { FileInputStream inputStream = new FileInputStream(uploadFile); byte[] buffer = new byte[BUFFER_SIZE]; int bytesRead = -1; + int i=0; long totalBytesRead = 0; int percentCompleted = 0; long fileSize = uploadFile.length(); @@ -57,7 +58,7 @@ public class UploadTask extends SwingWorker { final double NANOS_PER_SECOND = 1000000000.0; final double BYTES_PER_MIB = 1024*1024; while ((bytesRead = inputStream.read(buffer)) != -1 && isCancelled()==false) { - util.writeFileBytes(buffer, 0, bytesRead); + util.writeFileBytes(buffer, 0, bytesRead); totalBytesRead += bytesRead; percentCompleted = (int) (totalBytesRead * 100 / fileSize); double speed = NANOS_PER_SECOND / BYTES_PER_MIB * totalBytesRead / (System.nanoTime() - start + 1); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 6d3872a0..8c14fa01 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -405,6 +405,7 @@ public class FTPCreateUploader_GUI extends JFrame implements btnUploadStarten.setText("Bitte warten"); try { + System.out.println("Test"); user = client.getFtpUser(); System.out.println("FTP name" + user.userName); System.out.println("FTP path" + user.path); @@ -427,6 +428,7 @@ public class FTPCreateUploader_GUI extends JFrame implements + person.verantwortlicher.getUsername() + "_" + Image.image.getImagename() + ".vmdk"); System.out.println("Uploading to host: "+host); + task = new UploadTask(host, port, user.userName, user.password, user.path+"temp/", uploadFile); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index ead2bd11..b30a33a7 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -232,8 +232,7 @@ public class Login_GUI extends JFrame { .getAuthToken()); String hochschule = user.eMail.substring( - user.eMail.indexOf("@") + 1, - user.eMail.indexOf(".", user.eMail.indexOf("@"))); + user.eMail.indexOf("@") + 1); person.verantwortlicher.setUsername(lblusername.getText() .substring(0, lblusername.getText().indexOf("@"))); diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 052ffd4a..f0c8e2a5 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index e9bf43a7..57d6ed49 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -42,6 +42,7 @@ public class ServerHandler implements Server.Iface { user.setUserName(UUID.randomUUID().toString().substring(0, 8)); user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString() .substring(0, 8))); + user.setPath(Configuration.config.getAbsolute_path()); SQL sql = new SQL(); Connection con = sql.getConnection(); -- cgit v1.2.3-55-g7522