diff options
author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2011-07-04 16:15:46 +0100 |
---|---|---|
committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2011-07-04 16:15:46 +0100 |
commit | b7d8802c82886067d6849612397d31215456d3a0 (patch) | |
tree | f6a55cadec4010140f72b507e0334a47d1ac8606 /bin | |
parent | 8c15a0c480c9dd2ae074933cd71a25bb543004b9 (diff) | |
download | pykolab-b7d8802c82886067d6849612397d31215456d3a0.tar.gz |
Avoid very long lines
Diffstat (limited to 'bin')
-rw-r--r-- | bin/kolab_smtp_access_policy.py | 50 |
1 files changed, 43 insertions, 7 deletions
diff --git a/bin/kolab_smtp_access_policy.py b/bin/kolab_smtp_access_policy.py index b86795a..10c2bdd 100644 --- a/bin/kolab_smtp_access_policy.py +++ b/bin/kolab_smtp_access_policy.py @@ -104,7 +104,10 @@ def parse_address(email_address): if len(email_address.split("+")) > 1: # Take the first part split by recipient delimiter and the last part # split by '@'. - return "%s@%s" %(email_address.split("+")[0],email_address.split('@')[1]) + return "%s@%s" %( + email_address.split("+")[0], + email_address.split('@')[1] + ) else: return email_address @@ -166,7 +169,8 @@ def read_request_input(): if request_line == '': end_of_request = True else: - policy_request[request_line.split('=')[0]] = '='.join(request_line.split('=')[1:]) + policy_request[request_line.split('=')[0]] = \ + '='.join(request_line.split('=')[1:]) return policy_request @@ -197,7 +201,11 @@ def verify_recipient(policy_request): domain = policy_request['sender'].split('@')[1] user = { # TODO: Use cyrus-sasl result attribute - 'dn': auth.find_user('mail', parse_address(policy_request['sender']), domain=domain) + 'dn': auth.find_user( + 'mail', + parse_address(policy_request['sender']), + domain=domain + ) } sender_policy = auth.get_user_attribute( @@ -288,7 +296,13 @@ def verify_sender(policy_request): return False # Obtain 'kolabDelegate' from the envelope sender. - log.debug(_("Obtaining envelope sender dn for %s") %(policy_request['sender']), level=8) + log.debug( + _("Obtaining envelope sender dn for %s") %( + policy_request['sender'] + ), + level=8 + ) + sender_user = { 'dn': auth.find_user( 'mail', @@ -306,7 +320,14 @@ def verify_sender(policy_request): sasl_user = False if sender_delegates == None: - log.warning(_("User %s attempted to use envelope sender address %s without authorization") %(policy_request["sasl_username"],policy_request["sender"])) + log.warning( + _("User %s attempted to use envelope sender address %s without " + \ + "authorization") %( + policy_request["sasl_username"], + policy_request["sender"] + ) + ) + if not cache == False: result_set = cache.select( sender=policy_request['sender'], @@ -352,10 +373,25 @@ def verify_sender(policy_request): for sender_delegate in sender_delegates: if sasl_user['dn'] == sender_delegate: - log.debug(_("Found user %s to be a valid delegate user of %s") %(policy_request["sasl_username"], policy_request["sender"]), level=8) + log.debug( + _("Found user %s to be a valid delegate user of %s") %( + policy_request["sasl_username"], + policy_request["sender"] + ), + level=8 + ) + sender_is_delegate = True + elif sasl_user['uid'] == sender_delegate: - log.debug(_("Found user %s to be a valid delegate user of %s") %(policy_request["sasl_username"], policy_request["sender"]), level=8) + log.debug( + _("Found user %s to be a valid delegate user of %s") %( + policy_request["sasl_username"], + policy_request["sender"] + ), + level=8 + ) + sender_is_delegate = True # If the authenticated user is using delegate functionality, apply the |