From 8ddddd77478984777be79e817458183a41f0a978 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 26 Nov 2015 21:27:23 -0400
Subject: [feat] credentials handling: use twisted.cred

---
 src/leap/mail/imap/tests/utils.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/leap/mail/imap/tests/utils.py')

diff --git a/src/leap/mail/imap/tests/utils.py b/src/leap/mail/imap/tests/utils.py
index a34538b..b1f8563 100644
--- a/src/leap/mail/imap/tests/utils.py
+++ b/src/leap/mail/imap/tests/utils.py
@@ -77,14 +77,11 @@ class IMAP4HelperMixin(SoledadTestMixin):
 
         soledad_adaptor.cleanup_deferred_locks()
 
-        UUID = 'deadbeef',
         USERID = TEST_USER
 
         def setup_server(account):
             self.server = LEAPIMAPServer(
-                uuid=UUID, userid=USERID,
-                contextFactory=self.serverCTX,
-                soledad=self._soledad)
+                contextFactory=self.serverCTX)
             self.server.theAccount = account
 
             d_server_ready = defer.Deferred()
-- 
cgit v1.2.3


From 14cc0595eb58db6710782f7082dfc4e175eb86fc Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 15 Dec 2015 02:04:07 -0400
Subject: [fix] dummy credentials for tests

imap tests must be adapted, using a dummy credential checker.
---
 src/leap/mail/imap/tests/utils.py | 59 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

(limited to 'src/leap/mail/imap/tests/utils.py')

diff --git a/src/leap/mail/imap/tests/utils.py b/src/leap/mail/imap/tests/utils.py
index b1f8563..ad89e92 100644
--- a/src/leap/mail/imap/tests/utils.py
+++ b/src/leap/mail/imap/tests/utils.py
@@ -20,10 +20,15 @@ Common utilities for testing Soledad IMAP Server.
 from email import parser
 
 from mock import Mock
+from twisted.cred.checkers import ICredentialsChecker
+from twisted.cred.credentials import IUsernamePassword
+from twisted.cred.error import UnauthorizedLogin
+from twisted.cred.portal import Portal, IRealm
 from twisted.mail import imap4
 from twisted.internet import defer
 from twisted.protocols import loopback
 from twisted.python import log
+from zope.interface import implementer
 
 from leap.mail.adaptors import soledad as soledad_adaptor
 from leap.mail.imap.account import IMAPAccount
@@ -64,6 +69,57 @@ class SimpleClient(imap4.IMAP4Client):
         self.events.append(['newMessages', exists, recent])
         self.transport.loseConnection()
 
+#
+# Dummy credentials for tests
+#
+
+
+@implementer(IRealm)
+class TestRealm(object):
+
+    def __init__(self, account):
+        self._account = account
+
+    def requestAvatar(self, avatarId, mind, *interfaces):
+        avatar = self._account
+        return (imap4.IAccount, avatar,
+                getattr(avatar, 'logout', lambda: None))
+
+
+@implementer(ICredentialsChecker)
+class TestCredentialsChecker(object):
+
+    credentialInterfaces = (IUsernamePassword,)
+
+    userid = TEST_USER
+    password = TEST_PASSWD
+
+    def requestAvatarId(self, credentials):
+        username, password = credentials.username, credentials.password
+        d = self.checkTestCredentials(username, password)
+        d.addErrback(lambda f: defer.fail(UnauthorizedLogin()))
+        return d
+
+    def checkTestCredentials(self, username, password):
+        if username == self.userid and password == self.password:
+            return defer.succeed(username)
+        else:
+            return defer.fail(Exception("Wrong credentials"))
+
+
+class TestSoledadIMAPServer(LEAPIMAPServer):
+
+    def __init__(self, account, *args, **kw):
+
+        LEAPIMAPServer.__init__(self, *args, **kw)
+
+        realm = TestRealm(account)
+        portal = Portal(realm)
+        checker = TestCredentialsChecker()
+        self.checker = checker
+        self.portal = portal
+        portal.registerChecker(checker)
+
 
 class IMAP4HelperMixin(SoledadTestMixin):
     """
@@ -80,7 +136,8 @@ class IMAP4HelperMixin(SoledadTestMixin):
         USERID = TEST_USER
 
         def setup_server(account):
-            self.server = LEAPIMAPServer(
+            self.server = TestSoledadIMAPServer(
+                account=account,
                 contextFactory=self.serverCTX)
             self.server.theAccount = account
 
-- 
cgit v1.2.3


From ec0183a792223e6acd8343beb0e5ba1bf3df43b1 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 15 Apr 2016 16:06:56 -0400
Subject: [refactor] change IMAPAccount signature

for consistency with the previous Account change.
---
 src/leap/mail/imap/tests/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/leap/mail/imap/tests/utils.py')

diff --git a/src/leap/mail/imap/tests/utils.py b/src/leap/mail/imap/tests/utils.py
index ad89e92..64a0326 100644
--- a/src/leap/mail/imap/tests/utils.py
+++ b/src/leap/mail/imap/tests/utils.py
@@ -158,7 +158,7 @@ class IMAP4HelperMixin(SoledadTestMixin):
             self._soledad.sync = Mock()
 
             d = defer.Deferred()
-            self.acc = IMAPAccount(USERID, self._soledad, d=d)
+            self.acc = IMAPAccount(self._soledad, USERID, d=d)
             return d
 
         d = super(IMAP4HelperMixin, self).setUp()
-- 
cgit v1.2.3