Introduce CNID backend built on SQLite, GitHub #1177

Based on the MySQL CNID backend by Ralph Boehme.
In part written by Christopher Kobayashi.

Signed-off-by: Daniel Markstedt <[email protected]>

Author: rdmark

.github/workflows/build.yml

@@ -74,6 +74,7 @@ jobs:
             perl \
             pkgconfig \
             rpcsvc-proto-dev \
+            sqlite-dev \
             talloc-dev \
             tinysparql-dev
       - name: Configure
@@ -125,6 +126,7 @@ jobs:
             po4a \
             pkgconfig \
             rpcsvc-proto \
+            sqlite \
             talloc \
             tinysparql
       - name: Configure
@@ -180,6 +182,7 @@ jobs:
             libldap2-dev \
             libmariadb-dev \
             libpam0g-dev \
+            libsqlite3-dev \
             libtalloc-dev \
             libtirpc-dev \
             libtracker-sparql-3.0-dev \
@@ -250,6 +253,7 @@ jobs:
             perl \
             perl-Net-DBus \
             quota-devel \
+            sqlite-devel \
             systemd \
             systemtap-sdt-devel \
             tracker \
@@ -361,7 +365,8 @@ jobs:
             iniparser \
             mariadb \
             meson \
-            openldap
+            openldap \
+            sqlite
       - name: Configure
         run: |
           meson setup build \
@@ -419,6 +424,7 @@ jobs:
               py39-gdbm \
               py39-sqlite3 \
               py39-tkinter \
+              sqlite \
               talloc \
               tracker3
           run: |
@@ -462,6 +468,7 @@ jobs:
               p5-Net-DBus \
               perl5 \
               pkgconf \
+              sqlite3 \
               talloc \
               tracker3
           run: |
@@ -516,6 +523,7 @@ jobs:
               p5-Net-DBus \
               perl \
               pkg-config \
+              sqlite3 \
               talloc
           run: |
             set -e
@@ -569,6 +577,7 @@ jobs:
               openpam \
               p5-Net-DBus \
               pkgconf \
+              sqlite \
               tracker3
           run: |
             set -e
@@ -618,6 +627,7 @@ jobs:
               libgcrypt \
               meson \
               mysql-client \
+              sqlite3 \
               talloc
           run: |
             set -e
@@ -666,7 +676,8 @@ jobs:
               libgcrypt \
               ninja \
               pkg-config \
-              python/pip
+              python/pip \
+              sqlite-3
             pip install meson
             curl -O https://gitlab.com/iniparser/iniparser/-/archive/v4.2.5/iniparser-v4.2.5.tar.gz
             tar xzf iniparser-v4.2.5.tar.gz

etc/afpd/afp_options.c

@@ -78,6 +78,9 @@ static void show_version( void )
 #endif
 #ifdef CNID_BACKEND_MYSQL
 	printf( "mysql " );
+#endif
+#ifdef CNID_BACKEND_SQLITE
+	printf( "sqlite " );
 #endif
 	puts( "" );
 }

etc/cnid_dbd/cmd_dbd.c

@@ -247,7 +247,10 @@ int main(int argc, char **argv)
     }
 
     /* open volume */
-    if (STRCMP(vol->v_cnidscheme, != , "dbd") && STRCMP(vol->v_cnidscheme, != , "mysql")) {
+    if (STRCMP(vol->v_cnidscheme, != , "dbd")
+            && STRCMP(vol->v_cnidscheme, != , "mysql")
+            && STRCMP(vol->v_cnidscheme, != , "sqlite")
+            ) {
         dbd_log(LOGSTD, "\"%s\" isn't a \"dbd\" CNID volume", vol->v_path);
         exit(EXIT_FAILURE);
     }

etc/cnid_dbd/meson.build

@@ -19,12 +19,16 @@ if use_dbd_backend
 
     cnid_dbd_deps = [iniparser]
 
+    if have_iconv
+        cnid_dbd_deps += iconv
+    endif
+
     if use_mysql_backend
         cnid_dbd_deps += mysqlclient
     endif
 
-    if have_iconv
-        cnid_dbd_deps += iconv
+    if use_sqlite_backend
+        cnid_dbd_deps += sqlite_deps
     endif
 
     cnid_metad_sources = ['cnid_metad.c', 'usockfd.c', 'db_param.c']

include/atalk/cnid_sqlite_private.h

@@ -0,0 +1,20 @@
+#ifndef _ATALK_CNID_SQLITE_PRIVATE_H
+#define _ATALK_CNID_SQLITE_PRIVATE_H 1
+
+#include <atalk/cnid_private.h>
+#include <atalk/uuid.h>
+
+#define CNID_SQLITE_FLAG_DEPLETED (1 << 0) /* CNID set overflowed */
+
+typedef struct CNID_sqlite_private {
+    struct vol *vol;
+    uint32_t      cnid_sqlite_flags;
+    sqlite3      *cnid_sqlite_con;
+    char         *cnid_sqlite_voluuid_str;
+    cnid_t        cnid_sqlite_hint;
+    sqlite3_stmt *cnid_lookup_stmt;
+    sqlite3_stmt *cnid_add_stmt;
+    sqlite3_stmt *cnid_put_stmt;
+} CNID_sqlite_private;
+
+#endif

libatalk/cnid/cnid_init.c

@@ -44,6 +44,10 @@ extern struct _cnid_module cnid_dbd_module;
 extern struct _cnid_module cnid_mysql_module;
 #endif
 
+#ifdef CNID_BACKEND_SQLITE
+extern struct _cnid_module cnid_sqlite_module;
+#endif
+
 void cnid_init(void)
 {
 #ifdef CNID_BACKEND_LAST
@@ -57,4 +61,8 @@ void cnid_init(void)
 #ifdef CNID_BACKEND_MYSQL
     cnid_register(&cnid_mysql_module);
 #endif
+
+#ifdef CNID_BACKEND_SQLITE
+    cnid_register(&cnid_sqlite_module);
+#endif
 }

libatalk/cnid/meson.build

@@ -14,6 +14,12 @@ if use_mysql_backend
     libcnid_deps += mysql_deps
 endif
 
+if use_sqlite_backend
+    subdir('sqlite')
+    libcnid_libs += libcnid_sqlite
+    libcnid_deps += sqlite_deps
+endif
+
 cnid_sources = ['cnid_init.c', 'cnid.c']
 
 libcnid = static_library(

libatalk/cnid/sqlite/cnid_sqlite.c

@@ -0,0 +1,12 @@
+libcnid_sqlite_sources = ['cnid_sqlite.c']
+
+libcnid_sqlite = static_library(
+    'cnid_sqlite',
+    libcnid_sqlite_sources,
+    include_directories: root_includes,
+    dependencies: sqlite_deps,
+    c_args: statedir,
+    install: false,
+)
+
+install_emptydir(localstatedir / 'netatalk/CNID/sqlite', install_mode: 'rwxrwxrwx')

libatalk/cnid/sqlite/meson.build

@@ -1533,6 +1533,18 @@ if get_option('with-cnid-mysql-backend')
     endif
 endif
 
+# Check for sqlite CNID backend
+
+sqlite_deps = dependency('sqlite3', required: false)
+
+use_sqlite_backend = false
+
+if get_option('with-cnid-sqlite-backend') and sqlite_deps.found()
+    use_sqlite_backend = true
+    cnid_backends += ' sqlite'
+        cdata.set('CNID_BACKEND_SQLITE', 1)
+endif
+
 compiled_backends = '"' + cnid_backends + '"'
 cdata.set('compiled_backends', compiled_backends)
 

meson.build

@@ -19,6 +19,9 @@
 /* whether the MySQL CNID module is available */
 #mesondefine CNID_BACKEND_MYSQL
 
+/* whether the SQLite CNID module is available */
+#mesondefine CNID_BACKEND_SQLITE
+
 /* Path to dbus-daemon */
 #mesondefine DBUS_DAEMON_PATH
 

meson_config.h

@@ -33,6 +33,12 @@ option(
     value: true,
     description: 'Compile MySQL CNID scheme',
 )
+option(
+    'with-cnid-sqlite-backend',
+    type: 'boolean',
+    value: true,
+    description: 'Compile SQLite CNID scheme',
+)
 option(
     'with-cracklib',
     type: 'boolean',