From 35bb13da8e53b01a62b8fe45831134df95bdaffc Mon Sep 17 00:00:00 2001

From: Carlos Garcia Campos <cgarcia@igalia.com>

Date: Tue, 23 Mar 2021 15:59:16 +0100

Subject: [PATCH 01/11] Add support for building with libsoup3

Add soup2 build option, enabled by default. When disabled, it builds

against soup3 instead.

---

 meson.build                                   |  6 ++

 meson_options.txt                             |  2 +

 src/libtracker-sparql/remote/meson.build      |  8 ++-

 .../remote/tracker-remote.vala                | 37 +++++++---

 src/libtracker-sparql/tracker-endpoint-http.c | 68 +++++++++++++++++--

 5 files changed, 105 insertions(+), 16 deletions(-)

diff --git a/meson.build b/meson.build

index ce4c62261..12f93d966 100644

--- a/meson.build

+++ b/meson.build

@@ -52,6 +52,12 @@ libxml2 = dependency('libxml-2.0', version: '> 2.6')

 sqlite = dependency('sqlite3', version: '>' + sqlite_required)

 dbus = dependency('dbus-1')

+if get_option('soup2')

+  libsoup = dependency('libsoup-2.4', version: '> 2.40', required: true)

+else

+  libsoup = dependency('libsoup-3.0', version: '>= 2.99.2', required: true)

+endif

+

 libmath = cc.find_library('m', required: false)

 if get_option('man')

diff --git a/meson_options.txt b/meson_options.txt

index 99c569502..46e9c130f 100644

--- a/meson_options.txt

+++ b/meson_options.txt

@@ -26,3 +26,5 @@ option('test_utils_dir', type: 'string', value: '',

        description: 'Directory to install trackertestutils Python package (or empty to use the default)')

 option('tests_tap_protocol', type: 'boolean', value: false,

        description: 'Whether to enable TAP protocol on tests')

+option('soup2', type: 'boolean', value: true,

+       description: 'Whether to build with libsoup2')

diff --git a/src/libtracker-sparql/remote/meson.build b/src/libtracker-sparql/remote/meson.build

index f4d589d61..916b72a8a 100644

--- a/src/libtracker-sparql/remote/meson.build

+++ b/src/libtracker-sparql/remote/meson.build

@@ -7,13 +7,19 @@ sources = [

     '../../libtracker-common/libtracker-common.vapi'

 ]

+if get_option('soup2')

+  vala_defines = ['--define=SOUP2']

+else

+  vala_defines = []

+endif

+

 libtracker_remote = static_library('tracker-remote', sources,

     dependencies: tracker_remote_dependencies + [tracker_common_dep, tracker_sparql_intermediate_dep],

     c_args: tracker_c_args + [

         '-include', 'config.h',

         '-include', 'libtracker-sparql/tracker-private.h',

     ],

-    vala_args: [

+    vala_args: vala_defines + [

         '--debug',

         '--pkg', 'posix',

         # FIXME: Meson has code to add --target-glib automatically, but it

diff --git a/src/libtracker-sparql/remote/tracker-remote.vala b/src/libtracker-sparql/remote/tracker-remote.vala

index 206c237fc..50dc612f3 100644

--- a/src/libtracker-sparql/remote/tracker-remote.vala

+++ b/src/libtracker-sparql/remote/tracker-remote.vala

@@ -39,7 +39,11 @@ public class Tracker.Remote.Connection : Tracker.Sparql.Connection {

 	private Soup.Message create_request (string sparql) {

 		var uri = _base_uri + "?query=" + sparql;

 		var message = new Soup.Message ("GET", uri);

+#if SOUP2

 		var headers = message.request_headers;

+#else

+                var headers = message.get_request_headers();

+#endif

 		headers.append ("User-Agent", USER_AGENT);

 		headers.append ("Accept", JSON_TYPE);

@@ -48,15 +52,20 @@ public class Tracker.Remote.Connection : Tracker.Sparql.Connection {

 		return message;

 	}

-	private Sparql.Cursor create_cursor (Soup.Message message) throws GLib.Error, Sparql.Error {

-		string document = (string) message.response_body.flatten ().data;

+	private Sparql.Cursor create_cursor (Soup.Message message, string document) throws GLib.Error, Sparql.Error {

+#if SOUP2

+                var status_code = message.status_code;

+                var headers = message.response_headers;

+#else

+                var status_code = message.get_status();

+                var headers = message.get_response_headers();

+#endif

-		if (message.status_code != Soup.Status.OK) {

+		if (status_code != Soup.Status.OK) {

 			throw new Sparql.Error.UNSUPPORTED ("Unhandled status code %u, document is: %s",

-			                                    message.status_code, document);

+			                                    status_code, document);

 		}

-		var headers = message.response_headers;

 		var content_type = headers.get_content_type (null);

 		long length = document.length;

@@ -72,20 +81,32 @@ public class Tracker.Remote.Connection : Tracker.Sparql.Connection {

 	public override Sparql.Cursor query (string sparql, Cancellable? cancellable) throws GLib.Error, Sparql.Error, IOError {

 		var message = create_request (sparql);

+#if SOUP2

 		_session.send_message (message);

+#else

+                var body = _session.send_and_read (message);

+#endif

 		if (cancellable != null && cancellable.is_cancelled ())

 			throw new IOError.CANCELLED ("Operation was cancelled");

-		return create_cursor (message);

+#if SOUP2

+                return create_cursor (message, (string) message.response_body.flatten ().data);

+#else

+                return create_cursor (message, (string) body.get_data());

+#endif

 	}

 	public async override Sparql.Cursor query_async (string sparql, Cancellable? cancellable) throws GLib.Error, Sparql.Error, IOError {

 		var message = create_request (sparql);

+#if SOUP2

 		yield _session.send_async (message, cancellable);

-

-		return create_cursor (message);

+                return create_cursor (message, (string) message.response_body.flatten ().data);

+#else

+                var body = yield _session.send_and_read_async (message, GLib.Priority.DEFAULT, cancellable);

+                return create_cursor (message, (string) body.get_data());

+#endif

 	}

 	public override void close () {

diff --git a/src/libtracker-sparql/tracker-endpoint-http.c b/src/libtracker-sparql/tracker-endpoint-http.c

index de231ca59..5aa82b03d 100644

--- a/src/libtracker-sparql/tracker-endpoint-http.c

+++ b/src/libtracker-sparql/tracker-endpoint-http.c

@@ -41,7 +41,11 @@ struct _TrackerEndpointHttp {

 typedef struct {

 	TrackerEndpoint *endpoint;

+#if SOUP_CHECK_VERSION (2, 99, 2)

+        SoupServerMessage *message;

+#else

 	SoupMessage *message;

+#endif

 	GInputStream *istream;

 	GTask *task;

 	TrackerSerializerFormat format;

@@ -90,9 +94,11 @@ handle_request_in_thread (GTask        *task,

 	GError *error = NULL;

 	gssize count;

-	g_object_get (request->message,

-	              "response-body", &message_body,

-	              NULL);

+#if SOUP_CHECK_VERSION (2, 99, 2)

+        message_body = soup_server_message_get_response_body (request->message);

+#else

+        message_body = request->message->response_body;

+#endif

 	while (!finished) {

 		count = g_input_stream_read (request->istream,

@@ -127,12 +133,22 @@ request_finished_cb (GObject      *object,

 	endpoint_http = TRACKER_ENDPOINT_HTTP (request->endpoint);

 	if (!g_task_propagate_boolean (G_TASK (result), &error)) {

+#if SOUP_CHECK_VERSION (2, 99, 2)

+                soup_server_message_set_status (request->message, 500,

+                                                error ? error->message :

+                                                "No error message");

+#else

 		soup_message_set_status_full (request->message, 500,

 		                              error ? error->message :

 		                              "No error message");

+#endif

 		g_clear_error (&error);

 	} else {

+#if SOUP_CHECK_VERSION (2, 99, 2)

+                soup_server_message_set_status (request->message, 200, NULL);

+#else

 		soup_message_set_status (request->message, 200);

+#endif

 	}

 	soup_server_unpause_message (endpoint_http->server, request->message);

@@ -153,7 +169,11 @@ query_async_cb (GObject      *object,

 	cursor = tracker_sparql_connection_query_finish (TRACKER_SPARQL_CONNECTION (object),

 	                                                 result, &error);

 	if (error) {

+#if SOUP_CHECK_VERSION (2, 99, 2)

+                soup_server_message_set_status (request->message, 500, error->message);

+#else

 		soup_message_set_status_full (request->message, 500, error->message);

+#endif

 		soup_server_unpause_message (endpoint_http->server, request->message);

 		request_free (request);

 		return;

@@ -167,16 +187,25 @@ query_async_cb (GObject      *object,

 	g_task_run_in_thread (request->task, handle_request_in_thread);

 }

+#if SOUP_CHECK_VERSION (2, 99, 2)

+static gboolean

+pick_format (SoupServerMessage       *message,

+             TrackerSerializerFormat *format)

+#else

 static gboolean

 pick_format (SoupMessage             *message,

              TrackerSerializerFormat *format)

+#endif

 {

 	SoupMessageHeaders *request_headers, *response_headers;

-	g_object_get (message,

-	              "request-headers", &request_headers,

-	              "response-headers", &response_headers,

-	              NULL);

+#if SOUP_CHECK_VERSION (2, 99, 2)

+        request_headers = soup_server_message_get_request_headers (message);

+        response_headers = soup_server_message_get_response_headers (message);

+#else

+        request_headers = message->request_headers;

+        response_headers = message->response_headers;

+#endif

 	if (soup_message_headers_header_contains (request_headers, "Accept", JSON_TYPE)) {

 		soup_message_headers_set_content_type (response_headers, JSON_TYPE, NULL);

@@ -193,6 +222,14 @@ pick_format (SoupMessage             *message,

 	return FALSE;

 }

+#if SOUP_CHECK_VERSION (2, 99, 2)

+static void

+server_callback (SoupServer        *server,

+	         SoupServerMessage *message,

+                 const char        *path,

+	         GHashTable        *query,

+                 gpointer           user_data)

+#else

 static void

 server_callback (SoupServer        *server,

                  SoupMessage       *message,

@@ -200,6 +237,7 @@ server_callback (SoupServer        *server,

                  GHashTable        *query,

                  SoupClientContext *client,

                  gpointer           user_data)

+#endif

 {

 	TrackerEndpoint *endpoint = user_data;

 	TrackerSparqlConnection *conn;

@@ -209,25 +247,41 @@ server_callback (SoupServer        *server,

 	const gchar *sparql;

 	Request *request;

+#if SOUP_CHECK_VERSION (2, 99, 2)

+        remote_address = soup_server_message_get_remote_address (message);

+#else

 	remote_address = soup_client_context_get_remote_address (client);

+#endif

 	if (remote_address) {

 		g_signal_emit (endpoint, signals[BLOCK_REMOTE_ADDRESS], 0,

 		               remote_address, &block);

 	}

 	if (block) {

+#if SOUP_CHECK_VERSION (2, 99, 2)

+                soup_server_message_set_status (message, 500, "Remote address disallowed");

+#else

 		soup_message_set_status_full (message, 500, "Remote address disallowed");

+#endif

 		return;

 	}

 	sparql = g_hash_table_lookup (query, "query");

 	if (!sparql) {

+#if SOUP_CHECK_VERSION (2, 99, 2)

+                soup_server_message_set_status (message, 500, "No query given");

+#else

 		soup_message_set_status_full (message, 500, "No query given");

+#endif

 		return;

 	}

 	if (!pick_format (message, &format)) {

+#if SOUP_CHECK_VERSION (2, 99, 2)

+                soup_server_message_set_status (message, 500, "No recognized accepted formats");

+#else

 		soup_message_set_status_full (message, 500, "No recognized accepted formats");

+#endif

 		return;

 	}

-- 

2.38.1

From da2c34a2d7b7cb717360653c627531d04607a4ee Mon Sep 17 00:00:00 2001

From: Carlos Garnacho <carlosg@gnome.org>

Date: Wed, 28 Jul 2021 12:53:47 +0200

Subject: [PATCH 02/11] libtracker-sparql: Allow building against multiple

 versions of libsoup

Tracker is an innocent bystander hindering libsoup3 port, since the

libsoup2/3->tracker->gtk3 dependency chain imposes a libsoup version,

graphical applications using libsoup cannot port at their own pace.

Make our remote code (connection & endpoint) be a private module

that is built against both versions of libsoup (if found), then we

pick one at runtime, with a preference on libsoup3 if libsoup2 .so

file is not seen in the already loaded libraries.

This patch should be reverted ASAP, once we can consider libsoup2

deprecated.

Fixes: https://gitlab.gnome.org/GNOME/tracker/-/issues/320

---

 config.h.meson.in                             |   3 +

 meson.build                                   |  24 +++-

 meson_options.txt                             |   2 -

 src/libtracker-sparql/meson.build             |  60 ++++++++-

 src/libtracker-sparql/remote/meson.build      |  36 ------

 src/libtracker-sparql/tracker-backend.vala    |   5 -

 src/libtracker-sparql/tracker-remote-module.c | 115 ++++++++++++++++++

 7 files changed, 192 insertions(+), 53 deletions(-)

 delete mode 100644 src/libtracker-sparql/remote/meson.build

 create mode 100644 src/libtracker-sparql/tracker-remote-module.c

diff --git a/config.h.meson.in b/config.h.meson.in

index 9d1439e91..4aff15f72 100644

--- a/config.h.meson.in

+++ b/config.h.meson.in

@@ -57,3 +57,6 @@

 /* Define to the Tracker minor version */

 #mesondefine TRACKER_MINOR_VERSION

+

+/* Whether RTLD_NOLOAD is defined */

+#mesondefine HAVE_RTLD_NOLOAD

diff --git a/meson.build b/meson.build

index 12f93d966..3b487835b 100644

--- a/meson.build

+++ b/meson.build

@@ -51,14 +51,23 @@ libsoup = dependency('libsoup-2.4', version: '> 2.40', required: true)

 libxml2 = dependency('libxml-2.0', version: '> 2.6')

 sqlite = dependency('sqlite3', version: '>' + sqlite_required)

 dbus = dependency('dbus-1')

+libsoup2 = dependency('libsoup-2.4', version: '> 2.40', required: false)

+libsoup3 = dependency('libsoup-3.0', version: '>= 2.99.2', required: false)

-if get_option('soup2')

-  libsoup = dependency('libsoup-2.4', version: '> 2.40', required: true)

-else

-  libsoup = dependency('libsoup-3.0', version: '>= 2.99.2', required: true)

+libmath = cc.find_library('m', required: false)

+libdl = cc.find_library('dl')

+

+soup_backends = ''

+if libsoup2.found()

+  soup_backends = soup_backends + '2.x '

+endif

+if libsoup3.found()

+  soup_backends = soup_backends + '3.x '

 endif

-libmath = cc.find_library('m', required: false)

+if not libsoup2.found() and not libsoup3.found()

+  error('At least one of libsoup2 or libsoup3 is required')

+endif

 if get_option('man')

   asciidoc = find_program('asciidoc')

@@ -272,6 +281,10 @@ conf.set('TRACKER_MICRO_VERSION', tracker_micro_version)

 conf.set('TRACKER_INTERFACE_AGE', 0)

 conf.set('TRACKER_BINARY_AGE', 100 * tracker_minor_version + tracker_micro_version)

+# Check for RTLD_NOLOAD

+have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD')

+conf.set('HAVE_RTLD_NOLOAD', have_rtld_noload)

+

 # Config that goes in some other generated files (.desktop, .service, etc)

 conf.set('abs_top_builddir', meson.current_build_dir())

 conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir')))

@@ -362,6 +375,7 @@ summary = [

   '    Unicode support library:                ' + unicode_library_name,

   '    Use external FTS module:                ' + (not sqlite3_has_builtin_fts5).to_string(),

   '    Build with Stemming support:            ' + have_libstemmer.to_string(),

+  '    Libsoup backends:                       ' + soup_backends,

 ]

 if get_option('bash_completion')

diff --git a/meson_options.txt b/meson_options.txt

index 46e9c130f..99c569502 100644

--- a/meson_options.txt

+++ b/meson_options.txt

@@ -26,5 +26,3 @@ option('test_utils_dir', type: 'string', value: '',

        description: 'Directory to install trackertestutils Python package (or empty to use the default)')

 option('tests_tap_protocol', type: 'boolean', value: false,

        description: 'Whether to enable TAP protocol on tests')

-option('soup2', type: 'boolean', value: true,

-       description: 'Whether to build with libsoup2')

diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build

index 570f4b83b..87b8167cf 100644

--- a/src/libtracker-sparql/meson.build

+++ b/src/libtracker-sparql/meson.build

@@ -20,7 +20,6 @@ libtracker_sparql_c_sources = files(

     'tracker-cursor.c',

     'tracker-endpoint.c',

     'tracker-endpoint-dbus.c',

-    'tracker-endpoint-http.c',

     'tracker-error.c',

     'tracker-namespace-manager.c',

     'tracker-notifier.c',

@@ -54,7 +53,7 @@ libtracker_sparql_c_public_headers = files(

 libtracker_sparql_intermediate = static_library('tracker-sparql-intermediate',

     enum_types,

     libtracker_sparql_c_sources,

-    dependencies: [tracker_common_dep, json_glib, libxml2, libsoup],

+    dependencies: [tracker_common_dep, json_glib, libxml2],

     gnu_symbol_visibility: 'hidden',

 )

@@ -63,7 +62,7 @@ sparqlinc = [include_directories('.'), meson.current_build_dir()]

 tracker_sparql_intermediate_dep = declare_dependency(

     link_with: [libtracker_sparql_intermediate],

     include_directories: [srcinc, include_directories('.')],

-    dependencies: [ tracker_sparql_vapi_dep ],

+    dependencies: [ tracker_sparql_vapi_dep, tracker_data_dep ],

     sources: enum_types[1],

 )

@@ -88,13 +87,61 @@ install_data(

 subdir('bus')

 subdir('direct')

-subdir('remote')

+

+tracker_remote_dependencies = [json_glib, libxml2]

+

+remote_sources = [

+    'tracker-endpoint-http.c',

+    'remote/tracker-json-cursor.vala',

+    'remote/tracker-xml-cursor.vala',

+    'remote/tracker-remote.vala',

+]

+

+if libsoup2.found()

+    libtracker_remote_soup2 = shared_module('tracker-remote-soup2', remote_sources,

+        dependencies: tracker_remote_dependencies + [tracker_common_dep, tracker_sparql_intermediate_dep, libsoup2],

+        c_args: tracker_c_args + [

+            '-include', 'config.h',

+            '-include', 'libtracker-sparql/tracker-private.h',

+        ],

+        vala_args: [

+            '--debug',

+            '--pkg', 'posix',

+            # FIXME: Meson has code to add --target-glib automatically, but it

+            # doesn't seem to work here.

+            '--target-glib', glib_required,

+            '--define=SOUP2',

+        ],

+        install: true,

+        install_dir: tracker_internal_libs_dir,

+    )

+endif

+

+if libsoup3.found()

+    libtracker_remote_soup3 = shared_module('tracker-remote-soup3', remote_sources,

+        dependencies: tracker_remote_dependencies + [tracker_common_dep, tracker_sparql_intermediate_dep, libsoup3],

+        c_args: tracker_c_args + [

+            '-include', 'config.h',

+            '-include', 'libtracker-sparql/tracker-private.h',

+        ],

+        vala_args: [

+            '--debug',

+            '--pkg', 'posix',

+            # FIXME: Meson has code to add --target-glib automatically, but it

+            # doesn't seem to work here.

+            '--target-glib', glib_required,

+        ],

+        install: true,

+        install_dir: tracker_internal_libs_dir,

+    )

+endif

 libtracker_sparql = library('tracker-sparql-' + tracker_api_version,

     '../libtracker-common/libtracker-common.vapi',

     '../libtracker-data/libtracker-data.vapi',

     'direct/tracker-direct.vapi',

     'tracker-backend.vala',

+    'tracker-remote-module.c',

     tracker_gresources,

     gnu_symbol_visibility: 'hidden',

@@ -107,11 +154,14 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version,

     c_args: [

 	'-include', 'libtracker-sparql/tracker-private.h',

+        '-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir),

+        '-DBUILD_LIBDIR="@0@"'.format(meson.current_build_dir()),

+        '-DBUILDROOT="@0@"'.format(meson.project_build_root()),

     ],

     link_whole: [libtracker_sparql_intermediate],

-    dependencies: [tracker_common_dep, tracker_sparql_remote_dep, tracker_sparql_bus_dep, tracker_sparql_direct_dep, tracker_sparql_vapi_dep],

+    dependencies: [tracker_common_dep, tracker_sparql_bus_dep, tracker_sparql_direct_dep, tracker_sparql_vapi_dep, gmodule, libdl],

 )

 tracker_sparql_dep = declare_dependency(

diff --git a/src/libtracker-sparql/remote/meson.build b/src/libtracker-sparql/remote/meson.build

deleted file mode 100644

index 916b72a8a..000000000

--- a/src/libtracker-sparql/remote/meson.build

+++ /dev/null

@@ -1,36 +0,0 @@

-tracker_remote_dependencies = [json_glib, libsoup, libxml2]

-

-sources = [

-    'tracker-json-cursor.vala',

-    'tracker-xml-cursor.vala',

-    'tracker-remote.vala',

-    '../../libtracker-common/libtracker-common.vapi'

-]

-

-if get_option('soup2')

-  vala_defines = ['--define=SOUP2']

-else

-  vala_defines = []

-endif

-

-libtracker_remote = static_library('tracker-remote', sources,

-    dependencies: tracker_remote_dependencies + [tracker_common_dep, tracker_sparql_intermediate_dep],

-    c_args: tracker_c_args + [

-        '-include', 'config.h',

-        '-include', 'libtracker-sparql/tracker-private.h',

-    ],

-    vala_args: vala_defines + [

-        '--debug',

-        '--pkg', 'posix',

-        # FIXME: Meson has code to add --target-glib automatically, but it

-        # doesn't seem to work here.

-        '--target-glib', glib_required,

-    ],

-    gnu_symbol_visibility: 'hidden',

-)

-

-tracker_sparql_remote_dep = declare_dependency(

-    link_with: libtracker_remote,

-    include_directories: include_directories('.'),

-    dependencies: tracker_remote_dependencies,

-)

diff --git a/src/libtracker-sparql/tracker-backend.vala b/src/libtracker-sparql/tracker-backend.vala

index ae6313118..af1102d5a 100644

--- a/src/libtracker-sparql/tracker-backend.vala

+++ b/src/libtracker-sparql/tracker-backend.vala

@@ -22,11 +22,6 @@

  * effect of printing the 'help' message if TRACKER_DEBUG=help is set.

  */

-public static Tracker.Sparql.Connection tracker_sparql_connection_remote_new (string url_base) {

-	Tracker.get_debug_flags ();

-	return new Tracker.Remote.Connection (url_base);

-}

-

 public static Tracker.Sparql.Connection tracker_sparql_connection_bus_new (string service, string? object_path, DBusConnection? conn) throws Tracker.Sparql.Error, IOError, DBusError, GLib.Error {

 	Tracker.get_debug_flags ();

diff --git a/src/libtracker-sparql/tracker-remote-module.c b/src/libtracker-sparql/tracker-remote-module.c

new file mode 100644

index 000000000..2ca0fd181

--- /dev/null

+++ b/src/libtracker-sparql/tracker-remote-module.c

@@ -0,0 +1,115 @@

+/* Yuck */

+

+#include "config.h"

+

+#include <gio/gio.h>

+#include <tracker-sparql.h>

+#include <dlfcn.h>

+

+#define LIBSOUP_2_SONAME "libsoup-2.4.so.1"

+

+static gboolean initialized = FALSE;

+

+GType (* remote_endpoint_get_type) (void) = NULL;

+

+TrackerEndpoint * (* remote_endpoint_new) (TrackerSparqlConnection  *sparql_connection,

+                                           guint                     port,

+                                           GTlsCertificate          *certificate,

+                                           GCancellable             *cancellable,

+                                           GError                  **error) = NULL;

+TrackerSparqlConnection * (* remote_connection_new) (const gchar *url_base) = NULL;

+

+static void

+tracker_init_remote (void)

+{

+	const char *modules[3] = { 0 };

+	gpointer handle = NULL;

+	gint i = 0;

+

+	if (initialized)

+		return;

+

+	g_assert (g_module_supported ());

+

+#ifdef HAVE_RTLD_NOLOAD

+	if ((handle = dlopen (LIBSOUP_2_SONAME, RTLD_NOW | RTLD_NOLOAD))) {

+		/* Force load of soup2 module */

+		modules[0] = "libtracker-remote-soup2.so";

+	} else

+#endif

+	{

+		modules[0] = "libtracker-remote-soup3.so";

+		modules[1] = "libtracker-remote-soup2.so";

+	}

+

+	g_clear_pointer (&handle, dlclose);

+

+	for (i = 0; modules[i]; i++) {

+		GModule *remote_module;

+		gchar *module_path;

+

+		if (g_strcmp0 (g_get_current_dir (), BUILDROOT) == 0) {

+			/* Detect in-build runtime of this code, this may happen

+			 * building introspection information or running tests.

+			 * We want the in-tree modules to be loaded then.

+			 */

+			module_path = g_strdup_printf (BUILD_LIBDIR "/%s", modules[i]);

+		} else {

+			module_path = g_strdup_printf (PRIVATE_LIBDIR "/%s", modules[i]);

+		}

+

+		remote_module = g_module_open (module_path,

+		                               G_MODULE_BIND_LAZY |

+		                               G_MODULE_BIND_LOCAL);

+		g_free (module_path);

+

+		if (!remote_module)

+			continue;

+

+		if (!g_module_symbol (remote_module, "tracker_endpoint_http_get_type", (gpointer *) &remote_endpoint_get_type) ||

+		    !g_module_symbol (remote_module, "tracker_endpoint_http_new", (gpointer *) &remote_endpoint_new) ||

+		    !g_module_symbol (remote_module, "tracker_remote_connection_new", (gpointer *) &remote_connection_new)) {

+			g_clear_pointer (&remote_module, g_module_close);

+			continue;

+		}

+

+		g_module_make_resident (remote_module);

+		g_module_close (remote_module);

+		initialized = TRUE;

+		return;

+	}

+

+	g_assert_not_reached ();

+}

+

+GType

+tracker_endpoint_http_get_type (void)

+{

+	tracker_init_remote ();

+

+	return remote_endpoint_get_type ();

+}

+

+TrackerEndpointHttp *

+tracker_endpoint_http_new (TrackerSparqlConnection  *sparql_connection,

+                           guint                     port,

+                           GTlsCertificate          *certificate,

+                           GCancellable             *cancellable,

+                           GError                  **error)

+{

+	tracker_init_remote ();

+

+	return (TrackerEndpointHttp *) remote_endpoint_new (sparql_connection,

+	                                                    port,

+	                                                    certificate,

+	                                                    cancellable,

+	                                                    error);

+}

+

+TrackerSparqlConnection *

+tracker_sparql_connection_remote_new (const gchar *url_base)

+{

+	tracker_init_remote ();

+

+	return remote_connection_new (url_base);

+}

-- 

2.38.1

From 52324bd629a5446594717a2e782a85913821b447 Mon Sep 17 00:00:00 2001

From: Carlos Garnacho <carlosg@gnome.org>

Date: Wed, 10 Nov 2021 23:16:37 +0200

Subject: [PATCH 03/11] libtracker-sparql: Escape query in remote connection

This is embedded in the URI, so should get proper escaping to avoid

misinterpretation with certain characters.

---

 src/libtracker-sparql/remote/tracker-remote.vala | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libtracker-sparql/remote/tracker-remote.vala b/src/libtracker-sparql/remote/tracker-remote.vala

index 50dc612f3..252d70a40 100644