Changeset 11018 in hybrid for branches/releng-9.0/nanobsd

Timestamp:

May 28, 2012, 10:31:25 AM (13 years ago)

Author:

rick

Message:

Being able to somehow kick users if they are beeing bad.

Related-To: nodefactory:ticket:191

Location:

branches/releng-9.0/nanobsd/files/usr/local

Files:

• etc/wlportal/login.tmpl (modified) (1 diff)
• www/wlportal/index.cgi (modified) (3 diffs)

branches/releng-9.0/nanobsd/files/usr/local/etc/wlportal/login.tmpl

@@ -53 +53 @@
     <p>
     <small>N.B. Haal na gebruik de instellingen weer weg</small>
+<h4>Contact</h4>
+Vragen en opmerkingen kunt u kwijt op onze <a href="http://lijst.wirelessleiden.nl/mailman/listinfo/gebruikers">gebruikers mailing lijst</a>.
 <hr>
 <a name="english"></a>

branches/releng-9.0/nanobsd/files/usr/local/www/wlportal/index.cgi

@@ -85 +85 @@
   'tmpl_autologin': '/usr/local/etc/wlportal/autologin.tmpl',
   'tmpl_login'    : '/usr/local/etc/wlportal/login.tmpl',
+  'warnlist'      : [],
   'whitelist'     : [],
+  'blacklist'     : [],
   'config_files'  : ['/usr/local/etc/wlportal/config.yaml','/usr/local/etc/wleiden.yaml'],
   'expire_time'   : None,
@@ -294 +296 @@
   qs_post = { 'action' : 'login' }
 
+if remote_mac in cfg['warnlist']:
+  connect['status_msg'] = "U veroorzaakt overlast op het WL netwerk || You are causing WL network abuse"
+
 try:
   fw = PacketFilterControl()
@@ -311 +316 @@
   elif qs_post and qs_post.has_key('action'):
     if 'login' in qs_post['action']:
-      if fw.add(remote_host):
+      if remote_mac in cfg['blacklist']:
+        content['status_msg'] = "Toegang ontzegt ipv misbruik WL netwerk || Access denied due to WL network abuse"
+      elif fw.add(remote_host):
         content['extra_header'] = "Refresh: %(refresh_delay)s; url=%(portal_url)s\r" % content
         content['status_msg'] = "Sucessfully Logged In! || " +\