Merge pull request zerebubuth#354 from mmd-osm/patch/oauth10a_removal

OAuth 1.0a removal

Author: mmd-osm

README

@@ -179,7 +179,7 @@ https://github.com/zerebubuth/openstreetmap-cgimap/pull/213 has additional confi
 ## Database Permissions
 
 The read only apidb backend requires permissions to SELECT on the Postgres server.
-OAuth and update database connections require additional permissions to INSERT/UPDATE/DELETE
+Update database connections require additional permissions to INSERT/UPDATE/DELETE
 data, as well as creating temporary tables.
 
 It is recommended that a separate unix account is used for

include/cgimap/backend.hpp

@@ -16,7 +16,6 @@
 #include <boost/program_options.hpp>
 #include "cgimap/data_update.hpp"
 #include "cgimap/data_selection.hpp"
-#include "cgimap/oauth.hpp"
 
 /* implement this interface to add a new backend which will be selectable
  * on the command line.
@@ -37,9 +36,6 @@ struct backend {
   // create a data update factory from the arguments passed to cgimap.
   virtual std::unique_ptr<data_update::factory>
   create_data_update(const boost::program_options::variables_map &) = 0;
-  // create an oauth store based on arguments.
-  virtual std::unique_ptr<oauth::store>
-  create_oauth_store(const boost::program_options::variables_map &) = 0;
 };
 
 // figures out which backend should be selected and adds its options to the
@@ -56,10 +52,6 @@ create_backend(const boost::program_options::variables_map &);
 std::unique_ptr<data_update::factory>
 create_update_backend(const boost::program_options::variables_map &);
 
-// singleton call to create an OAuth store from options.
-std::unique_ptr<oauth::store>
-create_oauth_store(const boost::program_options::variables_map &);
-
 // this function registers a backend for use when creating backends
 // from user-provided options.
 bool register_backend(std::unique_ptr<backend>);

include/cgimap/backend/apidb/oauth_store.hpp

@@ -15,7 +15,6 @@
 
 #include "cgimap/data_selection.hpp"
 #include "cgimap/http.hpp"
-#include "cgimap/oauth.hpp"
 #include "cgimap/request_helpers.hpp"
 
 namespace oauth2 {

include/cgimap/oauth.hpp

@@ -33,7 +33,6 @@ class global_settings_base {
   virtual std::optional<uint32_t> get_relation_max_members() const = 0;
   virtual std::optional<uint32_t> get_element_max_tags() const = 0;
   virtual bool get_basic_auth_support() const = 0;
-  virtual bool get_oauth_10_support() const = 0;
   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;
@@ -86,10 +85,6 @@ class global_settings_default : public global_settings_base {
     return true;
   }
 
-  bool get_oauth_10_support() const override {
-    return true;
-  }
-
   uint32_t get_ratelimiter_ratelimit(bool moderator) const override {
     if (moderator) {
        return 1024 * 1024; // 1MB/s
@@ -171,10 +166,6 @@ class global_settings_via_options : public global_settings_base {
     return m_basic_auth_support;
   }
 
-  bool get_oauth_10_support() const override {
-    return m_oauth_10_support;
-  }
-
   uint32_t get_ratelimiter_ratelimit(bool moderator) const override {
     if (moderator) {
        return m_moderator_ratelimiter_ratelimit;
@@ -207,7 +198,6 @@ class global_settings_via_options : public global_settings_base {
   void set_relation_max_members(const po::variables_map &options);
   void set_element_max_tags(const po::variables_map &options);
   void set_basic_auth_support(const po::variables_map &options);
-  void set_oauth_10_support(const po::variables_map &options);
   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);
@@ -224,7 +214,6 @@ class global_settings_via_options : public global_settings_base {
   std::optional<uint32_t> m_relation_max_members;
   std::optional<uint32_t> m_element_max_tags;
   bool m_basic_auth_support;
-  bool m_oauth_10_support;
   uint32_t m_ratelimiter_ratelimit;
   uint32_t m_moderator_ratelimiter_ratelimit;
   uint32_t m_ratelimiter_maxdebt;
@@ -272,9 +261,6 @@ class global_settings final {
   // Enable HTTP basic authentication support
   static bool get_basic_auth_support() { return settings->get_basic_auth_support(); }
 
-  // Enable legacy OAuth 1.0 support
-  static bool get_oauth_10_support() { return settings->get_oauth_10_support(); }
-
   // average number of bytes/s to allow each client/moderator
   static uint32_t get_ratelimiter_ratelimit(bool moderator) { return settings->get_ratelimiter_ratelimit(moderator);  }
 

include/cgimap/oauth2.hpp

@@ -16,7 +16,6 @@
 #include "cgimap/data_selection.hpp"
 #include "cgimap/routes.hpp"
 #include "cgimap/basicauth.hpp"
-#include "cgimap/oauth.hpp"
 #include "cgimap/oauth2.hpp"
 #include <string>
 
@@ -26,7 +25,6 @@
 void process_request(request &req, rate_limiter &limiter,
                      const std::string &generator, const routes &route,
                      data_selection::factory& factory,
-                     data_update::factory* update_factory,
-                     oauth::store* store = nullptr);
+                     data_update::factory* update_factory);
 
 #endif /* PROCESS_REQUEST_HPP */