added imap module for sync_test and sync_handshake PYADPT-47

test/README.md

@@ -21,7 +21,7 @@ $ HOME=$PWD lldb python3 --  ../sync_handshake.py -e Phone
 Then this side is doing a replay in the debugger.  Using touch to set a
 different timestamp on the marker will only partly replay.
 
-In order to work with IMAP you need to create a sync_settings.py file with the
+In order to work with IMAP you need to create a imap_settings.py file with the
 following variables:
 
 IMAP_HOST = 'domain.ch'

test/imap_settings.py

@@ -0,0 +1,5 @@
+IMAP_HOST = 'exchange.peptest.ch'
+IMAP_PORT = '993'
+IMAP_USER = r'testnet\test046'
+IMAP_PWD = 'pEpdichauf5'
+IMAP_EMAIL = 'test046@exchange.peptest.ch'

test/miniimap.py

@@ -3,33 +3,20 @@ import pprint
 import email.message
 import email.charset
 import time
-import sync_settings as settings
+import os
+import imap_settings as settings
 
 
 def connect():
     "connect to the IMAP server Inbox"
     server = imaplib.IMAP4_SSL(settings.IMAP_HOST)
     server.login(settings.IMAP_USER, settings.IMAP_PWD)
-    server.select('Inbox')
+    tmp, data = server.select('Inbox')
+    if os.environ.get('NUMMESSAGES') is None:
+        os.environ["NUMMESSAGES"] = data[0].decode("UTF-8")
 
     return server
 
-def pEpMessage_to_imap(msg):
-    "convert pEpMessage to python imap formatted string"
-    new_message = email.message.Message()
-    new_message["From"] = str(msg.from_).replace("\n", " ")
-    new_message["To"] = str(msg.to[0])
-    new_message["Subject"] = msg.shortmsg
-    if msg.opt_fields:
-        for field, value in msg.opt_fields.items():
-            new_message[field] = str(value).replace("\n", " ")
-    new_message.set_payload(msg.longmsg)
-
-    new_message.set_charset(email.charset.Charset("utf-8"))
-    encoded_message = str(new_message).encode("utf-8")
-
-    return encoded_message
-
 def bytesmessage_to_string(msg):
     "converts bytes-like message to string"
     msg = msg.decode("UTF-8").rstrip()
@@ -37,30 +24,30 @@ def bytesmessage_to_string(msg):
 
 def send(inbox, msg):
     "send msg to inbox in MIME format"
+    print("send imap")
+
     server = connect()
-    msg = pEpMessage_to_imap(msg)
+    tmp, data = server.append('Inbox', '', imaplib.Time2Internaldate(time.time()), str(msg).encode("UTF-8"))
-    print('******** sent msg *******')
-    print(msg)
-    server.append('Inbox', '', imaplib.Time2Internaldate(time.time()), msg)
     server.close()
 
 
-def recv_all(inbox, start_time):
+def recv_all(inbox):
-    """receive a list of new MIME messages from inbox, which are newer than the
+    """receive a list of all MIME messages from inbox newer than the last message when first connected"""
-    start_time"""
+    print("recieve imap")
 
     server = connect()
     r = []
 
     tmp, data = server.search(None, 'ALL')
-    # tmp, data = server.search(None, 'SENTSINCE {0}'.format(start_time.strftime("%d-%b-%Y %H:%M%S")))
+
+    oldermsgid = os.environ.get('NUMMESSAGES')
 
     for num in data[0].split():
+        if int(num) >= int(oldermsgid):
             tmp, data = server.fetch(num, '(RFC822)')
             msg = bytesmessage_to_string(data[0][1])
             r.append((num, msg))
-        print('******** recieved msg *******')
+            os.environ["NUMMESSAGES"] = num.decode("UTF-8")
-        print(msg)
 
     server.close()
 
@@ -68,11 +55,14 @@ def recv_all(inbox, start_time):
 
 
 def clean_inbox():
-    print('clean IMAP')
+    """clean all messsages from IMAP inbox"""
+    print('cleaning IMAP...')
     server = connect()
     typ, data = server.search(None, 'ALL')
     for num in data[0].split():
         server.store(num, '+FLAGS', '\\Deleted')
     server.expunge()
+    server.close()
+    print('IMAP inbox empty.')
 
 

test/sync_handshake.py

@@ -25,7 +25,7 @@ import pEp
 import minimail
 import miniimap
 
-import sync_settings as settings
+import imap_settings 
 
 from datetime import datetime
 
@@ -105,6 +105,7 @@ def messageToSend(msg):
     minimail.send(inbox, msg, device_name)
 
 def messageImapToSend(msg):
+    print("send imap message")
     if msg.enc_format:
         m, keys, rating, flags = msg.decrypt(DONT_TRIGGER_SYNC)
     else:
@@ -126,6 +127,7 @@ def getMessageToSend(msg):
 
 class UserInterface(pEp.UserInterface):
     def notifyHandshake(self, me, partner, signal):
+        print('ui.notifyHandshake')
         print(colored(str(signal), "yellow"), end=" ")
         output("on " + device_name + "" if not me.fpr else
                 "for identities " + str(me.fpr) + " " + str(partner.fpr))
@@ -163,6 +165,8 @@ def run(name, color=None, imap=False):
     global device_name
     device_name = name
 
+    print("run sync_handhske")
+
     if color:
         global output
         output = lambda x: print(colored(x, color))
@@ -174,7 +178,8 @@ def run(name, color=None, imap=False):
             pEp.debug_color(36)
 
     if imap:
-        me = pEp.Identity(settings.IMAP_EMAIL, name + " of " + settings.IMAP_USER, name)
+        print("run handshake using imap")
+        me = pEp.Identity(imap_settings.IMAP_EMAIL, name + " of " + imap_settings.IMAP_USER, name)
         pEp.myself(me)
         pEp.messageToSend = messageImapToSend
     else:
@@ -195,13 +200,14 @@ def run(name, color=None, imap=False):
         sync = Thread(target=sync_thread)
         sync.start()
     else:
+        print('no threading')
         sync = None
         ui = UserInterface()
 
     try:
         while not the_end:
             if imap:
-                l = miniimap.recv_all(inbox, 'start_time')
+                l = miniimap.recv_all(inbox)
             else:
                 l = minimail.recv_all(inbox, name)
             for n, m in l:
@@ -237,6 +243,10 @@ if __name__=="__main__":
             help="use multithreaded instead of single threaded implementation")
     optParser.add_option("-n", "--noend", action="store_true",
             dest="noend", help="do not end")
+    optParser.add_option("-i", "--imap", action="store_true",
+            dest="imap",
+            help="use imap instead of minimail")
+
     options, args = optParser.parse_args()
 
     if not options.exec_for:
@@ -252,5 +262,5 @@ if __name__=="__main__":
         end_on = (None,)
 
     multithreaded = options.multithreaded
-    run(options.exec_for, options.color)
+    run(options.exec_for, options.color, options.imap)
 

test/sync_test.py

@@ -108,14 +108,17 @@ if __name__ == "__main__":
         options.clean = True
 
     if options.clean:
-        rmrf("TestInbox")
+
-        rmrf("Phone")
+        if options.imap:
-        rmrf("Laptop")
-        rmrf("Pad")
             try:
                 miniimap.clean_inbox()
             except:
                 pass
+        else:
+            rmrf("TestInbox")
+            rmrf("Phone")
+            rmrf("Laptop")
+            rmrf("Pad")
             
             if options.cleanall:
                 rmrf("Backup")