<!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>[185052] branches/safari-600.1.4.16-branch/Source/WebCore</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.webkit.org/projects/webkit/changeset/185052">185052</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-31 19:11:02 -0700 (Sun, 31 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/185003">r185003</a>. rdar://problem/21048994</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001416branchSourceWebCoreChangeLog">branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformsqlSQLiteDatabasecpp">branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp</a></li>
<li><a href="#branchessafari6001416branchSourceWebCoreplatformsqlSQLiteDatabaseh">branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001416branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog (185051 => 185052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-06-01 02:08:46 UTC (rev 185051)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-06-01 02:11:02 UTC (rev 185052)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-05-31 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r185003.
+
+ 2015-05-29 Brady Eidson <beidson@apple.com>
+
+ WebSQL default functions can bypass authorizer.
+ <rdar://problem/21048994> and https://bugs.webkit.org/show_bug.cgi?id=145463
+
+ Reviewed by Sam Weinig and Alexey Proskuryakov.
+
+ No new tests yet.
+
+ * platform/sql/SQLiteDatabase.cpp:
+ (WebCore::unauthorizedSQLFunction): Function to install into SQLite to override some built-in functions.
+ (WebCore::SQLiteDatabase::open):
+ (WebCore::SQLiteDatabase::overrideUnauthorizedFunctions): Install function overrides for functions that
+ take arbitrary input that are also meant to be disabled by virtue of them not being whitelisted.
+ * platform/sql/SQLiteDatabase.h:
+
</ins><span class="cx"> 2015-05-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r179010.
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformsqlSQLiteDatabasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp (185051 => 185052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2015-06-01 02:08:46 UTC (rev 185051)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2015-06-01 02:11:02 UTC (rev 185052)
</span><span class="lines">@@ -50,6 +50,13 @@
</span><span class="cx">
</span><span class="cx"> static const char notOpenErrorMessage[] = "database is not open";
</span><span class="cx">
</span><ins>+static void unauthorizedSQLFunction(sqlite3_context *context, int, sqlite3_value **)
+{
+ const char* functionName = (const char*)sqlite3_user_data(context);
+ String errorMessage = String::format("Function %s is unauthorized", functionName);
+ sqlite3_result_error(context, errorMessage.utf8().data(), -1);
+}
+
</ins><span class="cx"> SQLiteDatabase::SQLiteDatabase()
</span><span class="cx"> : m_db(0)
</span><span class="cx"> , m_pageSize(-1)
</span><span class="lines">@@ -82,6 +89,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ overrideUnauthorizedFunctions();
+
</ins><span class="cx"> m_openError = sqlite3_extended_result_codes(m_db, 1);
</span><span class="cx"> if (m_openError != SQLITE_OK) {
</span><span class="cx"> m_openErrorMessage = sqlite3_errmsg(m_db);
</span><span class="lines">@@ -133,6 +142,22 @@
</span><span class="cx"> m_openErrorMessage = CString();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SQLiteDatabase::overrideUnauthorizedFunctions()
+{
+ std::pair<const char*, int> functionParameters[] = {
+ { "rtreenode", 2 },
+ { "rtreedepth", 1 },
+ { "eval", 1 },
+ { "eval", 2 },
+ { "printf", -1 },
+ { "fts3_tokenizer", 1 },
+ { "fts3_tokenizer", 2 },
+ };
+
+ for (auto& functionParameter : functionParameters)
+ sqlite3_create_function(m_db, functionParameter.first, functionParameter.second, SQLITE_UTF8, (void*)functionParameter.first, unauthorizedSQLFunction, 0, 0);
+}
+
</ins><span class="cx"> void SQLiteDatabase::interrupt()
</span><span class="cx"> {
</span><span class="cx"> m_interrupted = true;
</span></span></pre></div>
<a id="branchessafari6001416branchSourceWebCoreplatformsqlSQLiteDatabaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.h (185051 => 185052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.h 2015-06-01 02:08:46 UTC (rev 185051)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/sql/SQLiteDatabase.h 2015-06-01 02:11:02 UTC (rev 185052)
</span><span class="lines">@@ -148,7 +148,9 @@
</span><span class="cx"> void enableAuthorizer(bool enable);
</span><span class="cx">
</span><span class="cx"> int pageSize();
</span><del>-
</del><ins>+
+ void overrideUnauthorizedFunctions();
+
</ins><span class="cx"> sqlite3* m_db;
</span><span class="cx"> int m_pageSize;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>