FVDE/ennstatus Changeset - 2cef966f277b · Chaos Computer Club Lëtzebuerg Projects

Changeset - 2cef966f277b

Parent rev.

Child rev.

[Not reviewed]

version_5

0 1 1

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

Added new check_ip function

2 files changed with 13 insertions and 5 deletions:

ennstatus/api/model.py

ennstatus/utils.py

0 comments (0 inline, 0 general)

ennstatus/api/model.py

➞

Show inline comments

@@ @@ -13,6 +13,9 @@ import requests @@
 from flask import current_app
 from pkg_resources import resource_filename
 from ..utils import check_ip
 schema = json.load(
     open(
         resource_filename('ennstatus.api', 'schema/server.json'),
@@ @@ -179,12 +182,8 @@ class Server: @@
         for key in ('ip', 'ip6'):
             if key in server:
                 address = ipaddress.ip_address(server[key])
                 if any({address.is_private, address.is_multicast,
                         address.is_unspecified, address.is_reserved,
                         address.is_loopback}):
                 if not check_ip(address):
                     raise ValueError('{} is not accepted!\n'.format(key))
         return True
     def save(self):

ennstatus/utils.py

➞

Show inline comments

@@ new file 100644 @@
 def check_ip(ipaddress):
     return not any({
         ipaddress.is_private,
         ipaddress.is_multicast,
         ipaddress.is_unspecified,
         ipaddress.is_reserved,
         ipaddress.is_loopback
     })

0 comments (0 inline, 0 general)