Changeset 1067 for ZMS/trunk/ZMSGlobals.py

Timestamp:

25.06.2010 23:24:03 (2 years ago)

Author:

zmsdev

Message:

Revised unauthorized.

File:

• ZMS/trunk/ZMSGlobals.py (modified) (2 diffs)

ZMS/trunk/ZMSGlobals.py

@@ -30 +30 @@
 from cStringIO import StringIO
 from types import StringTypes
-from zExceptions import Unauthorized
 from binascii import b2a_base64, a2b_base64
 import base64
@@ -1357 +1356 @@
       if _globals.debug( self):
         _globals.writeLog( self, '[localfs_read]: filename=%s'%filename)
+      
       # Check permissions.
-      access = False
-      for perm in self.getConfProperty('ZMS.localfs_read','').split(';')+[package_home(globals())]:
-        access = access or ( len( perm) > 0 and filename.lower().startswith( perm.lower()))
-      # Raise unauthorized error.
-      if not access:
-        raise Unauthorized
+      if REQUEST is not None:
+        authorized = False
+        for perm in self.getConfProperty('ZMS.localfs_read','').split(';')+[package_home(globals())]:
+          authorized = authorized or ( len( perm) > 0 and filename.lower().startswith( perm.lower()))
+        if not authorized:
+          RESPONSE = REQUEST.RESPONSE
+          raise REPONSE.unauthorized()
+      
       # Read file.
       if type( mode) is dict: