Add TDEI workspace tenant selection by header

Author: cyrossignol

include/cgimap/backend/apidb/pgsql_update.hpp

@@ -53,6 +53,9 @@ class pgsql_update : public data_update {
     const std::string& email,
     const std::string& display_name) override;
 
+  // TDEI Workspace tenant selection
+  void set_tdei_workspace(const workspace_id_t id) override;
+
   /**
    * abstracts the creation of transactions for the
    * data updates.

include/cgimap/backend/apidb/readonly_pgsql_selection.hpp

@@ -79,6 +79,7 @@ class readonly_pgsql_selection : public data_selection {
       const std::string &token_id, bool &expired, bool &revoked,
       bool &allow_api_write) override;
   std::optional<osm_user_id_t> get_user_id_for_tdei_token(const std::string& email) override;
+  void set_tdei_workspace(const workspace_id_t id) override;
   bool is_user_active(const osm_user_id_t id) override;
 
 

include/cgimap/data_selection.hpp

@@ -12,6 +12,7 @@
 
 #include "cgimap/types.hpp"
 #include "cgimap/output_formatter.hpp"
+#include "cgimap/workspaces/types.hpp"
 
 #include <chrono>
 #include <memory>
@@ -181,6 +182,9 @@ class data_selection {
   // Authentication using TDEI access token for TDEI Workspaces..
   virtual std::optional<osm_user_id_t> get_user_id_for_tdei_token(const std::string& email) = 0;
 
+  // TDEI Workspace tenant selection
+  virtual void set_tdei_workspace(const workspace_id_t id) = 0;
+
   // is user status confirmed or active?
   virtual bool is_user_active(const osm_user_id_t) = 0;
 

include/cgimap/data_update.hpp

@@ -13,6 +13,7 @@
 #include "cgimap/output_formatter.hpp"
 #include "cgimap/types.hpp"
 #include "cgimap/util.hpp"
+#include "cgimap/workspaces/types.hpp"
 
 #include "cgimap/api06/changeset_upload/changeset_updater.hpp"
 #include "cgimap/api06/changeset_upload/node_updater.hpp"
@@ -67,6 +68,9 @@ class data_update {
     const std::string& email,
     const std::string& display_name) = 0;
 
+  // TDEI Workspace tenant selection
+  virtual void set_tdei_workspace(const workspace_id_t id) = 0;
+
   /**
    * factory for the creation of data updates. this abstracts away
    * the creation process of transactions, and allows some up-front

include/cgimap/workspaces/tenant.hpp

@@ -0,0 +1,11 @@
+#ifndef WORKSPACES_TENANT_HPP
+#define WORKSPACES_TENANT_HPP
+
+#include "cgimap/request.hpp"
+#include "cgimap/workspaces/types.hpp"
+
+namespace workspaces {
+  std::optional<workspace_id_t> try_id_from_request(const request& req);
+}
+
+#endif /* WORKSPACES_TENANT_HPP */

include/cgimap/workspaces/types.hpp

@@ -0,0 +1,8 @@
+#ifndef WORKSPACES_TYPES_HPP
+#define WORKSPACES_TYPES_HPP
+
+#include <cstdint>
+
+using workspace_id_t = uint64_t;
+
+#endif /* WORKSPACES_TYPES_HPP */

src/CMakeLists.txt

@@ -67,6 +67,7 @@ target_sources(cgimap_core PRIVATE
     api06/changeset_upload/osmchange_tracking.cpp
 
     workspaces/tdei_auth.cpp
+    workspaces/tenant.cpp
 
     $<$<BOOL:${ENABLE_YAJL}>:json_formatter.cpp>
     $<$<BOOL:${ENABLE_YAJL}>:json_writer.cpp>

src/backend/apidb/pgsql_update.cpp

@@ -58,13 +58,13 @@ std::string connect_db_str(const po::variables_map &options) {
 } // anonymous namespace
 
 pgsql_update::pgsql_update(Transaction_Owner_Base& to, bool readonly)
-    : m{ to }, 
+    : m{ to },
       m_readonly{ readonly } {
 
   if (is_api_write_disabled())
     return;
 
-  m.exec(R"(CREATE TEMPORARY TABLE tmp_create_nodes 
+  m.exec(R"(CREATE TEMPORARY TABLE tmp_create_nodes
       (
         id bigint NOT NULL DEFAULT nextval('current_nodes_id_seq'::regclass),
         latitude integer NOT NULL,
@@ -79,7 +79,7 @@ pgsql_update::pgsql_update(Transaction_Owner_Base& to, bool readonly)
         ON COMMIT DROP
       )");
 
-  m.exec(R"(CREATE TEMPORARY TABLE tmp_create_ways 
+  m.exec(R"(CREATE TEMPORARY TABLE tmp_create_ways
       (
         id bigint NOT NULL DEFAULT nextval('current_ways_id_seq'::regclass),
         changeset_id bigint NOT NULL,
@@ -91,7 +91,7 @@ pgsql_update::pgsql_update(Transaction_Owner_Base& to, bool readonly)
         ON COMMIT DROP
      )");
 
-  m.exec(R"(CREATE TEMPORARY TABLE tmp_create_relations 
+  m.exec(R"(CREATE TEMPORARY TABLE tmp_create_relations
      (
         id bigint NOT NULL DEFAULT nextval('current_relations_id_seq'::regclass),
         changeset_id bigint NOT NULL,

src/backend/apidb/readonly_pgsql_selection.cpp

@@ -869,6 +869,11 @@ std::optional<osm_user_id_t> readonly_pgsql_selection::get_user_id_for_tdei_toke
   return {};
 }
 
+void readonly_pgsql_selection::set_tdei_workspace(const workspace_id_t id)
+{
+  m.exec(fmt::format(R"(SET search_path TO "workspace-{:d}", public)", id));
+}
+
 bool readonly_pgsql_selection::is_user_active(const osm_user_id_t id)
 {
   m.prepare("is_user_active",

src/process_request.cpp

@@ -16,6 +16,7 @@
 #include "cgimap/output_formatter.hpp"
 #include "cgimap/output_writer.hpp"
 #include "cgimap/workspaces/tdei_auth.hpp"
+#include "cgimap/workspaces/tenant.hpp"
 
 #include <chrono>
 #include <memory>
@@ -233,6 +234,10 @@ std::tuple<std::string, size_t>
 process_get_request(request& req, const handler& handler,
                     data_selection& selection,
                     const std::string &ip, const std::string &generator) {
+  if (const auto workspace_id = workspaces::try_id_from_request(req)) {
+    selection.set_tdei_workspace(*workspace_id);
+  }
+
   // request start logging
   const std::string request_name = handler.log_name();
   logger::message(fmt::format("Started request for {} from {}", request_name, ip));
@@ -250,7 +255,7 @@ process_get_request(request& req, const handler& handler,
  * process a POST/PUT request.
  */
 std::tuple<std::string, size_t>
-process_post_put_request(RequestContext& req_ctx, 
+process_post_put_request(RequestContext& req_ctx,
                          const handler& handler,
                          const data_selection::factory& factory,
                          data_update::factory& update_factory,
@@ -265,6 +270,7 @@ process_post_put_request(RequestContext& req_ctx,
 
   try {
     const auto & pe_handler = dynamic_cast< const payload_enabled_handler& >(handler);
+    const auto workspace_id = workspaces::try_id_from_request(req_ctx.req);
 
     // Process request, perform database update
     {
@@ -273,6 +279,10 @@ process_post_put_request(RequestContext& req_ctx,
       auto data_update = update_factory.make_data_update(*rw_transaction);
       check_db_readonly_mode(*data_update);
 
+      if (workspace_id) {
+        data_update->set_tdei_workspace(*workspace_id);
+      }
+
       // Executing the responder constructor parses the payload, performs db CRUD operations
       // and eventually calls db commit(), in case there are no issues with the data.
       auto responder = pe_handler.responder(*data_update, payload, req_ctx);
@@ -298,6 +308,11 @@ process_post_put_request(RequestContext& req_ctx,
 
     // create a data selection for the request
     auto data_selection = factory.make_selection(*read_only_transaction);
+
+    if (workspace_id) {
+      data_selection->set_tdei_workspace(*workspace_id);
+    }
+
     auto sel_responder = pe_handler.responder(*data_selection);
     bytes_written = generate_response(req_ctx.req, *sel_responder, generator);