140291 2007-01-19 14:34:17 +0000 Imap password should be properly escaped 2007-01-20 21:06:36 +0000 1 1 10 Unmaintained mailody general unspecified unspecified Linux RESOLVED FIXED NOR normal --- 1 tommi.tervo toma 0 oldest_to_newest 502537 0 tommi.tervo 2007-01-19 14:34:17 +0000 Version: 0.3.1-svn (using KDE 3.5.5, compiled sources) Compiler: Target: i486-linux-gnu OS: Linux (i686) release 2.6.12-10-386 mailody: IMAP C : a02 login "luser" "pass"Word" mailody: IMAP S(0): a02 BAD Protocol Error: "Unexpected additional characters at the end of command". 502544 1 toma 2007-01-19 14:57:46 +0000 SVN commit 625208 by toma: Quote login and password. Please check if it works, there is nothing in the IMAP rfc about this. Copied KDE kioslave behaviour, so should be ok. BUG: 140291 M +22 -3 imap.cpp M +1 -0 imap.h --- trunk/playground/pim/mailody/src/imap.cpp #625207:625208 @@ -95,7 +95,8 @@ else { m_queue.prepend(Queue(Queue::Auth, "", - "login \"" + login + "\" \"" + pass + "\"")); + "login \"" + quoteIMAP(login) + + "\" \"" + quoteIMAP(pass) + "\"")); m_currentQueueItem=Queue(); emit statusReady(); @@ -125,8 +126,8 @@ } if (result == KPasswordDialog::Accepted) m_queue.prepend(Queue(Queue::Auth, "", - "login \"" + login + "\" \"" + - QString(password) + "\"")); + "login \"" + quoteIMAP(login) + "\" \"" + + quoteIMAP(QString(password)) + "\"")); password.fill(0); // safe enough? m_currentQueueItem=Queue(); emit statusReady(); @@ -1145,6 +1146,24 @@ m_imap->reconnect(); } +/* Copy from KDE/3.5/kdepim/kioslaves/imap4/rfcdecoder.cc */ +/* Copyright (C) 2000 s.carstens@gmx.de */ +/* replace " with \" and \ with \\ " and \ characters */ +QString Imap::quoteIMAP(const QString &src) +{ + uint len = src.length(); + QString result; + result.reserve(2 * len); + for (unsigned int i = 0; i < len; i++) + { + if (src[i] == '"' || src[i] == '\\') + result += '\\'; + result += src[i]; + } + //result.squeeze(); - unnecessary and slow + return result; } +} + #include "imap.moc" --- trunk/playground/pim/mailody/src/imap.h #625207:625208 @@ -232,6 +232,7 @@ void integrity(const QString& mb, int); void timerEvent( QTimerEvent * ); void getCapabilities(); + QString quoteIMAP(const QString &src); signals: /** 502853 2 tommi.tervo 2007-01-20 21:06:36 +0000 Confirmed, fix works fine