mirror of
https://github.com/Grasscutters/mitmproxy.git
synced 2024-11-30 03:14:22 +00:00
Added replace for request and headers - Fixed missing replace option
This commit is contained in:
parent
70f94c7171
commit
99744cc780
@ -158,7 +158,7 @@ class Headers(multidict.MultiDict):
|
|||||||
else:
|
else:
|
||||||
return super(Headers, self).items()
|
return super(Headers, self).items()
|
||||||
|
|
||||||
def replace(self, pattern, repl, flags=0):
|
def replace(self, pattern, repl, flags=0, count=0):
|
||||||
"""
|
"""
|
||||||
Replaces a regular expression pattern with repl in each "name: value"
|
Replaces a regular expression pattern with repl in each "name: value"
|
||||||
header line.
|
header line.
|
||||||
@ -175,7 +175,7 @@ class Headers(multidict.MultiDict):
|
|||||||
|
|
||||||
fields = []
|
fields = []
|
||||||
for name, value in self.fields:
|
for name, value in self.fields:
|
||||||
line, n = pattern.subn(repl, name + b": " + value)
|
line, n = pattern.subn(repl, name + b": " + value, count=count)
|
||||||
try:
|
try:
|
||||||
name, value = line.split(b": ", 1)
|
name, value = line.split(b": ", 1)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
@ -183,6 +183,7 @@ class Headers(multidict.MultiDict):
|
|||||||
# There's not much we can do about this, so we just keep the header as-is.
|
# There's not much we can do about this, so we just keep the header as-is.
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
|
count -= n
|
||||||
replacements += n
|
replacements += n
|
||||||
fields.append((name, value))
|
fields.append((name, value))
|
||||||
self.fields = tuple(fields)
|
self.fields = tuple(fields)
|
||||||
|
@ -80,7 +80,7 @@ class Request(message.Message):
|
|||||||
self.method, hostport, path
|
self.method, hostport, path
|
||||||
)
|
)
|
||||||
|
|
||||||
def replace(self, pattern, repl, flags=0):
|
def replace(self, pattern, repl, flags=0, count=0):
|
||||||
"""
|
"""
|
||||||
Replaces a regular expression pattern with repl in the headers, the
|
Replaces a regular expression pattern with repl in the headers, the
|
||||||
request path and the body of the request. Encoded content will be
|
request path and the body of the request. Encoded content will be
|
||||||
@ -94,9 +94,9 @@ class Request(message.Message):
|
|||||||
if isinstance(repl, six.text_type):
|
if isinstance(repl, six.text_type):
|
||||||
repl = strutils.escaped_str_to_bytes(repl)
|
repl = strutils.escaped_str_to_bytes(repl)
|
||||||
|
|
||||||
c = super(Request, self).replace(pattern, repl, flags)
|
c = super(Request, self).replace(pattern, repl, flags, count)
|
||||||
self.path, pc = re.subn(
|
self.path, pc = re.subn(
|
||||||
pattern, repl, self.data.path, flags=flags
|
pattern, repl, self.data.path, flags=flags, count=count
|
||||||
)
|
)
|
||||||
c += pc
|
c += pc
|
||||||
return c
|
return c
|
||||||
|
Loading…
Reference in New Issue
Block a user