moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 11:12:22 -05:00
Code Issues Releases Wiki Activity

POP: Fix from Stefan Guggisberg, handle invalid CR or LF line feeds in DoubleDotOutputStream

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1626 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2011-02-21 10:41:46 +00:00
parent c4cf56a92f
commit 60132202c7
2 changed files with 425 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
src/java/davmail/exchange/DoubleDotOutputStream.java
View File

@ -1,76 +1,76 @@
/*
* DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway
* Copyright (C) 2010 Mickael Guessant
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package davmail.exchange;
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
/**
* Replace single dot lines with double dot.
*/
public class DoubleDotOutputStream extends FilterOutputStream {
enum State {
CR, CRLF, CRLFDOT
}
State currentState;
/**
* @inheritDoc
*/
public DoubleDotOutputStream(OutputStream out) {
super(out);
}
@Override
public void write(int b) throws IOException {
if (currentState == null && b == '\r') {
currentState = State.CR;
} else if (currentState == State.CR && b == '\n') {
currentState = State.CRLF;
} else if (currentState == State.CRLF && b == '.') {
currentState = State.CRLFDOT;
} else if (currentState == State.CRLFDOT && b == '\r') {
out.write('.');
currentState = null;
} else {
currentState = null;
}
out.write(b);
}
/**
* Send termination characters.
* Do not close actual outputstream
*
* @throws IOException on error
*/
@Override
public void close() throws IOException {
if (currentState != State.CRLF) {
out.write('\r');
out.write('\n');
}
out.write('.');
out.write('\r');
out.write('\n');
}
}
/*
* DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway
* Copyright (C) 2010 Mickael Guessant
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package davmail.exchange;
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
/**
* RFC 1939: 3 Basic Operations
* [...]
* If any line begins with the termination octet, the line is "byte-stuffed" by
* pre-pending the termination octet to that line of the response.
*/
public class DoubleDotOutputStream extends FilterOutputStream {
// remember last 2 bytes written
int[] buf = {0, 0};
/**
* @inheritDoc
*/
public DoubleDotOutputStream(OutputStream out) {
super(out);
}
@Override
public void write(int b) throws IOException {
if (b == '.' && (buf[0] == '\r' || buf[0] == '\n' || buf[0] == 0)) {
// line starts with '.', prepend it with an additional '.'
out.write('.');
}
out.write(b);
buf[1] = buf[0];
buf[0] = b;
}
/**
* RFC 1939: 3 Basic Operations
* [...]
* Hence a multi-line response is terminated with the five octets
* "CRLF.CRLF"
* <p/>
* Do not close actual outputstream
*
* @throws IOException on error
*/
@Override
public void close() throws IOException {
if (buf[1] != '\r' || buf[0] != '\n') {
out.write('\r');
out.write('\n');
}
out.write('.');
out.write('\r');
out.write('\n');
}
}

698
src/java/davmail/pop/PopConnection.java
View File

@ -1,349 +1,349 @@
/*
* DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway
* Copyright (C) 2009 Mickael Guessant
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package davmail.pop;
import davmail.AbstractConnection;
import davmail.BundleMessage;
import davmail.DavGateway;
import davmail.exchange.DoubleDotOutputStream;
import davmail.exchange.ExchangeSession;
import davmail.exchange.ExchangeSessionFactory;
import davmail.ui.tray.DavGatewayTray;
import davmail.util.IOUtil;
import org.apache.log4j.Logger;
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.Socket;
import java.net.SocketException;
import java.util.Date;
import java.util.List;
import java.util.StringTokenizer;
/**
* Dav Gateway pop connection implementation
*/
public class PopConnection extends AbstractConnection {
private static final Logger LOGGER = Logger.getLogger(PopConnection.class);
private List<ExchangeSession.Message> messages;
/**
* Initialize the streams and start the thread.
*
* @param clientSocket POP client socket
*/
public PopConnection(Socket clientSocket) {
super(PopConnection.class.getSimpleName(), clientSocket, null);
}
protected long getTotalMessagesLength() {
int result = 0;
for (ExchangeSession.Message message : messages) {
result += message.size;
}
return result;
}
protected void printCapabilities() throws IOException {
sendClient("TOP");
sendClient("USER");
sendClient("UIDL");
sendClient(".");
}
protected void printList() throws IOException {
int i = 1;
for (ExchangeSession.Message message : messages) {
sendClient(i++ + " " + message.size);
}
sendClient(".");
}
protected void printUidList() throws IOException {
int i = 1;
for (ExchangeSession.Message message : messages) {
sendClient(i++ + " " + message.getUid());
}
sendClient(".");
}
@Override
public void run() {
String line;
StringTokenizer tokens;
try {
ExchangeSessionFactory.checkConfig();
sendOK("DavMail "+ DavGateway.getCurrentVersion()+" POP ready at " + new Date());
for (; ;) {
line = readClient();
// unable to read line, connection closed ?
if (line == null) {
break;
}
tokens = new StringTokenizer(line);
if (tokens.hasMoreTokens()) {
String command = tokens.nextToken();
if ("QUIT".equalsIgnoreCase(command)) {
// delete messages before quit
if (session != null) {
session.purgeOldestTrashAndSentMessages();
}
sendOK("Bye");
break;
} else if ("USER".equalsIgnoreCase(command)) {
userName = null;
password = null;
session = null;
if (tokens.hasMoreTokens()) {
userName = line.substring("USER ".length());
sendOK("USER : " + userName);
state = State.USER;
} else {
sendERR("invalid syntax");
state = State.INITIAL;
}
} else if ("PASS".equalsIgnoreCase(command)) {
if (state != State.USER) {
sendERR("invalid state");
state = State.INITIAL;
} else if (!tokens.hasMoreTokens()) {
sendERR("invalid syntax");
} else {
// bug 2194492 : allow space in password
password = line.substring("PASS".length() + 1);
try {
session = ExchangeSessionFactory.getInstance(userName, password);
sendOK("PASS");
state = State.AUTHENTICATED;
} catch (SocketException e) {
// can not send error to client after a socket exception
LOGGER.warn(BundleMessage.formatLog("LOG_CLIENT_CLOSED_CONNECTION"));
} catch (Exception e) {
DavGatewayTray.error(e);
sendERR(e);
}
}
} else if ("CAPA".equalsIgnoreCase(command)) {
sendOK("Capability list follows");
printCapabilities();
} else if (state != State.AUTHENTICATED) {
sendERR("Invalid state not authenticated");
} else {
// load messages (once)
if (messages == null) {
messages = session.getAllMessageUidAndSize("INBOX");
}
if ("STAT".equalsIgnoreCase(command)) {
sendOK(messages.size() + " " +
getTotalMessagesLength());
} else if ("NOOP".equalsIgnoreCase(command)) {
sendOK("");
} else if ("LIST".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
String token = tokens.nextToken();
try {
int messageNumber = Integer.valueOf(token);
ExchangeSession.Message message = messages.get(messageNumber - 1);
sendOK("" + messageNumber + ' ' + message.size);
} catch (NumberFormatException e) {
sendERR("Invalid message index: " + token);
} catch (IndexOutOfBoundsException e) {
sendERR("Invalid message index: " + token);
}
} else {
sendOK(messages.size() +
" messages (" + getTotalMessagesLength() +
" octets)");
printList();
}
} else if ("UIDL".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
String token = tokens.nextToken();
try {
int messageNumber = Integer.valueOf(token);
sendOK(messageNumber + " " + messages.get(messageNumber - 1).getUid());
} catch (NumberFormatException e) {
sendERR("Invalid message index: " + token);
} catch (IndexOutOfBoundsException e) {
sendERR("Invalid message index: " + token);
}
} else {
sendOK(messages.size() +
" messages (" + getTotalMessagesLength() +
" octets)");
printUidList();
}
} else if ("RETR".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
try {
int messageNumber = Integer.valueOf(tokens.nextToken()) - 1;
sendOK("");
DoubleDotOutputStream doubleDotOutputStream = new DoubleDotOutputStream(os);
IOUtil.write(messages.get(messageNumber).getRawInputStream(), doubleDotOutputStream);
doubleDotOutputStream.close();
} catch (SocketException e) {
// can not send error to client after a socket exception
LOGGER.warn(BundleMessage.formatLog("LOG_CLIENT_CLOSED_CONNECTION"));
} catch (Exception e) {
DavGatewayTray.error(new BundleMessage("LOG_ERROR_RETRIEVING_MESSAGE"), e);
sendERR("error retreiving message " + e + ' ' + e.getMessage());
}
} else {
sendERR("invalid message index");
}
} else if ("DELE".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
ExchangeSession.Message message;
try {
int messageNumber = Integer.valueOf(tokens.
nextToken()) - 1;
message = messages.get(messageNumber);
message.moveToTrash();
sendOK("DELETE");
} catch (NumberFormatException e) {
sendERR("invalid message index");
} catch (IndexOutOfBoundsException e) {
sendERR("invalid message index");
}
} else {
sendERR("invalid message index");
}
} else if ("TOP".equalsIgnoreCase(command)) {
int message = 0;
try {
message = Integer.valueOf(tokens.nextToken());
int lines = Integer.valueOf(tokens.nextToken());
ExchangeSession.Message m = messages.get(message - 1);
sendOK("");
DoubleDotOutputStream doubleDotOutputStream = new DoubleDotOutputStream(os);
IOUtil.write(m.getRawInputStream(), new TopOutputStream(doubleDotOutputStream, lines));
doubleDotOutputStream.close();
} catch (NumberFormatException e) {
sendERR("invalid command");
} catch (IndexOutOfBoundsException e) {
sendERR("invalid message index: " + message);
} catch (Exception e) {
sendERR("error retreiving top of messages");
DavGatewayTray.error(e);
}
} else if ("RSET".equalsIgnoreCase(command)) {
sendOK("RSET");
} else {
sendERR("unknown command");
}
}
} else {
sendERR("unknown command");
}
os.flush();
}
} catch (SocketException e) {
DavGatewayTray.debug(new BundleMessage("LOG_CONNECTION_CLOSED"));
} catch (Exception e) {
DavGatewayTray.log(e);
try {
sendERR(e.getMessage());
} catch (IOException e2) {
DavGatewayTray.debug(new BundleMessage("LOG_EXCEPTION_SENDING_ERROR_TO_CLIENT"), e2);
}
} finally {
close();
}
DavGatewayTray.resetIcon();
}
protected void sendOK(String message) throws IOException {
sendClient("+OK ", message);
}
protected void sendERR(Exception e) throws IOException {
String message = e.getMessage();
if (message == null) {
message = e.toString();
}
sendERR(message);
}
protected void sendERR(String message) throws IOException {
sendClient("-ERR ", message.replaceAll("\\n", " "));
}
/**
* Filter to limit output lines to max body lines after header
*/
private static final class TopOutputStream extends FilterOutputStream {
private static final int START = 0;
private static final int CR = 1;
private static final int CRLF = 2;
private static final int CRLFCR = 3;
private static final int BODY = 4;
private int maxLines;
private int state = START;
private TopOutputStream(OutputStream os, int maxLines) {
super(os);
this.maxLines = maxLines;
}
@Override
public void write(int b) throws IOException {
if (state != BODY || maxLines > 0) {
super.write(b);
}
if (state == BODY) {
if (b == '\n') {
maxLines--;
}
} else if (state == START) {
if (b == '\r') {
state = CR;
}
} else if (state == CR) {
if (b == '\n') {
state = CRLF;
} else {
state = START;
}
} else if (state == CRLF) {
if (b == '\r') {
state = CRLFCR;
} else {
state = START;
}
} else if (state == CRLFCR) {
if (b == '\n') {
state = BODY;
} else {
state = START;
}
}
}
}
}
/*
* DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway
* Copyright (C) 2009 Mickael Guessant
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package davmail.pop;
import davmail.AbstractConnection;
import davmail.BundleMessage;
import davmail.DavGateway;
import davmail.exchange.DoubleDotOutputStream;
import davmail.exchange.ExchangeSession;
import davmail.exchange.ExchangeSessionFactory;
import davmail.ui.tray.DavGatewayTray;
import davmail.util.IOUtil;
import org.apache.log4j.Logger;
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.Socket;
import java.net.SocketException;
import java.util.Date;
import java.util.List;
import java.util.StringTokenizer;
/**
* Dav Gateway pop connection implementation
*/
public class PopConnection extends AbstractConnection {
private static final Logger LOGGER = Logger.getLogger(PopConnection.class);
private List<ExchangeSession.Message> messages;
/**
* Initialize the streams and start the thread.
*
* @param clientSocket POP client socket
*/
public PopConnection(Socket clientSocket) {
super(PopConnection.class.getSimpleName(), clientSocket, null);
}
protected long getTotalMessagesLength() {
int result = 0;
for (ExchangeSession.Message message : messages) {
result += message.size;
}
return result;
}
protected void printCapabilities() throws IOException {
sendClient("TOP");
sendClient("USER");
sendClient("UIDL");
sendClient(".");
}
protected void printList() throws IOException {
int i = 1;
for (ExchangeSession.Message message : messages) {
sendClient(i++ + " " + message.size);
}
sendClient(".");
}
protected void printUidList() throws IOException {
int i = 1;
for (ExchangeSession.Message message : messages) {
sendClient(i++ + " " + message.getUid());
}
sendClient(".");
}
@Override
public void run() {
String line;
StringTokenizer tokens;
try {
ExchangeSessionFactory.checkConfig();
sendOK("DavMail "+ DavGateway.getCurrentVersion()+" POP ready at " + new Date());
for (; ;) {
line = readClient();
// unable to read line, connection closed ?
if (line == null) {
break;
}
tokens = new StringTokenizer(line);
if (tokens.hasMoreTokens()) {
String command = tokens.nextToken();
if ("QUIT".equalsIgnoreCase(command)) {
// delete messages before quit
if (session != null) {
session.purgeOldestTrashAndSentMessages();
}
sendOK("Bye");
break;
} else if ("USER".equalsIgnoreCase(command)) {
userName = null;
password = null;
session = null;
if (tokens.hasMoreTokens()) {
userName = line.substring("USER ".length());
sendOK("USER : " + userName);
state = State.USER;
} else {
sendERR("invalid syntax");
state = State.INITIAL;
}
} else if ("PASS".equalsIgnoreCase(command)) {
if (state != State.USER) {
sendERR("invalid state");
state = State.INITIAL;
} else if (!tokens.hasMoreTokens()) {
sendERR("invalid syntax");
} else {
// bug 2194492 : allow space in password
password = line.substring("PASS".length() + 1);
try {
session = ExchangeSessionFactory.getInstance(userName, password);
sendOK("PASS");
state = State.AUTHENTICATED;
} catch (SocketException e) {
// can not send error to client after a socket exception
LOGGER.warn(BundleMessage.formatLog("LOG_CLIENT_CLOSED_CONNECTION"));
} catch (Exception e) {
DavGatewayTray.error(e);
sendERR(e);
}
}
} else if ("CAPA".equalsIgnoreCase(command)) {
sendOK("Capability list follows");
printCapabilities();
} else if (state != State.AUTHENTICATED) {
sendERR("Invalid state not authenticated");
} else {
// load messages (once)
if (messages == null) {
messages = session.getAllMessageUidAndSize("INBOX");
}
if ("STAT".equalsIgnoreCase(command)) {
sendOK(messages.size() + " " +
getTotalMessagesLength());
} else if ("NOOP".equalsIgnoreCase(command)) {
sendOK("");
} else if ("LIST".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
String token = tokens.nextToken();
try {
int messageNumber = Integer.valueOf(token);
ExchangeSession.Message message = messages.get(messageNumber - 1);
sendOK("" + messageNumber + ' ' + message.size);
} catch (NumberFormatException e) {
sendERR("Invalid message index: " + token);
} catch (IndexOutOfBoundsException e) {
sendERR("Invalid message index: " + token);
}
} else {
sendOK(messages.size() +
" messages (" + getTotalMessagesLength() +
" octets)");
printList();
}
} else if ("UIDL".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
String token = tokens.nextToken();
try {
int messageNumber = Integer.valueOf(token);
sendOK(messageNumber + " " + messages.get(messageNumber - 1).getUid());
} catch (NumberFormatException e) {
sendERR("Invalid message index: " + token);
} catch (IndexOutOfBoundsException e) {
sendERR("Invalid message index: " + token);
}
} else {
sendOK(messages.size() +
" messages (" + getTotalMessagesLength() +
" octets)");
printUidList();
}
} else if ("RETR".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
try {
int messageNumber = Integer.valueOf(tokens.nextToken()) - 1;
sendOK("");
DoubleDotOutputStream doubleDotOutputStream = new DoubleDotOutputStream(os);
IOUtil.write(messages.get(messageNumber).getRawInputStream(), doubleDotOutputStream);
doubleDotOutputStream.close();
} catch (SocketException e) {
// can not send error to client after a socket exception
LOGGER.warn(BundleMessage.formatLog("LOG_CLIENT_CLOSED_CONNECTION"));
} catch (Exception e) {
DavGatewayTray.error(new BundleMessage("LOG_ERROR_RETRIEVING_MESSAGE"), e);
sendERR("error retrieving message " + e + ' ' + e.getMessage());
}
} else {
sendERR("invalid message index");
}
} else if ("DELE".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
ExchangeSession.Message message;
try {
int messageNumber = Integer.valueOf(tokens.
nextToken()) - 1;
message = messages.get(messageNumber);
message.moveToTrash();
sendOK("DELETE");
} catch (NumberFormatException e) {
sendERR("invalid message index");
} catch (IndexOutOfBoundsException e) {
sendERR("invalid message index");
}
} else {
sendERR("invalid message index");
}
} else if ("TOP".equalsIgnoreCase(command)) {
int message = 0;
try {
message = Integer.valueOf(tokens.nextToken());
int lines = Integer.valueOf(tokens.nextToken());
ExchangeSession.Message m = messages.get(message - 1);
sendOK("");
DoubleDotOutputStream doubleDotOutputStream = new DoubleDotOutputStream(os);
IOUtil.write(m.getRawInputStream(), new TopOutputStream(doubleDotOutputStream, lines));
doubleDotOutputStream.close();
} catch (NumberFormatException e) {
sendERR("invalid command");
} catch (IndexOutOfBoundsException e) {
sendERR("invalid message index: " + message);
} catch (Exception e) {
sendERR("error retreiving top of messages");
DavGatewayTray.error(e);
}
} else if ("RSET".equalsIgnoreCase(command)) {
sendOK("RSET");
} else {
sendERR("unknown command");
}
}
} else {
sendERR("unknown command");
}
os.flush();
}
} catch (SocketException e) {
DavGatewayTray.debug(new BundleMessage("LOG_CONNECTION_CLOSED"));
} catch (Exception e) {
DavGatewayTray.log(e);
try {
sendERR(e.getMessage());
} catch (IOException e2) {
DavGatewayTray.debug(new BundleMessage("LOG_EXCEPTION_SENDING_ERROR_TO_CLIENT"), e2);
}
} finally {
close();
}
DavGatewayTray.resetIcon();
}
protected void sendOK(String message) throws IOException {
sendClient("+OK ", message);
}
protected void sendERR(Exception e) throws IOException {
String message = e.getMessage();
if (message == null) {
message = e.toString();
}
sendERR(message);
}
protected void sendERR(String message) throws IOException {
sendClient("-ERR ", message.replaceAll("\\n", " "));
}
/**
* Filter to limit output lines to max body lines after header
*/
private static final class TopOutputStream extends FilterOutputStream {
private static final int START = 0;
private static final int CR = 1;
private static final int CRLF = 2;
private static final int CRLFCR = 3;
private static final int BODY = 4;
private int maxLines;
private int state = START;
private TopOutputStream(OutputStream os, int maxLines) {
super(os);
this.maxLines = maxLines;
}
@Override
public void write(int b) throws IOException {
if (state != BODY || maxLines > 0) {
super.write(b);
}
if (state == BODY) {
if (b == '\n') {
maxLines--;
}
} else if (state == START) {
if (b == '\r') {
state = CR;
}
} else if (state == CR) {
if (b == '\n') {
state = CRLF;
} else {
state = START;
}
} else if (state == CRLF) {
if (b == '\r') {
state = CRLFCR;
} else {
state = START;
}
} else if (state == CRLFCR) {
if (b == '\n') {
state = BODY;
} else {
state = START;
}
}
}
}
}