Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added ..gitignore.un~
Binary file not shown.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/bin/
/target/
/**/target/
.classpath
.project
.settings/
/**/.classpath
/**/.project
/**/.settings/
1 change: 1 addition & 0 deletions core/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public void write(FtpReply reply) throws FtpException {

public boolean isSecure() {
// TODO Auto-generated method stub
return ioSession.isSecure();
return ioSession.isSecured();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ public boolean isWriterIdle() {
*
* @return true if the control socket is secured
*/
public boolean isSecure() {
public boolean isSecured() {
return getFilterChain().contains(SslFilter.class);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ public void sessionClosed(IoSession session) throws Exception {
FtpIoSession ftpSession = new FtpIoSession(session, context);
ftpHandler.sessionClosed(ftpSession);
}
public void inputClosed(IoSession session) throws Exception {
FtpIoSession ftpSession = new FtpIoSession(session, context);
ftpHandler.sessionClosed(ftpSession);
}

public void sessionCreated(IoSession session) throws Exception {
FtpIoSession ftpSession = new FtpIoSession(session, context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,23 @@ protected boolean expectDataConnectionSecure() {
* already tested by login in setup but an explicit test is good anyways.
*/
public void testCommandChannel() throws Exception {
assertTrue(getActiveSession().isSecure());
assertTrue(getActiveSession().isSecured());

assertEquals(expectDataConnectionSecure(), getActiveSession().getDataConnection().isSecure());

assertTrue(FTPReply.isPositiveCompletion(client.noop()));
}

public void testReissueAuth() throws Exception {
assertTrue(getActiveSession().isSecure());
assertTrue(getActiveSession().isSecured());
assertTrue(FTPReply.isPositiveCompletion(client.noop()));

// we do not accept reissued AUTH or AUTH on implicitly secured socket
assertEquals(534, client.sendCommand("AUTH SSL"));
}

public void testIsSecure() {
assertTrue(getActiveSession().isSecure());
assertTrue(getActiveSession().isSecured());
}

public void testStoreWithProtPInPassiveMode() throws Exception {
Expand Down
1 change: 1 addition & 0 deletions examples/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
1 change: 1 addition & 0 deletions examples/ftpserver-example-spring-war/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
1 change: 1 addition & 0 deletions examples/ftpserver-osgi-ftplet-service/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
1 change: 1 addition & 0 deletions examples/ftpserver-osgi-spring-service/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
1 change: 1 addition & 0 deletions ftplet-api/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>2.0.4</version>
<version>2.0.9</version>
</dependency>

<dependency>
Expand All @@ -173,13 +173,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.4</version>
<version>1.6.6</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.6.4</version>
<version>1.6.6</version>
</dependency>

<!-- Test dependencies -->
Expand All @@ -192,31 +192,31 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>2.0</version>
<version>3.4</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.4</version>
<version>1.6.6</version>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<version>1.2.17</version>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
<version>1.10</version>
</dependency>

<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
<version>1.8.0.10</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down