Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3117 from cortesi/morefixes

Browse Source 
More misc fixes
This commit is contained in:
Aldo Cortesi 2018-05-12 14:41:23 +12:00 committed by GitHub
commit 7fde02ac90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mitmproxy/addons/clientplayback.py
View File

@ -59,9 +59,7 @@ class RequestReplayThread(basethread.BaseThread):
# In all modes, we directly connect to the server displayed # In all modes, we directly connect to the server displayed
if self.options.mode.startswith("upstream:"): if self.options.mode.startswith("upstream:"):
server_address = server_spec.parse_with_mode(self.options.mode)[1].address server_address = server_spec.parse_with_mode(self.options.mode)[1].address
server = connections.ServerConnection( server = connections.ServerConnection(server_address)
server_address, (self.options.listen_host, 0)
)
server.connect() server.connect()
if r.scheme == "https": if r.scheme == "https":
connect_request = http.make_connect_request((r.data.host, r.port)) connect_request = http.make_connect_request((r.data.host, r.port))
@ -85,10 +83,7 @@ class RequestReplayThread(basethread.BaseThread):
r.first_line_format = "absolute" r.first_line_format = "absolute"
else: else:
server_address = (r.host, r.port) server_address = (r.host, r.port)
server = connections.ServerConnection( server = connections.ServerConnection(server_address)
server_address,
(self.options.listen_host, 0)
)
server.connect() server.connect()
if r.scheme == "https": if r.scheme == "https":
server.establish_tls( server.establish_tls(

5
mitmproxy/command.py
View File

@ -236,7 +236,10 @@ class CommandManager(mitmproxy.types._CommandBase):
""" """
Execute a command string. May raise CommandError. Execute a command string. May raise CommandError.
""" """
parts = list(lexer(cmdstr)) try:
parts = list(lexer(cmdstr))
except ValueError as e:
raise exceptions.CommandError("Command error: %s" % e)
if not len(parts) >= 1: if not len(parts) >= 1:
raise exceptions.CommandError("Invalid command: %s" % cmdstr) raise exceptions.CommandError("Invalid command: %s" % cmdstr)
return self.call_strings(parts[0], parts[1:]) return self.call_strings(parts[0], parts[1:])

4
mitmproxy/controller.py
View File

@ -96,8 +96,8 @@ class Reply:
def commit(self): def commit(self):
""" """
Ultimately, messages are committed. This is done either automatically by Ultimately, messages are committed. This is done either automatically by
if the message is not taken or manually by the entity which called the handler if the message is not taken or manually by the entity which
.take(). called .take().
""" """
if self.state != "taken": if self.state != "taken":
raise exceptions.ControlException( raise exceptions.ControlException(

2
test/mitmproxy/test_command.py
View File

@ -281,6 +281,8 @@ def test_simple():
c.execute("one.two too many args") c.execute("one.two too many args")
with pytest.raises(exceptions.CommandError, match="Unknown"): with pytest.raises(exceptions.CommandError, match="Unknown"):
c.call("nonexistent") c.call("nonexistent")
with pytest.raises(exceptions.CommandError, match="No escaped"):
c.execute("\\")
c.add("empty", a.empty) c.add("empty", a.empty)
c.execute("empty") c.execute("empty")