add way to disable cert verification

Author: dankmeme01

CMakeLists.txt

@@ -9,7 +9,7 @@ else()
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 endif()
 
-project(argon VERSION 1.1.2)
+project(argon VERSION 1.1.3)
 
 file(GLOB_RECURSE SOURCES
 	src/*.cpp

changelog.md

@@ -1,3 +1,8 @@
+# 1.1.3
+
+* Improve error messages further
+* Add a way to disable SSL certificate verification for web requests
+
 # 1.1.2
 
 * Slightly improve error messages

include/argon/argon.hpp

@@ -38,6 +38,12 @@ namespace argon {
     // Set the URL of the used Argon server, not thread-safe.
     geode::Result<> setServerUrl(std::string url);
 
+    // Enable or disable SSL certificate verification, by default is enabled.
+    void setCertVerification(bool state);
+
+    // Get whether certificate verification is enabled
+    bool getCertVerification();
+
     // Initializes the config lock structure for interoperability between other mods using Argon.
     // Should be called from the main thread once the game has at least reached the loading screen
     // (what matters is that GameManager::init has been run.)

src/main.cpp

@@ -109,6 +109,14 @@ Result<> setServerUrl(std::string url) {
     return ArgonState::get().setServerUrl(std::move(url));
 }
 
+void setCertVerification(bool state) {
+    ArgonState::get().setCertVerification(true);
+}
+
+bool getCertVerification() {
+    return ArgonState::get().getCertVerification();
+}
+
 void initConfigLock() {
     ArgonState::get().initConfigLock();
 }

src/state.cpp

@@ -80,6 +80,14 @@ asp::Mutex<>::Guard ArgonState::lockServerUrl() {
     return serverUrlMtx.lock();
 }
 
+void ArgonState::setCertVerification(bool state) {
+    this->certVerification = state;
+}
+
+bool ArgonState::getCertVerification() const {
+    return this->certVerification;
+}
+
 std::lock_guard<std::mutex> ArgonState::acquireConfigLock() {
     if (!configLock) {
         this->initConfigLock();
@@ -227,9 +235,18 @@ void ArgonState::processStage1Response(PendingRequest* req, web::WebResponse* re
     auto res = response->json();
 
     if (!res) {
+        auto str = response->string().unwrapOrDefault();
+
         log::warn("(Argon) Stage 1 request failed with code {}, server did not send a JSON, dumping server response.", response->code());
-        log::warn("{}", response->string().unwrapOrDefault());
-        this->handleStage1Error(req, fmt::format("Unknown server error ({})", response->code()));
+        log::warn("Response: {}", str);
+        log::warn("Curl (extra) error message: {}", response->errorMessage());
+
+        if (response->code() == -1) {
+            this->handleStage1Error(req, fmt::format("Unknown request error: ", truncate(str).asBorrowed()));
+        } else {
+            this->handleStage1Error(req, fmt::format("Unknown server error (code {}): {}", response->code(), truncate(str).asBorrowed()));
+        }
+
         return;
     }
 
@@ -299,9 +316,18 @@ void ArgonState::processStage3Response(PendingRequest* req, web::WebResponse* re
     auto res = response->json();
 
     if (!res) {
+        auto str = response->string().unwrapOrDefault();
+
         log::warn("(Argon) Stage 3 request failed with code {}, server did not send a JSON, dumping server response.", response->code());
-        log::warn("{}", response->string().unwrapOrDefault());
-        this->handleStage3Error(req, fmt::format("Unknown server error ({})", response->code()));
+        log::warn("Response: {}", str);
+        log::warn("Curl (extra) error message: {}", response->errorMessage());
+
+        if (response->code() == -1) {
+            this->handleStage3Error(req, fmt::format("Unknown request error: ", truncate(str).asBorrowed()));
+        } else {
+            this->handleStage3Error(req, fmt::format("Unknown server error (code {}): {}", response->code(), truncate(str).asBorrowed()));
+        }
+
         return;
     }
 

src/state.hpp

@@ -38,8 +38,13 @@ class ArgonState : public SingletonBase<ArgonState> {
     geode::Result<> setServerUrl(std::string url);
     std::string_view getServerUrl() const;
     asp::Mutex<>::Guard lockServerUrl();
+
+    void setCertVerification(bool state);
+    bool getCertVerification() const;
+
     std::lock_guard<std::mutex> acquireConfigLock();
     void initConfigLock();
+
     std::optional<asp::time::Duration> isInProgress(int accountId);
     void killAuthAttempt(int accountId);
 
@@ -53,6 +58,7 @@ class ArgonState : public SingletonBase<ArgonState> {
     friend class SingletonBase;
 
     asp::Mutex<> serverUrlMtx;
+    asp::AtomicBool certVerification = true;
     std::mutex* configLock = nullptr;
     std::string serverUrl;
     asp::Mutex<std::unordered_set<PendingRequest*>> pendingRequests;

src/web.cpp

@@ -123,6 +123,7 @@ WebTask startStage1(const AccountData& account, std::string_view preferredMethod
 
     auto req = web::WebRequest()
         .userAgent(getUserAgent())
+        .certVerification(argon.getCertVerification())
         .timeout(std::chrono::seconds(10))
         .bodyJSON(payload)
         .post(fmt::format("{}/v1/challenge/start", serverUrl));
@@ -145,6 +146,7 @@ WebTask restartStage1(const AccountData& account, std::string_view preferredMeth
 
     auto req = web::WebRequest()
         .userAgent(getUserAgent())
+        .certVerification(argon.getCertVerification())
         .timeout(std::chrono::seconds(10))
         .bodyJSON(payload)
         .post(fmt::format("{}/v1/challenge/restart", serverUrl));
@@ -164,6 +166,7 @@ WebTask startStage2Message(const AccountData& account, std::string_view serverUr
 
     // Upload a message to the GD bot account
     auto req = web::WebRequest()
+        .certVerification(getCertVerification())
         .timeout(std::chrono::seconds(20))
         .bodyString(payload)
         .userAgent("")
@@ -185,6 +188,7 @@ WebTask stage2MessageCleanup(const AccountData& account, int id, std::string_vie
 
     // delete the message
     auto req = web::WebRequest()
+        .certVerification(getCertVerification())
         .timeout(std::chrono::seconds(20))
         .bodyString(payload)
         .userAgent("")
@@ -210,6 +214,7 @@ WebTask startStage3(const AccountData& account, uint32_t challengeId, std::strin
 
     auto req = web::WebRequest()
         .userAgent(getUserAgent())
+        .certVerification(argon.getCertVerification())
         .timeout(std::chrono::seconds(10))
         .bodyJSON(payload)
         .post(fmt::format("{}/v1/challenge/verify", serverUrl));
@@ -229,6 +234,7 @@ WebTask pollStage3(const AccountData& account, uint32_t challengeId, std::string
 
     auto req = web::WebRequest()
         .userAgent(getUserAgent())
+        .certVerification(argon.getCertVerification())
         .timeout(std::chrono::seconds(10))
         .bodyJSON(payload)
         .post(fmt::format("{}/v1/challenge/verifypoll", serverUrl));