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/04/06 21:01:01 UTC
svn commit: r645286 - in
/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver:
filesystem/NativeFileSystemManager.java filter/
filter/FtpLoggingFilter.java listener/mina/MinaListener.java
Author: ngn
Date: Sun Apr 6 12:01:00 2008
New Revision: 645286
URL: http://svn.apache.org/viewvc?rev=645286&view=rev
Log:
+ FtpLoggingFilter, specialized LoggingFilter for masking FTP password (FTPSERVER-120)
Added:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java?rev=645286&r1=645285&r2=645286&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java Sun Apr 6 12:01:00 2008
@@ -75,7 +75,6 @@
}
}
- System.out.println("#########" + caseInsensitive);
FileSystemView fsView = new NativeFileSystemView(user, caseInsensitive);
return fsView;
}
Added: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java?rev=645286&view=auto
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java (added)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java Sun Apr 6 12:01:00 2008
@@ -0,0 +1,99 @@
+/*
+ * 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.filter;
+
+import org.apache.mina.common.IoEventType;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.logging.LoggingFilter;
+
+/**
+ * Specialized @see {@link LoggingFilter} that optionally
+ * masks FTP passwords.
+ */
+public class FtpLoggingFilter extends LoggingFilter {
+
+ private boolean maskPassword = true;
+
+ /**
+ * @see LoggingFilter#LoggingFilter()
+ */
+ public FtpLoggingFilter() {
+ super();
+ }
+
+ /**
+ * @see LoggingFilter#LoggingFilter(Class)
+ */
+ public FtpLoggingFilter(Class<?> clazz) {
+ super(clazz);
+ }
+
+ /**
+ * @see LoggingFilter#LoggingFilter(String)
+ */
+ public FtpLoggingFilter(String name) {
+ super(name);
+ }
+
+ /**
+ * @see LoggingFilter#messageReceived(org.apache.mina.common.IoFilter.NextFilter, IoSession, Object)
+ */
+ @Override
+ public void messageReceived(NextFilter nextFilter, IoSession session,
+ Object message) throws Exception {
+ String request = (String) message;
+
+ String logMessage;
+ if(maskPassword) {
+
+ request = request.trim().toUpperCase();
+
+ if(request.startsWith("PASS ")) {
+ logMessage = "PASS *****";
+ } else {
+ logMessage = request;
+ }
+ } else {
+ logMessage = request;
+ }
+
+ log(IoEventType.MESSAGE_RECEIVED, "RECEIVED: {}", logMessage);
+ nextFilter.messageReceived(session, message);
+ }
+
+ /**
+ * Are password masked?
+ * @return true if passwords are masked
+ */
+ public boolean isMaskPassword() {
+ return maskPassword;
+ }
+
+ /**
+ * Mask password in log messages
+ * @param maskPassword true if passwords should be masked
+ */
+ public void setMaskPassword(boolean maskPassword) {
+ this.maskPassword = maskPassword;
+ }
+
+
+
+}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java?rev=645286&r1=645285&r2=645286&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java Sun Apr 6 12:01:00 2008
@@ -26,6 +26,7 @@
import org.apache.ftpserver.DefaultFtpHandler;
import org.apache.ftpserver.FtpHandler;
+import org.apache.ftpserver.filter.FtpLoggingFilter;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.listener.AbstractListener;
import org.apache.ftpserver.listener.Listener;
@@ -35,7 +36,6 @@
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.filter.executor.OrderedThreadPoolExecutor;
-import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.filter.logging.MdcInjectionFilter;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.SocketAcceptor;
@@ -99,7 +99,7 @@
acceptor.getFilterChain().addLast(
"codec",
new ProtocolCodecFilter( new FtpServerProtocolCodecFactory() ) );
- acceptor.getFilterChain().addLast("logger", new LoggingFilter() );
+ acceptor.getFilterChain().addLast("logger", new FtpLoggingFilter() );
acceptor.getFilterChain().addLast("mdcFilter2", mdcFilter);