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

Changeset - 47d07b5cb8db

Parent rev.

Child rev.

[Not reviewed]

feature-onionpy

0 3 0

Dennis Fink - 9 years ago 2016-03-02 20:01:22
dennis.fink@c3l.lu

Added flags

3 files changed with 20 insertions and 0 deletions:

ennstatus/api/model.py

ennstatus/api/schema/server.json

ennstatus/api/views.py

0 comments (0 inline, 0 general)

ennstatus/api/model.py

➞

Show inline comments

@@ @@ -111,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']
@@ @@ -238,21 +239,30 @@ class Server: @@
         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
+        )
     def update_flags(self):
         try:
             data = manager.query('details', lookup=self.fingerprint)
         except:
             raise NotImplementedError
         self.flags = data.relays[0].flags
     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

@@ @@ -112,24 +112,29 @@ 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
     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,
+        {
             'Location': '/api/export/json/single?server_name={}'.format(
                 server.name
+            )

0 comments (0 inline, 0 general)