diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/thrift')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | 12 | ||||
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java index 34995b41..40c198ac 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java @@ -4,12 +4,14 @@ import java.awt.Frame; import java.awt.Window; import java.io.File; import java.io.FileNotFoundException; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.net.ssl.SSLContext; import javax.swing.JFileChooser; import org.apache.logging.log4j.LogManager; @@ -406,10 +408,12 @@ public class ThriftActions { TException transEx = null; String transHost = null; TransferInformation transInf = null; + SSLContext sslContext = null; try { transInf = ThriftManager.getSatClient().requestDownload(Session.getSatelliteToken(), imageVersionId); transHost = Session.getSatelliteAddress(); + sslContext = ThriftManager.getSatelliteSslContext(); } catch (TException e) { transEx = e; } @@ -420,6 +424,10 @@ public class ThriftActions { transInf = ThriftManager.getMasterClient().downloadImage(Session.getSatelliteToken(), imageVersionId); transHost = App.getMasterServerAddress(); + try { + sslContext = SSLContext.getDefault(); + } catch (NoSuchAlgorithmException e) { + } } catch (TException e) { transEx = e; } @@ -436,8 +444,8 @@ public class ThriftActions { final TransferInformation fTransInf = transInf; final DownloadTask dlTask; try { - dlTask = new DownloadTask(fTransHost, transInf.getPlainPort(), - transInf.getToken(), tmpDiskFile, imageSize, null); + dlTask = new DownloadTask(fTransHost, transInf, + sslContext, tmpDiskFile, imageSize, null); } catch (FileNotFoundException e) { Gui.asyncMessageBox(I18n.THRIFT.getString("ThriftActions.Message.error.destinationNotWritable"), MessageType.ERROR, LOGGER, e); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java index 78e41d05..5aa36bb1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java @@ -165,8 +165,8 @@ public class UploadInitiator { // do actually start the upload now LOGGER.debug("Starting upload for: " + diskFile.getName()); try { - uploadTask = new UploadTask(Session.getSatelliteAddress(), - transferInformation.getPlainPort(), transferInformation.getToken(), diskFile); + uploadTask = new UploadTask(Session.getSatelliteAddress(), transferInformation, + ThriftManager.getSatelliteSslContext(), diskFile); } catch (FileNotFoundException e) { cancelWithGuiErrorMessage("Kann VM nicht hochladen: Datei nicht gefunden\n\n" + diskFile.getAbsolutePath()); |