Skip to content

Commit

Permalink
prettify authentication debug logging
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@11962 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Feb 17, 2016
1 parent 32b847a commit 78ac435
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/xpra/server/auth/allow_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class Authenticator(SysAuthenticator):

def __repr__(self):
return "Allow Authenticator"
return "allow"

def get_challenge(self):
return get_hex_uuid(), "hmac"
Expand Down
2 changes: 1 addition & 1 deletion src/xpra/server/auth/fail_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ def __init__(self, username):
raise Exception("failing")

def __repr__(self):
return "Fail Authenticator"
return "fail"
2 changes: 1 addition & 1 deletion src/xpra/server/auth/file_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def get_sessions(self):
return self.sessions

def __repr__(self):
return "Password File Authenticator"
return "password file"



Expand Down
2 changes: 1 addition & 1 deletion src/xpra/server/auth/none_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ def authenticate(self, challenge_response, client_salt):
return True

def __repr__(self):
return "None Authenticator"
return "none"
2 changes: 1 addition & 1 deletion src/xpra/server/auth/pam_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def check(self, password):
return check(self.username, password)

def __repr__(self):
return "PAM Authenticator"
return "PAM"


def main(args):
Expand Down
2 changes: 1 addition & 1 deletion src/xpra/server/auth/reject_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ def get_sessions(self):
return None

def __repr__(self):
return "Reject Authenticator"
return "reject"
2 changes: 1 addition & 1 deletion src/xpra/server/auth/win32_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ def check(self, password):
win32security.LogonUser(self.username, '', password, win32security.LOGON32_LOGON_NETWORK, win32security.LOGON32_PROVIDER_DEFAULT)

def __repr__(self):
return "Win32 Authenticator"
return "win32"
3 changes: 2 additions & 1 deletion src/xpra/server/server_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,8 @@ def auth_failed(msg):
auth_failed("invalid state, unexpected challenge response")
return False
salt, digest = challenge
authlog.info("Authentication required, %s sending challenge for '%s' using digest %s", proto.authenticator, username, digest)
authlog.info("Authentication required by %s authenticator module", proto.authenticator)
authlog.info(" sending challenge for '%s' using %s digest", username, digest)
if digest not in self.digest_modes:
auth_failed("cannot proceed without %s digest support" % digest)
return False
Expand Down

0 comments on commit 78ac435

Please sign in to comment.