Fixed upload into account on directupload.eu; Fixed crash after changing login

* Fixed crash after changing login in Login dialog

Author: zenden2k

Data/Scripts/directupload.nut

@@ -1,25 +1,46 @@
 const BASE_HOST = "https://www.directupload.eu";
 
 function Authenticate() {
+    nm.doGet(BASE_HOST + "/mitglieder/");
+    if (nm.responseCode() != 200) {
+        WriteLog("error", "[directupload.eu] Failed to load the login page.");
+        return ResultCode.Failure;
+    }
+    local doc = Document(nm.responseBody());
+    local inputElement = doc.find("input[name=\"csrf_token\"]");
+    if (!inputElement.length()) {
+        WriteLog("error", "[directupload.eu] Failed to obtain CSRF token.");
+        return ResultCode.Failure;
+    }
+    local csrfToken = inputElement.attribute("value");
+
     local login = ServerParams.getParam("Login");
     local pass = ServerParams.getParam("Password");
     if (login == "" || pass == "") {
-        return 0;
+        return ResultCode.Failure;
     }
     nm.doGet(BASE_HOST + "/");
 
     nm.setReferer(BASE_HOST + "/");
     nm.setUrl(BASE_HOST + "/index.php?mode=user");
     nm.addQueryParam("benutzername", login);
+    nm.addQueryParam("csrf_token", csrfToken);
     nm.addQueryParam("passwort", pass);
     nm.addQueryParam("everlasting", "");
     nm.addQueryParam("anmelden", "Einloggen"); 
     nm.doPost("");
 
     if (nm.responseCode() == 200 || nm.responseCode() == 302) {
-        return 1;
+        doc = Document(nm.responseBody());
+        if (doc.find("div.message.error").length()) {
+            WriteLog("error", "[directupload.eu] Failed to authenticate. Invalid login or password.");
+            return ResultCode.Failure;
+        }
+        return ResultCode.Success;
+    } else {
+        WriteLog("error", "[directupload.eu] Failed to authenticate. Response code: " + nm.responseCode());
     }
-    return 0;
+    return ResultCode.Failure;
 }
 
 function _AnonymousUpload(fileName, options) {

Source/Core/Upload/UploadEngineManager.cpp

@@ -61,13 +61,15 @@ CAbstractUploadEngine* UploadEngineManager::getUploadEngine(ServerProfile &serve
         LOG(ERROR) << "No such server " << serverProfile.serverName();
         return nullptr;
     }
-    CAbstractUploadEngine* result = nullptr;
+    std::shared_ptr<CAbstractUploadEngine> result = nullptr;
     std::string serverName = serverProfile.serverName();
     std::thread::id threadId = std::this_thread::get_id();
 
     BasicSettings* Settings = ServiceLocator::instance()->basicSettings();
     ServerSettingsStruct* serverSettings = Settings->getServerSettings(serverProfile, true);
     std::string authDataLogin = serverSettings ? serverSettings->authData.Login : std::string();
+    auto key = std::make_pair(serverName, serverProfile.profileName());
+
     if (ue->UsingPlugin) {
         // Try to load Squirrel (.nut) script
         result = getPlugin(serverProfile, ue->PluginName);
@@ -80,9 +82,9 @@ CAbstractUploadEngine* UploadEngineManager::getUploadEngine(ServerProfile &serve
         CAbstractUploadEngine* plugin = nullptr;
         auto it = m_plugins.find(threadId);
         if (it != m_plugins.end()) {
-            auto it2 = it->second.find(serverName);
+            auto it2 = it->second.find(key);
             if (it2 != it->second.end()) {
-                plugin = it2->second;
+                plugin = it2->second.get();
             }
         }
 
@@ -96,48 +98,48 @@ CAbstractUploadEngine* UploadEngineManager::getUploadEngine(ServerProfile &serve
         if (!ue->Engine.empty()) {
 #ifdef IU_ENABLE_MEGANZ
             if (ue->Engine == "MegaNz") {
-                result = new CMegaNzUploadEngine(serverSync, serverSettings, errorCallback);
+                result = std::make_shared<CMegaNzUploadEngine>(serverSync, serverSettings, errorCallback);
             }
 #endif
             if (!result) {
                 LOG(ERROR) << "There is no built-in upload engine named '" << ue->Engine << "'.";
                 return nullptr;
             }
         } else {
-            result = new CDefaultUploadEngine(serverSync, errorCallback);
+            result = std::make_shared<CDefaultUploadEngine>(serverSync, errorCallback);
         }
         result->setServerSettings(serverSettings);
         result->setUploadData(ue);
 
-        m_plugins[threadId][serverName] = result;
+        m_plugins[threadId][key] = result;
     }
 
     result->setServerSettings(serverSettings);
     result->setUploadData(ue);
     result->setOnErrorMessageCallback(std::bind(&IUploadErrorHandler::ErrorMessage,uploadErrorHandler_.get(),std::placeholders::_1));
-    return result;
+    return result.get();
 }
 
 CScriptUploadEngine* UploadEngineManager::getScriptUploadEngine(ServerProfile& serverProfile)
 {
     return dynamic_cast<CScriptUploadEngine*>(getUploadEngine(serverProfile));
 }
 
-CScriptUploadEngine* UploadEngineManager::getPlugin(ServerProfile& serverProfile, const std::string& pluginName, bool UseExisting) {
+ std::shared_ptr<CScriptUploadEngine> UploadEngineManager::getPlugin(ServerProfile& serverProfile, const std::string& pluginName, bool UseExisting) {
     std::lock_guard<std::mutex> lock(pluginsMutex_);
     std::string serverName = serverProfile.serverName();
 
     BasicSettings* basicSettings = ServiceLocator::instance()->basicSettings();
     ServerSettingsStruct* params = basicSettings->getServerSettings(serverProfile, true);
 
     std::thread::id threadId = std::this_thread::get_id();
-    CScriptUploadEngine* plugin = nullptr;
-
+    std::shared_ptr<CScriptUploadEngine> plugin;
+    auto key = std::make_pair(serverName, serverProfile.profileName());
     auto it = m_plugins.find(threadId);
     if (it != m_plugins.end()) {
-        auto it2 = it->second.find(serverName);
+        auto it2 = it->second.find(key);
         if (it2 != it->second.end()) {
-            plugin = dynamic_cast<CScriptUploadEngine*>(it2->second);;
+            plugin = std::dynamic_pointer_cast<CScriptUploadEngine>(it2->second);
         }
     }
 
@@ -155,40 +157,31 @@ CScriptUploadEngine* UploadEngineManager::getPlugin(ServerProfile& serverProfile
     }
 
     if (plugin) {
-        delete plugin;
-        plugin = 0;
-        m_plugins[threadId][serverName] = nullptr;
+        m_plugins[threadId][key] = nullptr;
     }
     ServerSync* serverSync = getServerSync(serverProfile);
     std::string fileName = scriptsDirectory_ + pluginName + ".nut";
-    CScriptUploadEngine* newPlugin = new CScriptUploadEngine(fileName, serverSync, params, networkClientFactory_,
+    auto newPlugin = std::make_shared<CScriptUploadEngine>(fileName, serverSync, params, networkClientFactory_,
         std::bind(&IUploadErrorHandler::ErrorMessage, uploadErrorHandler_.get(), std::placeholders::_1));
 
     if (newPlugin->isLoaded()) {
-        m_plugins[threadId][serverName] = newPlugin;
+        m_plugins[threadId][key] = newPlugin;
         return newPlugin;
     }
-    else {
-        delete newPlugin;
-    }
+
     return nullptr;
 }
 
 void UploadEngineManager::unloadUploadEngines() {
     std::lock_guard<std::mutex> lock(pluginsMutex_);
-    for (auto it = m_plugins.begin(); it != m_plugins.end(); ++it) {
-        for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2) {
-            delete it2->second;
-        }
-    }
     m_plugins.clear();
 }
 
 
 void UploadEngineManager::unloadUploadEngines(const std::string& serverName, const std::string& profileName) {
     std::lock_guard<std::mutex> lock(pluginsMutex_);
     for (auto &pr: m_plugins) {
-        pr.second.erase(serverName);
+        pr.second.erase({ serverName, profileName });
     }
 }
 
@@ -202,9 +195,6 @@ void UploadEngineManager::clearThreadData()
     std::thread::id threadId = std::this_thread::get_id();
     auto it = m_plugins.find(threadId);
     if (it != m_plugins.end()) {
-        for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2) {
-            delete it2->second;
-        }
         m_plugins.erase(it);
     }
 }

Source/Core/Upload/UploadEngineManager.h

@@ -4,7 +4,10 @@
 #pragma once
 #include <thread>
 #include <mutex>
+#include <memory>
+#include <unordered_map>
 
+#include "Core/Utils/CoreUtils.h"
 #include "UploadEngine.h"
 
 // Forward class declarations
@@ -58,9 +61,9 @@ class UploadEngineManager
     */
     void resetFailedAuthorization();
 protected:
-    CScriptUploadEngine* getPlugin(ServerProfile& serverProfile, const std::string& pluginName, bool UseExisting = false);
+    std::shared_ptr<CScriptUploadEngine> getPlugin(ServerProfile& serverProfile, const std::string& pluginName, bool UseExisting = false);
     ServerSync* getServerSync(const ServerProfile& serverProfile);
-    std::map<std::thread::id, std::map< std::string, CAbstractUploadEngine*>> m_plugins;
+    std::map<std::thread::id, std::unordered_map<std::pair<std::string, std::string>, std::shared_ptr<CAbstractUploadEngine>>> m_plugins;
     std::mutex pluginsMutex_;
     std::string scriptsDirectory_;
     CUploadEngineList* uploadEngineList_;

Source/Core/Utils/CoreUtils.h

@@ -85,6 +85,25 @@ make_unique_malloc(std::size_t size) noexcept
     static_assert(std::is_trivial_v<T>);
     return unique_c_ptr<T>{static_cast<T*>(std::malloc(size))};
 }
+
+template <typename T>
+inline void hash_combine(std::size_t& seed, const T& val) {
+    std::hash<T> hasher;
+    seed ^= hasher(val) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+}
+
+//  taken from https://stackoverflow.com/a/7222201/916549
+//
+template <typename S, typename T>
+struct std::hash<std::pair<S, T>> {
+    inline size_t operator()(const std::pair<S, T>& val) const {
+        size_t seed = 0;
+        hash_combine(seed, val.first);
+        hash_combine(seed, val.second);
+        return seed;
+    }
+};
+
 namespace IuCoreUtils
 {
     // A version of fopen() function which supports utf8 file names

Source/Core/WinServerIconCache.h

@@ -7,26 +7,10 @@
 #include <future>
 
 #include "AbstractServerIconCache.h"
+#include "Core/Utils/CoreUtils.h"
 
 class IconBitmapUtils;
 
-template <typename T>
-inline void hash_combine(std::size_t& seed, const T& val) {
-    std::hash<T> hasher;
-    seed ^= hasher(val) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
-}
-
-//  taken from https://stackoverflow.com/a/7222201/916549
-//
-template <typename S, typename T>
-struct std::hash<std::pair<S, T>> {
-    inline size_t operator()(const std::pair<S, T>& val) const {
-        size_t seed = 0;
-        hash_combine(seed, val.first);
-        hash_combine(seed, val.second);
-        return seed;
-    }
-};
 
 /*struct PairHash {
     template <typename T1, typename T2>

Source/Gui/Dialogs/LoginDlg.cpp

@@ -283,7 +283,8 @@ void CLoginDlg::Accept()
 
         if (!accountName_.IsEmpty()) {
             // If user has changed account's name, delete account with old name
-            Settings.ServersSettings[serverName].erase(oldAccountName);
+            uploadEngineManager_->unloadUploadEngines(serverProfile_.serverName(), serverProfile_.profileName());
+            Settings.deleteProfile(serverName, oldAccountName);
         }
     }