Fixed ssh workaround in xauth code, and switched to new xauth handling.

petli · petli · commit ee40ff73fbe0 · 2003-06-08T23:21:53.000Z
diff --git a/Xlib/support/unix_connect.py b/Xlib/support/unix_connect.py
@@ -1,4 +1,4 @@
-# $Id: unix_connect.py,v 1.3 2003-01-29 23:53:37 petli Exp $
+# $Id: unix_connect.py,v 1.4 2003-06-08 23:21:53 petli Exp $
 #
 # Xlib.support.unix_connect -- Unix-type display connection functions
 #
@@ -90,18 +90,29 @@ def new_get_auth(sock, dname, host, dno):
 	family = xauth.FamilyInternet
 
 	# Convert the prettyprinted IP number into 4-octet string.
-	# Sometimes these modules are to smart...
+	# Sometimes these modules are too damn smart...
 	octets = string.split(sock.getpeername()[0], '.')
 	addr = string.join(map(lambda x: chr(int(x)), octets), '')
     else:
 	family = xauth.FamilyLocal
 	addr = socket.gethostname()
 
     au = xauth.Xauthority()
-    try:
-	return au.get_best_auth(family, addr, dno)
-    except error.XNoAuthError:
-	return '', ''
+    while 1:
+	try:
+	    return au.get_best_auth(family, addr, dno)
+	except error.XNoAuthError:
+	    pass
+
+	# We need to do this to handle ssh's X forwarding.  It sets
+	# $DISPLAY to localhost:10, but stores the xauth cookie as if
+	# DISPLAY was :10.  Hence, if localhost and not found, try
+	# again as a Unix socket.
+	if family == xauth.FamilyInternet and addr == '\x7f\x00\x00\x01':
+	    family = xauth.FamilyLocal
+	    addr = socket.gethostname()
+	else:
+	    return '', ''
 	
     
 def old_get_auth(sock, dname, host, dno):
@@ -135,4 +146,4 @@ def old_get_auth(sock, dname, host, dno):
 
     return auth_name, auth_data
     
-get_auth = old_get_auth
+get_auth = new_get_auth
diff --git a/Xlib/xauth.py b/Xlib/xauth.py
@@ -1,4 +1,4 @@
-# $Id: xauth.py,v 1.1 2003-01-29 23:53:31 petli Exp $
+# $Id: xauth.py,v 1.2 2003-06-08 23:21:53 petli Exp $
 #
 # Xlib.xauth -- ~/.Xauthority access 
 #
@@ -35,7 +35,7 @@ def __init__(self, filename = None):
 
 	if filename is None:
 	    try:
-		filename = os.path.join(os.environ['HOME'], '/.Xauthority')
+		filename = os.path.join(os.environ['HOME'], '.Xauthority')
 	    except KeyError:
 		raise error.XauthError(
 		    '$HOME not set, cannot find ~/.Xauthority')

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Id: xauth.py,v 1.1 2003-01-29 23:53:31 petli Exp $`
	`1`	`+# $Id: xauth.py,v 1.2 2003-06-08 23:21:53 petli Exp $`
`2`	`2`	`#`
`3`	`3`	`# Xlib.xauth -- ~/.Xauthority access`
`4`	`4`	`#`
`@@ -35,7 +35,7 @@ def __init__(self, filename = None):`
`35`	`35`
`36`	`36`	`if filename is None:`
`37`	`37`	`try:`
`38`		`- filename = os.path.join(os.environ['HOME'], '/.Xauthority')`
	`38`	`+ filename = os.path.join(os.environ['HOME'], '.Xauthority')`
`39`	`39`	`except KeyError:`
`40`	`40`	`raise error.XauthError(`
`41`	`41`	`'$HOME not set, cannot find ~/.Xauthority')`