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/11/16 22:15:53 UTC
svn commit: r718119 - in /mina/ftpserver/trunk/core/src:
main/java/org/apache/ftpserver/command/impl/PASS.java
test/java/org/apache/ftpserver/clienttests/LoginTest.java
test/resources/users.properties
Author: ngn
Date: Sun Nov 16 13:15:52 2008
New Revision: 718119
URL: http://svn.apache.org/viewvc?rev=718119&view=rev
Log:
Allow for empty passwords (FTPSERVER-220)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java
mina/ftpserver/trunk/core/src/test/resources/users.properties
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java?rev=718119&r1=718118&r2=718119&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java Sun Nov 16 13:15:52 2008
@@ -75,17 +75,7 @@
// argument check
String password = request.getArgument();
- if (password == null) {
- session
- .write(LocalizedFtpReply
- .translate(
- session,
- request,
- context,
- FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
- "PASS", null));
- return;
- }
+
// check user name
String userName = session.getUserArgument();
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java?rev=718119&r1=718118&r2=718119&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java Sun Nov 16 13:15:52 2008
@@ -57,9 +57,14 @@
public void testLoginWithEmptyPassword() throws Exception {
assertTrue(FTPReply.isPositiveIntermediate(client.user(ADMIN_USERNAME)));
- assertEquals(501, client.sendCommand("PASS"));
+ assertEquals(530, client.sendCommand("PASS"));
}
+ public void testLoginWithEmptyCorrectPassword() throws Exception {
+ assertTrue(FTPReply.isPositiveIntermediate(client.user("testuser3")));
+ assertTrue(FTPReply.isPositiveCompletion(client.sendCommand("PASS")));
+ }
+
public void testLoginIncorrectPassword() throws Exception {
assertFalse(client.login(ADMIN_USERNAME, UNKNOWN_PASSWORD));
}
Modified: mina/ftpserver/trunk/core/src/test/resources/users.properties
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/resources/users.properties?rev=718119&r1=718118&r2=718119&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/resources/users.properties (original)
+++ mina/ftpserver/trunk/core/src/test/resources/users.properties Sun Nov 16 13:15:52 2008
@@ -17,31 +17,37 @@
#Generated file - don't edit (please)
#Wed Feb 07 20:58:22 CET 2007
+
+ftpserver.user.admin.userpassword=admin
ftpserver.user.admin.homedirectory=./test-tmp/ftproot
ftpserver.user.admin.maxloginperip=0
-
ftpserver.user.admin.idletime=0
ftpserver.user.admin.enableflag=true
-ftpserver.user.testuser2.userpassword=password
-ftpserver.user.testuser2.writepermission=true
-ftpserver.user.testuser1.homedirectory=./test-tmp/ftproot
-ftpserver.user.anonymous.uploadrate=4800
-ftpserver.user.testuser2.homedirectory=./test-tmp/ftproot
+ftpserver.user.admin.writepermission=true
ftpserver.user.admin.maxloginnumber=0
-ftpserver.user.testuser2.maxloginperip=2
-ftpserver.user.testuser1.maxloginnumber=3
ftpserver.user.admin.uploadrate=0
-ftpserver.user.anonymous.maxloginperip=2
-ftpserver.user.admin.userpassword=admin
-ftpserver.user.testuser1.writepermission=true
ftpserver.user.admin.downloadrate=0
-ftpserver.user.anonymous.downloadrate=4800
+
+ftpserver.user.testuser1.homedirectory=./test-tmp/ftproot
+ftpserver.user.testuser1.maxloginnumber=3
+ftpserver.user.testuser1.writepermission=true
ftpserver.user.testuser1.userpassword=password
-ftpserver.user.admin.writepermission=true
+ftpserver.user.testuser2.userpassword=password
+ftpserver.user.testuser2.writepermission=true
+ftpserver.user.testuser2.homedirectory=./test-tmp/ftproot
+ftpserver.user.testuser2.maxloginperip=2
+
+ftpserver.user.testuser3.userpassword=
+ftpserver.user.testuser3.writepermission=true
+ftpserver.user.testuser3.homedirectory=./test-tmp/ftproot
+
+ftpserver.user.anonymous.userpassword=
+ftpserver.user.anonymous.maxloginperip=2
+ftpserver.user.anonymous.uploadrate=4800
ftpserver.user.anonymous.writepermission=false
ftpserver.user.anonymous.maxloginnumber=20
ftpserver.user.anonymous.enableflag=true
-ftpserver.user.anonymous.userpassword=
ftpserver.user.anonymous.homedirectory=./test-tmp/ftproot
ftpserver.user.anonymous.idletime=300
+ftpserver.user.anonymous.downloadrate=4800