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

Changeset - 6d5132a446e9

Parent rev.

Child rev.

[Not reviewed]

version_5

0 1 0

Dennis Fink - 10 years ago 2015-08-30 15:24:17
dennis.fink@c3l.lu

Rewrote checking of ip and setting the country

1 file changed with 11 insertions and 8 deletions:

ennstatus/api/views.py

0 comments (0 inline, 0 general)

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -25,109 +25,112 @@ gi6 = pygeoip.GeoIP('/usr/share/GeoIP/Ge @@
 def update():
     current_app.logger.info('Handling update')
     try:
         servers = current_app.config['ENNSTATUS_SERVERS']
     except KeyError as e:
         current_app.logger.error(str(e))
         return abort(500)
     username = httpauth.username()
     try:
         if request.remote_addr not in servers[username]['IPS']:
             current_app.logger.warn(
                 'Unallowed IP {} tried to update data!'.format(
                     request.remote_addr
+                )
+            )
             return 'IP not allowed!\n', 403, {'Content-Type': 'text/plain'}
     except KeyError as e:
         current_app.logger.error(str(e))
         return abort(500)
     try:
         data = request.get_json()
     except BadRequest:
         current_app.logger.info('No JSON data supplied!')
         return 'No JSON data supplied!\n', 400, {'Content-Type': 'text/plain'}
     try:
         if username != data['name'].lower():
             current_app.logger.warn(
                 'Unallowed user {} tried to update {}!'.format(
                     username, data['name']
+                )
+            )
             return ('You are not allowed to update this server\n',
 , {'Content-Type': 'text/plain'})
     except KeyError:
         return abort(409)
     if 'ip' in data:
         ip = data['ip']
     elif 'ip6' in data:
         ip = data['ip6']
     else:
         ip = request.remote_addr
     try:
-        ip = ipaddress.ip_address(ip)
+            temp_ip = ipaddress.ip_address(ip)
     except ipaddress.AddressValueError:
         return 'IP not allowed!\n', 403, {'Content-Type': 'text/plain'}
         else:
             if temp_ip.version == 4:
                 data['ip'] = ip
             elif temp_ip.verison == 6:
                 data['ip6'] = ip
     if ip.version == 4:
         data['country'] = gi4.country_name_by_addr(str(ip))
     elif ip.version == 6:
         data['country'] = gi6.country_name_by_addr(str(ip))
     else:
         data['country'] = None
     try:
         country = gi4.country_name_by_addr(ip)
     except pygeoip.GeoIPError:
         country = gi6.country_name_by_addr(ip)
     data['country'] = country
     data['last_updated'] = strict_rfc3339.timestamp_to_rfc3339_utcoffset(
         datetime.utcnow().timestamp()
+    )
     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(
                 server.name
+            )
+        }
+    )
 @api_page.route('/export', defaults={'server_type': 'all',
                                      'export_format': 'json'})
 @api_page.route('/export/<any("json", "xml"):export_format>',
                 defaults={'server_type': 'all'})
 @api_page.route(('/export/<any("json", "xml"):export_format>'
                  '/<any("all", "exit", "bridge", "relay", "single")'
                  ':server_type>'))
 def export(export_format, server_type):
     current_app.logger.info('Handling export')
     if server_type == 'single':
         server_name = request.args.get('server_name', None)
         if server_name is not None:

0 comments (0 inline, 0 general)