From 39356e8f347dd92a684f765954114e471e1f0239 Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Sun, 7 May 2017 02:07:41 +0530 Subject: [PATCH 1/4] Add dynamic apple instructions --- .../addons/onboardingapp/templates/index.html | 54 ++++++++++++------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/mitmproxy/addons/onboardingapp/templates/index.html b/mitmproxy/addons/onboardingapp/templates/index.html index f2b54b69b..7bd91cc27 100644 --- a/mitmproxy/addons/onboardingapp/templates/index.html +++ b/mitmproxy/addons/onboardingapp/templates/index.html @@ -1,47 +1,63 @@ {% extends "frame.html" %} {% block body %} + +

Click to install the mitmproxy certificate:

- +

Apple

- +

Windows

- +

Android

- +

Other

-
-

Apple: How to install on macOS / OSX

- +
- -
From 98fd704f67da9c6be0bc271c4d39489f3111c6a5 Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Sun, 7 May 2017 07:44:58 +0530 Subject: [PATCH 2/4] Add apple info from docs --- mitmproxy/addons/onboardingapp/templates/index.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mitmproxy/addons/onboardingapp/templates/index.html b/mitmproxy/addons/onboardingapp/templates/index.html index 7bd91cc27..8487a3cb8 100644 --- a/mitmproxy/addons/onboardingapp/templates/index.html +++ b/mitmproxy/addons/onboardingapp/templates/index.html @@ -14,18 +14,20 @@ function changeTo(device) {
  • A dialog window openes up
  • Change "Secure Socket Layer (SSL)" to "Always Trust"
  • Close the dialog window (and enter your password if prompted)
    • -
  • Go to Settings > General > About > Certificate Trust Settings and enable full trust for your certificate
    • +
  • For iOS version 10.3 or up, you need to make sure mitmproxy is enabled in
    + Certificate Trust Settings, you can check it by going to
    + Settings > General > About > Certificate Trust Settings
  • Done!
    • `; } else if (device == "windows") { - var text = "hi"; + var text = `

    Windows: How to install

    `; } else if (device == "android") { - var text = "hi"; + var text = `

    Android: How to install

    `; } else if (device == "asterisk") { - var text = "hi"; + var text = `

    others

    `; } document.getElementById("dynamic").innerHTML = text; } From e07d2b066026d2e8138cb52dcfdad24a5e5c0c66 Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Sun, 7 May 2017 08:13:45 +0530 Subject: [PATCH 3/4] Add instructions for Windows and Android --- .../addons/onboardingapp/templates/index.html | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/mitmproxy/addons/onboardingapp/templates/index.html b/mitmproxy/addons/onboardingapp/templates/index.html index 8487a3cb8..98fcd32d0 100644 --- a/mitmproxy/addons/onboardingapp/templates/index.html +++ b/mitmproxy/addons/onboardingapp/templates/index.html @@ -6,7 +6,6 @@ function changeTo(device) { if (device == "apple") { var text = `

    Apple: How to install on macOS / OSX

      -
    • Download PEM file (from above link)
    • Double-click the PEM file
    • The "Keychain Access" applications opens
    • Find the new certificate "mitmproxy" in the list
      • @@ -14,20 +13,42 @@ function changeTo(device) {
    • A dialog window openes up
    • Change "Secure Socket Layer (SSL)" to "Always Trust"
    • Close the dialog window (and enter your password if prompted)
      • -
    • For iOS version 10.3 or up, you need to make sure mitmproxy is enabled in
      - Certificate Trust Settings, you can check it by going to
      +
    • For iOS version 10.3 or up, you need to make sure mitmproxy is enabled in
      + Certificate Trust Settings, you can check it by going to
      Settings > General > About > Certificate Trust Settings
    • Done!
    `; } else if (device == "windows") { - var text = `

    Windows: How to install

    `; + var text = `

    Windows: How to install on Windows

    +
      +
    • Double-click the P12 file
      • +
    • Select Store Location for Current User and click Next
      • +
    • Click Next
      • +
    • Leave the Password column blank and click Next
      • +
    • Select Place all certificates in the following store
      • +
    • Click Browse and select Trusted Root Certification Authorities
      • +
    • Click Next and then click Finish
      • +
    • Click Yes if prompted for confirmation
      • +
    • Done!
      • +
    `; } else if (device == "android") { - var text = `

    Android: How to install

    `; + var text = `

    Android: How to install on Android

    +
      +
    • Open your device's Settings app
      • +
    • Under "Credential storage," tap Install from storage
      • +
    • Under "Open from," tap where you saved the certificate
      • +
    • Tap the file
      • +
    • If prompted, enter the key store password and tap OK
      • +
    • Type a name for the certificate
      • +
    • Pick VPN and apps or Wi-Fi
      • +
    • Tap OK
      • +
    • Done!
      • +
    `; } else if (device == "asterisk") { - var text = `

    others

    `; + var text = ""; } document.getElementById("dynamic").innerHTML = text; } From 4c2404049c9794e7e3aa530e673f531b19490524 Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Mon, 8 May 2017 06:43:44 +0530 Subject: [PATCH 4/4] Change to only Apps & VPN --- mitmproxy/addons/onboardingapp/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mitmproxy/addons/onboardingapp/templates/index.html b/mitmproxy/addons/onboardingapp/templates/index.html index 98fcd32d0..c8d0f07a0 100644 --- a/mitmproxy/addons/onboardingapp/templates/index.html +++ b/mitmproxy/addons/onboardingapp/templates/index.html @@ -42,7 +42,7 @@ function changeTo(device) {
  • Tap the file
  • If prompted, enter the key store password and tap OK
  • Type a name for the certificate
    • -
  • Pick VPN and apps or Wi-Fi
    • +
  • Pick VPN and apps
  • Tap OK
  • Done!
    • `;