From 005e3b85ece867349a6a53d2b423bc83e7ebd81c Mon Sep 17 00:00:00 2001 From: Andrea Giardini Date: Tue, 24 Oct 2017 11:36:56 +0200 Subject: [PATCH] Remove trailing whitespaces --- nginx-ldap-auth-daemon.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nginx-ldap-auth-daemon.py b/nginx-ldap-auth-daemon.py index 31626d1..5844d87 100755 --- a/nginx-ldap-auth-daemon.py +++ b/nginx-ldap-auth-daemon.py @@ -182,12 +182,12 @@ class LDAPAuthHandler(AuthHandler): try: # check that uri and baseDn are set # either from cli or a request - if not ctx['url']: + if not ctx['url']: self.log_message('LDAP URL is not set!') return if not ctx['basedn']: self.log_message('LDAP baseDN is not set!') - return + return ctx['action'] = 'initializing LDAP connection' ldap_obj = ldap.initialize(ctx['url']); @@ -246,14 +246,14 @@ if __name__ == '__main__': description="""Simple Nginx LDAP authentication helper.""") # Group for listen options: group = parser.add_argument_group("Listen options") - group.add_argument('--host', metavar="hostname", + group.add_argument('--host', metavar="hostname", default="localhost", help="host to bind (Default: localhost)") - group.add_argument('-p', '--port', metavar="port", type=int, + group.add_argument('-p', '--port', metavar="port", type=int, default=8888, help="port to bind (Default: 8888)") # ldap options: group = parser.add_argument_group(title="LDAP options") group.add_argument('-u', '--url', metavar="URL", - default="ldap://localhost:389", + default="ldap://localhost:389", help=("LDAP URI to query (Default: ldap://localhost:389)")) group.add_argument('-b', metavar="baseDn", dest="basedn", default='', help="LDAP base dn (Default: unset)") @@ -261,18 +261,18 @@ if __name__ == '__main__': help="LDAP bind DN (Default: anonymous)") group.add_argument('-w', metavar="passwd", dest="bindpw", default='', help="LDAP password for the bind DN (Default: unset)") - group.add_argument('-f', '--filter', metavar='filter', - default='(cn=%(username)s)', + group.add_argument('-f', '--filter', metavar='filter', + default='(cn=%(username)s)', help="LDAP filter (Default: cn=%%(username)s)") # http options: group = parser.add_argument_group(title="HTTP options") - group.add_argument('-R', '--realm', metavar='"Restricted Area"', + group.add_argument('-R', '--realm', metavar='"Restricted Area"', default="Resticted", help='HTTP auth realm (Default: "Restricted")') - group.add_argument('-c', '--cookie', metavar="cookiename", + group.add_argument('-c', '--cookie', metavar="cookiename", default="", help="HTTP cookie name to set in (Default: unset)") args = parser.parse_args() - global Listen + global Listen Listen = (args.host, args.port) auth_params = { 'realm': ('X-Ldap-Realm', args.realm),