<!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>[896] branches/PR-8488185</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.macosforge.org/projects/darwinbuild/changeset/896">896</a></dd>
<dt>Author</dt> <dd>wsiegrist@apple.com</dd>
<dt>Date</dt> <dd>2010-10-25 17:09:53 -0700 (Mon, 25 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Guard against recursive installs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesPR8488185darwinupDepotcpp">branches/PR-8488185/darwinup/Depot.cpp</a></li>
<li><a href="#branchesPR8488185darwinupmaincpp">branches/PR-8488185/darwinup/main.cpp</a></li>
<li><a href="#branchesPR8488185testingdarwinupruntestssh">branches/PR-8488185/testing/darwinup/run-tests.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesPR8488185darwinupDepotcpp"></a>
<div class="modfile"><h4>Modified: branches/PR-8488185/darwinup/Depot.cpp (895 => 896)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-8488185/darwinup/Depot.cpp 2010-10-25 22:07:40 UTC (rev 895)
+++ branches/PR-8488185/darwinup/Depot.cpp 2010-10-26 00:09:53 UTC (rev 896)
</span><span class="lines">@@ -426,6 +426,12 @@
</span><span class="cx">
</span><span class="cx"> IF_DEBUG("[analyze] %s\n", file->path());
</span><span class="cx">
</span><ins>+ if (strcasestr(file->path(), ".DarwinDepot")) {
+ fprintf(stderr, "Error: Root contains a .DarwinDepot, "
+ "aborting to avoid damaging darwinup metadata.\n");
+ return DEPOT_ERROR;
+ }
+
</ins><span class="cx"> // Perform a three-way-diff between the file to be installed (file),
</span><span class="cx"> // the file we last installed in this location (preceding),
</span><span class="cx"> // and the file that actually exists in this location (actual).
</span></span></pre></div>
<a id="branchesPR8488185darwinupmaincpp"></a>
<div class="modfile"><h4>Modified: branches/PR-8488185/darwinup/main.cpp (895 => 896)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-8488185/darwinup/main.cpp 2010-10-25 22:07:40 UTC (rev 895)
+++ branches/PR-8488185/darwinup/main.cpp 2010-10-26 00:09:53 UTC (rev 896)
</span><span class="lines">@@ -211,7 +211,23 @@
</span><span class="cx"> for (int i = 1; i < argc && res == 0; i++) {
</span><span class="cx"> if (strcmp(argv[0], "install") == 0) {
</span><span class="cx"> if (i==1 && depot->initialize(true)) exit(13);
</span><del>- res = depot->install(argv[i]);
</del><ins>+ // gaurd against installing paths ontop of themselves
+ if (strncmp(path, argv[i], strlen(argv[i])) == 0
+ && (strlen(path) == strlen(argv[i])
+ || strlen(path) - 1 == strlen(argv[i]))) {
+ if (strncmp(path, "/", 1) == 0 && strlen(path) == 1) {
+ fprintf(stderr, "Error: You provided '/' as a path to a root. "
+ "If you meant to specify a destination of '/', then you "
+ "just need to remove the '/' argument as the destination "
+ "defaults to '/'. Use the -p option to specify another "
+ "destination.\n");
+ } else {
+ fprintf(stderr, "Error: You cannot install the root at '%s' onto"
+ " itself.\n", path);
+ }
+ res = DEPOT_ERROR;
+ }
+ if (res == 0) res = depot->install(argv[i]);
</ins><span class="cx"> } else if (strcmp(argv[0], "upgrade") == 0) {
</span><span class="cx"> if (i==1 && depot->initialize(true)) exit(14);
</span><span class="cx"> // find most recent matching archive by name
</span></span></pre></div>
<a id="branchesPR8488185testingdarwinupruntestssh"></a>
<div class="modfile"><h4>Modified: branches/PR-8488185/testing/darwinup/run-tests.sh (895 => 896)</h4>
<pre class="diff"><span>
<span class="info">--- branches/PR-8488185/testing/darwinup/run-tests.sh 2010-10-25 22:07:40 UTC (rev 895)
+++ branches/PR-8488185/testing/darwinup/run-tests.sh 2010-10-26 00:09:53 UTC (rev 896)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> done;
</span><span class="cx">
</span><span class="cx"> cp corrupt.tgz $PREFIX/
</span><ins>+cp depotroot.tar.gz $PREFIX/
</ins><span class="cx">
</span><span class="cx"> mkdir -p $ORIG
</span><span class="cx"> cp -R $DEST/* $ORIG/
</span><span class="lines">@@ -438,6 +439,22 @@
</span><span class="cx"> $DIFF $ORIG $DEST 2>&1
</span><span class="cx"> if [ $? -ne 0 ]; then exit 1; fi
</span><span class="cx">
</span><ins>+echo "========== TEST: testing recursive install guards ==========";
+$DARWINUP install $PREFIX/depotroot.tar.gz
+if [ $? -ne 255 ]; then exit 1; fi
+echo "DIFF: diffing original test files to dest (should be no diffs) ..."
+$DIFF $ORIG $DEST 2>&1
+if [ $? -ne 0 ]; then exit 1; fi
+$DARWINUP install $DEST
+if [ $? -ne 255 ]; then exit 1; fi
+echo "DIFF: diffing original test files to dest (should be no diffs) ..."
+$DIFF $ORIG $DEST 2>&1
+if [ $? -ne 0 ]; then exit 1; fi
+darwinup $1 install /
+if [ $? -ne 255 ]; then exit 1; fi
+echo "DIFF: diffing original test files to dest (should be no diffs) ..."
+$DIFF $ORIG $DEST 2>&1
+if [ $? -ne 0 ]; then exit 1; fi
</ins><span class="cx">
</span><span class="cx"> echo "========== TEST: Try replacing File with Directory =========="
</span><span class="cx"> $DARWINUP install $PREFIX/rep_file_dir
</span></span></pre>
</div>
</div>
</body>
</html>