Author: ngn
Date: Sat Feb 27 20:43:03 2010
New Revision: 917039
URL: http://svn.apache.org/viewvc?rev=917039&view=rev
Log:
Remove check for File.fileSeparatorChar from MKD command. Will fail incorrectly
on custom file systems, and will disallow creation of directories which the OS
allows in some cases (FTPSERVER-348)
Modified:
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
Modified:
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java?rev=917039&r1=917038&r2=917039&view=diff
==============================================================================
---
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
(original)
+++
mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
Sat Feb 27 20:43:03 2010
@@ -61,7 +61,7 @@
// argument check
String fileName = request.getArgument();
- if (fileName == null || fileName.indexOf(File.pathSeparatorChar) > -1)
{
+ if (fileName == null) {
session.write(LocalizedFtpReply.translate(session, request,
context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"MKD", null));
Modified:
mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java?rev=917039&r1=917038&r2=917039&view=diff
==============================================================================
---
mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
(original)
+++
mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
Sat Feb 27 20:43:03 2010
@@ -56,10 +56,6 @@
assertEquals(501, client.sendCommand("MKD"));
}
- public void testMkdirInValidDirectoryName() throws Exception {
- assertEquals(501, client.sendCommand("MKD foo:bar;foo"));
- }
-
/**
* FTPSERVER-233, we should not recursively create directories
*/
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java?rev=917039&r1=917038&r2=917039&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
Sat Feb 27 20:43:03 2010
@@ -61,10 +61,7 @@
// argument check
String fileName = request.getArgument();
- //TODO perhaps we do not need to check if the given argument contains
- //path separator. Windows allows to create a dir like "a;b". Why
should
- //we restrict creation of such a folder?
- if (fileName == null || fileName.indexOf(File.pathSeparatorChar) > -1)
{
+ if (fileName == null) {
session.write(LocalizedFileActionFtpReply.translate(session,
request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"MKD", null, null));
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java?rev=917039&r1=917038&r2=917039&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
Sat Feb 27 20:43:03 2010
@@ -57,10 +57,6 @@
assertEquals(501, client.sendCommand("MKD"));
}
- public void testMkdirInValidDirectoryName() throws Exception {
- assertEquals(501, client.sendCommand("MKD foo:bar;foo"));
- }
-
/**
* FTPSERVER-233, we should not recursively create directories
*/
