FVDE/ennstatus Changeset - 4078d793b48d · Chaos Computer Club Lëtzebuerg Projects

Changeset - 4078d793b48d

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Dennis Fink - 11 years ago 2014-07-15 00:25:22
dennis.fink@c3l.lu

Add FTEProxy support

3 files changed with 29 insertions and 29 deletions:

ennstatus/api/functions.py

ennstatus/templates/api/export/xml/server.xml

ennstatus/templates/status/macros.html

0 comments (0 inline, 0 general)

ennstatus/api/functions.py

➞

Show inline comments

@@ @@ -14,75 +14,78 @@ IP_REGEX = (r'^(?:(?:25[0-5]|2[0-4][0-9] @@
 IP_REGEX = re.compile(IP_REGEX)
 PRIVATE_IP_REGEX = (r'(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)'
                     r'|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|'
                     r'255\.255\.255\.255')
 PRIVATE_IP_REGEX = re.compile(PRIVATE_IP_REGEX)
 DATE_FORMAT = '%d-%m-%Y %H:%M:%S'
 gi4 = pygeoip.GeoIP('/usr/share/GeoIP/GeoIP.dat', pygeoip.MEMORY_CACHE)
 def check_bridge(key, server):
     if key not in server:
         raise ValueError('%s key not present!\n' % key)
     else:
         if server[key] not in ('True', 'False'):
             error_message = ('%s has not the right content!'
                              ' is: %s must be one of: True or False\n') \
                 % (key, server[key])
             raise ValueError(error_message)
 def check_json_format(server):
     for key in ('server_type', 'server_name', 'tor_status'):
+    for key in ('server_type', 'server_name', 'tor_status', 'fingerprint'):
         if key not in server:
             raise ValueError('%s key not present!\n' % key)
     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 server['server_type'] in ('Exit', 'Relay'):
         if 'fingerprint' not in server:
             raise ValueError('fingerprint key not present!\n')
         else:
             if FINGERPRINT_REGEX.match(server['fingerprint']) is None:
                 raise ValueError('fingerprint has not the right format!\n')
     if FINGERPRINT_REGEX.match(server['fingerprint']) is None:
         raise ValueError('fingerprint has not the right format!\n')
     else:
         if 'obfs' not in server:
             raise ValueError('obfs key not present!\n')
         else:
             if server['obfs'] not in ('True', 'False'):
                 error_message = ('obfs has not the right content!'
                                  ' is: %s must be one of: True or False\n') \
                     % server['obfs']
                 raise ValueError(error_message)
     if server['server_type'] == 'bridge':
         for key in ('obfs', 'fteproxy'):
             check_bridge(key, server)
     if 'ip' in server:
         if IP_REGEX.match(server['ip']) is None:
             raise ValueError('ip is not the right format!\n')
         elif PRIVATE_IP_REGEX.match(server['ip']) is not None:
             raise ValueError('ip is not accepted!\n')
     return True
 def update_server(server, ip):
     server['last_updated'] = datetime.utcnow().strftime(DATE_FORMAT)
     server['server_status'] = 'Online'
     server['country'] = gi4.country_name_by_addr(ip)
     if server['server_type'] == 'Bridge':
         server['obfs'] = literal_eval(server['obfs'])
         server['fteproxy'] = literal_eval(server['fteproxy'])
         if 'ip' in server:
             del server['ip']
     else:
         if 'obfs' in server:
             del server['obfs']
         server['ip'] = ip
     try:
         filename = ''.join(['data/', server['server_name'].lower(), '.json'])

ennstatus/templates/api/export/xml/server.xml

➞

Show inline comments

 <server>
     <server_type>{{ server['server_type'] }}</server_type>
     <server_name>{{ server['server_name'] }}</server_name>
     <server_status>{{ server['server_status'] }}</server_status>
     <tor_status>{{ server['tor_status'] }}</tor_status>
     <country>{{ server['country'] }}</country>
     <last_updated>{{ server['last_updated'] }}</last_updated>
     {% if 'ip' in server %}
     <fingerprint>{{ server['fingerprint'] }}</fingerprint>
     {% if server['server_type'] == 'bridge' %}
     <obfs>{{ server['obfs'] }}</obfs>
     <fteproxy>{{ server['fteproxy'] }}</fteproxy>
     {% else %}
     <ip>{{ server['ip'] }}</ip>
     {% endif %}
     {% if 'fingerprint' in server %}
     <fingerprint>{{ server['fingerprint'] }}</fingerprint>
     {% endif %}
     {% if 'obfs' in server %}
     <obfs>{{ server['obfs'] }}</obfs>
     {% endif %}
   </server>

ennstatus/templates/status/macros.html

➞

Show inline comments

@@ @@ -29,51 +29,50 @@ @@
   {% else %}
     {% set url_type = 'bridge' %}
   {% endif %}
   <a href="http://globe.enn.lu/#/{{ url_type }}/{{ fingerprint }}">{{ fingerprint|upper}}</a>
 {% endmacro %}
 {% macro create_name(name) %}
   <a href="http://{{ name|lower }}.enn.lu">{{ name }}</a>
 {% endmacro %}
 {% macro create_server_table(server_type, servers) %}
   {% if server_type in ('Exit', 'Relay') %}
-    {% set headers = ['#', 'Name', 'IP', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)'] %}
+    {% set headers = ('#', 'Name', 'IP', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)') %}
   {% else %}
-    {% set headers = ['#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'Last Updated (UTC)'] %}
+    {% set headers = ('#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'FTEProxy', 'Last Updated (UTC)') %}
   {% endif %}
   <h2>{{ server_type }}</h2>
   <table class="table table-bordered table-striped">
     <thead>
       <tr>
         {% for name in headers %}
           <th>{{ name }}</th>
         {% endfor %}
       </tr>
     </thead>
     <tbody>
       {% for server in servers %}
         <tr>
           <td>{{ loop.index }}</td>
           {% if server_type in ('Exit', 'Relay') %}
             <td>{{ create_name(server['server_name']) }}</td>
             <td>{{ server['ip'] }}</td>
           {% else %}
             <td>{{ server['server_name'] }}</td>
           {% endif %}
           {% if server_type in ('Exit', 'Relay') %}
             <td>{{ server['ip'] }}</td>
           {% endif %}
           {% for status in [server['server_status'], server['tor_status']] %}
           {% for status in (server['server_status'], server['tor_status']) %}
             <td>{{ colorize_status(status) }}</td>
           {% endfor %}
           <td>{{ create_country(server['country']) }}</td>
           <td>{{ create_fingerprint(server['fingerprint'], server['server_type']) }}</td>
           {% if server_type == 'Bridge' %}
             <td>{{ colorize_obfs(server['obfs']) }}</td>
             <td>{{ colorize_obfs(server['fteproxy']) }}</td>
           {% endif %}
           <td>{{ server['last_updated'] }}</td>
         </tr>
       {% endfor %}
     </tbody>
   </table>
 {% endmacro %}

0 comments (0 inline, 0 general)