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

Changeset - 8e2ff6443761

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Dennis Fink - 10 years ago 2014-12-13 14:46:12
dennis.fink@c3l.lu

Fix ipv6 support

1 file changed with 5 insertions and 5 deletions:

ennstatus/api/functions.py

0 comments (0 inline, 0 general)

ennstatus/api/functions.py

➞

Show inline comments

@@ @@ -42,84 +42,84 @@ def check_json_format(server): @@
     if server['server_type'] not in ('Exit', 'Relay', 'Bridge'):
         error_message = ('server_type has not the right content!'
                          ' is: %s must be one of: Exit, Relay or Bridge\n') \
             % server['server_type']
         raise ValueError(error_message)
     if not server['tor_status'] in ('Online', 'Offline'):
         error_message = ('tor_status has not the right content!'
                          ' is: %s must be one of: Online or Offline\n') \
             % server['tor_status']
     if FINGERPRINT_REGEX.match(server['fingerprint']) is None:
         raise ValueError('fingerprint has not the right format!\n')
     if server['server_type'] == 'Bridge':
         for key in ('obfs', 'fteproxy', 'flashproxy', 'meek'):
             check_bridge(key, server)
     if 'ip' in server:
         try:
             address = ipaddress.IPv4Address(server['ip'])
             if any([address.is_private, address.is_multicast,
                     address.is_unspecified, address.is_reserved,
-                    address.is_loopback, address.link_local]):
                     address.is_loopback]):
                 raise ValueError('ip is not accepted!\n')
         except ipaddress.AddressValueError:
             raise ValueError('ip is not the right format!\n')
     if 'ip6' in server:
         try:
             address = ipaddress.IPv6Address(server['ip6'])
             if any([address.is_private, address.is_multicast,
                     address.is_unspecified, address.is_reserved,
                     address.is_loopback, address.link_local]):
                 raise ValueError('ip is not accepted!\n')
                     address.is_loopback]):
                 raise ValueError('ip6 is not accepted!\n')
         except ipaddress.AddressValueError:
-            raise ValueError('ip is not the right format!\n')
+            raise ValueError('ip6 is not the right format!\n')
     return True
 def _send_offline_mail(server_name, last_updated):
     current_app.logger.info('Sending tor status offline mail!')
     subject = '[Ennstatus] %s Tor status went offline'
     _send_mail(server_name, last_updated, subject)
     mail_cache[server_name] = datetime.utcnow()
 def update_server(server, ip):
     server['last_updated'] = datetime.utcnow().strftime(DATE_FORMAT)
     server['server_status'] = 'Online'
     if ip.version == 4:
         server['country'] = gi4.country_name_by_addr(str(ip))
-    elif ip.verion == 6:
+    elif ip.version == 6:
         server['country'] = gi6.country_name_by_addr(str(ip))
     server_name = server['server_name']
     if server['server_type'] == 'Bridge':
         if 'ip' in server:
             del server['ip']
         if 'ip6' in server:
             del server['ip6']
     else:
         for key in ('obfs', 'fteproxy', 'flashproxy', 'meek'):
             if key in server:
                 del server[key]
         if ip.version == 4:
             if 'ip' not in server:
                 server['ip'] = str(ip)
         elif ip.version == 6:
             if 'ip6' not in server:
                 server['ip6'] = str(ip)
     try:
         filename = ''.join(['data/', server_name.lower(), '.json'])

0 comments (0 inline, 0 general)