Ticket #3984: 3984-sshpublickeydatabase-userdir-lookup-2.patch

twisted/conch/checkers.py

@@ -132 +132 @@
         Retrieve the keys of the user specified by the credentials, and check
         if one matches the blob in the credentials.
         """
-        sshDir = os.path.expanduser(
-            os.path.join("~", credentials.username, ".ssh"))
+        sshDir = os.path.join(
+            os.path.expanduser("~" + credentials.username), ".ssh")
+
         if sshDir.startswith('~'): # didn't expand
             return False
         uid, gid = os.geteuid(), os.getegid()

twisted/conch/test/test_checkers.py

@@ -37 +37 @@
     Tests for L{SSHPublicKeyDatabase}.
     """
 
+    mockuser = "user"
+    mockhomedir = "home"
+
     if pwd is None:
         skip = "Cannot run without pwd module"
     elif SSHPublicKeyDatabase is None:
@@ -44 +47 @@
 
     def setUp(self):
         self.checker = SSHPublicKeyDatabase()
-        self.sshDir = FilePath(self.mktemp())
+
+        self.mockos = MockOS()
+        self.mockuserhome = FilePath(self.mktemp()).child(
+                    self.mockhomedir).child(self.mockuser)
+        self.sshDir = self.mockuserhome.child(".ssh")
         self.sshDir.makedirs()
 
         self.key1 = base64.encodestring("foobar")
         self.key2 = base64.encodestring("eggspam")
         self.content = "t1 %s foo\nt2 %s egg\n" % (self.key1, self.key2)
 
-        self.mockos = MockOS()
-        self.mockos.path = self.sshDir.path
+        self.mockos.path = self.sshDir.parent().parent().parent().path
+        self.mockos.users[self.mockuser] = self.mockuserhome.path
+
         self.patch(os.path, "expanduser", self.mockos.expanduser)
         self.patch(pwd, "getpwnam", self.mockos.getpwnam)
         self.patch(os, "seteuid", self.mockos.seteuid)
@@ -61 +69 @@
 
     def _testCheckKey(self, filename):
         self.sshDir.child(filename).setContent(self.content)
-        user = UsernamePassword("user", "password")
+        user = UsernamePassword(self.mockuser, "password")
         user.blob = "foobar"
         self.assertTrue(self.checker.checkKey(user))
         user.blob = "eggspam"
@@ -106 +114 @@
             keyFile.chmod(0777)
             return savedSeteuid(euid)
         self.patch(os, "seteuid", seteuid)
-        user = UsernamePassword("user", "password")
+        user = UsernamePassword(self.mockuser, "password")
         user.blob = "foobar"
         self.assertTrue(self.checker.checkKey(user))
         self.assertEquals(self.mockos.seteuidCalls, [0, 1, 0, os.getuid()])

twisted/test/test_process.py

@@ -1221 +1221 @@
     waitChild = None
     euid = 0
     egid = 0
+    uid = 1237
+    gid = 1235
     path = None
+    users = {}
 
     def __init__(self):
         """
@@ -1370 +1373 @@
         """
         Override C{os.getgid}. Return a dumb number.
         """
-        return 1235
+        return self.gid
 
 
     def getuid(self):
         """
         Override C{os.getuid}. Return a dumb number.
         """
-        return 1237
+        return self.uid
 
 
     def setuid(self, val):
@@ -1454 +1457 @@
         """
         Mock C{os.path.expanduser}.
         """
-        return self.path
+        if not path.startswith('~'):
+            return path
+        i = path.find('/', 1)
+        if i < 0:
+            i = len(path)
+        if i == 1:
+            userdir = self.users.get(self.user)
+        else:
+            userdir = self.users.get(path[1:i])
+        if userdir is None:
+            return path
+        userhome = os.path.join(self.path, userdir)
+        userhome = userhome.rstrip('/')
+        if not os.path.exists(userhome):
+            return path
+        return userhome + path[i:]
 
 
     def getpwnam(self, user):