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

Changeset - c5c8dae00266

Parent rev.

Child rev.

[Not reviewed]

Merge feature-donation-statistics

1 18 1

Dennis Fink - 8 years ago 2016-12-05 10:38:40
dennis.fink@c3l.lu

Merged dev

20 files changed with 348 insertions and 190 deletions:

ennstatus/api/model.py

ennstatus/api/views.py

ennstatus/cli/__init__.py

ennstatus/cli/commands/__init__.py

ennstatus/cli/commands/config.py

ennstatus/cli/commands/stats.py

232

ennstatus/config.py

ennstatus/donate/views.py

ennstatus/root/constants.py

ennstatus/root/forms.py

ennstatus/root/views.py

ennstatus/static/css/ennstatus.css

ennstatus/templates/base.html

ennstatus/templates/donate/index.html

ennstatus/templates/root/about.html

ennstatus/templates/root/contact.html

ennstatus/templates/root/membership.html

requirements.in

requirements.txt

setup.py

0 comments (0 inline, 0 general)

ennstatus/api/model.py

➞

Show inline comments

@@ @@ -255,10 +255,13 @@ class Server: @@
         except:
             raise NotImplementedError
         if data is not None:
             self.flags = data.relays[0].flags
         else:
             raise NotImplementedError
         try:
             if data is not None:
                 self.flags = data.relays[0].flags
             else:
                 raise NotImplementedError
         except IndexError as e:
             raise NotImplementedError from e
     def check_status(self):

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -115,15 +115,16 @@ def update(): @@
         current_app.logger.warning(' '.join([str(e), str(data)]))
         return str(e), 409, {'Content-Type': 'text/plain'}
     try:
         server.update_weights()
     except NotImplementedError:
         pass
     if current_app.config['ENNSTATUS_ENABLE_ONIONOO']:
         try:
             server.update_weights()
         except NotImplementedError:
             pass
     try:
         server.update_flags()
     except NotImplementedError:
         pass
         try:
             server.update_flags()
         except NotImplementedError:
             pass
     try:
         server.save()

ennstatus/cli/__init__.py

➞

Show inline comments

@@ @@ -15,9 +15,13 @@ @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import pathlib
 import importlib
 import operator
 import click
 from .commands import __all__ as commands_all
 @click.group()
 @click.option('-p', '--path', default='/srv/http/enn.lu',
@@ @@ -35,9 +39,10 @@ def cli(ctx, path): @@
     ctx.obj['config_file'] = path / 'config.json'
     ctx.obj['data_dir'] = path / 'data'
 from .commands import config
 cli.add_command(config, 'config')
 subcommands = importlib.import_module('ennstatus.cli.commands')
 for command in commands_all:
     get = operator.attrgetter(command)
     cli.add_command(get(subcommands), command)
 if __name__ == '__main__':
     cli()

ennstatus/cli/commands/__init__.py

➞

Show inline comments

@@ @@ -15,5 +15,6 @@ @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from .config import config
 from .stats import stats
 __all__ = ['config']
+__all__ = ['config', 'stats']

ennstatus/cli/commands/config.py

➞

Show inline comments

@@ @@ -16,6 +16,7 @@ @@
 import json
 import ipaddress
 import subprocess
 from pprint import pprint
@@ @@ -83,6 +84,7 @@ def add(obj, name, ips, password, bridge @@
         except KeyError:
             config['ENNSTATUS_BRIDGE_PROGRAM'] = [name]
     click.echo('%s password: %s' % (name, password))
     with obj['config_file'].open(mode='w', encoding='utf-8') as f:
         json.dump(config, f, indent=4, sort_keys=True)
@@ @@ -103,7 +105,7 @@ def delete(obj, name): @@
     try:
         config['ENNSTATUS_BRIDGE_PROGRAM'].remove(name)
     except KeyError:
+    except (KeyError, ValueError):
         pass
     with obj['config_file'].open(mode='w', encoding='utf-8') as f:
@@ @@ -114,3 +116,37 @@ def delete(obj, name): @@
         filename.unlink()
     except FileNotFoundError:
         pass
 @config.group(short_help='Configure more servers at once')
 def servers():
     pass
 @servers.command('add', short_help='Add servers')
 @click.argument('names', nargs=-1, required=True)
 @click.option('-i', '--ips', prompt='IPs (comma separated)')
 @click.option('--bridgeprogram/--no-bridgeprogram', default=False)
 @click.pass_context
 def adds(ctx, names, ips, bridgeprogram):
     for name in names:
         password = subprocess.check_output(['pwgen', '8', '1'])
         password = password.decode('utf-8')
         password = password.strip()
         ctx.invoke(
             add,
             name=name,
             ips=ips,
             password=password,
             bridgeprogram=bridgeprogram
+        )
 @servers.command('delete', short_help='Delete servers')
 @click.argument('names', nargs=-1, required=True)
 @click.pass_context
 def dels(ctx, names):
     for name in names:
         ctx.invoke(delete, name=name)

ennstatus/cli/commands/stats.py

➞

Show inline comments

@@ new file 100644 @@
 import json
 from collections import defaultdict
 import click
 from ennstatus import create_app
 from ...status.functions import split_all_servers_to_types
 @click.group(short_help='Get statistics')
 def stats():
     pass
 @stats.command('count')
 @click.option('--by-type', 'by_type', is_flag=True, default=False)
 @click.pass_obj
 def count(obj, by_type):
     def calculate_host_number(config, type='all', servers=None):
         hosts = set()
         if type == 'all':
             for values in config['ENNSTATUS_SERVERS'].values():
                 ips = frozenset(values['IPS'])
                 hosts.add(ips)
             return len(hosts)
         else:
             for server in servers[servertype]:
                 ips = frozenset(
                     config['ENNSTATUS_SERVERS'][server.name.lower()]['IPS']
+                )
                 hosts.add(ips)
         return len(hosts)
     app = create_app()
     with app.app_context():
         app.logger.disabled = True
         servers = split_all_servers_to_types()
     if not by_type:
         click.echo(
             'We have %s servers in total!' % (
                 click.style(
                     str(sum(len(x) for x in servers.values())),
                     fg='blue'
+                )
+            )
+        )
         click.echo(
             'We have %s different hosts!' % (
                 click.style(
                     str(calculate_host_number(app.config)),
                     fg='blue'
+                )
+            )
+        )
     else:
         for servertype, server in servers.items():
             click.echo(
                 'We have %s %s servers!' % (
                     click.style(
                         str(len(server)),
                         fg='blue'
                     ),
                     click.style(
                         servertype,
                         fg='red'
+                    )
+                )
+            )
             click.echo(
                 'We have %s different %s hosts!' % (
                     click.style(
                         str(
                             calculate_host_number(
                                 app.config,
                                 type=servertype,
                                 servers=servers
+                            )
                         ),
                         fg='blue'
                     ),
                     click.style(
                         servertype,
                         fg='red'
+                    )
+                )
+            )
 @stats.command('countries')
 @click.option('--by-type', 'by_type', is_flag=True, default=False)
 @click.pass_obj
 def countries(obj, by_type):
     app = create_app()
     with app.app_context():
         app.logger.disabled = True
         servers = split_all_servers_to_types()
     if not by_type:
         countries = defaultdict(int)
         for key, value in servers.items():
             for server in value:
                 countries[server.country] += 1
         for key, value in sorted(countries.items(), key=lambda x: x[1]):
             click.echo(
                 '%s: %s' % (
                     click.style(key, fg='green'),
                     click.style(str(value), fg='blue')
+                )
+            )
         click.echo(
             'We are hosted in %s different countries' % click.style(
                 str(len(countries.keys())),
                 fg='blue'
+            )
+        )
     else:
         type_countries = {
             'exit': defaultdict(int),
             'relay': defaultdict(int),
             'bridge': defaultdict(int)
+        }
         for key, value in servers.items():
             for server in value:
                 type_countries[key][server.country] += 1
         type_countries = dict((k, v) for k, v in type_countries.items() if v)
         for key, value in sorted(type_countries.items(), key=lambda x: x[0]):
             click.echo(
                 click.style(
                     key.capitalize(),
                     fg='red',
                     bold=True,
                     underline=True
+                )
+            )
             for country, count in sorted(type_countries[key].items(), key=lambda x: x[1]):
                 click.echo(
                     '%s: %s' % (
                         click.style(country, fg='green'),
                         click.style(str(count), fg='blue')
+                    )
+                )
             click.echo(
                 '%s are hosted in %s different countries' % (
                     key,
                     click.style(
                         str(len(type_countries[key].keys())),
                         fg='blue'
+                    )
+                )
+            )
 @stats.command('exit_probability')
 @click.option('--by-server', 'by_server', is_flag=True, default=False)
 @click.pass_obj
 def exit_probability(obj, by_server):
     app = create_app()
     with app.app_context():
         app.logger.disabled = True
         servers = split_all_servers_to_types()
     if not by_server:
         exit_probability = defaultdict(int)
         for server in servers['exit']:
             for subkey in ('1_week', '1_month', '3_months', '1_year', '5_years'):
                 try:
                     if server.mean_exit_probability[subkey] is not None:
                         exit_probability[subkey] += server.mean_exit_probability[subkey]
                 except KeyError:
                     continue
         for subkey in ('1_week', '1_month', '3_months', '1_year', '5_years'):
             try:
                 click.echo(
                     'Mean exit probability over %s: %s' % (
                         click.style(
                             subkey,
                             fg='blue'
                         ),
                         click.style(
                             str(round(exit_probability[subkey], 2)) + '%',
                             fg='red'
+                        )
+                    )
+                )
             except KeyError:
                 continue
     else:
         for server in servers['exit']:
             click.echo(
                 click.style(
                     server.name.capitalize(),
                     fg='red',
                     bold=True,
                     underline=True
+                )
+            )
             for subkey in ('1_week', '1_month', '3_months', '1_year', '5_years'):
                 try:
                     if server.mean_exit_probability[subkey] is not None:
                         click.echo(
                             'Mean exit probabilty over %s: %s' % (
                                 click.style(
                                     subkey,
                                     fg='blue'
                                 ),
                                 click.style(
                                     str(round(server.mean_exit_probability[subkey], 2)) + "%",
                                     fg='red'
+                                )
+                            )
+                        )
                 except KeyError:
                     continue

ennstatus/config.py

➞

Show inline comments

@@ @@ -36,3 +36,5 @@ def init_app(app): @@
     config.setdefault('ENNSTATUS_MOMENTJS_FORMAT', 'DD MMMM YYYY HH:mm:ss')
     config.setdefault('ENNSTATUS_STRFTIME_FORMAT', '%d %B %Y %H:%M:%S')
     config.setdefault('ENNSTATUS_ENABLE_ONIONOO', False)

ennstatus/donate/views.py

➞

Show inline comments

@@ @@ -34,40 +34,12 @@ from ennstatus.donate.functions import ( @@
                                         get_mode_donation,
+                                        )
 from ennstatus.root.forms import BPMForm
 from ennstatus.root.constants import BPM_ADDRESSES
 donate_page = Blueprint('donate', __name__)
-@donate_page.route('/', methods=('GET', 'POST'))
 @donate_page.route('/')
 def index():
     current_app.logger.info('Handling index')
     form = BPMForm()
     country_choices = [choice[0] for choice in form.country.choices]
     if request.method == 'POST':
         current_app.logger.debug('Validating form')
         if form.validate_on_submit():
             country = form.country.data
             return redirect(url_for('donate.index', country=country))
     else:
         if 'country' in request.args:
             country = request.args['country']
             if country in country_choices:
                 current_app.logger.info('Showing country %s' % country)
             else:
                 current_app.logger.warn('Country %s not found' % country)
                 country = 'luxembourg'
         else:
             current_app.logger.info('Using default country')
             country = 'luxembourg'
     form.country.data = country
     address = BPM_ADDRESSES[country]
     return render_template('donate/index.html', form=form, address=address)
     return render_template('donate/index.html')
 @donate_page.route('/received',

ennstatus/root/constants.py

➞

Show inline comments

deleted file

ennstatus/root/forms.py

➞

Show inline comments

@@ @@ -15,28 +15,12 @@ @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from flask_wtf import Form
 from wtforms import (SelectField,
                      StringField,
 from wtforms import (StringField,
                      RadioField,
                      BooleanField,
                      SubmitField
+                     )
 from wtforms.validators import InputRequired, Email, Length, DataRequired
 COUNTRIES = [
     ('luxembourg', 'Luxembourg'),
     ('belgium', 'Belgium'),
     ('france', 'France'),
     ('germany', 'Germany'),
+]
 class BPMForm(Form):
     country = SelectField('Country',
                           validators=[DataRequired()],
                           choices=COUNTRIES)
     submit = SubmitField('Submit')
 from wtforms.validators import InputRequired, Email, Length
 class MembershipForm(Form):

ennstatus/root/views.py

➞

Show inline comments

@@ @@ -17,8 +17,7 @@ @@
 from flask import (Blueprint, render_template, current_app,
                    request, redirect, url_for, flash)
 from ennstatus.root.forms import BPMForm, MembershipForm, BridgeprogramForm
 from ennstatus.root.constants import BPM_ADDRESSES
 from ennstatus.root.forms import MembershipForm, BridgeprogramForm
 from ennstatus.root.functions import (send_membership_mail,
                                       send_bridgeprogram_mail)
@@ @@ -80,35 +79,9 @@ def mirrors(): @@
     return render_template('root/mirrors.html')
-@root_page.route('/contact', methods=('GET', 'POST'))
 @root_page.route('/contact')
 def contact():
     current_app.logger.info('Handling contact')
     form = BPMForm()
     country_choices = [choice[0] for choice in form.country.choices]
     if request.method == 'POST':
         current_app.logger.debug('Validating form')
         if form.validate_on_submit():
             country = form.country.data
             return redirect(url_for('root.contact', country=country))
     else:
         if 'country' in request.args:
             country = request.args['country']
             if country in country_choices:
                 current_app.logger.info('Showing country %s' % country)
             else:
                 current_app.logger.warn('Country %s not found' % country)
                 country = 'luxembourg'
         else:
             current_app.logger.info('Using default country')
             country = 'luxembourg'
     form.country.data = country
     address = BPM_ADDRESSES[country]
     return render_template('root/contact.html', form=form, address=address)
     return render_template('root/contact.html')
 @root_page.route('/abuse')

ennstatus/static/css/ennstatus.css

➞

Show inline comments

@@ @@ -165,3 +165,12 @@ a, a:hover, a:active, a:visited { @@
 footer {
     margin-bottom: 20px;
+}
 @media (min-width: 768px) {
     .dl-horizontal dd {
         margin-left: 200px
+    }
     .dl-horizontal dt {
         width: 180px
+    }
+}

ennstatus/templates/base.html

➞

Show inline comments

@@ @@ -133,18 +133,20 @@ @@
   {% block content %}
   {% endblock %}
   </div>
   <footer class="col-md-12">
     <hr style="margin-bottom: 0.5%;">
     <div class="text-center clearfix">
       <div class="pull-left">
         <a href="https://twitter.com/FrennVunDerEnn" target="blank">@FrennVunDerEnn</a>
   <div class="row">
     <footer class="col-md-12">
       <hr style="margin-bottom: 0.5%;">
       <div class="text-center clearfix">
         <div class="pull-left">
           <a href="https://twitter.com/FrennVunDerEnn" target="blank">@FrennVunDerEnn</a>
         </div>
         <strong>Frënn vun der Enn a.s.b.l.</strong>  <em>(R.C.S. Luxembourg F 9.478)</em>
         <div class="pull-right">
           <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" target="blank">CC-BY-NC-SA</a>
         </div>
       </div>
       <strong>Frënn vun der Enn a.s.b.l.</strong>  <em>(R.C.S. Luxembourg F 9.478)</em>
       <div class="pull-right">
         <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" target="blank">CC-BY-NC-SA</a>
       </div>
     </div>
   </footer>
     </footer>
   </div>
 </div>
 {% block scripts %}

ennstatus/templates/donate/index.html

➞

Show inline comments

@@ @@ -83,21 +83,13 @@ @@
           <h3>SnailMail</h3>
         </center>
         <div class="well well-sm">
           <div class="pull-right">
             <form class="form-inline" role="form" method="POST" action"{{ url_for('donate.index') }}">
               {{ form.hidden_tag() }}
               <div class="form-group">
                 {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
                 <noscript>{{ form.submit(class_='btn btn-enn btn-sm') }}</noscript>
               </div>
             </form>
           </div>
           <address>
             <strong>Frënn vun der Ënn, ASBL</strong><br>
                     BPM 381892<br>
                     {{ address['address'] }}<br>
                     {{ address['postal_code'] }}, {{ address['city'] }}<br>
                     {{ address['country'] }}
            <address>
              <strong>Frënn vun der Ënn, ASBL</strong><br>
                     {{ config['ENNSTATUS_ADDRESS_CO'] }}<br>
                     {{ config['ENNSTATUS_HOUSE_NAME'] }}<br>
                     {{ config['ENNSTATUS_STREET'] }}<br>
                     {{ config['ENNSTATUS_POSTAL_CODE'] }}, {{ config['ENNSTATUS_CITY'] }}<br>
                     {{ config['ENNSTATUS_COUNTRY'] }}, {{ config['ENNSTATUS_CONTINENT'] }}<br>
           </address>
         </div>
       </div>
@@ @@ -204,13 +196,12 @@ @@
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
-          <h3>BPM Points</h3>
+          <h3>Patreon</h3>
           <div class="well well-sm">
             <p>For our parcel station and international mail boxes.</p>
             <p>
               Send your BPM voucher code to: <br>
               <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:info@enn.lu">info@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a>
             </p>
             <p>Support us!</p>
             <a href="https://www.patreon.com/FVDE?utm_medium=social&ty=h&utm_campaign=creatorshare" target="_blank">
               <img src="https://s3.amazonaws.com/patreon_public_assets/toolbox/patreon.png" alt="Patreon" title="Patreon" border="0"></img>
             </a>
           </div>
         </center>
       </div>

ennstatus/templates/root/about.html

➞

Show inline comments

@@ @@ -46,8 +46,9 @@ @@
     <p>
       <dl class="dl-horizontal" >
         <dt>President</dt><dd>Sam Grüneisen</dd>
-        <dt>Secretary</dt><dd>Gilles Hamen</dd>
+        <dt>Secretary</dt><dd>Nadine Schneider</dd>
         <dt>Treasurer</dt><dd>Patrick Kahr</dd>
         <dt>International Ambassador</dt><dd>Christophe Kemp</dd>
         <dt>Developers</dt><dd>Dennis Fink (Ënnstatus Lead Developer), Sam Grüneisen</dd>
       </dl>
     </p>

ennstatus/templates/root/contact.html

➞

Show inline comments

@@ @@ -26,26 +26,16 @@ @@
       <h2>Contact</h2>
     </div>
   </div>
   <div class="col-md-8 clearfix">
     <h2 class="pull-left">General</h2>
     <div class="pull-right">
       <form class="form-inline" role="form" method="POST" action="{{ url_for('root.contact') }}">
         {{ form.hidden_tag()}}
         <div class="form-group">
           {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
           <noscript>{{ form.submit(class_='btn btn-enn btn-sm') }}</noscript>
         </div>
       </form>
     </div>
   </div>
   <div class="col-md-8">
     <h2>General</h2>
     <p>Please mail all general inquiries to:</p>
     <address>
       <strong>Frënn vun der Ënn, ASBL</strong><br>
         BPM 381892<br>
         {{ address['address'] }}<br>
         {{ address['postal_code'] }}, {{ address['city'] }}<br>
         {{ address['country'] }}<br>
         {{ config['ENNSTATUS_ADDRESS_CO'] }}<br>
         {{ config['ENNSTATUS_HOUSE_NAME'] }}<br>
         {{ config['ENNSTATUS_STREET'] }}<br>
         {{ config['ENNSTATUS_POSTAL_CODE'] }}, {{ config['ENNSTATUS_CITY'] }}<br>
         {{ config['ENNSTATUS_COUNTRY'] }}, {{ config['ENNSTATUS_CONTINENT'] }}
         <br>
       <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:info@enn.lu">info@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a><br>
       <abbr title="Website"><span class="glyphicon glyphicon-cloud"></span></abbr> : <a href="//enn.lu/">enn.lu/</a> <strong>or</strong> <a href="//{{ config['ENNSTATUS_ONION_ADDRESS'] }}/" target="_blank">{{ config['ENNSTATUS_ONION_ADDRESS'] }}</a><br>

ennstatus/templates/root/membership.html

➞

Show inline comments

@@ @@ -80,7 +80,6 @@ @@
         {{ form.submit(class_='btn btn-enn') }}
         </div>
       </div>
     </div>
     </form>
     <p>Field marked with * are required!</p>
     <p><sup>1</sup>: If you have decided to apply for the <i>double membership</i>, the membership fees are 150€/year for the regular

requirements.in

➞

Show inline comments

@@ @@ -9,6 +9,5 @@ Flask @@
 jsonschema
 pygeoip
 python-gnupg
 requests
 strict-rfc3339
 OnionPy

requirements.txt

➞

Show inline comments

@@ @@ -22,6 +22,7 @@ onionpy==0.3.2 @@
 pygeoip==0.3.2
 python-gnupg==0.3.8
 pytz==2015.7              # via babel
 requests==2.9.1           # via onionpy
 strict-rfc3339==0.6
 visitor==0.1.2            # via flask-bootstrap
 Werkzeug==0.11.4          # via flask, flask-wtf

setup.py

➞

Show inline comments

@@ @@ -11,7 +11,7 @@ def _get_requirements(): @@
 setup(name='Ennstatus',
-      version='5.4.2-dev',
+      version='5.6.2',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',

0 comments (0 inline, 0 general)