Fix existing unit tests

Author: wkeeling

.editorconfig

@@ -8,7 +8,6 @@ include README.rst
 recursive-include tests *
 recursive-include seleniumwire *.crt
 recursive-include seleniumwire *.key
-recursive-include seleniumwire *.exe
 recursive-include seleniumwire *.cnf
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]

MANIFEST.in

@@ -3,7 +3,7 @@
 import signal
 from argparse import RawDescriptionHelpFormatter
 
-from seleniumwire.thirdparty.mitmproxy import backend, utils
+from seleniumwire import backend, utils
 
 logging.basicConfig(level=logging.DEBUG, format='%(message)s')
 

Makefile

@@ -2,13 +2,12 @@
 import logging
 
 from seleniumwire.handler import MitmProxyRequestHandler
+from seleniumwire.modifier import RequestModifier
+from seleniumwire.storage import RequestStorage
 from seleniumwire.thirdparty.mitmproxy import addons
-from seleniumwire.thirdparty.mitmproxy.exceptions import Timeout
 from seleniumwire.thirdparty.mitmproxy.master import Master
 from seleniumwire.thirdparty.mitmproxy.options import Options
 from seleniumwire.thirdparty.mitmproxy.server import ProxyConfig, ProxyServer
-from seleniumwire.modifier import RequestModifier
-from seleniumwire.storage import RequestStorage
 from seleniumwire.utils import extract_cert_and_key, get_upstream_proxy
 
 logger = logging.getLogger(__name__)
@@ -27,7 +26,7 @@ def __init__(self, host, port, options):
         self.storage = RequestStorage(
             base_dir=options.pop('request_storage_base_dir', None)
         )
-        extract_cert_and_key(self.storage.storage_home)
+        extract_cert_and_key(self.storage.home_dir)
 
         # Used to modify requests/responses passing through the server
         # DEPRECATED. Will be superceded by request/response interceptors.
@@ -49,7 +48,7 @@ def __init__(self, host, port, options):
 
         # mitmproxy specific options
         mitmproxy_opts = Options(
-            confdir=self.storage.storage_home,
+            confdir=self.storage.home_dir,
             listen_host=host,
             listen_port=port,
         )

seleniumwire/__main__.py

@@ -37,9 +37,10 @@ def __init__(self, base_dir=None):
         if base_dir is None:
             base_dir = os.path.expanduser('~')
 
-        self.storage_home = os.path.join(base_dir, '.seleniumwire')
-        self.storage_session = os.path.join(self.storage_home, 'storage-{}'.format(str(uuid.uuid4())))
-        os.makedirs(self.storage_session, exist_ok=True)
+        """"""
+        self.home_dir = os.path.join(base_dir, '.seleniumwire')
+        self.session_dir = os.path.join(self.home_dir, 'storage-{}'.format(str(uuid.uuid4())))
+        os.makedirs(self.session_dir, exist_ok=True)
         self._cleanup_old_dirs()
 
         # Index of requests received.
@@ -73,7 +74,7 @@ def _index_request(self, request):
         return request_id
 
     def _save(self, obj, dirname, filename):
-        request_dir = os.path.join(self.storage_session, dirname)
+        request_dir = os.path.join(self.session_dir, dirname)
 
         with open(os.path.join(request_dir, filename), 'wb') as out:
             pickle.dump(obj, out)
@@ -217,19 +218,19 @@ def find(self, path, check_response=True):
         return None
 
     def _get_request_dir(self, request_id):
-        return os.path.join(self.storage_session, 'request-{}'.format(request_id))
+        return os.path.join(self.session_dir, 'request-{}'.format(request_id))
 
     def cleanup(self):
         """Removes all stored requests, the storage directory containing those
         requests, and if that is the only storage directory, also removes the
         top level parent directory.
         """
-        log.debug('Cleaning up %s', self.storage_session)
+        log.debug('Cleaning up %s', self.session_dir)
         self.clear_requests()
-        shutil.rmtree(self.storage_session, ignore_errors=True)
+        shutil.rmtree(self.session_dir, ignore_errors=True)
         try:
             # Attempt to remove the parent folder if it is empty
-            os.rmdir(os.path.dirname(self.storage_session))
+            os.rmdir(os.path.dirname(self.session_dir))
         except OSError:
             # Parent folder not empty
             pass
@@ -238,7 +239,7 @@ def _cleanup_old_dirs(self):
         """Cleans up and removes any old storage directories that were not previously
         cleaned up properly by _cleanup().
         """
-        parent_dir = os.path.dirname(self.storage_session)
+        parent_dir = os.path.dirname(self.session_dir)
         for storage_dir in os.listdir(parent_dir):
             storage_dir = os.path.join(parent_dir, storage_dir)
             try:

seleniumwire/server.py

@@ -4,7 +4,8 @@
 import typing
 
 from seleniumwire.thirdparty.mitmproxy import exceptions
-from seleniumwire.thirdparty.mitmproxy.net.http import headers, request, response, url
+from seleniumwire.thirdparty.mitmproxy.net.http import (headers, request,
+                                                        response, url)
 
 
 def get_header_tokens(headers, key):
@@ -255,6 +256,12 @@ def _read_request_line(rfile):
                 raise ValueError
         else:
             scheme, rest = target.split(b"://", maxsplit=1)
+            # There seems to be a bug here for http URLs that
+            # have no path and don't end with a slash - e.g.
+            # http://python.org
+            # Add a slash in this case.
+            if not rest.endswith(b"/"):
+                rest = rest + b"/"
             authority, path_ = rest.split(b"/", maxsplit=1)
             path = b"/" + path_
             host, port = url.parse_authority(authority, check=True)