better-sqlite3-multiple-ciphers 7.5.1 → 7.5.2-beta.0

package/README.md

@@ -23,10 +23,10 @@ The fastest and simplest library for SQLite3 in Node.js. This particular fork su
   - **SQLite3 Multiple Ciphers** - [`1.3.10`](https://github.com/utelle/SQLite3MultipleCiphers/releases/tag/v1.3.10)
 
 - ### Beta
-  - **better-sqlite3-multiple-ciphers** - [`7.5.1-beta.3`](https://github.com/m4heshd/better-sqlite3-multiple-ciphers/releases/tag/v7.5.1-beta.3)
-  - **better-sqlite3** - [`7.5.0`](https://github.com/JoshuaWise/better-sqlite3/releases/tag/v7.5.0)
-  - **SQLite** - [`3.38.1`](https://www.sqlite.org/draft/releaselog/3_38_1.html)
-  - **SQLite3 Multiple Ciphers** - [`1.3.9`](https://github.com/utelle/SQLite3MultipleCiphers/releases/tag/v1.3.9)
+  - **better-sqlite3-multiple-ciphers** - [`7.5.2-beta.0`](https://github.com/m4heshd/better-sqlite3-multiple-ciphers/releases/tag/v7.5.2-beta.0)
+  - **better-sqlite3** - [`7.5.1`](https://github.com/JoshuaWise/better-sqlite3/releases/tag/v7.5.1)
+  - **SQLite** - [`3.38.2`](https://www.sqlite.org/draft/releaselog/3_38_2.html)
+  - **SQLite3 Multiple Ciphers** - [`1.4.1`](https://github.com/utelle/SQLite3MultipleCiphers/releases/tag/v1.4.1)
 
 ## Help this project stay strong! 💪
 

package/deps/setup.ps1

@@ -2,7 +2,7 @@
 $ErrorActionPreference = "Stop"
 
 # SQLite Info
-$SQLITEMC_VER = "v1.3.10"
+$SQLITEMC_VER = "v1.4.1"
 $API_URL = "https://api.github.com/repos/utelle/SQLite3MultipleCiphers/releases/tags/" + $SQLITEMC_VER
 
 # Paths

package/deps/sqlite3/sqlite3.c

@@ -239670,10 +239670,10 @@ SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
 #define SQLITE3MC_VERSION_H_
 
 #define SQLITE3MC_VERSION_MAJOR      1
-#define SQLITE3MC_VERSION_MINOR      3
-#define SQLITE3MC_VERSION_RELEASE    10
+#define SQLITE3MC_VERSION_MINOR      4
+#define SQLITE3MC_VERSION_RELEASE    0
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.3.10"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.4.0"
 
 #endif /* SQLITE3MC_VERSION_H_ */
 /*** End of #include "sqlite3mc_version.h" ***/
@@ -262581,7 +262581,7 @@ sqlite3mcHandleMainKey(sqlite3* db, const char* zPath)
 ** Purpose:     Implementation of SQLite codec API
 ** Author:      Ulrich Telle
 ** Created:     2006-12-06
-** Copyright:   (c) 2006-2021 Ulrich Telle
+** Copyright:   (c) 2006-2022 Ulrich Telle
 ** License:     MIT
 */
 
@@ -263049,7 +263049,7 @@ SQLITE_PRIVATE Codec*
 sqlite3mcGetMainCodec(sqlite3* db);
 
 SQLITE_PRIVATE void
-sqlite3mcSetCodec(sqlite3* db, const char* zFileName, Codec* codec);
+sqlite3mcSetCodec(sqlite3* db, const char* zDbName, const char* zFileName, Codec* codec);
 
 static int
 mcAdjustBtree(Btree* pBt, int nPageSize, int nReserved, int isLegacy)
@@ -263111,7 +263111,7 @@ sqlite3mcCodecAttach(sqlite3* db, int nDb, const char* zPath, const void* zKey,
           sqlite3mcSetBtree(codec, db->aDb[nDb].pBt);
           mcAdjustBtree(db->aDb[nDb].pBt, pageSize, reserved, sqlite3mcGetLegacyWriteCipher(codec));
           sqlite3mcCodecSizeChange(codec, pageSize, reserved);
-          sqlite3mcSetCodec(db, dbFileName, codec);
+          sqlite3mcSetCodec(db, zDbName, dbFileName, codec);
         }
         else
         {
@@ -263132,7 +263132,7 @@ sqlite3mcCodecAttach(sqlite3* db, int nDb, const char* zPath, const void* zKey,
       /* Remove codec for main database */
       if (nDb == 0 && nKey == 0)
       {
-        sqlite3mcSetCodec(db, dbFileName, NULL);
+        sqlite3mcSetCodec(db, zDbName, dbFileName, NULL);
       }
     }
   }
@@ -263167,7 +263167,7 @@ sqlite3mcCodecAttach(sqlite3* db, int nDb, const char* zPath, const void* zKey,
       int reserved = sqlite3mcGetReservedWriteCipher(codec);
       mcAdjustBtree(db->aDb[nDb].pBt, pageSize, reserved, sqlite3mcGetLegacyWriteCipher(codec));
       sqlite3mcCodecSizeChange(codec, pageSize, reserved);
-      sqlite3mcSetCodec(db, dbFileName, codec);
+      sqlite3mcSetCodec(db, zDbName, dbFileName, codec);
     }
     else
     {
@@ -263314,7 +263314,7 @@ sqlite3_rekey_v2(sqlite3* db, const char* zDbName, const void* zKey, int nKey)
         int nReservedWriteCipher;
         sqlite3mcSetHasReadCipher(codec, 0); /* Original database is not encrypted */
         mcAdjustBtree(pBt, sqlite3mcGetPageSizeWriteCipher(codec), sqlite3mcGetReservedWriteCipher(codec), sqlite3mcGetLegacyWriteCipher(codec));
-        sqlite3mcSetCodec(db, dbFileName, codec);
+        sqlite3mcSetCodec(db, zDbName, dbFileName, codec);
         nReservedWriteCipher = sqlite3mcGetReservedWriteCipher(codec);
         sqlite3mcCodecSizeChange(codec, nPagesize, nReservedWriteCipher);
         if (nReserved != nReservedWriteCipher)
@@ -263465,7 +263465,7 @@ leave_rekey:
   if (!sqlite3mcIsEncrypted(codec))
   {
     /* Remove codec for unencrypted database */
-    sqlite3mcSetCodec(db, dbFileName, NULL);
+    sqlite3mcSetCodec(db, zDbName, dbFileName, NULL);
   }
   return rc;
 }
@@ -273367,7 +273367,7 @@ int sqlite3_regexp_init(
 ** Purpose:     Implementation of SQLite VFS for Multiple Ciphers
 ** Author:      Ulrich Telle
 ** Created:     2020-02-28
-** Copyright:   (c) 2020-2021 Ulrich Telle
+** Copyright:   (c) 2020-2022 Ulrich Telle
 ** License:     MIT
 */
 
@@ -273396,6 +273396,7 @@ struct sqlite3mc_file
 {
   sqlite3_file base;           /* sqlite3_file I/O methods */
   sqlite3_file* pFile;         /* Real underlying OS file */
+  sqlite3mc_vfs* pVfsMC;       /* Pointer to the sqlite3mc_vfs object */
   const char* zFileName;       /* File name */
   int openFlags;               /* Open flags */
   sqlite3mc_file* pMainNext;   /* Next main db file */
@@ -273418,9 +273419,6 @@ struct sqlite3mc_vfs
 #define REALVFS(p) ((sqlite3_vfs*)(((sqlite3mc_vfs*)(p))->base.pAppData))
 #define REALFILE(p) (((sqlite3mc_file*)(p))->pFile)
 
-#define ORIGVFS(p)  ((sqlite3_vfs*)((p)->pAppData))
-#define ORIGFILE(p) ((sqlite3_file*)(((CksmFile*)(p))+1))
-
 /*
 ** Prototypes for VFS methods
 */
@@ -273474,37 +273472,8 @@ static const int walFrameHeaderSize = 24;
 static const int walFileHeaderSize = 32;
 
 /*
-** Global VFS structure of SQLite3 Multiple Ciphers VFS
+** Global I/O method structure of SQLite3 Multiple Ciphers VFS
 */
-static sqlite3mc_vfs mcVfsGlobal =
-{
-  {
-    3,                      /* iVersion */
-    0,                      /* szOsFile */
-    1024,                   /* mxPathname */
-    0,                      /* pNext */
-    SQLITE3MC_VFS_NAME,     /* zName */
-    0,                      /* pAppData */
-    mcVfsOpen,              /* xOpen */
-    mcVfsDelete,            /* xDelete */
-    mcVfsAccess,            /* xAccess */
-    mcVfsFullPathname,      /* xFullPathname */
-    mcVfsDlOpen,            /* xDlOpen */
-    mcVfsDlError,           /* xDlError */
-    mcVfsDlSym,             /* xDlSym */
-    mcVfsDlClose,           /* xDlClose */
-    mcVfsRandomness,        /* xRandomness */
-    mcVfsSleep,             /* xSleep */
-    mcVfsCurrentTime,       /* xCurrentTime */
-    mcVfsGetLastError,      /* xGetLastError */
-    mcVfsCurrentTimeInt64,  /* xCurrentTimeInt64 */
-    mcVfsSetSystemCall,     /* xSetSystemCall */
-    mcVfsGetSystemCall,     /* xGetSystemCall */
-    mcVfsNextSystemCall     /* xNextSystemCall */
-  },
-  NULL
-};
-
 static sqlite3_io_methods mcIoMethodsGlobal =
 {
   3,                          /* iVersion */
@@ -273538,10 +273507,10 @@ static sqlite3_io_methods mcIoMethodsGlobal =
 static void mcMainListAdd(sqlite3mc_file* pFile)
 {
   assert( (pFile->openFlags & SQLITE_OPEN_MAIN_DB) );
-  sqlite3_mutex_enter(mcVfsGlobal.mutex);
-  pFile->pMainNext = mcVfsGlobal.pMain;
-  mcVfsGlobal.pMain = pFile;
-  sqlite3_mutex_leave(mcVfsGlobal.mutex);
+  sqlite3_mutex_enter(pFile->pVfsMC->mutex);
+  pFile->pMainNext = pFile->pVfsMC->pMain;
+  pFile->pVfsMC->pMain = pFile;
+  sqlite3_mutex_leave(pFile->pVfsMC->mutex);
 }
 
 /*
@@ -273550,11 +273519,11 @@ static void mcMainListAdd(sqlite3mc_file* pFile)
 static void mcMainListRemove(sqlite3mc_file* pFile)
 {
   sqlite3mc_file** pMainPrev;
-  sqlite3_mutex_enter(mcVfsGlobal.mutex);
-  for (pMainPrev = &mcVfsGlobal.pMain; *pMainPrev && *pMainPrev != pFile; pMainPrev = &((*pMainPrev)->pMainNext)){}
+  sqlite3_mutex_enter(pFile->pVfsMC->mutex);
+  for (pMainPrev = &pFile->pVfsMC->pMain; *pMainPrev && *pMainPrev != pFile; pMainPrev = &((*pMainPrev)->pMainNext)){}
   if (*pMainPrev) *pMainPrev = pFile->pMainNext;
   pFile->pMainNext = 0;
-  sqlite3_mutex_leave(mcVfsGlobal.mutex);
+  sqlite3_mutex_leave(pFile->pVfsMC->mutex);
 }
 
 /*
@@ -273572,6 +273541,51 @@ static sqlite3mc_file* mcFindDbMainFileName(sqlite3mc_vfs* mcVfs, const char* zF
   return pDb;
 }
 
+/*
+** Find a pointer to the Multiple Ciphers VFS in use for a database connection.
+*/
+static sqlite3mc_vfs* mcFindVfs(sqlite3* db, const char* zDbName)
+{
+  sqlite3mc_vfs* pVfsMC = NULL;
+  if (db->pVfs && db->pVfs->xOpen == mcVfsOpen)
+  {
+    /* The top level VFS is a Multiple Ciphers VFS */
+    pVfsMC = (sqlite3mc_vfs*)(db->pVfs);
+  }
+  else
+  {
+    /*
+    ** The top level VFS is not a Multiple Ciphers VFS.
+    ** Retrieve the VFS names stack.
+    */
+    char* zVfsNameStack = 0;
+    if ((sqlite3_file_control(db, zDbName, SQLITE_FCNTL_VFSNAME, &zVfsNameStack) == SQLITE_OK) && (zVfsNameStack != NULL))
+    {
+      /* Search for the name prefix of a Multiple Ciphers VFS. */
+      char* zVfsName = strstr(zVfsNameStack, SQLITE3MC_VFS_NAME);
+      if (zVfsName != NULL)
+      {
+        /* The prefix was found, now determine the full VFS name. */
+        char* zVfsNameEnd = zVfsName + strlen(SQLITE3MC_VFS_NAME);
+        if (*zVfsNameEnd == '-')
+        {
+          for (++zVfsNameEnd; *zVfsNameEnd != '/'  && *zVfsNameEnd != 0; ++zVfsNameEnd);
+          if (*zVfsNameEnd == '/') *zVfsNameEnd = 0;
+
+          /* Find a pointer to the VFS with the determined name. */
+          sqlite3_vfs* pVfs = sqlite3_vfs_find(zVfsName);
+          if (pVfs && pVfs->xOpen == mcVfsOpen)
+          {
+            pVfsMC = (sqlite3mc_vfs*) pVfs;
+          }
+        }
+      }
+      sqlite3_free(zVfsNameStack);
+    }
+  }
+  return pVfsMC;
+}
+
 /*
 ** Find the codec of the database file
 ** corresponding to the database schema name.
@@ -273579,11 +273593,16 @@ static sqlite3mc_file* mcFindDbMainFileName(sqlite3mc_vfs* mcVfs, const char* zF
 SQLITE_PRIVATE Codec* sqlite3mcGetCodec(sqlite3* db, const char* zDbName)
 {
   Codec* codec = NULL;
-  const char* dbFileName = sqlite3_db_filename(db, zDbName);
-  sqlite3mc_file* pDbMain = mcFindDbMainFileName(&mcVfsGlobal, dbFileName);
-  if (pDbMain)
+  sqlite3mc_vfs* pVfsMC = mcFindVfs(db, zDbName);
+
+  if (pVfsMC)
   {
-    codec = pDbMain->codec;
+    const char* dbFileName = sqlite3_db_filename(db, zDbName);
+    sqlite3mc_file* pDbMain = mcFindDbMainFileName(pVfsMC, dbFileName);
+    if (pDbMain)
+    {
+      codec = pDbMain->codec;
+    }
   }
   return codec;
 }
@@ -273606,9 +273625,14 @@ SQLITE_PRIVATE Codec* sqlite3mcGetMainCodec(sqlite3* db)
 ** connection handle is actually valid, because the association between
 ** connection handles and database file handles is not maintained properly.
 */
-SQLITE_PRIVATE void sqlite3mcSetCodec(sqlite3* db, const char* zFileName, Codec* codec)
+SQLITE_PRIVATE void sqlite3mcSetCodec(sqlite3* db, const char* zDbName, const char* zFileName, Codec* codec)
 {
-  sqlite3mc_file* pDbMain = mcFindDbMainFileName(&mcVfsGlobal, zFileName);
+  sqlite3mc_file* pDbMain = NULL;
+  sqlite3mc_vfs* pVfsMC = mcFindVfs(db, zDbName);
+  if (pVfsMC)
+  {
+    pDbMain = mcFindDbMainFileName((sqlite3mc_vfs*)(db->pVfs), zFileName);
+  }
   if (pDbMain)
   {
     Codec* prevCodec = pDbMain->codec;
@@ -273677,6 +273701,7 @@ static int mcVfsOpen(sqlite3_vfs* pVfs, const char* zName, sqlite3_file* pFile,
   sqlite3mc_vfs* mcVfs = (sqlite3mc_vfs*) pVfs;
   sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
   mcFile->pFile = (sqlite3_file*) &mcFile[1];
+  mcFile->pVfsMC = mcVfs;
   mcFile->openFlags = flags;
   mcFile->zFileName = zName;
   mcFile->codec = 0;
@@ -273707,7 +273732,7 @@ static int mcVfsOpen(sqlite3_vfs* pVfs, const char* zName, sqlite3_file* pFile,
     else if (flags & SQLITE_OPEN_MAIN_JOURNAL)
     {
       const char* dbFileName = sqlite3_filename_database(zName);
-      mcFile->pMainDb = mcFindDbMainFileName(&mcVfsGlobal, dbFileName);
+      mcFile->pMainDb = mcFindDbMainFileName(mcFile->pVfsMC, dbFileName);
       mcFile->zFileName = zName;
       SQLITE3MC_DEBUG_LOG("mcVfsOpen MAIN Journal: mcFile=%p fileName=%s dbFileName=%s\n", mcFile, mcFile->zFileName, dbFileName);
     }
@@ -273722,7 +273747,7 @@ static int mcVfsOpen(sqlite3_vfs* pVfs, const char* zName, sqlite3_file* pFile,
     else if (flags & SQLITE_OPEN_SUBJOURNAL)
     {
       const char* dbFileName = sqlite3_filename_database(zName);
-      mcFile->pMainDb = mcFindDbMainFileName(&mcVfsGlobal, dbFileName);
+      mcFile->pMainDb = mcFindDbMainFileName(mcFile->pVfsMC, dbFileName);
       mcFile->zFileName = zName;
       SQLITE3MC_DEBUG_LOG("mcVfsOpen SUB Journal: mcFile=%p fileName=%s dbFileName=%s\n", mcFile, mcFile->zFileName, dbFileName);
     }
@@ -273738,7 +273763,7 @@ static int mcVfsOpen(sqlite3_vfs* pVfs, const char* zName, sqlite3_file* pFile,
     else if (flags & SQLITE_OPEN_WAL)
     {
       const char* dbFileName = sqlite3_filename_database(zName);
-      mcFile->pMainDb = mcFindDbMainFileName(&mcVfsGlobal, dbFileName);
+      mcFile->pMainDb = mcFindDbMainFileName(mcFile->pVfsMC, dbFileName);
       mcFile->zFileName = zName;
       SQLITE3MC_DEBUG_LOG("mcVfsOpen WAL Journal: mcFile=%p fileName=%s dbFileName=%s\n", mcFile, mcFile->zFileName, dbFileName);
     }
@@ -273860,7 +273885,7 @@ static int mcIoClose(sqlite3_file* pFile)
     p->codec = 0;
   }
 
-  assert(p->pMainNext == 0 && mcVfsGlobal.pMain != p);
+  assert(p->pMainNext == 0 && p->pVfsMC->pMain != p);
   rc = REALFILE(pFile)->pMethods->xClose(REALFILE(pFile));
   return rc;
 }
@@ -274522,6 +274547,14 @@ static int mcIoFileControl(sqlite3_file* pFile, int op, void* pArg)
   if (doReal)
   {
     rc = REALFILE(pFile)->pMethods->xFileControl(REALFILE(pFile), op, pArg);
+    if (rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME)
+    {
+      sqlite3mc_vfs* pVfsMC = p->pVfsMC;
+      char* zIn = *(char**)pArg;
+      char* zOut = sqlite3_mprintf("%s/%z", pVfsMC->base.zName, zIn);
+      *(char**)pArg = zOut;
+      if (zOut == 0) rc = SQLITE_NOMEM;
+    }
   }
   return rc;
 }

package/deps/sqlite3/sqlite3.h

@@ -30,10 +30,10 @@
 #define SQLITE3MC_VERSION_H_
 
 #define SQLITE3MC_VERSION_MAJOR      1
-#define SQLITE3MC_VERSION_MINOR      3
-#define SQLITE3MC_VERSION_RELEASE    10
+#define SQLITE3MC_VERSION_MINOR      4
+#define SQLITE3MC_VERSION_RELEASE    0
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.3.10"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.4.0"
 
 #endif /* SQLITE3MC_VERSION_H_ */
 /*** End of #include "sqlite3mc_version.h" ***/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-sqlite3-multiple-ciphers",
-  "version": "7.5.1",
+  "version": "7.5.2-beta.0",
   "description": "better-sqlite3 with multiple-cipher encryption support",
   "homepage": "https://github.com/m4heshd/better-sqlite3-multiple-ciphers",
   "author": "Mahesh Bandara Wijerathna (m4heshd) <m4heshd@gmail.com>",