Changeset 09370c in indico

Timestamp:

07/27/11 15:38:57 (22 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

6c9393

Parents:

44d915

Message:

[IMP] Network-wide ACLs for export.py

• Hopefully temporary;

Location:

indico

Files:

• MaKaC/RSSinterface/conference.py (modified) (1 diff)
• htdocs/scripts/export.py (modified) (1 diff)

indico/MaKaC/RSSinterface/conference.py

@@ -28 +28 @@
 from MaKaC.common.timezoneUtils import nowutc
 import MaKaC.common.info as info
+import struct, socket
 
 
+# TOREMOVE
 def ACLfiltered(iter, requestIP, aw=None):
 
+    def _inIPList(iplist, ip):
+
+        for rule in iplist:
+            if '/' in rule:
+                # it's a netmask (CIDR), check if ip belongs to it
+                # ipv4-specific, non-endian-safe check!
+                ipaddr = struct.unpack('L', socket.inet_aton(ip))[0]
+                netaddr, bits = rule.split('/')
+                netmask = struct.unpack('L', socket.inet_aton(netaddr))[0] & ((2L << int(bits) - 1) - 1)
+                if ipaddr & netmask == netmask:
+                    return True
+            else:
+                if ip in iplist:
+                    return True
+        return False
+
     acl = Config.getInstance().getExportACL().iteritems()
-    blIds = list(categ for (categ, iplist) in acl if (requestIP not in iplist))
+    blIds = list(categ for (categ, iplist) in acl if (not _inIPList(iplist, requestIP)))
 
     for conf in iter:

indico/htdocs/scripts/export.py

@@ -48 +48 @@
   minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
 
-  hostIP = req.get_remote_host()
+  hostIP = req.get_remote_ip()
   if minfo.useProxy():
       # if we're behind a proxy, use X-Forwarded-For
-      xff = req.headers_in.get("X-Forwarded-For", hostIP).split(", ")[-1]
-      hostIP = socket.gethostbyname(xff)
+      hostIP = req.headers_in.get("X-Forwarded-For", hostIP).split(", ")[-1]
 
   if minfo.getRoomBookingModuleActive():