Add ESPs. Because we can.

master
informatic 2016-11-26 12:38:19 +01:00
parent ec6cf1afd2
commit 007b880dc5
2 changed files with 13 additions and 3 deletions

11
at.py
View File

@ -42,9 +42,9 @@ def restrict_ip(prefix='', exclude=[]):
def func(*a, **kw):
r_addr = v4addr()
if not r_addr.startswith(prefix) or r_addr in exclude:
app.logger.info('got IP %s, rejecting',r_addr)
app.logger.info('got IP %s, rejecting', r_addr)
abort(403)
return f(*a, **kw)
return func
return decorator
@ -244,6 +244,7 @@ def list_all():
result['users'] = map(prettify_user, result['users'])
result['unknown'] = len(result['unknown'])
result['kektops'] = len(result['kektops'])
result['esps'] = len(result['esps'])
res = make_response(json.dumps(result), 200)
res.headers['Access-Control-Allow-Origin'] = '*'
return res
@ -257,9 +258,12 @@ def now_at():
# das kektop sorting maschine
kektops = set()
unknown = set()
esps = set()
for u in all_unknown:
if u.startswith('90:e6:ba:84'):
kektops.add(u)
elif u.startswith('5c:cf:7f'):
esps.add(u)
else:
unknown.add(u)
@ -269,7 +273,8 @@ def now_at():
users[info.owner] = devices[info.hwaddr][0]
users_sorted = sorted(users.items(), key=lambda (u, a): a, reverse=True)
return dict(users=users_sorted, unknown=unknown, kektops=kektops)
return dict(users=users_sorted, unknown=unknown, kektops=kektops,
esps=esps)
restrict_to_hs = restrict_ip(prefix=app.config['CLAIMABLE_PREFIX'],

View File

@ -24,6 +24,11 @@ Now at hackerspace
{% pluralize %}
There are {{ n_kek }} unknown kektops operating.
{% endtrans %}
{% trans n_esp=esps|length %}
There is {{ n_esp }} unknown ESP operating.
{% pluralize %}
There are {{ n_esp }} unknown ESPs operating.
{% endtrans %}
<hr>
<a href="claim">Claim this device!</a>
{% endblock %}