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

Changeset - b038426930ea

Parent rev.

Child rev.

[Not reviewed]

Merge dev

0 5 0

Dennis Fink - 9 years ago 2016-03-02 23:56:03
dennis.fink@c3l.lu

Merged feature-onionpy

5 files changed with 44 insertions and 26 deletions:

ennstatus/api/model.py

ennstatus/api/schema/server.json

ennstatus/api/views.py

requirements.in

requirements.txt

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
@@ @@ -114,12 +117,13 @@ class Server: @@
         self.type = kwargs['type']
         self.status = kwargs.get('status')
         self.fingerprint = kwargs['fingerprint']
         self.last_updated = kwargs['last_updated']
         self.country = kwargs['country']
         self.bandwidth = kwargs.get('bandwidth')
         self.flags = kwargs.get('flags')
         if self.type == 'bridge':
             self.obfs = kwargs.get('obfs')
             self.fteproxy = kwargs.get('fteproxy')
             self.flashproxy = kwargs.get('flashproxy')
             self.meek = kwargs.get('meek')
@@ @@ -221,36 +225,43 @@ 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
         try:
             data = manager.query('weights', lookup=self.fingerprint)
         except:
             raise NotImplementedError
         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_guard_probability = calculate_weight(
             data.guard_probability
+        )
         self.mean_middle_probability = calculate_weight(
             data.middle_probability
+        )
         self.mean_consensus_weight_fraction = calculate_weight(
             data.consensus_weight_fraction
+        )
-        data = requests.get(url)
+    def update_flags(self):
         try:
             data.raise_for_status()
         except requests.HTTPError as e:
             raise e
         else:
             data = data.json()['relays'][0]
             data = manager.query('details', lookup=self.fingerprint)
         except:
             raise NotImplementedError
         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']
+        )
         self.mean_middle_probability = calculate_weight(
             data['middle_probability']
+        )
         self.mean_consensus_weight_fraction = calculate_weight(
             data['consensus_weight_fraction']
+        )
         if data is not None:
             self.flags = data.relays[0].flags
         else:
             raise NotImplementedError
     def check_status(self):
         now = datetime.utcnow()
         delta = now - self.last_updated

ennstatus/api/schema/server.json

➞

Show inline comments

@@ @@ -97,12 +97,17 @@ @@
                 "null"
             ],
             "default": null
         },
         "type": {
             "type": "string"
         },
         "flags": {
             "type": "array",
             "items": { "type": "string" },
             "uniqueItems": true
+        }
     },
     "required": [
         "name",
         "status",
         "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,14 +116,16 @@ 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)
     try:
         server.update_flags()
     except NotImplementedError:
         pass
     try:
         server.save()
     except Exception as e:
         current_app.logger.error(str(e))

requirements.in

➞

Show inline comments

@@ @@ -8,6 +8,7 @@ Flask-WTF @@
 Flask
 jsonschema
 pygeoip
 python-gnupg
 requests
 strict-rfc3339
 OnionPy

requirements.txt

➞

Show inline comments

@@ @@ -15,14 +15,14 @@ Flask-Moment==0.5.1 @@
 Flask-WTF==0.12
 Flask==0.10.1             # via flask-bootstrap, flask-httpauth, flask-mail, flask-moment, flask-wtf
 itsdangerous==0.24        # via flask
 Jinja2==2.8               # via flask
 jsonschema==2.5.1
 MarkupSafe==0.23          # via jinja2
 onionpy==0.3.2
 pygeoip==0.3.2
 python-gnupg==0.3.8
 pytz==2015.7              # via babel
 requests==2.9.1
 strict-rfc3339==0.6
 visitor==0.1.2            # via flask-bootstrap
 Werkzeug==0.11.4          # via flask, flask-wtf
 WTForms==2.1              # via flask-wtf

0 comments (0 inline, 0 general)