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

@@ @@ -15,60 +15,63 @@ @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import ipaddress
 import json
 import functools
 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(
         resource_filename('ennstatus.api', 'schema/server.json'),
         encoding='utf-8'
+    )
+)
 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
     return obj
 class ServerEncoder(json.JSONEncoder):
     def default(self, obj):
@@ @@ -215,46 +218,41 @@ class Server: @@
         try:
             with filepath.open(mode='w', encoding='utf-8') as f:
                 json.dump(self.__dict__, f, cls=ServerEncoder)
         except Exception as e:
             raise e
     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
         if delta.seconds >= 3600:
             self.status = False
         elif delta.seconds >= 600:
             self.status = None

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -17,25 +17,24 @@ @@
 import ipaddress
 import json
 from datetime import datetime
 from flask import (Blueprint, request, current_app, jsonify, render_template,
                    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
 api_page = Blueprint('api', __name__)
 gi4 = pygeoip.GeoIP('/usr/share/GeoIP/GeoIP.dat', pygeoip.MEMORY_CACHE)
 gi6 = pygeoip.GeoIP('/usr/share/GeoIP/GeoIPv6.dat', pygeoip.MEMORY_CACHE)
@@ @@ -111,27 +110,24 @@ def update(): @@
+    )
     try:
         server = Server.from_dict(data)
     except Exception as e:
         current_app.logger.warning(' '.join([str(e), str(data)]))
         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'}
     current_app.logger.info('Return result')
     return (
         server.json(), 201,
+        {
             'Location': '/api/export/json/single?server_name={}'.format(

requirements.in

➞

Show inline comments

 Babel==2.1.1
 click==5.1
 Flask-Bootstrap==3.3.5.6
 Flask-HTTPAuth==2.6.0
 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)