More tests and cleanup

dev-requirements.txt

@@ -1,5 +1,6 @@
 pytest
 pytest-cov
+httpretty
 black
 codecov
 flake8

little_boxes/activitypub.py

@@ -12,7 +12,7 @@ from .errors import NotFromOutboxError
 
 # from .errors import ActivityNotFoundError
 # from .urlutils import check_url
-from .utils import parse_collection
+from .collection import parse_collection
 from .backend import Backend
 
 from typing import List

little_boxes/backend.py

@@ -62,6 +62,10 @@ class Backend(abc.ABC):
     def inbox_update(self, as_actor: "ap.Person", activity: "ap.Update") -> None:
         pass
 
+    @abc.abstractmethod
+    def outbox_update(self, as_actor: "ap.Person", activity: "ap.Update") -> None:
+        pass
+
     @abc.abstractmethod
     def inbox_like(self, as_actor: "ap.Person", activity: "ap.Like") -> None:
         pass

little_boxes/urlutils.py

@@ -28,10 +28,16 @@ def is_url_valid(url: str) -> bool:
         return False
 
     try:
-        ip_address = socket.getaddrinfo(parsed.hostname, parsed.port or 80)[0][4][0]
-    except socket.gaierror:
-        logger.exception(f"failed to lookup url {url}")
-        return False
+        ip_address = ipaddress.ip_address(parsed.hostname)
+    except ValueError:
+        try:
+            ip_address = socket.getaddrinfo(parsed.hostname, parsed.port or 80)[0][4][0]
+            logger.debug(f"dns lookup: {parsed.hostname} -> {ip_address}")
+        except socket.gaierror:
+            logger.exception(f"failed to lookup url {url}")
+            return False
+
+    logger.debug(f"{ip_address}")
 
     if ipaddress.ip_address(ip_address).is_private:
         logger.info(f"rejecting private URL {url}")
@@ -41,6 +47,7 @@ def is_url_valid(url: str) -> bool:
 
 
 def check_url(url: str) -> None:
+    logger.debug(f"check_url {url}")
     if not is_url_valid(url):
         raise InvalidURLError(f'"{url}" is invalid')
 

tests/test_backend.py

@@ -235,10 +235,12 @@ class InMemBackend(Backend):
     def outbox_delete(self, as_actor: ap.Person, activity: ap.Delete) -> None:
         pass
 
+    @track_call
     def inbox_update(self, as_actor: ap.Person, activity: ap.Update) -> None:
         pass
 
-    def outbox_update(self, activity: ap.Update) -> None:
+    @track_call
+    def outbox_update(self, as_actor: ap.Person, activity: ap.Update) -> None:
         pass
 
     @track_call