Revision 647a5f48 pithos/backends/modular.py

b/pithos/backends/modular.py
225 225
226 226 
        logger.debug("get_account_policy: %s", account)
227 227 
        if user != account:
228 
            raise NotAllowedError
228 
            if account not in self._allowed_accounts(user):
229 
                raise NotAllowedError
230 
            return {}
229 231 
        path, node = self._lookup_account(account, True)
230 
        return self.node.policy_get(node)
232 
        policy = self.default_policy.copy()
233 
        policy.update(self.node.policy_get(node))
234 
        return policy
231 235
232 236 
    @backend_method
233 237 
    def update_account_policy(self, user, account, policy, replace=False):
......
337 341 
                raise NotAllowedError
338 342 
            return {}
339 343 
        path, node = self._lookup_container(account, container)
340 
        return self.node.policy_get(node)
344 
        policy = self.default_policy.copy()
345 
        policy.update(self.node.policy_get(node))
346 
        return policy
341 347
342 348 
    @backend_method
343 349 
    def update_container_policy(self, user, account, container, policy, replace=False):

Also available in: Unified diff