Changeset 1247

Timestamp:

09/05/06 07:26:11 (2 years ago)

Author:

wmark

Message:

TracRblPatch:

Whitelisting of IPs from being checked against RBL was implemented.

Files:

• tracrblpatch/0.9/trac-0.9.6-rbl.patch (modified) (5 diffs)

tracrblpatch/0.9/trac-0.9.6-rbl.patch

@@ -4 +4 @@
-+++ trac/perm.py        (Arbeitskopie)
-@@ -18,7 +18,9 @@
-
+
- """Management of permissions."""
-
+
-+import os
- from trac.core import *
-+from trac import rbl
-
-
+
+
- __all__ = ['IPermissionRequestor', 'IPermissionStore',
-@@ -225,6 +227,9 @@
@@ -21 +21 @@
-+               actions = filter((lambda x: not x.endswith(suffix)), actions)
-         return [action for action in actions if not action.islower()]
-
+
-     def get_all_permissions(self):
-Index: trac/rbl.py
@@ -27 +27 @@
---- trac/rbl.py (Revision 0)
-+++ trac/rbl.py (Revision 0)
-6
+8
-+import socket
-+
@@ -45 +45 @@
-+    @param     config_get      Is typically env.config.get
-+    """
++    if remote_ip in [rbl.strip() for rbl in config_get("trac", "rbl_whitelist").split(",") if not rbl.strip() == ""]:
++       return False
-+    rbls = [rbl.strip() for rbl in config_get("trac", "rbl").split(",") if not rbl.strip() == ""]
-+    if len(rbls) > 0:
@@ -63 +65 @@
-         os.environ['PYTHON_EGG_CACHE'] = req.subprocess_env['PYTHON_EGG_CACHE']
-+    os.environ['REMOTE_IP'] = req.connection.remote_ip
-
+
-     mpr = ModPythonRequest(req, options)
-     project_opts = dict_translate(options,