Move hardcoded file server and files to config file

Author: juga0

bwscanner/config.py

@@ -3,7 +3,7 @@
 import os.path
 import click
 
-default = {
+DEFAULT = {
     'data_dir': click.get_app_dir('bwscanner'),
     'measurement_dir': os.path.join(click.get_app_dir('bwscanner'),
                                     'measurements'),
@@ -20,7 +20,7 @@
     'timeout': 120,
     'request_limit': 10
 }
-bw_files = {
+BW_FILES = {
     64*1024: ("64M", "6258de4f4d602be75a3458117b29d2c580c4bcb7ba5b9d2c4135c7603109f554"),
     32*1024: ("32M", "5a5d66d7865f09498d776f20c9e9791b055a4fff357185f84fb4ecfca7da93f0"),
     16*1024: ("(16M", "6258de4f4d602be75a3458117b29d2c580c4bcb7ba5b9d2c4135c7603109f554"),

bwscanner/measurement.py

@@ -43,16 +43,8 @@ def __init__(self, state, clock, measurement_dir, **kwargs):
 
         self.tasks = []
         self.circuits = None
-        self.baseurl = 'https://bwauth.torproject.org/bwauth.torproject.org'
-        self.bw_files = {
-            64*1024: ("64M", "913b3c5df256d62235f955fa936e7a4e2d5e0cb6"),
-            32*1024: ("32M", "a536076ef51c2cfff607fec2d362671e031d6b48"),
-            16*1024: ("16M", "e91690ed2abf05e347b61aafaa23abf2a2b3292f"),
-            8*1024: ("8M", "c690229b300945ec4ba872b80e8c443e2e1750f0"),
-            4*1024: ("4M", "94f7bc6679a4419b080debd70166c2e43e80533d"),
-            2*1024: ("2M", "9793cc92932598898d22497acdd5d732037b1a13"),
-        }
-
+        self.baseurl = kwargs.get('baseurl')
+        self.bw_files = kwargs.get('bw_files')
         self.result_sink = ResultSink(self.measurement_dir, chunk_size=10)
 
     def now(self):

bwscanner/scanner.py

@@ -9,7 +9,7 @@
 from bwscanner.logger import setup_logging, log
 from bwscanner.measurement import BwScan
 from bwscanner.aggregate import write_aggregate_data
-from bwscanner.config import TOR_OPTIONS
+from bwscanner.config import TOR_OPTIONS, DEFAULT, BW_FILES
 from bwscanner import __version__
 
 
@@ -75,13 +75,15 @@ def cli(ctx, data_dir, loglevel, logfile, launch_tor, circuit_build_timeout):
 @click.option('--request-limit', default=10,
               help='Limit the number of simultaneous bandwidth measurements '
               '(default: %d).' % 10)
+@click.option('--baseurl', default=DEFAULT.get('baseurl'),
+              help='File server URL')
 @pass_scan
-def scan(scan, partitions, current_partition, timeout, request_limit):
+def scan(scan, partitions, current_partition, timeout, request_limit, baseurl):
     """
     Start a scan through each Tor relay to measure it's bandwidth.
     """
     log.info("Using {data_dir} as the data directory.", data_dir=scan.data_dir)
-
+    assert isinstance(BW_FILES, dict)
     # XXX: check that each run is producing the same input set!
     scan_time = str(int(time.time()))
     scan_data_dir = os.path.join(scan.measurement_dir, '{}.running'.format(scan_time))
@@ -93,6 +95,8 @@ def rename_finished_scan(deferred):
         os.rename(scan_data_dir, os.path.join(scan.measurement_dir, scan_time))
 
     scan.tor_state.addCallback(BwScan, reactor, scan_data_dir,
+                               baseurl=baseurl,
+                               bw_files=BW_FILES,
                                request_timeout=timeout,
                                request_limit=request_limit,
                                partitions=partitions,