Fixed Yahoo IMAP support. (#138)

Author: twrecked

changelog

@@ -1,3 +1,6 @@
+0.8.0.1
+  Better Yahoo IMAP handling. It will now better parse out the emails and
+  better keep track of the used IDs.
 0.8.0.0
   Try multiple EDHC curves
   Allow `Source: arloWebCam` header entry to be turned on and off

pyaarlo/__init__.py

@@ -46,7 +46,7 @@
 
 _LOGGER = logging.getLogger("pyaarlo")
 
-__version__ = "0.8.0.0"
+__version__ = "0.8.0.1"
 
 
 class PyArlo(object):

pyaarlo/backend.py

@@ -771,7 +771,7 @@ def _auth(self):
                 return False
 
             # look for code source choice
-            self.debug("looking for {}".format(self._arlo.cfg.tfa_type))
+            self.debug(f"looking for {self._arlo.cfg.tfa_type}/{self._arlo.cfg.tfa_nickname}")
             factors_of_type = []
             factor_id = None
 

pyaarlo/tfa.py

@@ -112,36 +112,40 @@ def get(self):
                     self.debug("no change in emails")
                     continue
 
-                # new message...
+                # New message. Reverse so we look at the newest one first.
                 old_ids = self._old_ids[0].split()
-                for msg_id in self._new_ids[0].split():
+                msg_ids = self._new_ids[0].split()
+                msg_ids.reverse()
+                for msg_id in msg_ids:
 
-                    # seen it?
+                    # Seen it?
                     if msg_id in old_ids:
                         continue
 
                     # New message. Look at all the parts and try to grab the code, if we catch an exception
                     # just move onto the next part.
                     self.debug("new-msg={}".format(msg_id))
-                    res, msg = self._imap.fetch(msg_id, "(BODY.PEEK[])")
-                    if isinstance(msg[0][1], bytes):
-                        for part in email.message_from_bytes(msg[0][1]).walk():
-                            if part.get_content_type() != "text/html":
-                                continue
-                            try:
-                                for line in part.get_payload(decode=True).splitlines():
-                                    # match code in email, this might need some work if the email changes
-                                    code = re.match(r"^\W+(\d{6})\W*$", line.decode())
-                                    if code is not None:
-                                        self.debug(
-                                            "code={}".format(code.group(1))
-                                        )
-                                        return code.group(1)
-                            except:
-                                self.debug("trying next part")
-
-                # update old so we don't keep trying new
-                self._old_ids = self._new_ids
+                    res, parts = self._imap.fetch(msg_id, "(BODY.PEEK[])")
+                    # res, parts = self._imap.fetch(msg_id, "(RFC822)")
+
+                    for msg in parts:
+                        try:
+                            if isinstance(msg[1], bytes):
+                                for part in email.message_from_bytes(msg[1]).walk():
+                                    if part.get_content_type() != "text/html":
+                                        continue
+                                    for line in part.get_payload(decode=True).splitlines():
+                                        # match code in email, this might need some work if the email changes
+                                        code = re.match(r"^\W+(\d{6})\W*$", line.decode())
+                                        if code is not None:
+                                            self.debug(f"code={code.group(1)}")
+                                            return code.group(1)
+                        except Exception as e:
+                            self.debug(f"trying next part {str(e)}")
+
+                # Update old so we don't keep trying new.
+                # Yahoo can lose ids so we extend the old list.
+                self._old_ids.extend(new_id for new_id in self._new_ids if new_id not in self._old_ids)
 
             # problem parsing the message, force a fail
             except Exception as e:

setup.py

@@ -11,7 +11,7 @@ def readme():
 setup(
 
     name='pyaarlo',
-    version='0.8.0.0',
+    version='0.8.0.1',
     packages=['pyaarlo'],
 
     python_requires='>=3.7',