Libquic integration

.clang-format

@@ -28,7 +28,7 @@ SpacesInAngles: 'false'
 SpacesInContainerLiterals: 'false'
 SpacesInParentheses: 'false'
 SpacesInSquareBrackets: 'false'
-Standard: c++17
+Standard: c++20
 UseTab: Never
 SortIncludes: true
 ColumnLimit: 100

.drone.jsonnet

@@ -10,7 +10,7 @@ local submodules = {
 
 local apt_get_quiet = 'apt-get -o=Dpkg::Use-Pty=0 -q';
 
-local libngtcp2_deps = ['libgnutls28-dev', 'libprotobuf-dev'];
+local libngtcp2_deps = ['libgnutls28-dev', 'libprotobuf-dev', 'libngtcp2-dev', 'libngtcp2-crypto-gnutls-dev'];
 
 local default_deps_nocxx = [
   'nlohmann-json3-dev',
@@ -375,12 +375,14 @@ local static_build(name,
                'libsession-util-windows-x64-TAG.zip',
                deps=['g++-mingw-w64-x86-64-posix'],
                cmake_extra='-DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw-x86-64-toolchain.cmake'),
+  /*  currently broken:
   static_build('Static Windows x86',
                docker_base + 'debian-win32-cross',
                'libsession-util-windows-x86-TAG.zip',
                deps=['g++-mingw-w64-i686-posix'],
                allow_fail=true,
                cmake_extra='-DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw-i686-toolchain.cmake'),
+  */
   debian_pipeline(
     'Static Android',
     docker_base + 'android',

.gitignore

@@ -2,4 +2,4 @@
 /compile_commands.json
 /.cache/
 /.vscode/
-*.DS_Store
+.DS_STORE

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "external/oxen-encoding"]
-	path = external/oxen-encoding
-	url = https://github.com/session-foundation/oxen-encoding.git
 [submodule "external/libsodium-internal"]
     path = external/libsodium-internal
     url = https://github.com/session-foundation/libsodium-internal.git
@@ -16,6 +13,9 @@
 [submodule "external/nlohmann-json"]
 	path = external/nlohmann-json
 	url = https://github.com/nlohmann/json.git
+[submodule "external/oxen-libquic"]
+	path = external/oxen-libquic
+	url = https://github.com/oxen-io/oxen-libquic.git
 [submodule "external/protobuf"]
 	path = external/protobuf
 	url = https://github.com/protocolbuffers/protobuf.git

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14...3.23)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Has to be set before `project()`, and ignored on non-macos:
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13 CACHE STRING "macOS deployment target (Apple clang only)")
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "macOS deployment target (Apple clang only)")
 
 set(LANGS C CXX)
 find_program(CCACHE_PROGRAM ccache)
@@ -16,7 +16,6 @@ if(CCACHE_PROGRAM)
   endforeach()
 endif()
 
-
 project(libsession-util
     VERSION 1.2.0
     DESCRIPTION "Session client utility library"
@@ -41,7 +40,7 @@ else()
 endif()
 
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -81,7 +80,7 @@ option(STATIC_LIBSTD "Statically link libstdc++/libgcc" ${default_static_libstd}
 
 option(USE_LTO "Use Link-Time Optimization" ${use_lto_default})
 
-# Provide this as an option for now because GMP and iOS are sometimes unhappy with each other.
+# Provide this as an option for now because GMP and Desktop are sometimes unhappy with each other.
 option(ENABLE_ONIONREQ "Build with onion request functionality" ON)
 
 if(USE_LTO)
@@ -118,6 +117,21 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 
 add_subdirectory(external)
+
+if(ENABLE_ONIONREQ)
+    if(NOT TARGET nettle::nettle)
+        if(BUILD_STATIC_DEPS)
+            message(FATAL_ERROR "Internal error: nettle::nettle target (expected via libquic BUILD_STATIC_DEPS) not found")
+        else()
+            find_package(PkgConfig REQUIRED)
+            pkg_check_modules(NETTLE REQUIRED IMPORTED_TARGET nettle)
+            add_library(nettle INTERFACE)
+            target_link_libraries(nettle INTERFACE PkgConfig::NETTLE)
+            add_library(nettle::nettle ALIAS nettle)
+        endif()
+    endif()
+endif()
+
 add_subdirectory(src)
 add_subdirectory(proto)
 

cmake/AddStaticBundleLib.cmake

@@ -1,14 +1,36 @@
 
 set(LIBSESSION_STATIC_BUNDLE_LIBS "" CACHE INTERNAL "list of libs to go into the static bundle lib")
 
+function(_libsession_static_bundle_append tgt)
+    list(APPEND LIBSESSION_STATIC_BUNDLE_LIBS "${tgt}")
+    set(LIBSESSION_STATIC_BUNDLE_LIBS "${LIBSESSION_STATIC_BUNDLE_LIBS}" CACHE INTERNAL "")
+endfunction()
+
 # Call as:
 #
 #     libsession_static_bundle(target [target2 ...])
 #
 # to append the given target(s) to the list of libraries that will be combined to make the static
 # bundled libsession-util.a.
 function(libsession_static_bundle)
-    list(APPEND LIBSESSION_STATIC_BUNDLE_LIBS "${ARGN}")
-    list(REMOVE_DUPLICATES LIBSESSION_STATIC_BUNDLE_LIBS)
-    set(LIBSESSION_STATIC_BUNDLE_LIBS "${LIBSESSION_STATIC_BUNDLE_LIBS}" CACHE INTERNAL "")
+    foreach(tgt IN LISTS ARGN)
+        if(TARGET "${tgt}" AND NOT "${tgt}" IN_LIST LIBSESSION_STATIC_BUNDLE_LIBS)
+            get_target_property(tgt_type ${tgt} TYPE)
+
+            if(tgt_type STREQUAL STATIC_LIBRARY)
+                message(STATUS "Adding ${tgt} to libsession-util bundled library list")
+                _libsession_static_bundle_append("${tgt}")
+            endif()
+
+            if(tgt_type STREQUAL INTERFACE_LIBRARY)
+                get_target_property(tgt_link_deps ${tgt} INTERFACE_LINK_LIBRARIES)
+            else()
+                get_target_property(tgt_link_deps ${tgt} LINK_LIBRARIES)
+            endif()
+
+            if(tgt_link_deps)
+                libsession_static_bundle(${tgt_link_deps})
+            endif()
+        endif()
+    endforeach()
 endfunction()

cmake/GenVersion.cmake

@@ -41,14 +41,17 @@ else()
         OUTPUT_VARIABLE git_tag
         OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    if(git_tag)
+    if(git_tag AND git_tag MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+$")
         message(STATUS "${git_commit} is tagged (${git_tag}); tagging version as 'release'")
         set(vfull "v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
         set(PROJECT_VERSION_TAG "release")
 
         if (NOT git_tag STREQUAL "${vfull}")
             message(FATAL_ERROR "This commit is tagged, but the tag (${git_tag}) does not match the project version (${vfull})!")
         endif()
+    elseif(git_tag)
+        message(WARNING "Did not recognize git tag (${git_tag}) for ${git_commit}; tagging with commit hash")
+        set(PROJECT_VERSION_TAG "${git_commit}")
     else()
         message(STATUS "Did not find a git tag for ${git_commit}; tagging version with the commit hash")
         set(PROJECT_VERSION_TAG "${git_commit}")

cmake/StaticBuild.cmake

@@ -5,21 +5,6 @@
 
 set(LOCAL_MIRROR "" CACHE STRING "local mirror path/URL for lib downloads")
 
-set(GMP_VERSION 6.3.0 CACHE STRING "gmp version")
-set(GMP_MIRROR ${LOCAL_MIRROR} https://gmplib.org/download/gmp
-    CACHE STRING "gmp mirror(s)")
-set(GMP_SOURCE gmp-${GMP_VERSION}.tar.xz)
-set(GMP_HASH SHA512=e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2
-    CACHE STRING "gmp source hash")
-
-set(NETTLE_VERSION 3.9.1 CACHE STRING "nettle version")
-set(NETTLE_MIRROR ${LOCAL_MIRROR} https://ftp.gnu.org/gnu/nettle
-    CACHE STRING "nettle mirror(s)")
-set(NETTLE_SOURCE nettle-${NETTLE_VERSION}.tar.gz)
-set(NETTLE_HASH SHA512=5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced
-    CACHE STRING "nettle source hash")
-
-
 include(ExternalProject)
 
 set(DEPS_DESTDIR ${CMAKE_BINARY_DIR}/static-deps)
@@ -230,32 +215,6 @@ elseif(gmp_build_host STREQUAL "")
     set(gmp_build_host "--build=${CMAKE_LIBRARY_ARCHITECTURE}")
 endif()
 
-if(ENABLE_ONIONREQ)
-    build_external(gmp
-        CONFIGURE_COMMAND ./configure ${gmp_build_host} --disable-shared --prefix=${DEPS_DESTDIR} --with-pic
-            "CC=${deps_cc}" "CXX=${deps_cxx}" "CFLAGS=${deps_CFLAGS}${apple_cflags_arch}" "CXXFLAGS=${deps_CXXFLAGS}${apple_cxxflags_arch}"
-            "LDFLAGS=${apple_ldflags_arch}" ${cross_rc} CC_FOR_BUILD=cc CPP_FOR_BUILD=cpp
-    )
-    add_static_target(gmp gmp_external libgmp.a)
-
-    build_external(nettle
-        CONFIGURE_COMMAND ./configure ${gmp_build_host} --disable-shared --prefix=${DEPS_DESTDIR} --libdir=${DEPS_DESTDIR}/lib
-            --with-pic --disable-openssl
-            "CC=${deps_cc}" "CXX=${deps_cxx}"
-            "CFLAGS=${deps_CFLAGS}${apple_cflags_arch}" "CXXFLAGS=${deps_CXXFLAGS}${apple_cxxflags_arch}"
-            "CPPFLAGS=-I${DEPS_DESTDIR}/include"
-            "LDFLAGS=-L${DEPS_DESTDIR}/lib${apple_ldflags_arch}"
-
-        DEPENDS gmp_external
-        BUILD_BYPRODUCTS
-        ${DEPS_DESTDIR}/lib/libnettle.a
-        ${DEPS_DESTDIR}/lib/libhogweed.a
-        ${DEPS_DESTDIR}/include/nettle/version.h
-    )
-    add_static_target(nettle nettle_external libnettle.a gmp)
-    add_static_target(hogweed nettle_external libhogweed.a nettle)
-endif()
-
 link_libraries(-static-libstdc++)
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     link_libraries(-static-libgcc)

external/CMakeLists.txt

@@ -26,7 +26,7 @@ if(SUBMODULE_CHECK)
     message(STATUS "Checking submodules")
     check_submodule(ios-cmake)
     check_submodule(libsodium-internal)
-    check_submodule(oxen-encoding)
+    check_submodule(oxen-libquic external/oxen-logging external/oxen-encoding)
     check_submodule(nlohmann-json)
     check_submodule(zstd)
     check_submodule(protobuf)
@@ -37,7 +37,7 @@ if(NOT BUILD_STATIC_DEPS AND NOT FORCE_ALL_SUBMODULES)
   find_package(PkgConfig REQUIRED)
 endif()
 
-macro(system_or_submodule BIGNAME smallname pkgconf subdir)
+macro(libsession_system_or_submodule BIGNAME smallname pkgconf subdir)
   option(FORCE_${BIGNAME}_SUBMODULE "force using ${smallname} submodule" OFF)
   if(NOT BUILD_STATIC_DEPS AND NOT FORCE_${BIGNAME}_SUBMODULE AND NOT FORCE_ALL_SUBMODULES)
     pkg_check_modules(${BIGNAME} ${pkgconf} IMPORTED_TARGET GLOBAL)
@@ -57,6 +57,9 @@ macro(system_or_submodule BIGNAME smallname pkgconf subdir)
   if(TARGET ${smallname} AND NOT TARGET ${smallname}::${smallname})
     add_library(${smallname}::${smallname} ALIAS ${smallname})
   endif()
+  if(BUILD_STATIC_DEPS AND STATIC_BUNDLE)
+      libsession_static_bundle(${smallname}::${smallname})
+  endif()
 endmacro()
 
 
@@ -65,11 +68,6 @@ set(cross_host "")
 set(cross_rc "")
 if(CMAKE_CROSSCOMPILING)
     if(APPLE_TARGET_TRIPLE)
-        if(PLATFORM MATCHES "OS64" OR PLATFORM MATCHES "SIMULATORARM64")
-            set(APPLE_TARGET_TRIPLE aarch64-apple-ios)
-        elseif(PLATFORM MATCHES "SIMULATOR64")
-            set(APPLE_TARGET_TRIPLE x86_64-apple-ios)
-        endif()
         set(cross_host "--host=${APPLE_TARGET_TRIPLE}")
     elseif(ANDROID)
         if(CMAKE_ANDROID_ARCH_ABI MATCHES x86_64)
@@ -102,8 +100,31 @@ if(CMAKE_CROSSCOMPILING)
     endif()
 endif()
 
+set(LIBQUIC_BUILD_TESTS OFF CACHE BOOL "")
+if(ENABLE_ONIONREQ)
+  libsession_system_or_submodule(OXENQUIC quic liboxenquic>=1.1.0 oxen-libquic)
+endif()
+
+if(NOT TARGET oxenc::oxenc)
+    # The oxenc target will already exist if we load libquic above via submodule
+    set(OXENC_BUILD_TESTS OFF CACHE BOOL "")
+    set(OXENC_BUILD_DOCS OFF CACHE BOOL "")
+    libsession_system_or_submodule(OXENC oxenc liboxenc>=1.1.0 oxen-libquic/external/oxen-encoding)
+endif()
 
-system_or_submodule(OXENC oxenc liboxenc>=1.0.10 oxen-encoding)
+if(NOT TARGET oxen::logging)
+    add_subdirectory(oxen-libquic/external/oxen-logging)
+endif()
+
+oxen_logging_add_source_dir("${PROJECT_SOURCE_DIR}")
+
+# Apple xcode 15 has a completely broken std::source_location; we can't fix it, but at least we can
+# hack up the source locations to hide the path that it uses (which is the useless path to
+# oxen/log.hpp where the info/critical/etc. bodies are).
+if(APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16)
+    message(WARNING "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} is broken: filenames in logging statements will not display properly")
+    oxen_logging_add_source_dir("${CMAKE_CURRENT_SOURCE_DIR}/oxen-libquic/external/oxen-logging/include/oxen")
+endif()
 
 
 if(CMAKE_C_COMPILER_LAUNCHER)
@@ -143,7 +164,7 @@ set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 set(protobuf_ABSL_PROVIDER "module" CACHE STRING "" FORCE)
 set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "")
 set(protobuf_BUILD_PROTOBUF_BINARIES ON CACHE BOOL "" FORCE)
-system_or_submodule(PROTOBUF_LITE protobuf_lite protobuf-lite>=3.21 protobuf)
+libsession_system_or_submodule(PROTOBUF_LITE protobuf_lite protobuf-lite>=3.21 protobuf)
 if(TARGET PkgConfig::PROTOBUF_LITE AND NOT TARGET protobuf::libprotobuf-lite)
     add_library(protobuf::libprotobuf-lite ALIAS PkgConfig::PROTOBUF_LITE)
 endif()
@@ -172,4 +193,4 @@ libsession_static_bundle(libzstd_static)
 
 set(JSON_BuildTests OFF CACHE INTERNAL "")
 set(JSON_Install ON CACHE INTERNAL "") # Required to export targets that we use
-system_or_submodule(NLOHMANN nlohmann_json nlohmann_json>=3.7.0 nlohmann-json)
+libsession_system_or_submodule(NLOHMANN nlohmann_json nlohmann_json>=3.7.0 nlohmann-json)

include/session/config.hpp

@@ -95,10 +95,10 @@ class ConfigMessage {
     std::optional<std::array<unsigned char, 64>> verified_signature_;
 
     // This will be set during construction from configs based on the merge result:
-    // -1 means we had to merge one or more configs together into a new merged config
-    // >= 0 indicates the index of the config we used if we did not merge (i.e. there was only one
+    // nullopt means we had to merge one or more configs together into a new merged config
+    // If set to a value then the value is the index of the config we used (i.e. there was only one
     // config, or there were multiple but one of them referenced all the others).
-    int unmerged_ = -1;
+    std::optional<size_t> unmerged_;
 
   public:
     constexpr static int DEFAULT_DIFF_LAGS = 5;
@@ -203,13 +203,13 @@ class ConfigMessage {
     /// After loading multiple config files this flag indicates whether or not we had to produce a
     /// new, merged configuration message (true) or did not need to merge (false).  (For config
     /// messages that were not loaded from serialized data this is always true).
-    bool merged() const { return unmerged_ == -1; }
+    bool merged() const { return !unmerged_; }
 
     /// After loading multiple config files this field contains the index of the single config we
     /// used if we didn't need to merge (that is: there was only one config or one config that
     /// superceded all the others).  If we had to merge (or this wasn't loaded from serialized
-    /// data), this will return -1.
-    int unmerged_index() const { return unmerged_; }
+    /// data), this will return std::nullopt.
+    const std::optional<size_t>& unmerged_index() const { return unmerged_; }
 
     /// Read-only access to the optional verified signature if this message contained a valid,
     /// verified signature when it was parsed.  Returns nullopt otherwise (e.g. not loaded from
@@ -364,8 +364,6 @@ class MutableConfigMessage : public ConfigMessage {
 /// - `dict` -- a `bt_dict_consumer` positioned at or before the "~" key where the signature is
 ///   expected.  (If the bt_dict_consumer has already consumed the "~" key then this call will fail
 ///   as if the signature was missing).
-/// - `config_msg` -- the full config message; this must be a view of the same data in memory that
-///   `dict` is parsing (i.e. it cannot be a copy).
 /// - `verifier` -- a callback to invoke to verify the signature of the message.  If the callback is
 ///   empty then the signature will be ignored (it is neither required nor verified).
 /// - `verified_signature` is a pointer to a std::optional array of signature data; if this is
@@ -381,7 +379,6 @@ class MutableConfigMessage : public ConfigMessage {
 /// - throws on failure
 void verify_config_sig(
         oxenc::bt_dict_consumer dict,
-        ustring_view config_msg,
         const ConfigMessage::verify_callable& verifier,
         std::optional<std::array<unsigned char, 64>>* verified_signature = nullptr,
         bool trust_signature = false);