From 8f88fcedd601c0033b4469b66626a83011879baf Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 22 Jan 2014 13:33:02 +1300 Subject: Move the doc tree out into its own repo. --- .../android-settingssecurityinstallca.png | Bin 57723 -> 0 bytes .../certinstall/android-settingssecuritymenu.png | Bin 75679 -> 0 bytes .../android-settingssecurityuserinstalledca.png | Bin 47263 -> 0 bytes .../certinstall/android-shellwgetmitmproxyca.png | Bin 22198 -> 0 bytes doc-src/certinstall/android.html | 45 --------------------- doc-src/certinstall/firefox.html | 23 ----------- doc-src/certinstall/index.py | 10 ----- doc-src/certinstall/ios-simulator.html | 23 ----------- doc-src/certinstall/ios.html | 21 ---------- doc-src/certinstall/osx.html | 16 -------- doc-src/certinstall/windows7.html | 32 --------------- 11 files changed, 170 deletions(-) delete mode 100644 doc-src/certinstall/android-settingssecurityinstallca.png delete mode 100644 doc-src/certinstall/android-settingssecuritymenu.png delete mode 100644 doc-src/certinstall/android-settingssecurityuserinstalledca.png delete mode 100644 doc-src/certinstall/android-shellwgetmitmproxyca.png delete mode 100644 doc-src/certinstall/android.html delete mode 100644 doc-src/certinstall/firefox.html delete mode 100644 doc-src/certinstall/index.py delete mode 100644 doc-src/certinstall/ios-simulator.html delete mode 100644 doc-src/certinstall/ios.html delete mode 100644 doc-src/certinstall/osx.html delete mode 100644 doc-src/certinstall/windows7.html (limited to 'doc-src/certinstall') diff --git a/doc-src/certinstall/android-settingssecurityinstallca.png b/doc-src/certinstall/android-settingssecurityinstallca.png deleted file mode 100644 index f0f97273..00000000 Binary files a/doc-src/certinstall/android-settingssecurityinstallca.png and /dev/null differ diff --git a/doc-src/certinstall/android-settingssecuritymenu.png b/doc-src/certinstall/android-settingssecuritymenu.png deleted file mode 100644 index fea412fe..00000000 Binary files a/doc-src/certinstall/android-settingssecuritymenu.png and /dev/null differ diff --git a/doc-src/certinstall/android-settingssecurityuserinstalledca.png b/doc-src/certinstall/android-settingssecurityuserinstalledca.png deleted file mode 100644 index 1f7717ad..00000000 Binary files a/doc-src/certinstall/android-settingssecurityuserinstalledca.png and /dev/null differ diff --git a/doc-src/certinstall/android-shellwgetmitmproxyca.png b/doc-src/certinstall/android-shellwgetmitmproxyca.png deleted file mode 100644 index 4a4e326f..00000000 Binary files a/doc-src/certinstall/android-shellwgetmitmproxyca.png and /dev/null differ diff --git a/doc-src/certinstall/android.html b/doc-src/certinstall/android.html deleted file mode 100644 index 9b0c5d71..00000000 --- a/doc-src/certinstall/android.html +++ /dev/null @@ -1,45 +0,0 @@ -The proxy situation on Android is [an -embarrasment](http://code.google.com/p/android/issues/detail?id=1273). It's -scarcely credible, but Android didn't have a global proxy setting at all until -quite recently, and it's still not supported on many common Android versions. -In the meantime the app ecosystem has grown used to life without this basic -necessity, and many apps merrily ignore it even if it's there. This situation -is improving, but in many circumstances using [transparent -mode](@!urlTo("transparent.html")!@) is mandatory for testing Android apps. - -We used an Asus Transformer Prime TF201 with Android 4.0.3 in the examples -below - your device may differ, but the broad process should be similar. - - -## Getting the certificate onto the device - -First we need to get the __mitmproxy-ca-cert.cer__ file into the -__/sdcard__ folder on the device (/sdcard/Download on older devices). There are a number of ways to do -this. If you have the Android Developer Tools installed, you can use [__adb -push__](http://developer.android.com/tools/help/adb.html) to accomplish this. -Depending on your device, you could also transfer the file using external media -like an SD Card. In this example, we're using wget from within a terminal -emulator to transfer the certificate from a local HTTP server: - - - - -## Installing the certificate - -Once we have the certificate on the local disk, we need to import it into the -list of trusted CAs. Go to Settings -> Security -> Credential Storage, -and select "Install from storage": - - - -The certificate in /sdcard is automatically located and offered for -installation. Installing the cert will delete the download file from the local -disk: - - - -Afterwards, you should see the certificate listed in the Trusted Credentials -store: - - - diff --git a/doc-src/certinstall/firefox.html b/doc-src/certinstall/firefox.html deleted file mode 100644 index 66fa9d79..00000000 --- a/doc-src/certinstall/firefox.html +++ /dev/null @@ -1,23 +0,0 @@ - -How to install the __mitmproxy__ certificate authority in Firefox: - -
    -
  1. If needed, copy the ~/.mitmproxy/mitmproxy-ca-cert.pem file to the target.
    2. - -
  2. Open preferences, click on "Advanced", then select"Encryption": - -
    3. - -
  3. Click "View Certificates", "Import", and select the certificate file: - -
    4. - -
  4. Tick "Trust this CS to identify web sites", and click "Ok": - -
    5. - -
  5. You should now see the mitmproxy certificate listed in the Authorities - tab.
    6. - -
- diff --git a/doc-src/certinstall/index.py b/doc-src/certinstall/index.py deleted file mode 100644 index 3f145fbc..00000000 --- a/doc-src/certinstall/index.py +++ /dev/null @@ -1,10 +0,0 @@ -from countershape import Page - -pages = [ - Page("firefox.html", "Firefox"), - Page("osx.html", "OSX"), - Page("windows7.html", "Windows 7"), - Page("ios.html", "IOS"), - Page("ios-simulator.html", "IOS Simulator"), - Page("android.html", "Android"), -] diff --git a/doc-src/certinstall/ios-simulator.html b/doc-src/certinstall/ios-simulator.html deleted file mode 100644 index 9eb98108..00000000 --- a/doc-src/certinstall/ios-simulator.html +++ /dev/null @@ -1,23 +0,0 @@ - -How to install the __mitmproxy__ certificate authority in the IOS simulator: - -
    - -
  1. First, check out the ADVTrustStore tool - from github.
    2. - -
  2. Now, run the following command: - - 
    ./iosCertTrustManager.py -a ~/.mitmproxy/mitmproxy-ca-cert.pem
    - -
    3. - -
- - -Note that although the IOS simulator has its own certificate store, it shares -the proxy settings of the host operating system. You will therefore to have -configure your OSX host's proxy settings to use the mitmproxy instance you want -to test with. - diff --git a/doc-src/certinstall/ios.html b/doc-src/certinstall/ios.html deleted file mode 100644 index fd14e65a..00000000 --- a/doc-src/certinstall/ios.html +++ /dev/null @@ -1,21 +0,0 @@ - -How to install the __mitmproxy__ certificate authority on IOS devices: - -
    -
  1. Set up the Mail app on the device to receive email.
    2. - -
  2. Mail the mitmproxy-ca-cert.pem file to the device, and tap on the attachment.
    3. - -
  3. You will be prompted to install a profile. Click "Install": - -
    4. - -
  4. Accept the warning by clicking "Install" again: - -
    5. - -
  5. The certificate should now be trusted: - -
    6. - -
diff --git a/doc-src/certinstall/osx.html b/doc-src/certinstall/osx.html deleted file mode 100644 index a532d538..00000000 --- a/doc-src/certinstall/osx.html +++ /dev/null @@ -1,16 +0,0 @@ - -How to install the __mitmproxy__ certificate authority in OSX: - -
    - -
  1. Open Finder, and double-click on the mitmproxy-ca-cert.pem file.
    2. - -
  2. You will be prompted to add the certificate. Click "Always Trust": - - -
    3. - -
  3. You may be prompted for your password. You should now see the - mitmproxy cert listed under "Certificates".
    4. -
- diff --git a/doc-src/certinstall/windows7.html b/doc-src/certinstall/windows7.html deleted file mode 100644 index 47c807c6..00000000 --- a/doc-src/certinstall/windows7.html +++ /dev/null @@ -1,32 +0,0 @@ - -How to install the __mitmproxy__ certificate authority in Windows 7: - -
    - -
  1. Copy the ~/.mitmproxy/mitmproxy-ca-cert.p12 file to the target system.
    2. - -
  2. - Double-click the certificate file. You should see a certificate import wizard: - - -
    3. - -
  3. - Click "Next" until you're prompted for the certificate store: - - - -
    4. - - -
  4. -

    Select "Place all certificates in the following store", and select "Trusted Root Certification Authorities":

    - - - -
    5. - -
  5. Click "Next" and "Finish".
    6. - -
- -- cgit v1.2.3