Deployment preparations

11 files changed, 70 insertions, 34 deletions

diff --git a/flake.nix b/flake.nix
index 2320882..7629d56 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,8 +21,8 @@
           });
           boost = pkgs."boost${toString boostVersion}";
 
-          routemon = stdenv.mkDerivation {
-            name = "routemon";
+          routemon-server = stdenv.mkDerivation {
+            name = "routemon-server";
             src = ./server;
 
             buildInputs = with pkgs; [ boost pugixml expat icu openssl sqlite ];
@@ -48,13 +48,29 @@
               "-DCMAKE_CXX_STDLIB_MODULES_JSON=${libstdcxxGcc}/lib/libstdc++.modules.json"
             ];
           };
+
+          routemon-web = pkgs.stdenvNoCC.mkDerivation {
+            name = "routemon-web";
+
+            src = ./web;
+
+            installPhase = ''
+              runHook preInstall
+
+              mkdir -p $out/usr/lib/routemon-web/htdocs
+              cp -rv index.html index.js style.css $out/usr/lib/routemon-web/htdocs
+
+              runHook postInstall
+            '';
+          };
         in
         {
-          packages.routemon = routemon;
+          packages.routemon-server = routemon-server;
+          packages.routemon-web = routemon-web;
 
           devShells.default = pkgs.mkShell.override { inherit stdenv; } {
             buildInputs = [ pkgs.nix-index pkgs.nix-tree ];
-            inputsFrom = [ routemon ];
+            inputsFrom = [ routemon-server ];
           };
 
           formatter = pkgs.nixpkgs-fmt;
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 15ebfae..014ec7c 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -9,7 +9,7 @@ add_compile_options(
   -fno-omit-frame-pointer
   -Wall -Wextra -Wformat -Wformat=2 -Wconversion -Wimplicit-fallthrough
   -Werror=format-security
-  -U_FORTIFY_SOURCE # -D_FORTIFY_SOURCE=3 (unfortunately breaks the std module)
+  -U_FORTIFY_SOURCE # -D_FORTIFY_SOURCE=3 (unfortunately breaks the std module, see https://github.com/llvm/llvm-project/issues/121709)
   -D_GLIBCXX_ASSERTIONS
   -fstrict-flex-arrays=3
   -fstack-clash-protection -fstack-protector-strong
diff --git a/server/src/config.cpp b/server/src/config.cpp
index 5c1a161..200b873 100644
--- a/server/src/config.cpp
+++ b/server/src/config.cpp
@@ -182,7 +182,8 @@ auto tag_invoke(
       [](object_reader& r) -> http_server
       {
         return {
-          .lax_cors = r.expect_at<bool>("lax_cors"),
+          .allow_origins =
+              r.expect_at<std::vector<std::string>>("allow_origins"),
         };
       });
 }
diff --git a/server/src/config.cppm b/server/src/config.cppm
index 358a961..ab9b137 100644
--- a/server/src/config.cppm
+++ b/server/src/config.cppm
@@ -23,7 +23,7 @@ export struct database
 
 export struct http_server
 {
-  bool lax_cors;
+  std::vector<std::string> allow_origins;
 };
 
 export struct logger
diff --git a/server/src/http_server.cppm b/server/src/http_server.cppm
index dc8c183..b16f3a8 100644
--- a/server/src/http_server.cppm
+++ b/server/src/http_server.cppm
@@ -15,7 +15,7 @@ export module routemon:http.server;
 import std;
 import :config;
 import :trace;
-export import :http.common;
+import :http.common;
 import :problem;
 
 namespace net = boost::asio;
@@ -157,14 +157,33 @@ using middleware_t =
                       ->net::awaitable<presponse>>;
 
 template <class Ctx>
-auto lax_cors_middleware(
-    Ctx ctx, bhttp::request_header<bhttp::fields>& req_hdr,
-    next_handler_t<Ctx> next) -> net::awaitable<presponse>
+auto id_middleware(
+    Ctx ctx, bhttp::request_header<bhttp::fields>&, next_handler_t<Ctx> next)
+    -> net::awaitable<presponse>
 {
-  std::ignore = req_hdr;
-  auto prersp = co_await next(ctx);
-  prersp.header().set(bhttp::field::access_control_allow_origin, "*");
-  co_return std::move(prersp);
+  co_return co_await next(std::move(ctx));
+}
+
+template <class Ctx>
+auto cors_middleware(std::vector<std::string> const& allow_origins)
+    -> middleware_t<Ctx, Ctx>
+{
+  if (allow_origins.empty())
+    return id_middleware<Ctx>;
+
+  auto header_str = allow_origins
+                    | std::views::join_with(std::string_view{", "})
+                    | std::ranges::to<std::string>();
+
+  return [header_str = std::move(header_str)](
+             Ctx ctx, bhttp::request_header<bhttp::fields>& req_hdr,
+             next_handler_t<Ctx> next) -> net::awaitable<presponse>
+  {
+    std::ignore = req_hdr;
+    auto prersp = co_await next(ctx);
+    prersp.header().set(bhttp::field::access_control_allow_origin, header_str);
+    co_return std::move(prersp);
+  };
 }
 
 template <class InnerCtx>
@@ -310,14 +329,6 @@ auto default_options_handler(
 auto global_options_handler(base_ctx const& ctx, readable_request r)
     -> net::awaitable<presponse>;
 
-template <class Ctx>
-auto id_middleware(
-    Ctx ctx, bhttp::request_header<bhttp::fields>&, next_handler_t<Ctx> next)
-    -> net::awaitable<presponse>
-{
-  co_return co_await next(std::move(ctx));
-}
-
 template <class A, class B, class C>
 auto middleware_compose(middleware_t<A, B> ab, middleware_t<B, C> bc)
     -> middleware_t<A, C>
diff --git a/server/src/main.cpp b/server/src/main.cpp
index d5fcd42..b0a9938 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -105,8 +105,9 @@ auto real_main(std::span<char const*> args) -> exit_status
   l.info("Loading situations finished in {}", dur_load);
 
   auto handler = routemon::api::handler{l, std::move(pub)};
-  auto http_server =
-      routemon::srv::server{l, std::move(lsel), std::move(handler)};
+  auto http_server = routemon::srv::server{
+    l, config.http_server, std::move(lsel), std::move(handler)
+  };
   http_server.spawn(ioc);
   ioc.run();
 
diff --git a/server/src/srv.cpp b/server/src/srv.cpp
index 00a2bb8..b70f05c 100644
--- a/server/src/srv.cpp
+++ b/server/src/srv.cpp
@@ -232,22 +232,24 @@ auto handler::make_routes() -> http::route_tree<http::routed_ctx<outer_ctx>>
   });
 }
 
-auto server::make_global_middleware()
+auto server::make_global_middleware(config::http_server const& cfg)
     -> http::middleware_t<http::base_ctx, handler::outer_ctx>
 {
   return http::middleware_compose<
       http::base_ctx, http::trace_id_ctx<http::base_ctx>,
       http::trace_id_ctx<http::base_ctx>
   >(http::trace_id_middleware<http::base_ctx>,
-    http::lax_cors_middleware<http::trace_id_ctx<http::base_ctx>>);
+    http::cors_middleware<http::trace_id_ctx<http::base_ctx>>(
+        cfg.allow_origins));
 }
 
 server::server(
-    log::logger const& l, locale::selector&& lsel, api::handler&& inner)
+    log::logger const& l, config::http_server const& cfg,
+    locale::selector&& lsel, api::handler&& inner)
   : handler_{std::move(inner)},
     srv_{
       l, http::router{
-           std::move(lsel), make_global_middleware(), handler_.make_routes()
+           std::move(lsel), make_global_middleware(cfg), handler_.make_routes()
          }
     }
 {
diff --git a/server/src/srv.cppm b/server/src/srv.cppm
index 1d082fb..063617e 100644
--- a/server/src/srv.cppm
+++ b/server/src/srv.cppm
@@ -35,11 +35,13 @@ export class server
   handler handler_;
   http::server srv_;
 
-  static auto make_global_middleware()
+  static auto make_global_middleware(config::http_server const& cfg)
       -> http::middleware_t<http::base_ctx, handler::outer_ctx>;
 
 public:
-  server(log::logger const& l, locale::selector&& lsel, api::handler&& inner);
+  server(
+      log::logger const& l, config::http_server const& cfg,
+      locale::selector&& lsel, api::handler&& inner);
 
   auto spawn(net::io_context& ioc) -> void;
 };
diff --git a/todo.org b/todo.org
index ebddd19..91c02e3 100644
--- a/todo.org
+++ b/todo.org
@@ -1 +1,2 @@
 - [ ] Accept-Language negotation does not work as expected
+- [ ] Expect: 100-continue support in HTTP server?
diff --git a/web/index.html b/web/index.html
index f927d39..0fa0cea 100644
--- a/web/index.html
+++ b/web/index.html
@@ -47,6 +47,6 @@
     </dialog>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet.js" integrity="sha512-BwHfrr4c9kmRkLw6iXFdzcdWV/PGkVgiIyIWLLlTSXzWQzxuSg4DiQUCpauz/EWjgk5TYQqX/kvn9pG1NpYfqg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="script.js"></script>
+    <script src="index.js"></script>
   </body>
 </html>
diff --git a/web/script.js b/web/index.js
index b3179b3..316e73f 100644
--- a/web/script.js
+++ b/web/index.js
@@ -1,3 +1,5 @@
+const apiBaseUrl = "https://api.routemon.fautchen.eu";
+
 const dialog = document.querySelector("dialog");
 const closeButton = document.querySelector("dialog button");
 closeButton.addEventListener("click", () => {
@@ -73,7 +75,7 @@ async function showProblem(rsp) {
 }
 
 async function getSysinfo() {
-    const rsp = await fetch("http://localhost:8284/sysinfo", {
+    const rsp = await fetch(apiBaseUrl + "/sysinfo", {
         method: "GET",
         headers: {
             "Accept-Language": "nl-NL",
@@ -89,7 +91,7 @@ async function getSysinfo() {
 }
 
 async function load(gpxFile) {
-    const rsp = await fetch("http://localhost:8284/gpx", {
+    const rsp = await fetch(apiBaseUrl + "/gpx", {
         method: "POST",
         headers: {
             "Accept-Language": "nl-NL",