aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
diff options
context:
space:
mode:
Diffstat (limited to 'mitmproxy')
-rw-r--r--mitmproxy/addons/onboardingapp/templates/index.html17
-rw-r--r--mitmproxy/net/tls.py2
-rw-r--r--mitmproxy/tools/_main.py2
-rw-r--r--mitmproxy/tools/console/defaultkeys.py12
-rw-r--r--mitmproxy/tools/console/flowview.py2
-rw-r--r--mitmproxy/tools/console/help.py14
-rw-r--r--mitmproxy/tools/console/keymap.py1
7 files changed, 32 insertions, 18 deletions
diff --git a/mitmproxy/addons/onboardingapp/templates/index.html b/mitmproxy/addons/onboardingapp/templates/index.html
index aee6858c..822e2856 100644
--- a/mitmproxy/addons/onboardingapp/templates/index.html
+++ b/mitmproxy/addons/onboardingapp/templates/index.html
@@ -20,6 +20,14 @@ function changeTo(device) {
</ul>
</div>
<div class="col-md-4">
+ <h3 class="text-center">How to install on iOS 13+</h3>
+ <ul>
+ <li>Install and active the new Profile</li>
+ <li>Goto Settings -> General -> About -> Certificate Trust Settings</li>
+ <li>Toggle mitmproxy to ON</li>
+ <li>Done!</li>
+ </div>
+ <div class="col-md-4">
<h3 class="text-center">How to install on browsers</h3>
<ul>
<li>Safari on macOS uses the macOS keychain. So installing our CA in the system is enough.</li>
@@ -27,15 +35,6 @@ function changeTo(device) {
<li>Firefox on macOS has its own CA store and needs to be installed with Firefox-specific instructions that can be found <a href="https://wiki.mozilla.org/MozillaRootCertificate#Mozilla_Firefox">HERE</a> .</li>
</ul>
</div>
- <div class="col-md-4">
- <h3 class="text-center">How to install on iOS v10.3</h3>
- <ul>
- <li>After certificate installation, open Settings</li>
- <li>Navigate to General and then About</li>
- <li>Select Certificate Trust Settings</li>
- <li>Each root that has been installed via a profile will be listed below the heading Enable Full Trust For Root Certificates. Toggle mitmproxy on</li>
- <li>Done!</li>
- </div>
</div>
</div>`;
}
diff --git a/mitmproxy/net/tls.py b/mitmproxy/net/tls.py
index d8e943d3..4c0f1d6b 100644
--- a/mitmproxy/net/tls.py
+++ b/mitmproxy/net/tls.py
@@ -297,7 +297,7 @@ def create_client_context(
if cert:
try:
context.use_privatekey_file(cert)
- context.use_certificate_file(cert)
+ context.use_certificate_chain_file(cert)
except SSL.Error as v:
raise exceptions.TlsException("SSL client certificate error: %s" % str(v))
return context
diff --git a/mitmproxy/tools/_main.py b/mitmproxy/tools/_main.py
index c1dd6179..23eb39f0 100644
--- a/mitmproxy/tools/_main.py
+++ b/mitmproxy/tools/_main.py
@@ -110,6 +110,8 @@ def run(
master.commands.dump()
sys.exit(0)
if extra:
+ if(args.filter_args):
+ master.log.info(f"Only processing flows that match \"{' & '.join(args.filter_args)}\"")
opts.update(**extra(args))
loop = asyncio.get_event_loop()
diff --git a/mitmproxy/tools/console/defaultkeys.py b/mitmproxy/tools/console/defaultkeys.py
index a0f27625..a27fd85c 100644
--- a/mitmproxy/tools/console/defaultkeys.py
+++ b/mitmproxy/tools/console/defaultkeys.py
@@ -1,14 +1,14 @@
def map(km):
- km.add(":", "console.command ", ["global"], "Command prompt")
+ km.add(":", "console.command ", ["commonkey", "global"], "Command prompt")
km.add("?", "console.view.help", ["global"], "View help")
km.add("B", "browser.start", ["global"], "Start an attached browser")
km.add("C", "console.view.commands", ["global"], "View commands")
km.add("K", "console.view.keybindings", ["global"], "View key bindings")
- km.add("O", "console.view.options", ["global"], "View options")
- km.add("E", "console.view.eventlog", ["global"], "View event log")
+ km.add("O", "console.view.options", ["commonkey", "global"], "View options")
+ km.add("E", "console.view.eventlog", ["commonkey", "global"], "View event log")
km.add("Q", "console.exit", ["global"], "Exit immediately")
- km.add("q", "console.view.pop", ["global"], "Exit the current view")
+ km.add("q", "console.view.pop", ["commonkey", "global"], "Exit the current view")
km.add("-", "console.layout.cycle", ["global"], "Cycle to next layout")
km.add("shift tab", "console.panes.next", ["global"], "Focus next layout pane")
km.add("ctrl right", "console.panes.next", ["global"], "Focus next layout pane")
@@ -20,8 +20,8 @@ def map(km):
km.add("j", "console.nav.down", ["global"], "Down")
km.add("l", "console.nav.right", ["global"], "Right")
km.add("h", "console.nav.left", ["global"], "Left")
- km.add("tab", "console.nav.next", ["global"], "Next")
- km.add("enter", "console.nav.select", ["global"], "Select")
+ km.add("tab", "console.nav.next", ["commonkey", "global"], "Next")
+ km.add("enter", "console.nav.select", ["commonkey", "global"], "Select")
km.add("space", "console.nav.pagedown", ["global"], "Page down")
km.add("ctrl f", "console.nav.pagedown", ["global"], "Page down")
km.add("ctrl b", "console.nav.pageup", ["global"], "Page up")
diff --git a/mitmproxy/tools/console/flowview.py b/mitmproxy/tools/console/flowview.py
index c4dafee6..3fef70ce 100644
--- a/mitmproxy/tools/console/flowview.py
+++ b/mitmproxy/tools/console/flowview.py
@@ -170,7 +170,7 @@ class FlowDetails(tabs.Tabs):
self.master.log.debug(error)
# Give hint that you have to tab for the response.
if description == "No content" and isinstance(message, http.HTTPRequest):
- description = "No request content (press tab to view response)"
+ description = "No request content"
# If the users has a wide terminal, he gets fewer lines; this should not be an issue.
chars_per_line = 80
diff --git a/mitmproxy/tools/console/help.py b/mitmproxy/tools/console/help.py
index fb4e0051..5a7bbb9a 100644
--- a/mitmproxy/tools/console/help.py
+++ b/mitmproxy/tools/console/help.py
@@ -51,10 +51,22 @@ class HelpView(tabs.Tabs, layoutwidget.LayoutWidget):
text = [
urwid.Text(
[
- ("title", "Keybindings for this view")
+ ("title", "Common Keybindings")
]
)
+
]
+
+ text.extend(self.format_keys(self.master.keymap.list("commonkey")))
+
+ text.append(
+ urwid.Text(
+ [
+ "\n",
+ ("title", "Keybindings for this view")
+ ]
+ )
+ )
if self.helpctx:
text.extend(self.format_keys(self.master.keymap.list(self.helpctx)))
diff --git a/mitmproxy/tools/console/keymap.py b/mitmproxy/tools/console/keymap.py
index a42225cf..0a1c64ef 100644
--- a/mitmproxy/tools/console/keymap.py
+++ b/mitmproxy/tools/console/keymap.py
@@ -18,6 +18,7 @@ class KeyBindingError(Exception):
Contexts = {
"chooser",
"commands",
+ "commonkey",
"dataviewer",
"eventlog",
"flowlist",
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 01:33:02 +0000