From 5da5ac0db8a1dd7dbd89dbf60d41ca5ffd92c9c1 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 4 May 2011 11:07:16 +0000
Subject: [PATCH] LMS-2231: force clients to use "ftps". No plain connections
will be possible when 'ftp.server.use-ssl' is specified
SVN: 21130
---
.../dss/generic/server/ftp/FtpServer.java | 2 ++
.../generic/server/ftp/FtpServerConfig.java | 26 +++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
index 1687baa36e4..053780f7ebc 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
@@ -63,6 +63,7 @@ public class FtpServer implements FileSystemFactory
if (config.isStartServer())
{
+ config.logStartupInfo();
start();
}
}
@@ -80,6 +81,7 @@ public class FtpServer implements FileSystemFactory
sslConfigFactory.setKeystorePassword(config.getKeyStorePassword());
sslConfigFactory.setKeyPassword(config.getKeyPassword());
factory.setSslConfiguration(sslConfigFactory.createSslConfiguration());
+ factory.setImplicitSsl(true);
}
serverFactory.addListener("default", factory.createListener());
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java
index de2a2ab500d..bbbd3361e08 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java
@@ -20,8 +20,13 @@ import java.io.File;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
+import org.apache.log4j.Logger;
+
+import ch.systemsx.cisd.common.logging.LogCategory;
+import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.utilities.ExtendedProperties;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
import ch.systemsx.cisd.openbis.dss.generic.server.ConfigParameters;
@@ -31,6 +36,9 @@ import ch.systemsx.cisd.openbis.dss.generic.server.ConfigParameters;
*/
public class FtpServerConfig
{
+ private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
+ FtpServerConfig.class);
+
private final static String PREFIX = "ftp.server.";
private final static String ENABLE_KEY = PREFIX + "enable";
@@ -160,4 +168,22 @@ public class FtpServerConfig
return Collections.unmodifiableMap(fileListSubPaths);
}
+ /**
+ * information being logged on FTP server startup.
+ */
+ public void logStartupInfo()
+ {
+ operationLog.info("Ftp Server port: " + port);
+ operationLog.info("Ftp Server using SSL: " + useSSL);
+ operationLog.info("Ftp Server data set display template : " + dataSetDisplayTemplate);
+ for (Entry<String, String> subpathEntry : fileListSubPaths.entrySet())
+ {
+ String message =
+ String.format("Ftp Server subpath configuration for data "
+ + "set type '%s' : '%s'", subpathEntry.getKey(),
+ subpathEntry.getValue());
+ operationLog.info(message);
+ }
+ }
+
}
--
GitLab