diff options
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console.py | 2 | ||||
| -rw-r--r-- | libmproxy/contrib/pyparsing.py (renamed from libmproxy/pyparsing.py) | 0 | ||||
| -rw-r--r-- | libmproxy/dump.py | 1 | ||||
| -rw-r--r-- | libmproxy/filt.py | 4 | ||||
| -rw-r--r-- | libmproxy/flow.py | 2 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 7 | ||||
| -rw-r--r-- | libmproxy/script.py | 1 |
7 files changed, 12 insertions, 5 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index 0df1339c..03fde9f5 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -858,7 +858,7 @@ class ConsoleMaster(controller.Master): try: idx = self.state.view.index(self.currentflow) self.conn_list_view.set_focus(idx) - except IndexError: + except (IndexError, ValueError): pass self.body = urwid.ListBox(self.conn_list_view) self.statusbar = StatusBar(self, self.footer_text_default) diff --git a/libmproxy/pyparsing.py b/libmproxy/contrib/pyparsing.py index 06b11d98..06b11d98 100644 --- a/libmproxy/pyparsing.py +++ b/libmproxy/contrib/pyparsing.py diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 83238da4..1fe1c095 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -1,6 +1,7 @@ import sys import controller +#begin nocover class DumpMaster(controller.Master): """ A simple master that just dumps to screen. diff --git a/libmproxy/filt.py b/libmproxy/filt.py index 87746f94..31c43581 100644 --- a/libmproxy/filt.py +++ b/libmproxy/filt.py @@ -39,7 +39,7 @@ rex Equivalent to ~u rex """ import re, sys -import pyparsing as pp +import contrib.pyparsing as pp class _Token: @@ -315,6 +315,6 @@ def parse(s): return bnf.parseString(s, parseAll=True)[0] except pp.ParseException: return None - except ValueError: + except ValueError, e: return None diff --git a/libmproxy/flow.py b/libmproxy/flow.py index cf39bed9..8b8a8bae 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -48,8 +48,8 @@ class Flow: @classmethod def script_deserialize(klass, data): - data = base64.decodestring(data) try: + data = base64.decodestring(data) data = bson.loads(data) # bson.loads doesn't define a particular exception on error... except Exception: diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 9715bb5a..00b9e0ba 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -45,7 +45,10 @@ def parse_url(url): port = int(port) else: host = netloc - port = 80 + if scheme == "https": + port = 443 + else: + port = 80 path = urlparse.urlunparse(('', '', path, params, query, fragment)) if not path: path = "/" @@ -277,6 +280,8 @@ class FileLike: return result +#begin nocover + class ServerConnection: def __init__(self, request): self.request = request diff --git a/libmproxy/script.py b/libmproxy/script.py index 9ff861e9..5693f5e5 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -10,6 +10,7 @@ from contrib import bson import flow +#begin nocover def load_flow(): """ Load a flow from the stdin. Returns a Flow object. |