<!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>[15232] 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/15232">15232</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-26 10:26:14 -0700 (Mon, 26 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Setup keychain items for testing during bin/develop on OS X.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
<li><a href="#CalendarServertrunkbindevelop">CalendarServer/trunk/bin/develop</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbinkeychain_initpy">CalendarServer/trunk/bin/keychain_init.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_build.sh (15231 => 15232)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2015-10-26 15:21:15 UTC (rev 15231)
+++ CalendarServer/trunk/bin/_build.sh 2015-10-26 17:26:14 UTC (rev 15232)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> case "$(uname -s)" in
</span><span class="cx"> Darwin)
</span><span class="cx"> default_requirements="${wd}/requirements-osx.txt";
</span><del>- use_openssl="false"
</del><ins>+ use_openssl="false"
</ins><span class="cx"> ;;
</span><span class="cx"> esac;
</span><span class="cx"> fi;
</span><span class="lines">@@ -706,8 +706,8 @@
</span><span class="cx"> ruler "Patching Python requirements";
</span><span class="cx"> echo "";
</span><span class="cx"> if [ ! -e "${dev_patches}/Twisted" ]; then
</span><del>- apply_patches "Twisted" "${py_virtualenv}/lib/python2.7/site-packages"
- touch "${dev_patches}/Twisted";
</del><ins>+ apply_patches "Twisted" "${py_virtualenv}/lib/python2.7/site-packages"
+ touch "${dev_patches}/Twisted";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> echo "";
</span></span></pre></div>
<a id="CalendarServertrunkbindevelop"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/develop (15231 => 15232)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/develop 2015-10-26 15:21:15 UTC (rev 15231)
+++ CalendarServer/trunk/bin/develop 2015-10-26 17:26:14 UTC (rev 15232)
</span><span class="lines">@@ -70,10 +70,22 @@
</span><span class="cx">
</span><span class="cx"> ln -s "../${source}" "${target}";
</span><span class="cx">
</span><del>- # NO! This causes bin/develop to hang the second time it is run
</del><ins>+ # NO! This causes bin/develop to hang the second time it is run
</ins><span class="cx"> #rm -f "${target}/.develop";
</span><span class="cx"> #ln -s "${wd}/.develop" "${target}/.develop";
</span><span class="cx"> done;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#
+# Do keychain init on OS X
+#
+if [ -z "${USE_OPENSSL-}" ]; then
+ case "$(uname -s)" in
+ Darwin)
+ echo "Keychain init."
+ bin/python bin/keychain_init.py
+ ;;
+ esac;
+fi;
+
</ins><span class="cx"> echo "Dependency setup complete."
</span></span></pre></div>
<a id="CalendarServertrunkbinkeychain_initpy"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/bin/keychain_init.py (0 => 15232)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/keychain_init.py (rev 0)
+++ CalendarServer/trunk/bin/keychain_init.py 2015-10-26 17:26:14 UTC (rev 15232)
</span><span class="lines">@@ -0,0 +1,125 @@
</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 re
+import sys
+
+identity_preference = "org.calendarserver.test"
+certname_regex = re.compile(r'"alis"<blob>="(.*)"')
+
+certificate_name = "localhost"
+certificate_file = "./twistedcaldav/test/data/server.pem"
+
+def identityExists():
+ child = Popen(
+ args=[
+ "/usr/bin/security", "get-identity-preference",
+ "-s", identity_preference,
+ "login.keychain",
+ ],
+ stdout=PIPE, stderr=STDOUT,
+ )
+ output, _ignore_error = child.communicate()
+
+ if child.returncode:
+ print("Could not find identity '{}'".format(identity_preference))
+ return False
+ else:
+ match = certname_regex.search(output)
+ if not match:
+ raise RuntimeError("No certificate found for identity '{}'".format(identity_preference))
+ else:
+ print("Found certificate '{}' for identity '{}'".format(match.group(1), identity_preference))
+ return True
+
+
+
+def identityCreate():
+ child = Popen(
+ args=[
+ "/usr/bin/security", "set-identity-preference",
+ "-s", identity_preference,
+ "-c", certificate_name,
+ ],
+ stdout=PIPE, stderr=STDOUT,
+ )
+ output, error = child.communicate()
+
+ if child.returncode:
+ raise RuntimeError(error if error else output)
+ else:
+ print("Created identity '{}' for certificate '{}'".format(identity_preference, certificate_name))
+ return True
+
+
+
+def certificateExists():
+ child = Popen(
+ args=[
+ "/usr/bin/security", "find-certificate",
+ "-c", certificate_name,
+ "login.keychain",
+ ],
+ stdout=PIPE, stderr=STDOUT,
+ )
+ _ignore_output, _ignore_error = child.communicate()
+
+ if child.returncode:
+ print("No certificate '{}' found for identity '{}'".format(certificate_name, identity_preference))
+ return False
+ else:
+ print("Found certificate '{}'".format(certificate_name))
+ return True
+
+
+
+def certificateImport():
+ child = Popen(
+ args=[
+ "/usr/bin/security", "import",
+ certificate_file,
+ "-k", "login.keychain",
+ "-A",
+ ],
+ stdout=PIPE, stderr=STDOUT,
+ )
+ output, error = child.communicate()
+
+ if child.returncode:
+ raise RuntimeError(error if error else output)
+ else:
+ print("Imported certificate '{}'".format(certificate_name))
+ return True
+
+if __name__ == '__main__':
+
+ if os.path.isfile("/usr/bin/security"):
+ # If the identity exists we are done
+ if identityExists():
+ sys.exit(0)
+
+ # Check for certificate and import if not present
+ if not certificateExists():
+ certificateImport()
+
+ # Create the identity
+ identityCreate()
+
+ else:
+ raise RuntimeError("Keychain access utility ('security') not found")
</ins><span class="cx">Property changes on: CalendarServer/trunk/bin/keychain_init.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
</div>
</body>
</html>