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

Changeset - 7653ca815385

Parent rev.

Child rev.

[Not reviewed]

Merge feature-donation-statistics

0 5 0

Dennis Fink - 9 years ago 2016-03-03 00:16:04
dennis.fink@c3l.lu

Merged dev

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

@@ @@ -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):
@@ @@ -108,24 +111,25 @@ class ServerDecoder(json.JSONDecoder): @@
 class Server:
     def __init__(self, *args, **kwargs):
         self.name = kwargs['name']
         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')
         else:
             self.ip = kwargs['ip']
             if 'ip6' in kwargs:
                 self.ip6 = kwargs['ip6']
@@ @@ -215,46 +219,53 @@ 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
         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
         if delta.seconds >= 3600:
             self.status = False
         elif delta.seconds >= 600:
             self.status = None

ennstatus/api/schema/server.json

➞

Show inline comments

@@ @@ -91,24 +91,29 @@ @@
             "type": "string",
             "format": "date-time"
         },
         "bandwidth": {
             "type": [
                 "string",
                 "null"
             ],
             "default": null
         },
         "type": {
             "type": "string"
         },
         "flags": {
             "type": "array",
             "items": { "type": "string" },
             "uniqueItems": true
+        }
     },
     "required": [
         "name",
         "status",
         "last_updated",
         "country",
         "fingerprint",
         "type"
     ],
     "definitions": {
         "weights": {

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,26 +110,28 @@ 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)
     try:
         server.update_flags()
     except NotImplementedError:
         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,
+        {

requirements.in

➞

Show inline comments

@@ @@ -2,12 +2,13 @@ Babel @@
 click
 Flask-Bootstrap
 Flask-HTTPAuth
 Flask-Mail
 Flask-Moment
 Flask-WTF
 Flask
 jsonschema
 pygeoip
 python-gnupg
 requests
 strict-rfc3339
 OnionPy

requirements.txt

➞

Show inline comments

@@ @@ -9,20 +9,20 @@ blinker==1.4 # via flask-ma @@
 click==6.3
 dominate==2.1.17          # via flask-bootstrap
 Flask-Bootstrap==3.3.5.7
 Flask-HTTPAuth==2.7.2
 Flask-Mail==0.9.1
 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)