Fix safe mode authorizer callback to reject disallowed UDFs. Tests to follow.

FossilOrigin-Name: 4d934f00634fa31827c0bf2503a5011117c1fe9fd2f41c2a4bf954fb416d9b0f

diff --git a/manifest b/manifest
index 8a69714c97cf97fe0448534696d6a7da3446abc8..0cf4ef0a175a0dc68a19ff253e6260dc2966e4f5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sUPDATE\smethod\sof\sthe\ssqlite_dbpage\svirtual\stable\srebust\sagainst\nOOM\serrors.\s\s[forum:/forumpost/bbcf0dd6ca|Forum\spost\sbbcf0dd6ca].\s\sTest\scase\nin\sTH3.
-D 2022-10-31T18:11:12.230
+C Fix\ssafe\smode\sauthorizer\scallback\sto\sreject\sdisallowed\sUDFs.\sTests\sto\sfollow.
+D 2022-12-04T22:13:29.014
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -571,7 +571,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c f0d663c9b1ceeb3e7d262ede872dd3b24b323a7cc11d84c05a39d962e7d64b07
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c fea5ae26259dc995b2144a28bbb5b013196dbcc86527cd992ed109b00af7f9e8
-F src/shell.c.in 58e5d20e651d94159764a7a51f19bd62e0810ad46f3ea23d037c38bf0760fe5c
+F src/shell.c.in ee686b027782898a0679d54ee9c76e906176b998316f1a4c85f8b408a7338511
 F src/sqlite.h.in 01573eae96721f2a8ee2a9e3b7140ceeba2e9c44350911890b89b8ff0dcf6781
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -1980,9 +1980,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d6893183c281301e1b2feb13e321694a5c16d1eccb8ca527e2b3bce5b5a8b753
-Q +d15c9a4a323b825eb80e706e12e9df95e5db458024f51e6e537940efc8234d8b
-R dc348a7f4184bc9a5a36ff0b44c5b7cd
-U drh
-Z a1ffb12a875b558426b139aadfd0b50d
+P 852f2c95833e3e853016aaaa15dd2a8c7b2cd886f6e6bee2f38e34536b093819
+R 81a8e6b41952fbdbc498c05f6826ed29
+U larrybr
+Z a75434dae93c8cb1a2477e7cb00345a2
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4dd45103d230fe772e82e93388fff9ca9202c753..03bb6498e30ddd39367d709767a87215f07660e1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-852f2c95833e3e853016aaaa15dd2a8c7b2cd886f6e6bee2f38e34536b093819
\ No newline at end of file
+4d934f00634fa31827c0bf2503a5011117c1fe9fd2f41c2a4bf954fb416d9b0f
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index c87edfcd9a20f59922f34486aa2f0c7ab9bff119..e2ec5dcdc1c26eca97aa1b325b75ddbb03b432a2 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1833,7 +1833,7 @@ static int safeModeAuth(
     "zipfile",
     "zipfile_cds",
   };
-  UNUSED_PARAMETER(zA2);
+  UNUSED_PARAMETER(zA1);
   UNUSED_PARAMETER(zA3);
   UNUSED_PARAMETER(zA4);
   switch( op ){
@@ -1848,7 +1848,7 @@ static int safeModeAuth(
     case SQLITE_FUNCTION: {
       int i;
       for(i=0; i<ArraySize(azProhibitedFunctions); i++){
-        if( sqlite3_stricmp(zA1, azProhibitedFunctions[i])==0 ){
+        if( sqlite3_stricmp(zA2, azProhibitedFunctions[i])==0 ){
           failIfSafeMode(p, "cannot use the %s() function in safe mode",
                          azProhibitedFunctions[i]);
         }