Add validation for the feedback topic id.

src/addon/validation.cpp

@@ -541,6 +541,14 @@ std::string addon_check_status_desc(unsigned int code)
 			ADDON_CHECK_STATUS::VERSION_NOT_INCREMENTED,
 			N_("Version number not greater than the latest uploaded version.")
 		},
+		{
+			ADDON_CHECK_STATUS::BAD_FEEDBACK_TOPIC_ID,
+			N_("Feedback topic id is not a number.")
+		},
+		{
+			ADDON_CHECK_STATUS::FEEDBACK_TOPIC_ID_NOT_FOUND,
+			N_("Feedback topic does not exist.")
+		},
 		{
 			ADDON_CHECK_STATUS::INVALID_UTF8_ATTRIBUTE,
 			N_("The add-on publish information contains an invalid UTF-8 sequence.")

src/addon/validation.hpp

@@ -60,6 +60,8 @@ enum class ADDON_CHECK_STATUS : unsigned int
 	BAD_TYPE					= 0x207,		/**< Bad add-on type */
 	VERSION_NOT_INCREMENTED		= 0x208,		/**< Version number is not an increment */
 	INVALID_UTF8_ATTRIBUTE		= 0x2FF,		/**< Invalid UTF-8 sequence in add-on metadata */
+	BAD_FEEDBACK_TOPIC_ID       = 0x209,        /**< The provided topic ID for the addon's feedback forum thread is invalid */
+	FEEDBACK_TOPIC_ID_NOT_FOUND = 0x2A0,        /**< The provided topic ID for the addon's feedback forum thread wasn't found in the forum database */
 	//
 	// Server errors
 	//

src/server/campaignd/server.cpp

@@ -1372,6 +1372,21 @@ ADDON_CHECK_STATUS server::validate_addon(const server::request& req, config*& e
 		return ADDON_CHECK_STATUS::UNEXPECTED_DELTA;
 	}
 
+	if(const config& url_params = upload.child("feedback")) {
+		try {
+			int topic_id = std::stoi(url_params["topic_id"].str("0"));
+			if(user_handler_ && topic_id != 0) {
+				if(!user_handler_->db_topic_id_exists(topic_id)) {
+					LOG_CS << "Validation error: feedback topic ID does not exist in forum database\n";
+					return ADDON_CHECK_STATUS::FEEDBACK_TOPIC_ID_NOT_FOUND;
+				}
+			}
+		} catch(...) {
+			LOG_CS << "Validation error: feedback topic ID is not a valid number\n";
+			return ADDON_CHECK_STATUS::BAD_FEEDBACK_TOPIC_ID;
+		}
+	}
+
 	return ADDON_CHECK_STATUS::SUCCESS;
 }
 

src/server/common/dbconn.cpp

@@ -34,6 +34,7 @@ dbconn::dbconn(const config& c)
 	, db_game_content_info_table_(c["db_game_content_info_table"].str())
 	, db_user_group_table_(c["db_user_group_table"].str())
 	, db_tournament_query_(c["db_tournament_query"].str())
+	, db_topics_table_(c["db_topics_table"].str())
 {
 	try
 	{
@@ -344,6 +345,19 @@ void dbconn::set_oos_flag(const std::string& uuid, int game_id)
 	}
 }
 
+bool dbconn::topic_id_exists(int topic_id) {
+	try
+	{
+		return exists(connection_, "SELECT 1 FROM `"+db_topics_table_+"` WHERE TOPIC_ID = ?",
+			topic_id);
+	}
+	catch(const mariadb::exception::base& e)
+	{
+		log_sql_exception("Unable to check whether `"+std::to_string(topic_id)+"` exists.", e);
+		return true;
+	}
+}
+
 //
 // handle complex query results
 //

src/server/common/dbconn.hpp

@@ -143,6 +143,11 @@ class dbconn
 		 */
 		void set_oos_flag(const std::string& uuid, int game_id);
 
+		/**
+		 * @see forum_user_handler::db_topic_id_exists().
+		 */
+		bool topic_id_exists(int topic_id);
+
 	private:
 		/**
 		 * The account used to connect to the database.
@@ -169,6 +174,8 @@ class dbconn
 		std::string db_user_group_table_;
 		/** The text of the SQL query to use to retrieve any currently active tournaments. */
 		std::string db_tournament_query_;
+		/** The name of the table that contains phpbb forum thread information */
+		std::string db_topics_table_;
 
 		/**
 		 * This is used to write out error text when an SQL-related exception occurs.

src/server/common/forum_user_handler.cpp

@@ -243,4 +243,8 @@ void fuh::async_test_query(boost::asio::io_service& io_service, int limit) {
 	 });
 }
 
+bool fuh::db_topic_id_exists(int topic_id) {
+	return conn_.topic_id_exists(topic_id);
+}
+
 #endif //HAVE_MYSQLPP

src/server/common/forum_user_handler.hpp

@@ -200,6 +200,14 @@ class fuh : public user_handler
 	 */
 	void async_test_query(boost::asio::io_service& io_service, int limit);
 
+	/**
+	 * Checks whether a forum thread with @a topic_id exists.
+	 * 
+	 * @param topic_id The topic id to check for.
+	 * @return True if the thread exists or there was a database failure, false if the topic wasn't found.
+	 */
+	bool db_topic_id_exists(int topic_id);
+
 private:
 	/** An instance of the class responsible for executing the queries and handling the database connection. */
 	dbconn conn_;

src/server/common/user_handler.hpp

@@ -142,4 +142,5 @@ class user_handler
 	virtual void db_insert_game_content_info(const std::string& uuid, int game_id, const std::string& type, const std::string& name, const std::string& id, const std::string& source, const std::string& version) = 0;
 	virtual void db_set_oos_flag(const std::string& uuid, int game_id) = 0;
 	virtual void async_test_query(boost::asio::io_service& io_service, int limit) = 0;
+	virtual bool db_topic_id_exists(int topic_id) = 0;
 };

utils/mp-server/table_definitions.sql

@@ -18,6 +18,13 @@
 --     PRIMARY KEY (USER_ID, GROUP_ID)
 -- ) ENGINE=InnoDB;
 
+-- a minimal topics table, if not using a phpbb3 installation
+-- create table topics
+-- (
+--     TOPIC_ID MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT,
+--     PRIMARY KEY (TOPIC_ID)
+-- ) ENGINE=InnoDB;
+
 -- table which the forum inserts bans into, which wesnothd checks during login
 -- create table ban
 -- (