1 files changed, 27 insertions, 16 deletions

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>