Add unit test for http-binary-cache

ci/gha/tests/wrapper.nix

@@ -1,14 +1,21 @@
 {
   nixFlake ? builtins.getFlake ("git+file://" + toString ../../..),
   system ? builtins.currentSystem,
-  pkgs ? nixFlake.inputs.nixpkgs.legacyPackages.${system},
   stdenv ? "stdenv",
   componentTestsPrefix ? "",
   withInstrumentation ? false,
 }@args:
+let
+  # Create a pkgs set with your httplib overlay applied.
+  pkgs = import nixFlake.inputs.nixpkgs {
+    inherit system;
+    overlays = [ nixFlake.overlays.internal ];
+  };
+in
 import ./. (
   args
   // {
+    inherit pkgs;
     getStdenv = p: p.${stdenv};
     withSanitizers = withInstrumentation;
     withCoverage = withInstrumentation;

flake.nix

@@ -28,7 +28,6 @@
       nixpkgs-regression,
       ...
     }:
-
     let
       inherit (nixpkgs) lib;
 
@@ -202,7 +201,6 @@
               hostTarget = f hostTarget;
               targetTarget = f targetTarget;
             };
-
         in
         args@{
           pkgs,
@@ -285,8 +283,24 @@
           nixDependencies2 = packageSets.nixDependencies;
 
           nix = final.nixComponents2.nix-cli;
-        };
 
+          # We need to support pkgconfig until https://github.com/NixOS/nixpkgs/pull/452456
+          httplib = prev.httplib.overrideAttrs (oldAttrs: {
+            nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ prev.copyPkgconfigItems ];
+            pkgconfigItems = [
+              (prev.makePkgconfigItem rec {
+                name = "httplib";
+                version = oldAttrs.version;
+                cflags = [ "-I${variables.includedir}" ];
+                variables = rec {
+                  prefix = placeholder "out";
+                  includedir = "''${prefix}/include";
+                };
+                inherit (oldAttrs.meta) description;
+              })
+            ];
+          });
+        };
     in
     {
       overlays.internal = overlayFor (p: p.stdenv);
@@ -555,7 +569,6 @@
             pkgs,
             getStdenv ? pkgs: pkgs.stdenv,
           }:
-
           let
             packageSets = packageSetsFor { inherit getStdenv pkgs; };
           in

src/libstore-tests/http-binary-cache-store.cc

@@ -1,6 +1,10 @@
 #include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <httplib.h>
 
 #include "nix/store/http-binary-cache-store.hh"
+#include "nix/store/path.hh"
+#include "nix/util/url.hh"
 
 namespace nix {
 
@@ -34,4 +38,86 @@ TEST(HttpBinaryCacheStore, constructConfigWithParamsAndUrlWithParams)
     EXPECT_EQ(config.getReference().params, params);
 }
 
+struct ServerManager
+{
+    httplib::Server & server;
+    std::thread & server_thread;
+
+    ~ServerManager()
+    {
+        server.stop();
+        if (server_thread.joinable()) {
+            server_thread.join();
+        }
+    }
+};
+
+TEST(HttpBinaryCacheStore, NixCacheInfoBasicTest)
+{
+// FIXME: MacOS tests on Github actions were not able to bind to any port,
+// it kept returning -1 for the bound port.
+#if !defined(__linux__)
+    GTEST_SKIP() << "Skipping test on non-Linux platform due to unknown networking differences.";
+#endif
+
+    httplib::Server server;
+    server.Get("/nix-cache-info", [](const httplib::Request &, httplib::Response & res) {
+        res.set_content(
+            "StoreDir: /nix/store\n"
+            "WantMassQuery: 1\n"
+            "Priority: 40\n",
+            "text/plain");
+    });
+    int port = server.bind_to_any_port("127.0.0.1");
+    ASSERT_GT(port, 0);
+
+    auto serverUrl = "127.0.0.1:" + std::to_string(port);
+    auto serverThread = std::thread([&server]() { server.listen_after_bind(); });
+    // Create the RAII guard object. Its destructor will handle cleanup.
+    ServerManager manager(server, serverThread);
+
+    auto config = std::make_shared<HttpBinaryCacheStoreConfig>("http", serverUrl, StoreConfig::Params{});
+    auto store = config->openStore().dynamic_pointer_cast<BinaryCacheStore>();
+    ASSERT_TRUE(store);
+
+    auto cacheInfo = store->getNixCacheInfo();
+    EXPECT_EQ(cacheInfo.value(), "StoreDir: /nix/store\nWantMassQuery: 1\nPriority: 40\n");
+}
+
+TEST(HttpBinaryCacheStore, UrlEncodingPlusSign)
+{
+// FIXME: MacOS tests on Github actions were not able to bind to any port,
+// it kept returning -1 for the bound port.
+#if !defined(__linux__)
+    GTEST_SKIP() << "Skipping test on non-Linux platform due to unknown networking differences.";
+#endif
+
+    httplib::Server server;
+    const std::string drvNameWithPlus = "bqlpc40ak1qn45zmv44h8cqjx12hphzi-hello+plus-1.0.drv";
+    const std::string expectedLogPath = "/log/" + drvNameWithPlus;
+    server.Get(R"(/log/(.+))", [&](const httplib::Request & req, httplib::Response & res) {
+        if (req.path == expectedLogPath) {
+            res.set_content("correct", "text/plain");
+            res.status = 200;
+        } else {
+            res.status = 404;
+            res.set_content("Not Found: Path was decoded incorrectly.", "text/plain");
+        }
+    });
+    int port = server.bind_to_any_port("127.0.0.1");
+    ASSERT_GT(port, 0);
+
+    auto serverUrl = "127.0.0.1:" + std::to_string(port);
+    auto serverThread = std::thread([&server]() { server.listen_after_bind(); });
+    // Create the RAII guard object. Its destructor will handle cleanup.
+    ServerManager manager(server, serverThread);
+
+    auto config = std::make_shared<HttpBinaryCacheStoreConfig>("http", serverUrl, StoreConfig::Params{});
+    auto store = config->openStore().dynamic_pointer_cast<BinaryCacheStore>();
+    ASSERT_TRUE(store);
+
+    auto buildLog = store->getBuildLogExact(StorePath{drvNameWithPlus});
+    EXPECT_THAT(buildLog, testing::Optional(testing::Eq("correct")));
+}
+
 } // namespace nix

src/libstore-tests/meson.build

@@ -51,6 +51,9 @@ config_priv_h = configure_file(
 gtest = dependency('gmock')
 deps_private += gtest
 
+httplib = dependency('httplib')
+deps_private += httplib
+
 subdir('nix-meson-build-support/common')
 
 sources = files(

src/libstore-tests/package.nix

@@ -12,6 +12,7 @@
 
   rapidcheck,
   gtest,
+  httplib,
   gbenchmark,
   runCommand,
 
@@ -47,6 +48,7 @@ mkMesonExecutable (finalAttrs: {
     sqlite
     rapidcheck
     gtest
+    httplib
   ]
   ++ lib.optionals withBenchmarks [
     gbenchmark