FVDE/ennstatus Changeset - 9e4fba8ebb3b · Chaos Computer Club Lëtzebuerg Projects

Changeset - 9e4fba8ebb3b

Parent rev.

Child rev.

[Not reviewed]

feature-onionpy

0 3 0

Dennis Fink - 9 years ago 2016-03-02 19:32:50
dennis.fink@c3l.lu

Use onionpy for querying onionoo

3 files changed with 17 insertions and 24 deletions:

ennstatus/api/model.py

ennstatus/api/views.py

requirements.in

0 comments (0 inline, 0 general)

ennstatus/api/model.py

➞

Show inline comments

@@ @@ -21,16 +21,17 @@ import statistics @@
 from pathlib import Path
 from datetime import datetime
 import jsonschema
 import strict_rfc3339
 import requests
 from flask import current_app
 from pkg_resources import resource_filename
 from onion_py.manager import Manager
 from onion_py.caching import OnionSimpleCache
 from ..utils import check_ip
 schema = json.load(
     open(
@@ @@ -42,27 +43,29 @@ schema = json.load( @@
 validate = functools.partial(
     jsonschema.validate,
     schema=schema,
     format_checker=jsonschema.FormatChecker()
+)
 manager = Manager(OnionSimpleCache())
 def calculate_weight(data):
     obj = {}
     for subkey in ('1_week', '1_month', '3_months', '1_year', '5_years'):
         try:
             subdata = data[subkey]
         except KeyError:
             continue
-        factor = subdata['factor']
+        factor = subdata.factor
-        values = [x * factor for x in subdata['values'] if x is not None]
+        values = [x * factor for x in subdata.values if x is not None]
         if values:
             obj[subkey] = statistics.mean(values) * 100
         else:
             obj[subkey] = None
@@ @@ -221,35 +224,30 @@ class Server: @@
     def update_weights(self):
         if self.type not in ('exit', 'relay'):
             raise NotImplementedError
         url = 'https://onionoo.torproject.org/weights?lookup={}'.format(
             self.fingerprint
+        )
         data = requests.get(url)
         try:
             data = manager.query('weights', lookup=self.fingerprint)
         except:
             raise NotImplementedError
         try:
             data.raise_for_status()
         except requests.HTTPError as e:
             raise e
         else:
             data = data.json()['relays'][0]
         if data is not None:
             data = data.relays[0]
         self.mean_consensus_weight = calculate_weight(data['consensus_weight'])
         self.mean_exit_probability = calculate_weight(data['exit_probability'])
         self.mean_consensus_weight = calculate_weight(data.consensus_weight)
         self.mean_exit_probability = calculate_weight(data.exit_probability)
         self.mean_guard_probability = calculate_weight(
-            data['guard_probability']
+            data.guard_probability
+        )
         self.mean_middle_probability = calculate_weight(
-            data['middle_probability']
+            data.middle_probability
+        )
         self.mean_consensus_weight_fraction = calculate_weight(
-            data['consensus_weight_fraction']
+            data.consensus_weight_fraction
+        )
     def check_status(self):
         now = datetime.utcnow()
         delta = now - self.last_updated

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -23,13 +23,12 @@ from flask import (Blueprint, request, c @@
                    abort)
 from werkzeug.exceptions import BadRequest
 import strict_rfc3339
 import pygeoip
 import requests
 from ennstatus import csrf
 from ennstatus.status.functions import (single_server, all_servers,
                                         all_servers_by_type)
 from .model import Server
 from .auth import httpauth
@@ @@ -117,15 +116,12 @@ def update(): @@
         return str(e), 409, {'Content-Type': 'text/plain'}
     try:
         server.update_weights()
     except NotImplementedError:
         pass
     except requests.HTTPError as e:
         current_app.logger.error(str(e), exc_info=True)
         pass
     try:
         server.save()
     except Exception as e:
         current_app.logger.error(str(e))
         return str(e), 500, {'Content-Type': 'text/plain'}

requirements.in

➞

Show inline comments

@@ @@ -6,9 +6,8 @@ Flask-Mail==0.9.1 @@
 Flask-Moment==0.5.1
 Flask-WTF==0.12
 Flask==0.10.1
 jsonschema==2.5.1
 pygeoip==0.3.2
 python-gnupg==0.3.7
 requests==2.7.0
 strict-rfc3339==0.5
 OnionPy

0 comments (0 inline, 0 general)