Author: norman
Date: Fri Sep 16 10:56:13 2011
New Revision: 1171500
URL: http://svn.apache.org/viewvc?rev=1171500&view=rev
Log:
Handle STARTTLS correctly. See PROTOCOLS-30
Added:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/StartTlsPop3Response.java
(with props)
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
Added:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/StartTlsPop3Response.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/StartTlsPop3Response.java?rev=1171500&view=auto
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/StartTlsPop3Response.java
(added)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/StartTlsPop3Response.java
Fri Sep 16 10:56:13 2011
@@ -0,0 +1,39 @@
+/****************************************************************
+ * 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.james.pop3server;
+
+import org.apache.james.protocols.api.StartTlsResponse;
+
+/**
+ * Special sub-type of {@link POP3Response} which will trigger the start of
TLS after the response was written to the client
+ *
+ *
+ */
+public class StartTlsPop3Response extends POP3Response implements
StartTlsResponse{
+
+ public StartTlsPop3Response(String code, CharSequence description) {
+ super(code, description);
+ }
+
+ public StartTlsPop3Response(String code) {
+ super(code);
+ }
+
+}
Propchange:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/StartTlsPop3Response.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java?rev=1171500&r1=1171499&r2=1171500&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
Fri Sep 16 10:56:13 2011
@@ -19,13 +19,13 @@
package org.apache.james.pop3server.core;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
+import org.apache.james.pop3server.StartTlsPop3Response;
import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
@@ -49,23 +49,13 @@ public class StlsCmdHandler implements C
// check if starttls is supported, the state is the right one and it
was
// not started before
if (session.isStartTLSSupported() && session.getHandlerState() ==
POP3Session.AUTHENTICATION_READY && session.isTLSStarted() == false) {
- response = new POP3Response(POP3Response.OK_RESPONSE, "Begin TLS
negotiation");
- session.writeResponse(response);
- try {
- session.startTLS();
- } catch (IOException e) {
- session.getLogger().info("Error while trying to secure
connection", e);
-
- // disconnect
- response = new POP3Response(POP3Response.ERR_RESPONSE);
- response.setEndSession(true);
- return response;
- }
+ response = new StartTlsPop3Response(POP3Response.OK_RESPONSE,
"Begin TLS negotiation");
+ return response;
+
} else {
response = new POP3Response(POP3Response.ERR_RESPONSE);
return response;
}
- return null;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
