<!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>[116989] trunk/dports/net/openssh</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="https://trac.macports.org/changeset/116989">116989</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-02-11 17:31:19 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>openssh: fix sandboxing feature, fix password auth by forcing PAM, closes #36291</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetopensshPortfile">trunk/dports/net/openssh/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsnetopensshfilesorgopensshsshdsb">trunk/dports/net/openssh/files/org.openssh.sshd.sb</a></li>
<li><a href="#trunkdportsnetopensshfilespatchsandboxdarwincapplesandboxnamedexternaldiff">trunk/dports/net/openssh/files/patch-sandbox-darwin.c-apple-sandbox-named-external.diff</a></li>
<li><a href="#trunkdportsnetopensshfilespatchsshdcapplesandboxnamedexternaldiff">trunk/dports/net/openssh/files/patch-sshd.c-apple-sandbox-named-external.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetopensshPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/openssh/Portfile (116988 => 116989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/openssh/Portfile 2014-02-12 00:39:10 UTC (rev 116988)
+++ trunk/dports/net/openssh/Portfile 2014-02-12 01:31:19 UTC (rev 116989)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name openssh
</span><span class="cx"> version 6.5p1
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx">
</span><span class="cx"> categories net
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -46,12 +46,29 @@
</span><span class="cx">
</span><span class="cx"> # the HPN patch needs this, so rewrite all other patches to support it, too
</span><span class="cx"> patch.args -p1
</span><del>-patchfiles launchd.patch
</del><ins>+patchfiles launchd.patch \
+ pam.patch \
+ patch-sandbox-darwin.c-apple-sandbox-named-external.diff \
+ patch-sshd.c-apple-sandbox-named-external.diff
+# We need a couple of patches
+# - pam.patch
+# getpwnam(3) on OS X always returns "*********" in the pw_passwd field even
+# when run as root, so it can't be used for authentication. This patch just
+# forces the use of PAM regardless of the configuration.
+# - patch-*-apple-sandbox-named-external.diff
+# Use Apple's sandbox_init(3) in addition to standard privilege separation.
+# This requires a sandbox profile (which we provide) and the sandbox_init(3)
+# call before the chroot(2) to privsep-path ($prefix/var/empty), or it will
+# fail to load the sandbox description and libsandbox.1.dylib.
</ins><span class="cx">
</span><del>-# Specified -fno-builtin because GCC 3.3 has log() as a builtin
-# (from math.h) while OpenSSH has its own log() function
-# -- from fink.
-configure.cppflags-append -fno-builtin
</del><ins>+post-patch {
+ # reinplace prefix in path to sandbox definition added by
+ # patch-sandbox-darwin.c-apple-sandbox-named-external.diff
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/sandbox-darwin.c
+}
+
+# Use Apple's sandboxing feature
+configure.cppflags-append -D__APPLE_SANDBOX_NAMED_EXTERNAL__
</ins><span class="cx"> configure.args --with-ssl-dir=${prefix} \
</span><span class="cx"> --sysconfdir=${prefix}/etc/ssh \
</span><span class="cx"> --with-privsep-path=${prefix}/var/empty \
</span><span class="lines">@@ -76,9 +93,18 @@
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> destroot.keepdirs ${destroot}${prefix}/var/run ${destroot}${prefix}/var/empty
</span><ins>+
+ # switch default port to avoid conflict with system sshd
</ins><span class="cx"> reinplace "s|#Port 22|Port 2222|g" ${destroot}${prefix}/etc/ssh/sshd_config
</span><ins>+
+ # provide ssh-copy-id
</ins><span class="cx"> xinstall -m 755 ${worksrcpath}/contrib/ssh-copy-id ${destroot}${prefix}/bin
</span><span class="cx"> xinstall -m 644 ${worksrcpath}/contrib/ssh-copy-id.1 ${destroot}${prefix}/share/man/man1
</span><ins>+
+ # install sandbox definition
+ xinstall -m 755 -d ${destroot}${prefix}/share/${name}
+ xinstall -m 644 ${filespath}/org.openssh.sshd.sb ${destroot}${prefix}/share/${name}
+
</ins><span class="cx"> file rename "${destroot}${prefix}/etc/ssh/sshd_config" "${destroot}${prefix}/etc/ssh/sshd_config.example"
</span><span class="cx"> file rename "${destroot}${prefix}/etc/ssh/ssh_config" "${destroot}${prefix}/etc/ssh/ssh_config.example"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsnetopensshfilesorgopensshsshdsb"></a>
<div class="addfile"><h4>Added: trunk/dports/net/openssh/files/org.openssh.sshd.sb (0 => 116989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/openssh/files/org.openssh.sshd.sb (rev 0)
+++ trunk/dports/net/openssh/files/org.openssh.sshd.sb 2014-02-12 01:31:19 UTC (rev 116989)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+;; Copyright (c) 2008 Apple Inc. All Rights reserved.
+;;
+;; sshd - profile for privilege separated children
+;;
+;; WARNING: The sandbox rules in this file currently constitute
+;; Apple System Private Interface and are subject to change at any time and
+;; without notice.
+;;
+
+(version 1)
+
+(deny default)
+
+(allow file-chroot)
+(allow file-read-metadata (literal "/var"))
+
+(allow sysctl-read)
+(allow mach-per-user-lookup)
+(allow mach-lookup
+ (global-name "com.apple.system.notification_center")
+ (global-name "com.apple.system.logger"))
</ins></span></pre></div>
<a id="trunkdportsnetopensshfilespatchsandboxdarwincapplesandboxnamedexternaldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/openssh/files/patch-sandbox-darwin.c-apple-sandbox-named-external.diff (0 => 116989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/openssh/files/patch-sandbox-darwin.c-apple-sandbox-named-external.diff (rev 0)
+++ trunk/dports/net/openssh/files/patch-sandbox-darwin.c-apple-sandbox-named-external.diff 2014-02-12 01:31:19 UTC (rev 116989)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- a/sandbox-darwin.c.orig 2014-02-12 01:31:10.000000000 +0100
++++ b/sandbox-darwin.c 2014-02-12 01:31:54.000000000 +0100
+@@ -62,8 +62,16 @@
+ struct rlimit rl_zero;
+
+ debug3("%s: starting Darwin sandbox", __func__);
++#ifdef __APPLE_SANDBOX_NAMED_EXTERNAL__
++#ifndef SANDBOX_NAMED_EXTERNAL
++#define SANDBOX_NAMED_EXTERNAL (0x3)
++#endif
++ if (sandbox_init("@PREFIX@/share/openssh/org.openssh.sshd.sb",
++ SANDBOX_NAMED_EXTERNAL, &errmsg) == -1)
++#else
+ if (sandbox_init(kSBXProfilePureComputation, SANDBOX_NAMED,
+ &errmsg) == -1)
++#endif
+ fatal("%s: sandbox_init: %s", __func__, errmsg);
+
+ /*
</ins></span></pre></div>
<a id="trunkdportsnetopensshfilespatchsshdcapplesandboxnamedexternaldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/openssh/files/patch-sshd.c-apple-sandbox-named-external.diff (0 => 116989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/openssh/files/patch-sshd.c-apple-sandbox-named-external.diff (rev 0)
+++ trunk/dports/net/openssh/files/patch-sshd.c-apple-sandbox-named-external.diff 2014-02-12 01:31:19 UTC (rev 116989)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+--- a/sshd.c 2014-02-11 23:55:15.000000000 +0100
++++ b/sshd.c 2013-07-03 01:09:16.000000000 +0200
+@@ -708,11 +699,18 @@
+ set_log_handler(mm_log_handler, pmonitor);
+
+ /* Demote the child */
++#ifdef __APPLE_SANDBOX_NAMED_EXTERNAL__
++ /* We need to do this before we chroot() so we can read sshd.sb */
++ if (box != NULL)
++ ssh_sandbox_child(box);
++#endif
+ if (getuid() == 0 || geteuid() == 0)
+ privsep_preauth_child();
+ setproctitle("%s", "[net]");
++#ifndef __APPLE_SANDBOX_NAMED_EXTERNAL__
+ if (box != NULL)
+ ssh_sandbox_child(box);
++#endif
+
+ return 0;
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>