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

@@ @@ -49,61 +49,64 @@ def update(): @@
     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'}

0 comments (0 inline, 0 general)