<!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>[114131] trunk/base/src/darwintracelib1.0</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/114131">114131</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2013-11-29 16:05:22 -0800 (Fri, 29 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>darwintrace: Don't always follow symlinks
Only follow symlinks in __darwintrace_is_in_sandbox() when the DT_FOLLOWSYMS
flag is set. This has the following advantages:
- lstat(2) and readlink(2) work on symlinks that point to files outside of the
sandbox (previously, these attempts would have returned ENOENT).
- readdir(3) is a lot faster again, because it doesn't have to lstat(2) and
possibly readlink(2) every file in a loop.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcdarwintracelib10accessc">trunk/base/src/darwintracelib1.0/access.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10darwintracec">trunk/base/src/darwintracelib1.0/darwintrace.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10darwintraceh">trunk/base/src/darwintracelib1.0/darwintrace.h</a></li>
<li><a href="#trunkbasesrcdarwintracelib10mkdirc">trunk/base/src/darwintracelib1.0/mkdir.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10openc">trunk/base/src/darwintracelib1.0/open.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10procc">trunk/base/src/darwintracelib1.0/proc.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10readlinkc">trunk/base/src/darwintracelib1.0/readlink.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10renamec">trunk/base/src/darwintracelib1.0/rename.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10rmdirc">trunk/base/src/darwintracelib1.0/rmdir.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10statc">trunk/base/src/darwintracelib1.0/stat.c</a></li>
<li><a href="#trunkbasesrcdarwintracelib10unlinkc">trunk/base/src/darwintracelib1.0/unlink.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcdarwintracelib10accessc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/access.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/access.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/access.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
</ins><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10darwintracec"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/darwintrace.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/darwintrace.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/darwintrace.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -825,6 +825,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ((flags & DT_FOLLOWSYMS) == 0) {
+ // only expand symlinks when the DT_FOLLOWSYMS flags is set;
+ // otherwise just ignore whether this path is a symlink or not to
+ // speed up readdir(3).
+ break;
+ }
+
</ins><span class="cx"> if (++loopCount >= 10) {
</span><span class="cx"> // assume cylce and let the OS deal with that (yes, this actually
</span><span class="cx"> // happens in software!)
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10darwintraceh"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/darwintrace.h (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/darwintrace.h 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/darwintrace.h 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -66,8 +66,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> enum {
</span><del>- DT_REPORT = 1 << 0,
- DT_ALLOWDIR = 1 << 1
</del><ins>+ DT_REPORT = 1 << 0,
+ DT_ALLOWDIR = 1 << 1,
+ DT_FOLLOWSYMS = 1 << 2
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -104,6 +105,12 @@
</span><span class="cx"> * path references an existing directory. Set this for
</span><span class="cx"> * read operations such as stat(2), omit this for operations
</span><span class="cx"> * that modify directories like rmdir(2) and mkdir(2).
</span><ins>+ * - DT_FOLLOWSYMS: Check for and expand symlinks, while
+ * checking both the link name and the link target against
+ * the sandbox. Set this for all operations that read file
+ * contents or check file attributes. Omit this flag for
+ * operations that only list the file (or rather symlink)
+ * name.
</ins><span class="cx"> * \return \c true if the file is within sandbox bounds, \c false if access
</span><span class="cx"> * should be denied
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10mkdirc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/mkdir.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/mkdir.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/mkdir.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(path, DT_REPORT)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_FOLLOWSYMS)) {
</ins><span class="cx"> struct stat st;
</span><span class="cx"> if (-1 == lstat(path, &st) && errno == ENOENT) {
</span><span class="cx"> // directory doesn't exist yet */
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10openc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/open.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/open.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/open.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> __darwintrace_setup();
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
</ins><span class="cx"> errno = ((flags & O_CREAT) > 0) ? EACCES : ENOENT;
</span><span class="cx"> result = -1;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10procc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/proc.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/proc.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/proc.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* check the iterpreter against the sandbox */
</span><del>- if (!__darwintrace_is_in_sandbox(interp, DT_REPORT | DT_ALLOWDIR)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(interp, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
</ins><span class="cx"> close(fd);
</span><span class="cx"> return ENOENT;
</span><span class="cx"> }
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
</ins><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span><span class="cx"> } else {
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> static posix_spawn_t prev_posix_spawn = NULL;
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
</ins><span class="cx"> result = ENOENT;
</span><span class="cx"> } else {
</span><span class="cx"> int interp_result = check_interpreter(path);
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10readlinkc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/readlink.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/readlink.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/readlink.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -44,10 +44,6 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Deny \c readlink(2) if the file is not within the sandbox bounds.
</span><del>- *
- * FIXME Currently also denies reading the link if the link target does not
- * exist. To fix this, add a parameter to __darwintrace_is_in_sandbox that
- * controls whether symlinks should be followed.
</del><span class="cx"> */
</span><span class="cx"> #ifdef READLINK_IS_NOT_P1003_1A
</span><span class="cx"> int readlink(const char *path, char *buf, int bufsiz) {
</span><span class="lines">@@ -59,6 +55,8 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><ins>+ // don't follow symlinks here; whether access to the link target is allowed
+ // or not does not matter for reading the symlink
</ins><span class="cx"> if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</span><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10renamec"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/rename.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/rename.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/rename.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(from, DT_REPORT)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(from, DT_REPORT | DT_FOLLOWSYMS)) {
</ins><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span><del>- } else if (!__darwintrace_is_in_sandbox(to, DT_REPORT)) {
</del><ins>+ } else if (!__darwintrace_is_in_sandbox(to, DT_REPORT | DT_FOLLOWSYMS)) {
</ins><span class="cx"> errno = EACCES;
</span><span class="cx"> result = -1;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10rmdirc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/rmdir.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/rmdir.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/rmdir.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(path, DT_REPORT)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_FOLLOWSYMS)) {
</ins><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10statc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/stat.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/stat.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/stat.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
</ins><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span><span class="cx"> } else {
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
</ins><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span><span class="cx"> } else {
</span><span class="lines">@@ -98,6 +98,7 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><ins>+ // don't follow symlinks for lstat
</ins><span class="cx"> if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</span><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span><span class="lines">@@ -119,6 +120,7 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><ins>+ // don't follow symlinks for lstat
</ins><span class="cx"> if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</span><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10unlinkc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/unlink.c (114130 => 114131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/unlink.c 2013-11-29 23:30:23 UTC (rev 114130)
+++ trunk/base/src/darwintracelib1.0/unlink.c 2013-11-30 00:05:22 UTC (rev 114131)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> int result = 0;
</span><span class="cx">
</span><del>- if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR)) {
</del><ins>+ if (!__darwintrace_is_in_sandbox(path, DT_REPORT | DT_ALLOWDIR | DT_FOLLOWSYMS)) {
</ins><span class="cx"> errno = ENOENT;
</span><span class="cx"> result = -1;
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>