Patch URLs conditionally

src/commons.cpp

@@ -16,10 +16,10 @@ extern "C" void _xovi_construct() {
     QSettings extensionConfig(configFile, QSettings::IniFormat);
     QString newRMFCHostNameQStr = extensionConfig.value("host").toString();
     if (newRMFCHostNameQStr == "") {
-        std::cerr << "[" << NAME << "] No host defined in the config file!";
+        std::cerr << "[" << NAME << "] No host defined in the config file!" << std::endl;
         abort();
     }
-    std::cerr << "[" << NAME << "] New host set to: " << newRMFCHostNameQStr.toStdString();
+    std::cerr << "[" << NAME << "] New host set to: " << newRMFCHostNameQStr.toStdString() << std::endl;
     newRMFCHostName = newRMFCHostNameQStr;
     bool ok;
     newRMFCPort = extensionConfig.value("port").toInt(&ok);
@@ -38,8 +38,26 @@ extern "C" void _xovi_construct() {
         config.setCaCertificates(globalCerts);
         QSslConfiguration::setDefaultConfiguration(config);
     } else {
-        std::cerr << "[" << NAME << "] Failed to open CA file!";
+        std::cerr << "[" << NAME << "] Failed to open CA file!" << std::endl;
     }
 
     free(configRoot);
 }
+
+static inline bool shouldPatchURL(const QString &host) {
+    return QString(R""""(
+        hwr-production-dot-remarkable-production.appspot.com
+        service-manager-production-dot-remarkable-production.appspot.com
+        local.appspot.com
+        my.remarkable.com
+        ping.remarkable.com
+        internal.cloud.remarkable.com
+        eu.tectonic.remarkable.com
+        backtrace-proxy.cloud.remarkable.engineering
+        dev.ping.remarkable.com
+        dev.tectonic.remarkable.com
+        dev.internal.cloud.remarkable.com
+        eu.internal.tctn.cloud.remarkable.com
+        webapp-prod.cloud.remarkable.engineering
+    )"""").contains(host);
+}

src/networkaccess-part.cpp

@@ -12,6 +12,15 @@ extern "C" QNetworkReply* override$_ZN21QNetworkAccessManager13createRequestENS_
     const QNetworkRequest& req,
     QIODevice* outgoingData
 ) {
+    using CreateFn = QNetworkReply*(*)(QNetworkAccessManager*,
+                        QNetworkAccessManager::Operation,
+                        const QNetworkRequest&,
+                        QIODevice*);
+    CreateFn orig = reinterpret_cast<CreateFn>(
+        $_ZN21QNetworkAccessManager13createRequestENS_9OperationERK15QNetworkRequestP9QIODevice
+    );
+
+    if(shouldPatchURL(req.url().host())) {
         // set new url
         QUrl newUrl = req.url();
         newUrl.setHost(newRMFCHostName);
@@ -21,15 +30,9 @@ extern "C" QNetworkReply* override$_ZN21QNetworkAccessManager13createRequestENS_
         QNetworkRequest newReq(req);
         newReq.setUrl(newUrl);
 
-    // get original function signature
-    using CreateFn = QNetworkReply*(*)(QNetworkAccessManager*,
-                            QNetworkAccessManager::Operation,
-                            const QNetworkRequest&,
-                            QIODevice*);
-    CreateFn orig = reinterpret_cast<CreateFn>(
-        $_ZN21QNetworkAccessManager13createRequestENS_9OperationERK15QNetworkRequestP9QIODevice
-    );
-
         // call original function, and return the result
         return orig(self, op, newReq, outgoingData);
+    } else {
+        return orig(self, op, req, outgoingData);
+    }
 }

src/websocket-part.cpp

@@ -11,6 +11,13 @@ extern "C" void override$_ZN10QWebSocket4openERK15QNetworkRequest(
     QWebSocket* self,
     const QNetworkRequest& req
 ) {
+    using CreateFn = void*(*)(QWebSocket*,
+                        const QNetworkRequest&);
+    CreateFn orig = reinterpret_cast<CreateFn>(
+        $_ZN10QWebSocket4openERK15QNetworkRequest
+    );
+
+    if(shouldPatchURL(req.url().host())) {
         // set new url
         QUrl newUrl = req.url();
         newUrl.setHost(newRMFCHostName);
@@ -20,13 +27,10 @@ extern "C" void override$_ZN10QWebSocket4openERK15QNetworkRequest(
         QNetworkRequest newReq(req);
         newReq.setUrl(newUrl);
 
-    // get original function signature
-    using CreateFn = void*(*)(QWebSocket*,
-                            const QNetworkRequest&);
-    CreateFn orig = reinterpret_cast<CreateFn>(
-        $_ZN10QWebSocket4openERK15QNetworkRequest
-    );
 
         // call original function, and return the result
         orig(self, newReq);
+    } else {
+        orig(self, req);
+    }
 }