[tor-commits] [ooni-probe/master] add psiphon user documentation

Wed Dec 2 11:49:13 UTC 2015

commit 122c8b91d81b6275305456f2b373b78c72872dce
Author: juga0 <juga>
Date:   Thu Nov 19 19:55:36 2015 +0000

    add psiphon user documentation
---
 docs/source/nettests/ooni.nettests.third_party.rst |    8 ++
 docs/source/tests/psiphon.rst                      |  119 ++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/docs/source/nettests/ooni.nettests.third_party.rst b/docs/source/nettests/ooni.nettests.third_party.rst
index ef53443..7c0e692 100644
--- a/docs/source/nettests/ooni.nettests.third_party.rst
+++ b/docs/source/nettests/ooni.nettests.third_party.rst
@@ -16,3 +16,11 @@ ooni.nettests third_party Package
      :members:
      :undoc-members:
      :show-inheritance:
+
+:mod:`ooni.nettests.third_party.psiphon` Module
+------------------------------------------------
+
+.. automodule:: ooni.nettests.third_party.psiphon
+     :members:
+     :undoc-members:
+     :show-inheritance:
diff --git a/docs/source/tests/psiphon.rst b/docs/source/tests/psiphon.rst
new file mode 100644
index 0000000..5050b79
--- /dev/null
+++ b/docs/source/tests/psiphon.rst
@@ -0,0 +1,119 @@
+Details
+=======
+
+*Test Name*: Psiphon
+
+*Current version*: 0.1
+
+*NetTest*: Psiphon (https://github.com/TheTorProject/ooni-probe/blob/master/ooni/nettests/third_party/psiphon.py)
+
+*Test Helper*: None
+
+*Test Type*: third party
+
+*Requires Root*: No
+
+Description
+===========
+
+This test first check that the Psiphon path exists, then launches Psiphon and parses output to determine if it has bootstrapped. After bootstrap, it fetches google.com (or other URL specified by the --url argument) using Psiphons SOCKS proxy listening on 127.0.0.1:1080 (or otherwise specified by the --socksproxy argument).
+
+The specific string used to determine bootstrap from Psiphon output in version
+"0.0.1" is "Press Ctrl-C to terminate." from standard output.
+
+How to run the test
+===================
+
+`ooniprobe third_party/psiphon`
+
+To test Psiphon with a different URL run:
+
+`ooniprobe third_party/psiphon -u http://<url>/`
+
+To test Psiphon when it is installed in a different path other than the user home:
+
+`ooniprobe blocking/http_requests -p <path to Psiphon repository>`
+
+How to install Psiphon
+===================
+
+Run the install script:
+
+`scripts/psiphon_install.sh`
+
+To run Psiphon manually, it must be run inside of the proper directory:
+
+`cd <psiphonpath>//psiphon-circumvention-system/pyclient/`
+`python psi_client.py`
+
+Sample report
+=============
+
+`ooniprobe blocking/http_requests -f example_inputs/url_lists_file.txt`
+
+    ::
+
+    ###########################################
+    # OONI Probe Report for psiphon_test (0.0.1)
+    # Mon Oct 12 21:40:52 2015
+    ###########################################
+    ---
+    input_hashes: []
+    options: [-u, google.com]
+    probe_asn: AS0
+    probe_cc: ZZ
+    probe_city: null
+    probe_ip: 127.0.0.1
+    report_id: 4dAHr0ceNDBmw5lUQ7pBoxqgyUSfP873Qj1zv5VyElnSSTXwcsLYeCv69DsUjb94
+    software_name: ooniprobe
+    software_version: 1.3.1
+    start_time: 1444686051.0
+    test_helpers: {}
+    test_name: psiphon_test
+    test_version: 0.0.1
+    ...
+    ---
+    /tmp/tmplKg8K3: {exit_reason: process_done, stderr: '', stdout: "./ssh is not a valid\
+        \ executable. Using standard ssh.\r\n\r\nYour SOCKS proxy is now running at 127.0.0.1:1080\r\
+        \n\r\nPress Ctrl-C to terminate.\r\nTerminating...\r\nConnection closed\r\n"}
+    agent: agent
+    input: null
+    psiphon_installed: true
+    requests:
+    - request:
+        body: null
+        headers: []
+        method: GET
+        tor: {is_tor: false}
+        url: http://google.com
+      response:
+        body: "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\"\
+          >\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has\
+          \ moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n"
+        code: 301
+        headers:
+        - - Content-Length
+          - ['219']
+        - - X-XSS-Protection
+          - [1; mode=block]
+        - - Expires
+          - ['Wed, 11 Nov 2015 21:40:58 GMT']
+        - - Server
+          - [gws]
+        - - Connection
+          - [close]
+        - - Location
+          - ['http://www.google.com/']
+        - - Cache-Control
+          - ['public, max-age=2592000']
+        - - Date
+          - ['Mon, 12 Oct 2015 21:40:58 GMT']
+        - - X-Frame-Options
+          - [SAMEORIGIN]
+        - - Content-Type
+          - [text/html; charset=UTF-8]
+    socksproxy: 127.0.0.1:1080
+    test_runtime: 7.373162031173706
+    test_start_time: 1444686052.0
+    ...
+



