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 2009/01/06 20:29:06 UTC
svn commit: r732069 - in /mina/ftpserver/trunk/core/src:
main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java
main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
test/java/org/apache/ftpserver/clienttests/SiteTest.java
Author: ngn
Date: Tue Jan 6 11:29:06 2009
New Revision: 732069
URL: http://svn.apache.org/viewvc?rev=732069&view=rev
Log:
Fix for SITE DESCUSER printing WriteRequest FQCN instead of true (FTPSERVER-257)
Fix for SITE WHO throwing NPE (FTPSERVER-256)
Added test for the above commands
Added:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SiteTest.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java?rev=732069&r1=732068&r2=732069&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java Tue Jan 6 11:29:06 2009
@@ -104,7 +104,7 @@
sb.append("homedirectory : ").append(user.getHomeDirectory()).append(
"\n");
sb.append("writepermission : ").append(
- user.authorize(new WriteRequest())).append("\n");
+ user.authorize(new WriteRequest()) != null).append("\n");
sb.append("enableflag : ").append(user.getEnabled()).append("\n");
sb.append("idletime : ").append(user.getMaxIdleTime()).append(
"\n");
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java?rev=732069&r1=732068&r2=732069&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java Tue Jan 6 11:29:06 2009
@@ -63,6 +63,8 @@
public void sessionOpened(final FtpIoSession session) throws Exception {
context.getFtpletContainer().onConnect(session.getFtpletSession());
+ session.updateLastAccessTime();
+
session.write(LocalizedFtpReply.translate(session, null, context,
FtpReply.REPLY_220_SERVICE_READY, null, null));
}
@@ -114,6 +116,8 @@
public void messageReceived(final FtpIoSession session,
final FtpRequest request) throws Exception {
try {
+ session.updateLastAccessTime();
+
String commandName = request.getCommand();
CommandFactory commandFactory = context.getCommandFactory();
Command command = commandFactory.getCommand(commandName);
Added: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SiteTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SiteTest.java?rev=732069&view=auto
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SiteTest.java (added)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SiteTest.java Tue Jan 6 11:29:06 2009
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ftpserver.clienttests;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.net.ftp.FTPReply;
+
+/**
+*
+* @author The Apache MINA Project (dev@mina.apache.org)
+* @version $Rev$, $Date$
+*
+*/
+public class SiteTest extends ClientTestTemplate {
+
+ public void testSiteDescUser() throws Exception {
+ client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
+
+ client.sendCommand("SITE DESCUSER admin");
+ String[] siteReplies = client.getReplyString().split("\r\n");
+
+ assertEquals("200-", siteReplies[0]);
+ assertEquals("userid : admin", siteReplies[1]);
+ assertEquals("userpassword : ********", siteReplies[2]);
+ assertEquals("homedirectory : ./test-tmp/ftproot", siteReplies[3]);
+ assertEquals("writepermission : true", siteReplies[4]);
+ assertEquals("enableflag : true", siteReplies[5]);
+ assertEquals("idletime : 0", siteReplies[6]);
+ assertEquals("uploadrate : 0", siteReplies[7]);
+ assertEquals("200 downloadrate : 0", siteReplies[8]);
+ }
+
+ public void testAnonNotAllowed() throws Exception {
+ client.login(ANONYMOUS_USERNAME, ANONYMOUS_PASSWORD);
+
+ assertTrue(FTPReply.isNegativePermanent(client.sendCommand("SITE DESCUSER admin")));
+ }
+
+ public void testSiteWho() throws Exception {
+ client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
+
+ client.sendCommand("SITE WHO");
+ String[] siteReplies = client.getReplyString().split("\r\n");
+
+ assertEquals("200-", siteReplies[0]);
+
+ String timestampPattern = "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}";
+ System.out.println(">>" + siteReplies[1] + "<<");
+
+ String pattern = "200 admin 127.0.0.1 " + timestampPattern + " " + timestampPattern + " ";
+
+ assertTrue(Pattern.matches(pattern, siteReplies[1]));
+ }
+
+
+
+}