<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178049] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178049">178049</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-01-07 13:20:57 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make webkit-patch try harder to find keychain credentials
https://bugs.webkit.org/show_bug.cgi?id=140170
Reviewed by Ryosuke Niwa.
When the user manually enters a password into webkit-patch, we hand that off to the
Keyring Python module. However, that module creates a generic password entry instead
of an internet password entry. We should look for both kinds.
* Scripts/webkitpy/common/net/credentials.py:
(Credentials._run_security_tool):
(Credentials._credentials_from_keychain):
* Scripts/webkitpy/common/net/credentials_unittest.py:
(test_security_output_parse_entry_not_found):
(_assert_security_call):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetcredentialspy">trunk/Tools/Scripts/webkitpy/common/net/credentials.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetcredentials_unittestpy">trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178048 => 178049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-07 20:56:24 UTC (rev 178048)
+++ trunk/Tools/ChangeLog 2015-01-07 21:20:57 UTC (rev 178049)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-07 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Make webkit-patch try harder to find keychain credentials
+ https://bugs.webkit.org/show_bug.cgi?id=140170
+
+ Reviewed by Ryosuke Niwa.
+
+ When the user manually enters a password into webkit-patch, we hand that off to the
+ Keyring Python module. However, that module creates a generic password entry instead
+ of an internet password entry. We should look for both kinds.
+
+ * Scripts/webkitpy/common/net/credentials.py:
+ (Credentials._run_security_tool):
+ (Credentials._credentials_from_keychain):
+ * Scripts/webkitpy/common/net/credentials_unittest.py:
+ (test_security_output_parse_entry_not_found):
+ (_assert_security_call):
+
</ins><span class="cx"> 2015-01-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the Mountain Lion build.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetcredentialspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/credentials.py (178048 => 178049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/credentials.py 2015-01-07 20:56:24 UTC (rev 178048)
+++ trunk/Tools/Scripts/webkitpy/common/net/credentials.py 2015-01-07 21:20:57 UTC (rev 178049)
</span><span class="lines">@@ -89,10 +89,10 @@
</span><span class="cx"> security_output)
</span><span class="cx"> return [username, password]
</span><span class="cx">
</span><del>- def _run_security_tool(self, username=None):
</del><ins>+ def _run_security_tool(self, command, username=None):
</ins><span class="cx"> security_command = [
</span><span class="cx"> "/usr/bin/security",
</span><del>- "find-internet-password",
</del><ins>+ command,
</ins><span class="cx"> "-g",
</span><span class="cx"> "-s",
</span><span class="cx"> self.host,
</span><span class="lines">@@ -115,11 +115,15 @@
</span><span class="cx"> if not self._is_mac_os_x():
</span><span class="cx"> return [username, None]
</span><span class="cx">
</span><del>- security_output = self._run_security_tool(username)
</del><ins>+ security_output = self._run_security_tool("find-internet-password", username)
</ins><span class="cx"> if security_output:
</span><ins>+ parsed_output = self._parse_security_tool_output(security_output)
+ if any(parsed_output):
+ return parsed_output
+ security_output = self._run_security_tool("find-generic-password", username)
+ if security_output:
</ins><span class="cx"> return self._parse_security_tool_output(security_output)
</span><del>- else:
- return [None, None]
</del><ins>+ return [None, None]
</ins><span class="cx">
</span><span class="cx"> def _read_environ(self, key):
</span><span class="cx"> environ_key = self._environ_prefix + key
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetcredentials_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py (178048 => 178049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py 2015-01-07 20:56:24 UTC (rev 178048)
+++ trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py 2015-01-07 21:20:57 UTC (rev 178049)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> # by the test case CredentialsTest._assert_security_call (below).
</span><span class="cx"> outputCapture = OutputCapture()
</span><span class="cx"> outputCapture.capture_output()
</span><del>- self.assertIsNone(credentials._run_security_tool())
</del><ins>+ self.assertIsNone(credentials._run_security_tool("find-internet-password"))
</ins><span class="cx"> outputCapture.restore_output()
</span><span class="cx">
</span><span class="cx"> def _assert_security_call(self, username=None):
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> credentials = MockedCredentials("example.com", executive=executive_mock)
</span><span class="cx">
</span><span class="cx"> expected_logs = "Reading Keychain for example.com account and password. Click \"Allow\" to continue...\n"
</span><del>- OutputCapture().assert_outputs(self, credentials._run_security_tool, [username], expected_logs=expected_logs)
</del><ins>+ OutputCapture().assert_outputs(self, credentials._run_security_tool, ["find-internet-password", username], expected_logs=expected_logs)
</ins><span class="cx">
</span><span class="cx"> security_args = ["/usr/bin/security", "find-internet-password", "-g", "-s", "example.com"]
</span><span class="cx"> if username:
</span></span></pre>
</div>
</div>
</body>
</html>