You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/08/07 21:34:00 UTC
svn commit: r683687 - in /mina/ftpserver/trunk:
core/src/main/java/org/apache/ftpserver/
core/src/main/java/org/apache/ftpserver/interfaces/
ftplet-api/src/main/java/org/apache/ftpserver/ftplet/
Author: ngn
Date: Thu Aug 7 12:34:00 2008
New Revision: 683687
URL: http://svn.apache.org/viewvc?rev=683687&view=rev
Log:
Provide convenience methods for checking is the control and data sockets are secure (FTPSERVER-149)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/IODataConnectionFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnectionFactory.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java?rev=683687&r1=683686&r2=683687&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java Thu Aug 7 12:34:00 2008
@@ -220,4 +220,11 @@
public void write(FtpReply reply) throws FtpException {
ioSession.write(reply);
}
+
+ public boolean isSecure() {
+ // TODO Auto-generated method stub
+ return ioSession.isSecure();
+ }
+
+
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/IODataConnectionFactory.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/IODataConnectionFactory.java?rev=683687&r1=683686&r2=683687&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/IODataConnectionFactory.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/IODataConnectionFactory.java Thu Aug 7 12:34:00 2008
@@ -318,7 +318,7 @@
/* (non-Javadoc)
- * @see org.apache.ftpserver.FtpDataConnectionFactory2#isSecure()
+ * @see org.apache.ftpserver.DataConnectionFactory#isSecure()
*/
public boolean isSecure() {
return secure;
@@ -332,7 +332,7 @@
}
/* (non-Javadoc)
- * @see org.apache.ftpserver.FtpDataConnectionFactory2#isZipMode()
+ * @see org.apache.ftpserver.DataConnectionFactory#isZipMode()
*/
public boolean isZipMode() {
return isZip;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java?rev=683687&r1=683686&r2=683687&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java Thu Aug 7 12:34:00 2008
@@ -721,4 +721,13 @@
return wrappedSession.isWriterIdle();
}
+ /**
+ * Indicates whether the control socket for this session is secure,
+ * that is, running over SSL/TLS
+ * @return true if the control socket is secured
+ */
+ public boolean isSecure() {
+ return getFilterChain().contains("sslSessionFilter");
+ }
+
}
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnectionFactory.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnectionFactory.java?rev=683687&r1=683686&r2=683687&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnectionFactory.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnectionFactory.java Thu Aug 7 12:34:00 2008
@@ -30,6 +30,13 @@
*/
DataConnection openConnection() throws Exception;
+ /**
+ * Indicates whether the data socket created by this factory will be secure
+ * that is, running over SSL/TLS.
+ * @return true if the data socket will be secured
+ */
+
+ boolean isSecure();
/**
* Close data socket.
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java?rev=683687&r1=683686&r2=683687&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java Thu Aug 7 12:34:00 2008
@@ -154,4 +154,13 @@
* @throws FtpException
*/
void write(FtpReply reply) throws FtpException;
+
+ /**
+ * Indicates whether the control socket for this session is secure,
+ * that is, running over SSL/TLS
+ * @return true if the control socket is secured
+ */
+ boolean isSecure();
+
+
}