Merge branch 'master' into feature/jsonparser

Author: mmd-osm

.github/workflows/docker_trixie.yml

@@ -1,10 +1,9 @@
 name: Build on Debian Trixie
 
-on: []
+on: [push, pull_request]
 
 jobs:
   build:
-    if: ${{ false }}
     runs-on: ubuntu-latest
 
     steps:

include/cgimap/api06/changeset_close_handler.hpp

@@ -16,6 +16,8 @@
 #include "cgimap/handler.hpp"
 #include "cgimap/request.hpp"
 
+struct RequestContext;
+
 namespace api06 {
 
 class changeset_close_responder : public text_responder {
@@ -24,7 +26,7 @@ class changeset_close_responder : public text_responder {
                             data_update &, 
                             osm_changeset_id_t,
                             const std::string &,
-                            std::optional<osm_user_id_t>);
+                            const RequestContext& req_ctx);
 };
 
 class changeset_close_handler : public payload_enabled_handler {
@@ -36,7 +38,7 @@ class changeset_close_handler : public payload_enabled_handler {
 
   responder_ptr_t responder(data_update &,
                             const std::string &payload,
-                            std::optional<osm_user_id_t> user_id) const override;
+                            const RequestContext& req_ctx) const override;
   bool requires_selection_after_update() const override;
 
 private:

include/cgimap/api06/changeset_create_handler.hpp

@@ -23,7 +23,7 @@ class changeset_create_responder : public text_responder {
   changeset_create_responder(mime::type, 
                              data_update &,
                              const std::string &,
-                             std::optional<osm_user_id_t>);
+                             const RequestContext& req_ctx);
 };
 
 class changeset_create_handler : public payload_enabled_handler {
@@ -35,7 +35,7 @@ class changeset_create_handler : public payload_enabled_handler {
 
   responder_ptr_t responder(data_update &,
                             const std::string &payload,
-                            std::optional<osm_user_id_t> user_id) const override;
+                            const RequestContext& req_ctx) const override;
   bool requires_selection_after_update() const override;
 };
 

include/cgimap/api06/changeset_update_handler.hpp

@@ -25,7 +25,7 @@ class changeset_update_responder : public text_responder {
                              data_update &,
                              osm_changeset_id_t id_,
                              const std::string & payload,
-                             std::optional<osm_user_id_t> user_id);
+                             const RequestContext& req_ctx);
 };
 
 class changeset_update_sel_responder : public osm_current_responder {
@@ -46,7 +46,7 @@ class changeset_update_handler : public payload_enabled_handler {
 
   responder_ptr_t responder(data_update &,
                             const std::string &payload,
-                            std::optional<osm_user_id_t> user_id) const override;
+                            const RequestContext& req_ctx) const override;
   bool requires_selection_after_update() const override;
 
 private:

include/cgimap/api06/changeset_upload/changeset_updater.hpp

@@ -26,6 +26,8 @@ class Changeset_Updater {
 
   virtual void update_changeset(uint32_t num_new_changes, bbox_t bbox) = 0;
 
+  virtual bbox_t get_bbox() const = 0;
+
   virtual osm_changeset_id_t api_create_changeset(const std::map<std::string, std::string>&) = 0;
 
   virtual void api_update_changeset(const std::map<std::string, std::string>&) = 0;

include/cgimap/api06/changeset_upload_handler.hpp

@@ -16,13 +16,15 @@
 #include "cgimap/osm_diffresult_responder.hpp"
 #include "cgimap/request.hpp"
 
+struct RequestContext;
+
 namespace api06 {
 
 class changeset_upload_responder : public osm_diffresult_responder {
 public:
   changeset_upload_responder(mime::type, data_update &, osm_changeset_id_t,
                              const std::string &,
-                             std::optional<osm_user_id_t>);
+                             const RequestContext& req_ctx);
 };
 
 class changeset_upload_handler : public payload_enabled_handler {
@@ -34,7 +36,7 @@ class changeset_upload_handler : public payload_enabled_handler {
 
   responder_ptr_t responder(data_update &,
                             const std::string &payload,
-                            std::optional<osm_user_id_t> user_id) const override;
+                            const RequestContext& req_ctx) const override;
   bool requires_selection_after_update() const override;
 
 private:

include/cgimap/backend/apidb/changeset_upload/changeset_updater.hpp

@@ -17,19 +17,23 @@
 #include "cgimap/api06/changeset_upload/osmchange_tracking.hpp"
 #include "cgimap/backend/apidb/transaction_manager.hpp"
 
+struct RequestContext;
+
 class ApiDB_Changeset_Updater : public api06::Changeset_Updater {
 
 public:
   ApiDB_Changeset_Updater(Transaction_Manager &_m,
-                          osm_changeset_id_t _changeset, 
-                          osm_user_id_t _uid);
+                          const RequestContext& _req_ctx, 
+                          osm_changeset_id_t _changeset);
 
   ~ApiDB_Changeset_Updater() override = default;
 
   void lock_current_changeset(bool check_max_elements_limit) override;
 
   void update_changeset(const uint32_t num_new_changes, const bbox_t bbox) override;
 
+  bbox_t get_bbox() const override;
+
   osm_changeset_id_t api_create_changeset(const std::map<std::string, std::string>&) override;
 
   void api_update_changeset(const std::map<std::string, std::string>&) override;
@@ -46,9 +50,9 @@ class ApiDB_Changeset_Updater : public api06::Changeset_Updater {
   void changeset_insert_cs ();
 
   Transaction_Manager &m;
+  const RequestContext& req_ctx;
   uint32_t cs_num_changes{0};
   osm_changeset_id_t changeset;
-  osm_user_id_t uid;
   bbox_t cs_bbox{};
 };
 

include/cgimap/backend/apidb/changeset_upload/node_updater.hpp

@@ -20,11 +20,14 @@
 #include <memory>
 #include <set>
 
+struct RequestContext;
+
 
 class ApiDB_Node_Updater : public api06::Node_Updater {
 
 public:
   ApiDB_Node_Updater(Transaction_Manager &_m,
+                     const RequestContext& req_ctx,
                      api06::OSMChange_Tracking &ct);
 
   ~ApiDB_Node_Updater() override = default;
@@ -108,6 +111,7 @@ class ApiDB_Node_Updater : public api06::Node_Updater {
   void delete_current_node_tags(const std::vector<osm_nwr_id_t> &ids);
 
   Transaction_Manager &m;
+  const RequestContext& req_ctx;
   api06::OSMChange_Tracking &ct;
 
   std::vector<node_t> create_nodes;

include/cgimap/backend/apidb/changeset_upload/relation_updater.hpp

@@ -21,13 +21,16 @@
 #include <memory>
 #include <set>
 
+struct RequestContext;
+
 using RelationMemberList = std::vector<api06::RelationMember>;
 using TagList = std::map<std::string, std::string>;
 
 class ApiDB_Relation_Updater : public api06::Relation_Updater {
 
 public:
   ApiDB_Relation_Updater(Transaction_Manager &_m,
+                         const RequestContext& _req_ctx,
                          api06::OSMChange_Tracking &ct);
 
   ~ApiDB_Relation_Updater() override = default;
@@ -175,6 +178,7 @@ class ApiDB_Relation_Updater : public api06::Relation_Updater {
       const std::set<osm_nwr_id_t> &direct_relation_ids);
 
   Transaction_Manager &m;
+  const RequestContext& req_ctx;
   api06::OSMChange_Tracking &ct;
 
   std::vector<relation_t> create_relations;

include/cgimap/backend/apidb/changeset_upload/way_updater.hpp

@@ -21,6 +21,8 @@
 #include <memory>
 #include <set>
 
+struct RequestContext;
+
 /*  Way operations
  *
  */
@@ -29,6 +31,7 @@ class ApiDB_Way_Updater : public api06::Way_Updater {
 
 public:
   ApiDB_Way_Updater(Transaction_Manager &_m,
+                    const RequestContext& _req_ctx,
                     api06::OSMChange_Tracking &ct);
 
   ~ApiDB_Way_Updater() override = default;
@@ -130,6 +133,7 @@ class ApiDB_Way_Updater : public api06::Way_Updater {
   void delete_current_way_nodes(std::vector<osm_nwr_id_t> ids);
 
   Transaction_Manager &m;
+  const RequestContext& req_ctx;
   api06::OSMChange_Tracking &ct;
 
   std::vector<way_t> create_ways;

include/cgimap/backend/apidb/pgsql_update.hpp

@@ -18,6 +18,8 @@
 #include <pqxx/pqxx>
 #include <boost/program_options.hpp>
 
+struct RequestContext;
+
 class pgsql_update : public data_update {
 
 public:
@@ -26,23 +28,25 @@ class pgsql_update : public data_update {
   ~pgsql_update() override = default;
 
   std::unique_ptr<api06::Changeset_Updater>
-  get_changeset_updater(osm_changeset_id_t _changeset, osm_user_id_t _uid) override;
+  get_changeset_updater(const RequestContext& ctx, osm_changeset_id_t _changeset) override;
 
   std::unique_ptr<api06::Node_Updater>
-  get_node_updater(api06::OSMChange_Tracking &ct) override;
+  get_node_updater(const RequestContext& ctx, api06::OSMChange_Tracking &ct) override;
 
   std::unique_ptr<api06::Way_Updater>
-  get_way_updater(api06::OSMChange_Tracking &ct) override;
+  get_way_updater(const RequestContext& ctx, api06::OSMChange_Tracking &ct) override;
 
   std::unique_ptr<api06::Relation_Updater>
-  get_relation_updater(api06::OSMChange_Tracking &ct) override;
+  get_relation_updater(const RequestContext& ctx, api06::OSMChange_Tracking &ct) override;
 
   void commit() override;
 
   bool is_api_write_disabled() const override;
 
   uint32_t get_rate_limit(osm_user_id_t uid) override;
 
+  uint64_t get_bbox_size_limit(osm_user_id_t uid) override;
+
   /**
    * abstracts the creation of transactions for the
    * data updates.

include/cgimap/data_update.hpp

@@ -24,6 +24,8 @@
 #include <memory>
 #include <vector>
 
+struct RequestContext;
+
 class data_update {
 public:
   data_update() = default;
@@ -37,16 +39,16 @@ class data_update {
   data_update& operator=(data_update&&) = delete;
 
   virtual std::unique_ptr<api06::Changeset_Updater>
-  get_changeset_updater(osm_changeset_id_t _changeset, osm_user_id_t _uid) = 0;
+  get_changeset_updater(const RequestContext& ctx, osm_changeset_id_t _changeset) = 0;
 
   virtual std::unique_ptr<api06::Node_Updater>
-  get_node_updater(api06::OSMChange_Tracking &ct) = 0;
+  get_node_updater(const RequestContext& ctx, api06::OSMChange_Tracking &ct) = 0;
 
   virtual std::unique_ptr<api06::Way_Updater>
-  get_way_updater(api06::OSMChange_Tracking &ct) = 0;
+  get_way_updater(const RequestContext& ctx, api06::OSMChange_Tracking &ct) = 0;
 
   virtual std::unique_ptr<api06::Relation_Updater>
-  get_relation_updater(api06::OSMChange_Tracking &ct) = 0;
+  get_relation_updater(const RequestContext& ctx, api06::OSMChange_Tracking &ct) = 0;
 
   virtual void
   commit() = 0;
@@ -56,6 +58,9 @@ class data_update {
   // get the current rate limit for changeset uploads for a given user id
   virtual uint32_t get_rate_limit(osm_user_id_t) = 0;
 
+  // get the current maximum bounding box size for a given user id
+  virtual uint64_t get_bbox_size_limit(osm_user_id_t uid) = 0;
+
   /**
    * factory for the creation of data updates. this abstracts away
    * the creation process of transactions, and allows some up-front

include/cgimap/handler.hpp

@@ -96,7 +96,7 @@ class payload_enabled_handler : public handler {
   // Responder used to update the database
   virtual responder_ptr_t responder(data_update &, 
                                     const std::string & payload, 
-                                    std::optional<osm_user_id_t> user_id) const = 0;
+                                    const RequestContext& req_ctx) const = 0;
 
   // Optional responder to return XML response back to caller of the API method
   responder_ptr_t responder(data_selection &) const override = 0;

include/cgimap/options.hpp

@@ -35,6 +35,7 @@ class global_settings_base {
   virtual uint32_t get_ratelimiter_ratelimit(bool) const = 0;
   virtual uint32_t get_ratelimiter_maxdebt(bool) const = 0;
   virtual bool get_ratelimiter_upload() const = 0;
+  virtual bool get_bbox_size_limiter_upload() const = 0;
 };
 
 class global_settings_default : public global_settings_base {
@@ -97,6 +98,10 @@ class global_settings_default : public global_settings_base {
   bool get_ratelimiter_upload() const override {
     return false;
   }
+
+  bool get_bbox_size_limiter_upload() const override {
+    return false;
+  }
 };
 
 class global_settings_via_options : public global_settings_base {
@@ -175,6 +180,10 @@ class global_settings_via_options : public global_settings_base {
     return m_ratelimiter_upload;
   }
 
+  bool get_bbox_size_limiter_upload() const override {
+    return m_bbox_size_limiter_upload;
+  }
+
 private:
   void init_fallback_values(const global_settings_base &def);
   void set_new_options(const po::variables_map &options);
@@ -191,6 +200,7 @@ class global_settings_via_options : public global_settings_base {
   void set_ratelimiter_ratelimit(const po::variables_map &options);
   void set_ratelimiter_maxdebt(const po::variables_map &options);
   void set_ratelimiter_upload(const po::variables_map &options);
+  void set_bbox_size_limiter_upload(const po::variables_map &options);
   bool validate_timeout(const std::string &timeout) const;
 
   uint32_t m_payload_max_size;
@@ -208,6 +218,7 @@ class global_settings_via_options : public global_settings_base {
   uint32_t m_ratelimiter_maxdebt;
   uint32_t m_moderator_ratelimiter_maxdebt;
   bool m_ratelimiter_upload;
+  bool m_bbox_size_limiter_upload;
 };
 
 class global_settings final {
@@ -256,6 +267,9 @@ class global_settings final {
   // Use ratelimiter for changeset uploads
   static bool get_ratelimiter_upload() { return settings->get_ratelimiter_upload(); }
 
+  // Use bbox size limiter for changeset uploads
+  static bool get_bbox_size_limiter_upload() { return settings->get_bbox_size_limiter_upload(); }
+
 private:
   static std::unique_ptr<global_settings_base> settings;  // gets initialized with global_settings_default instance
 };