[tor-commits] [ooni-probe/develop] Merge branch 'master' into feature/ui

[isis at torproject.org]

commit c8ee22a8afc3fd7f3525d1f1d4e717f3aadd2713
Merge: 673236c 5782f32
Author: Arturo Filastò <art at fuffa.org>
Date:   Sun May 5 17:52:44 2013 +0200

    Merge branch 'master' into feature/ui
    
    * master: (69 commits)
      Implement Vagrant file for running ooniprobe on any platform
      Have some slightly saner defaults for the config file
      Fix markup of README file
      Fix markup of code
      Swallow the report creation failure so that it does not propagate
      Fix tls_handshake input processing
      Fix import conflict
      Set self.input to self.host if no inputFile, and update several log messages.
      Reformat docstrings for several HandshakeTest functions to Sphinx format.
      Rename HandshakeTest.test_tlsv1_handshake() to HandshakeTest.test_handshake().
      Cleanup docstrings for getX509Name() and getPublicKey() functions.
      Add Sphinx docstring for getPeerCert() function.
      Move to call IPAddress explicitly from ipaddr.IPAdress.
      Add self.host to the inputProcessor().
      If no ciphersuite list is provided, explain that we're using firefox's.
      Fix bug where conflicting SSL context choices was not explained to the user.
      Fix #8440, set the self.host attribute when given the --host option.
      Create a host attribute for storing the --host option, and set self.ciphers.
      Make 'context' be a class-level attribute and give it a Sphinx :attr: docstring.
      Bump the version number on HandshakeTest, and rename the usageOptions attribute.
      ...
    
    Conflicts:
    	data/ooniprobe.conf.sample
    	ooni/director.py

 .gitignore                             |    2 +
 README.md                              |  161 +++++--
 Vagrantfile                            |  153 ++++++
 data/ooniprobe.conf.sample             |    4 +-
 docs/fabfile.py                        |   22 +
 inputs/Makefile                        |    3 +-
 nettests/experimental/tls_handshake.py |  794 ++++++++++++++++++++++++++++++++
 ooni/reporter.py                       |    3 +-
 ooni/utils/txscapy.py                  |    1 +
 setup.py                               |    4 +-
 10 files changed, 1089 insertions(+), 58 deletions(-)

diff --cc data/ooniprobe.conf.sample
index 2b79d3e,0000000..a12b526
mode 100644,000000..100644
--- a/data/ooniprobe.conf.sample
+++ b/data/ooniprobe.conf.sample
@@@ -1,55 -1,0 +1,55 @@@
 +# This is the configuration file for OONIProbe
 +# This file follows the YAML markup format: http://yaml.org/spec/1.2/spec.html
 +# Keep in mind that indentation matters.
 +
 +basic:
 +    # Where OONIProbe should be writing it's log file
 +    logfile: /var/log/ooniprobe.log
 +privacy:
 +    # Should we include the IP address of the probe in the report?
 +    includeip: false
 +    # Should we include the ASN of the probe in the report?
 +    includeasn: false
 +    # Should we include the country as reported by GeoIP in the report?
 +    includecountry: false
 +    # Should we include the city as reported by GeoIP in the report?
 +    includecity: false
 +    # Should we collect a full packet capture on the client?
 +    includepcap: false
 +reports:
 +    # This is a packet capture file (.pcap) to load as a test:
 +    pcap: null
 +    collector: 'httpo://nkvphnp3p6agi5qq.onion'
 +advanced:
 +    geoip_data_dir: /usr/share/ooni/
 +    debug: true
 +    # enable if auto detection fails
 +    #tor_binary: /usr/sbin/tor
 +    # For auto detection
 +    interface: auto
 +    # Of specify a specific interface
 +    #interface: wlan0
 +    # If you do not specify start_tor, you will have to have Tor running and
 +    # explicitly set the control port and SOCKS port
-     start_tor: true
++    start_tor: false
 +    # After how many seconds we should give up on a particular measurement
 +    measurement_timeout: 30
 +    # After how many retries we should give up on a measurement
 +    measurement_retries: 2
 +    # How many measurments to perform concurrently
 +    measurement_concurrency: 100
 +    # After how may seconds we should give up reporting
 +    reporting_timeout: 30
 +    # After how many retries to give up on reporting
 +    reporting_retries: 3
 +    # How many reports to perform concurrently
 +    reporting_concurrency: 20
 +tor:
-     #socks_port: 9050
++    socks_port: 9050
 +    #control_port: 9051
 +    # Specify the absolute path to the Tor bridges to use for testing
 +    #bridges: bridges.list
 +    # Specify path of the tor datadirectory.
 +    # This should be set to something to avoid having Tor download each time
 +    # the descriptors and consensus data.
 +    #data_dir: ~/.tor/
diff --cc setup.py
index 454984d,e336e08..1ae39d4
--- a/setup.py
+++ b/setup.py
@@@ -13,19 -11,9 +13,17 @@@ install_requires = 
  ]
  
  dependency_links = [
-     'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe',
-     'https://github.com/hellais/pypcap/archive/v1.1.1.tar.gz#egg=pypcap-1.1.1'
+     'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe'
  ]
  
 +files = []
 +for root, dirs, file_names in os.walk('data/'):
 +    for file_name in file_names:
 +        if not file_name.endswith('.pyc'):
 +            files.append(os.path.join(root, file_name))
 +
 +data_files = [('/usr/share/ooni/', files)]
 +
  with open('requirements.txt') as f:
      for line in f:
          if line.startswith("#") or line.startswith('http'):