<!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>[15241] CalendarServer/trunk/bin</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.calendarserver.org//changeset/15241">15241</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-28 06:47:26 -0700 (Wed, 28 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unlock keychain to allow access to certs when testing or running.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbinrun">CalendarServer/trunk/bin/run</a></li>
<li><a href="#CalendarServertrunkbintest">CalendarServer/trunk/bin/test</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbinkeychain_unlockpy">CalendarServer/trunk/bin/keychain_unlock.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbinkeychain_unlockpy"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/bin/keychain_unlock.py (0 => 15241)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/keychain_unlock.py (rev 0)
+++ CalendarServer/trunk/bin/keychain_unlock.py 2015-10-28 13:47:26 UTC (rev 15241)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+#!/usr/bin/env python
+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from subprocess import Popen, PIPE, STDOUT
+import os
+import sys
+
+password_file = os.path.expanduser("~/.keychain")
+
+def isKeychainUnlocked():
+
+ child = Popen(
+ args=[
+ "/usr/bin/security", "show-keychain-info",
+ "login.keychain",
+ ],
+ stdout=PIPE, stderr=STDOUT,
+ )
+ _ignore_output, _ignore_error = child.communicate()
+
+ if child.returncode:
+ return False
+ else:
+ return True
+
+
+
+def unlockKeychain():
+
+ if not os.path.isfile(password_file):
+ print("Could not unlock login.keychain: no password available.")
+ return False
+
+ with open(password_file) as f:
+ password = f.read().strip()
+
+ child = Popen(
+ args=[
+ "/usr/bin/security", "unlock-keychain",
+ "-p", password,
+ "login.keychain",
+ ],
+ stdout=PIPE, stderr=STDOUT,
+ )
+ output, error = child.communicate()
+
+ if child.returncode:
+ print("Could not unlock login.keychain: {}".format(error if error else output))
+ return False
+ else:
+ print("Unlocked login.keychain")
+ return True
+
+
+
+if __name__ == '__main__':
+
+ if os.path.isfile("/usr/bin/security"):
+ if isKeychainUnlocked():
+ print("Keychain already unlocked")
+ else:
+ # If the identity exists we are done
+ result = unlockKeychain()
+ else:
+ print("Keychain access utility ('security') not found")
+ result = False
+ sys.exit(0 if True else 1)
</ins><span class="cx">Property changes on: CalendarServer/trunk/bin/keychain_unlock.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="CalendarServertrunkbinrun"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/run (15240 => 15241)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/run 2015-10-27 17:40:22 UTC (rev 15240)
+++ CalendarServer/trunk/bin/run 2015-10-28 13:47:26 UTC (rev 15241)
</span><span class="lines">@@ -159,6 +159,18 @@
</span><span class="cx"> caldavd_wrapper_command="";
</span><span class="cx"> #fi;
</span><span class="cx">
</span><ins>+ #
+ # Do keychain unlock on OS X
+ #
+ if [ -z "${USE_OPENSSL-}" ]; then
+ case "$(uname -s)" in
+ Darwin)
+ bin/python bin/keychain_unlock.py
+ ;;
+ esac;
+ fi;
+
+
</ins><span class="cx"> echo "";
</span><span class="cx"> echo "Starting server...";
</span><span class="cx"> export PYTHON="${python}";
</span></span></pre></div>
<a id="CalendarServertrunkbintest"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/test (15240 => 15241)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/test 2015-10-27 17:40:22 UTC (rev 15240)
+++ CalendarServer/trunk/bin/test 2015-10-28 13:47:26 UTC (rev 15241)
</span><span class="lines">@@ -106,6 +106,16 @@
</span><span class="cx"> find "${wd}" -name \*.pyc -print0 | xargs -0 rm;
</span><span class="cx">
</span><span class="cx">
</span><ins>+#
+# Do keychain unlock on OS X
+#
+if [ -z "${USE_OPENSSL-}" ]; then
+ case "$(uname -s)" in
+ Darwin)
+ bin/python bin/keychain_unlock.py
+ ;;
+ esac;
+fi;
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # Unit tests
</span></span></pre>
</div>
</div>
</body>
</html>