netlib.certutils -> mitmproxy.certs

2 files changed, 20 insertions, 14 deletions

diff --git a/pathod/pathoc.py b/pathod/pathoc.py
index caa9accb..39dedf05 100644
--- a/pathod/pathoc.py
+++ b/pathod/pathoc.py
@@ -13,13 +13,17 @@ import logging
 
 from netlib.tutils import treq
 from mitmproxy.utils import strutils
-from netlib import tcp, certutils, websockets, socks
+from netlib import tcp
+from mitmproxy import certs
+from netlib import websockets
+from netlib import socks
 from netlib import exceptions
 from netlib.http import http1
 from mitmproxy.types import basethread
 
-from . import log, language
-from .protocols import http2
+from pathod import log
+from pathod import language
+from pathod.protocols import http2
 
 
 logging.getLogger("hpack").setLevel(logging.WARNING)
@@ -76,7 +80,7 @@ class SSLInfo:
             }
             t = types.get(pk.type(), "Uknown")
             parts.append("\tPubkey: %s bit %s" % (pk.bits(), t))
-            s = certutils.SSLCert(i)
+            s = certs.SSLCert(i)
             if s.altnames:
                 parts.append("\tSANs: %s" % " ".join(strutils.native(n, "utf8") for n in s.altnames))
         return "\n".join(parts)
diff --git a/pathod/pathod.py b/pathod/pathod.py
index 3692ceff..5d951350 100644
--- a/pathod/pathod.py
+++ b/pathod/pathod.py
@@ -5,15 +5,17 @@ import sys
 import threading
 
 from netlib import tcp
-from netlib import certutils
+from mitmproxy import certs as mcerts
 from netlib import websockets
 from mitmproxy import version
 
 import urllib
-from netlib.exceptions import HttpException, HttpReadDisconnect, TcpTimeout, TcpDisconnect, \
-    TlsException
+from netlib import exceptions
 
-from . import language, utils, log, protocols
+from pathod import language
+from pathod import utils
+from pathod import log
+from pathod import protocols
 
 
 DEFAULT_CERT_DOMAIN = b"pathod.net"
@@ -52,7 +54,7 @@ class SSLOptions:
         self.ssl_options = ssl_options
         self.ciphers = ciphers
         self.alpn_select = alpn_select
-        self.certstore = certutils.CertStore.from_store(
+        self.certstore = mcerts.CertStore.from_store(
             os.path.expanduser(confdir),
             CERTSTORE_BASENAME
         )
@@ -128,9 +130,9 @@ class PathodHandler(tcp.BaseHandler):
         with logger.ctx() as lg:
             try:
                 req = self.protocol.read_request(self.rfile)
-            except HttpReadDisconnect:
+            except exceptions.HttpReadDisconnect:
                 return None, None
-            except HttpException as s:
+            except exceptions.HttpException as s:
                 s = str(s)
                 lg(s)
                 return None, dict(type="error", msg=s)
@@ -252,7 +254,7 @@ class PathodHandler(tcp.BaseHandler):
                     options=self.server.ssloptions.ssl_options,
                     alpn_select=self.server.ssloptions.alpn_select,
                 )
-            except TlsException as v:
+            except exceptions.TlsException as v:
                 s = str(v)
                 self.server.add_log(
                     dict(
@@ -384,7 +386,7 @@ class Pathod(tcp.TCPServer):
         try:
             h.handle()
             h.finish()
-        except TcpDisconnect:  # pragma: no cover
+        except exceptions.TcpDisconnect:  # pragma: no cover
             log.write_raw(self.logfp, "Disconnect")
             self.add_log(
                 dict(
@@ -393,7 +395,7 @@ class Pathod(tcp.TCPServer):
                 )
             )
             return
-        except TcpTimeout:
+        except exceptions.TcpTimeout:
             log.write_raw(self.logfp, "Timeout")
             self.add_log(
                 dict(