Changeset 84697 in webkit

Timestamp:

Apr 22, 2011 3:47:55 PM (13 years ago)

Author:

dbates@webkit.org

Message:

2011-04-22 Daniel Bates <​dbates@webkit.org>

Reviewed by Csaba Osztrogonác.

webkit-patch land hangs if svn prompts for credentials
​https://bugs.webkit.org/show_bug.cgi?id=31500

Make has_authorization_for_realm() return True only if there exists a credentials file
that contains either the word "password" or "passtype". We assume that these words don't
coincide with the actual credential data (e.g. a person's username is "password").

• Scripts/webkitpy/common/checkout/scm.py:
• Scripts/webkitpy/common/checkout/scm_unittest.py:
  • Added test cases: test_has_authorization_for_realm_using_credentials_with_passtype(), test_has_authorization_for_realm_using_credentials_with_password(), test_not_have_authorization_for_realm_with_credentials_missing_password_and_passtype()
  • Renamed test_not_have_authorization_for_realm() to test_not_have_authorization_for_realm_when_missing_credentials_file() to better describe what it's testing.
  • Repurposed test_has_authorization_for_realm() to take realm and credential data to use and return the result of calling has_authorization_for_realm() so that the caller can assert the result; Renamed to _test_has_authorization_for_realm_using_credentials() to better reflect its new purpose.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-22  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        webkit-patch land hangs if svn prompts for credentials
+        https://bugs.webkit.org/show_bug.cgi?id=31500
+
+        Make has_authorization_for_realm() return True only if there exists a credentials file
+        that contains either the word "password" or "passtype". We assume that these words don't
+        coincide with the actual credential data (e.g. a person's username is "password").
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+        * Scripts/webkitpy/common/checkout/scm_unittest.py:
+          - Added test cases:
+            test_has_authorization_for_realm_using_credentials_with_passtype(),
+            test_has_authorization_for_realm_using_credentials_with_password(),
+            test_not_have_authorization_for_realm_with_credentials_missing_password_and_passtype()
+          - Renamed test_not_have_authorization_for_realm() to test_not_have_authorization_for_realm_when_missing_credentials_file()
+            to better describe what it's testing.
+          - Repurposed test_has_authorization_for_realm() to take realm and credential data to use
+            and return the result of calling has_authorization_for_realm() so that the caller can
+            assert the result; Renamed to _test_has_authorization_for_realm_using_credentials() to
+            better reflect its new purpose.
+
 2011-04-22  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm.py

@@ -329 +329 @@
         find_args = ["find", ".subversion", "-type", "f", "-exec", "grep", "-q", realm, "{}", ";", "-print"]
         find_output = self.run(find_args, cwd=home_directory, error_handler=Executive.ignore_error).rstrip()
-        return find_output and os.path.isfile(os.path.join(home_directory, find_output))
+        if not find_output or not os.path.isfile(os.path.join(home_directory, find_output)):
+            return False
+        # Subversion either stores the password in the credential file, indicated by the presence of the key "password",
+        # or uses the system password store (e.g. Keychain on Mac OS X) as indicated by the presence of the key "passtype".
+        # We assume that these keys will not coincide with the actual credential data (e.g. that a person's username
+        # isn't "password") so that we can use grep.
+        if self.run(["grep", "password", find_output], cwd=home_directory, return_exit_code=True) == 0:
+            return True
+        return self.run(["grep", "passtype", find_output], cwd=home_directory, return_exit_code=True) == 0
 
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm_unittest.py

@@ -1 +1 @@
 # Copyright (C) 2009 Google Inc. All rights reserved.
 # Copyright (C) 2009 Apple Inc. All rights reserved.
+# Copyright (C) 2011 Daniel Bates (dbates@intudata.com). All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -668 +669 @@
         self.assertRaises(AuthenticationError, self._shared_test_commit_with_message)
 
-    def test_has_authorization_for_realm(self):
+    def test_has_authorization_for_realm_using_credentials_with_passtype(self):
+        credentials = """
+K 8
+passtype
+V 8
+keychain
+K 15
+svn:realmstring
+V 39
+<http://svn.webkit.org:80> Mac OS Forge
+K 8
+username
+V 17
+dbates@webkit.org
+END
+"""
+        self.assertTrue(self._test_has_authorization_for_realm_using_credentials(SVN.svn_server_realm, credentials))
+
+    def test_has_authorization_for_realm_using_credentials_with_password(self):
+        credentials = """
+K 15
+svn:realmstring
+V 39
+<http://svn.webkit.org:80> Mac OS Forge
+K 8
+username
+V 17
+dbates@webkit.org
+K 8
+password
+V 4
+blah
+END
+"""
+        self.assertTrue(self._test_has_authorization_for_realm_using_credentials(SVN.svn_server_realm, credentials))
+
+    def _test_has_authorization_for_realm_using_credentials(self, realm, credentials):
         scm = detect_scm_system(self.svn_checkout_path)
         fake_home_dir = tempfile.mkdtemp(suffix="fake_home_dir")
@@ -674 +711 @@
         os.mkdir(svn_config_dir_path)
         fake_webkit_auth_file = os.path.join(svn_config_dir_path, "fake_webkit_auth_file")
-        write_into_file_at_path(fake_webkit_auth_file, SVN.svn_server_realm)
-        self.assertTrue(scm.has_authorization_for_realm(SVN.svn_server_realm, home_directory=fake_home_dir))
+        write_into_file_at_path(fake_webkit_auth_file, credentials)
+        result = scm.has_authorization_for_realm(realm, home_directory=fake_home_dir)
         os.remove(fake_webkit_auth_file)
         os.rmdir(svn_config_dir_path)
         os.rmdir(fake_home_dir)
-
-    def test_not_have_authorization_for_realm(self):
+        return result
+
+    def test_not_have_authorization_for_realm_with_credentials_missing_password_and_passtype(self):
+        credentials = """
+K 15
+svn:realmstring
+V 39
+<http://svn.webkit.org:80> Mac OS Forge
+K 8
+username
+V 17
+dbates@webkit.org
+END
+"""
+        self.assertFalse(self._test_has_authorization_for_realm_using_credentials(SVN.svn_server_realm, credentials))
+
+    def test_not_have_authorization_for_realm_when_missing_credentials_file(self):
         scm = detect_scm_system(self.svn_checkout_path)
         fake_home_dir = tempfile.mkdtemp(suffix="fake_home_dir")