support archive.org protected urls

support for servers that does not permit NOOP
2025-01-11 21:25:55 -08:00 · 2025-01-10 21:06:19 -08:00 · 2025-01-10 21:05:16 -08:00 · 2024-11-08 22:55:32 -08:00 · 2024-11-08 22:33:05 -08:00 · 2024-11-08 11:24:14 +01:00
15 changed files with 1797 additions and 619 deletions
@@ -69,7 +69,7 @@ add_executable(ezremote_client

 add_self(ezremote_client)

-add_pkg(ezremote_client ${CMAKE_SOURCE_DIR}/data "RMTC00001" "ezRemote Client" "01.29" 32 0)
+add_pkg(ezremote_client ${CMAKE_SOURCE_DIR}/data "RMTC00001" "ezRemote Client" "01.34" 32 0)

 target_link_libraries(ezremote_client
  c
@@ -0,0 +1,166 @@
+STR_CONNECTION_SETTINGS=Tilkoblingsinnstillinger
+STR_SITE=Side
+STR_LOCAL=Lokal
+STR_REMOTE=Ekstern
+STR_MESSAGES=Meldinger
+STR_UPDATE_SOFTWARE=Oppdater programvare
+STR_CONNECT=Koble til
+STR_DISCONNECT=Koble fra
+STR_SEARCH=Søk
+STR_REFRESH=Oppdater
+STR_SERVER=Tjener
+STR_USERNAME=Brukernavn
+STR_PASSWORD=Passord
+STR_PORT=Port
+STR_PASV=Pasv
+STR_DIRECTORY=Mappe
+STR_FILTER=Filter
+STR_YES=Ja
+STR_NO=Nei
+STR_CANCEL=Avbryt
+STR_CONTINUE=Fortsett
+STR_CLOSE=Lukk
+STR_FOLDER=Mappe
+STR_FILE=Fil
+STR_TYPE=Type
+STR_NAME=Navn
+STR_SIZE=Størrelse
+STR_DATE=Dato
+STR_NEW_FOLDER=Ny mappe
+STR_RENAME=Gi nytt navn
+STR_DELETE=Slett
+STR_UPLOAD=Last opp
+STR_DOWNLOAD=Last ned
+STR_SELECT_ALL=Marker alle
+STR_CLEAR_ALL=Fjern alle
+STR_UPLOADING=Laster opp
+STR_DOWNLOADING=Laster ned
+STR_OVERWRITE=Skriv over
+STR_DONT_OVERWRITE=Ikke skriv over
+STR_ASK_FOR_CONFIRM=Spør om bekreftelse
+STR_DONT_ASK_CONFIRM=Ikke spør om bekreftelse
+STR_ALLWAYS_USE_OPTION=Bruk alltid dette valget og ikke spør igjen
+STR_ACTIONS=Handlinger
+STR_CONFIRM=Bekreft
+STR_OVERWRITE_OPTIONS=Overskriv innstillinger
+STR_PROPERTIES=Egenskaper
+STR_PROGRESS=Framdrift
+STR_UPDATES=Oppdateringer
+STR_DEL_CONFIRM_MSG=Er du sikker på at du vil slette filen(e)/mappen(e)?
+STR_CANCEL_ACTION_MSG=Avbryter. Venter på at siste handling skal fullføres
+STR_FAIL_UPLOAD_MSG=Opplasting av fil mislykkes
+STR_FAIL_DOWNLOAD_MSG=Nedlasting av fil mislykkes
+STR_FAIL_READ_LOCAL_DIR_MSG=Lesing av mappe mislykkes, eller mappen finnes ikke.
+STR_CONNECTION_CLOSE_ERR_MSG=426 Tilkobling Lukket.
+STR_REMOTE_TERM_CONN_MSG=426 Ekstern Tjener har lukket tilkoblingen.
+STR_FAIL_LOGIN_MSG=300 Innlogging Mislykkes. Vennligst sjekk ditt brukernavn og passord.
+STR_FAIL_TIMEOUT_MSG=426 Mislykkes. Tilkoblingen timet ut.
+STR_FAIL_DEL_DIR_MSG=Sletting av mappe mislykkes
+STR_DELETING=Sletter
+STR_FAIL_DEL_FILE_MSG=Sletting av fil mislykkes
+STR_DELETED=Slettet
+STR_LINK=Lenke
+STR_SHARE=Del
+STR_FAILED=310 Mislykket
+STR_FAIL_CREATE_LOCAL_FILE_MSG=310 Oppretting av lokal fil mislykkes
+STR_INSTALL=Installér
+STR_INSTALLING=Installerer
+STR_INSTALL_SUCCESS=Vellykket
+STR_INSTALL_FAILED=Mislykket
+STR_INSTALL_SKIPPED=Hoppet over
+STR_CHECK_HTTP_MSG=Sjekker tilkobling til ekstern HTTP-tjener
+STR_FAILED_HTTP_CHECK=Mislykket tilkobling til HTTP-tjener
+STR_REMOTE_NOT_HTTP=Ekstern tjener er ikke en HTTP-tjener
+STR_INSTALL_FROM_DATA_MSG=Pakke finnes ikke i mappene /data eller /mnt/usbX
+STR_ALREADY_INSTALLED_MSG=Pakken er allerede installert
+STR_INSTALL_FROM_URL=Installer fra URL
+STR_CANNOT_READ_PKG_HDR_MSG=Kunne ikke lese pakkens header
+STR_FAVORITE_URLS=Favoritt-URLer
+STR_SLOT=Spor
+STR_EDIT=Redigér
+STR_ONETIME_URL=Engangs-URL
+STR_NOT_A_VALID_PACKAGE=Ikke en gyldig pakke
+STR_WAIT_FOR_INSTALL_MSG=Venter på at pakke skal bli ferdig å installere
+STR_FAIL_INSTALL_TMP_PKG_MSG=Installasjon av PKG-fil mislykkes. Vennligst slett den midlertidlige PKG-filen manuelt
+STR_FAIL_TO_OBTAIN_GG_DL_MSG=Kunne ikke hente nedlastings-URL
+STR_AUTO_DELETE_TMP_PKG=Automatisk slett midlertidig nedlastet PKG-fil etter installasjon
+STR_PROTOCOL_NOT_SUPPORTED=Protokollen er ikke støttet
+STR_COULD_NOT_RESOLVE_HOST=Kunne ikke koble til tjenernavnet
+STR_EXTRACT=Pakk ut
+STR_EXTRACTING=Pakker ut
+STR_FAILED_TO_EXTRACT=Utpakking mislykkes
+STR_EXTRACT_LOCATION=Utpakkingsbane
+STR_COMPRESS=Komprimér
+STR_ZIP_FILE_PATH=ZIP-filnavn
+STR_COMPRESSING=Komprimerer
+STR_ERROR_CREATE_ZIP=Oppretting av ZIP mislykket
+STR_UNSUPPORTED_FILE_FORMAT=Arkivformatet er ikke støttet
+STR_CUT=Klipp ut
+STR_COPY=Kopiér
+STR_PASTE=Lim inn
+STR_MOVING=Flytter
+STR_COPYING=Kopierer
+STR_FAIL_MOVE_MSG=Flytting av fil mislykkes
+STR_FAIL_COPY_MSG=Kopiering av fil mislykkes
+STR_CANT_MOVE_TO_SUBDIR_MSG=Kan ikke flytte overordnet mappe til undermappe
+STR_CANT_COPY_TO_SUBDIR_MSG=Kan ikke kopiere overordnet mappe til undermappe
+STR_UNSUPPORTED_OPERATION_MSG=Handling ikke støttet
+STR_HTTP_PORT=HTTP-port
+STR_REINSTALL_CONFIRM_MSG=Innholdet er allerede installert. Vil du fortsette installasjonen
+STR_REMOTE_NOT_SUPPORT_MSG=Fjerninstallasjon av pakker er ikke støttet for beskyttede tjenere.
+STR_CANNOT_CONNECT_REMOTE_MSG=Ekstern HTTP-tjener kan ikke nås.
+STR_DOWNLOAD_INSTALL_MSG=Fjerninstallasjon er ikke mulig. Vil du laste ned pakken og installere den istedet?
+STR_CHECKING_REMOTE_SERVER_MSG=Sjekker tjener for fjerninstallasjon av pakke.
+STR_ENABLE_RPI=FIP
+STR_ENABLE_RPI_FTP_SMB_MSG=Dette valget skrur på fjerninstallasjon av pakke via innebygd Web-tjenerproxy.
+STR_ENABLE_RPI_WEBDAV_MSG=Dette valget skrur på fjerninstallasjon av pakke via innebygd Web-tjenerproxy.
+STR_FILES=Filer
+STR_EDITOR=Redigeringsprogram
+STR_SAVE=Lagre
+STR_MAX_EDIT_FILE_SIZE_MSG=Kan ikke redigere filer større enn
+STR_DELETE_LINE=Slett markert linje
+STR_INSERT_LINE=Sett inn under markert linje
+STR_MODIFIED=Endret
+STR_FAIL_GET_TOKEN_MSG=Kunne ikke hente en tilgangstoken fra
+STR_GET_TOKEN_SUCCESS_MSG=Innlogging vellykket. Du kan lukke nettleseren og gå tilbake til applikasjonen
+STR_PERM_DRIVE=Se, endre, opprette og slette dine Google Drive-filer
+STR_PERM_DRIVE_APPDATA=Se, opprette og slette dens egen konfigurasjonsdata i din Google Drive
+STR_PERM_DRIVE_FILE=Se, endre, opprette og slette kun de spesifikke Google Drive-filene du bruker med denne appen
+STR_PERM_DRIVE_METADATA=Vise og behandle metadataen til filer i din Google Drive
+STR_PERM_DRIVE_METADATA_RO=Se informasjon om dine Google Drive-filer
+STR_GOOGLE_LOGIN_FAIL_MSG=Google-innlogging mislykkes
+STR_GOOGLE_LOGIN_TIMEOUT_MSG=Google-innlogging timet ut
+STR_NEW_FILE=Ny Fil
+STR_SETTINGS=Innstillinger
+STR_CLIENT_ID=Klient-ID
+STR_CLIENT_SECRET=Klienthemmelighet (Client Secret)
+STR_GLOBAL=Global
+STR_GOOGLE=Google
+STR_COPY_LINE=Kopier markert linje
+STR_PASTE_LINE=Lim inn i markert linje
+STR_SHOW_HIDDEN_FILES=Vis skjulte filer
+STR_SET_DEFAULT_DIRECTORY=Sett oppstartsmappe
+STR_SET_DEFAULT_DIRECTORY_MSG=har blitt satt som oppstartsmappe
+STR_VIEW_IMAGE=Vis bilde
+STR_VIEW_PKG_INFO=Pakkeinformasjon
+STR_NFS_EXP_PATH_MISSING_MSG=NFS-eksportbane mangler fra URL
+STR_FAIL_INIT_NFS_CONTEXT=Initialisering av NFS-kontekst mislykkes
+STR_FAIL_MOUNT_NFS_MSG=Montering av NFS-share mislykkes
+STR_WEB_SERVER=Web-tjener
+STR_ENABLE=Skru på
+STR_COMPRESSED_FILE_PATH=Lokasjon for komprimerte filer
+STR_COMPRESSED_FILE_PATH_MSG=Lokasjon for komprimerte filer på Web-tjener
+STR_ALLDEBRID=AllDebrid
+STR_API_KEY=API-nøkkel
+STR_CANT_EXTRACT_URL_MSG=Kunne ikke utvinne nedlastings-URL
+STR_FAIL_INSTALL_FROM_URL_MSG=Installasjon fra URL mislykkes
+STR_INVALID_URL=Ugyldig URL
+STR_ALLDEBRID_API_KEY_MISSING_MSG=For å bruke denne funksjonen, må du konfigurere en API-nøkkel i instillingene for ezRemote Client.
+STR_LANGUAGE=Språk
+STR_TEMP_DIRECTORY=Midlertidig mappe
+STR_REALDEBRID=Real-Debrid
+STR_BACKGROUND_INSTALL_INPROGRESS=Pakkeinstallasjon kjører i bakrunnen. Ikke lykk denne appen mens installasjonen pågår
+STR_ENABLE_DISC_CACHE_MSG=Skru på disk-caching. Kan gjøre fjerninstallasjon av pakker kjappere når tilkoblingen er treg, men lar deg ikke fortsette en avbrutt installasjon
+STR_ENABLE_ALLDEBRID_MSG=Installér via AllDebrid
+STR_ENABLE_REALDEBRID_MSG=Installér via RealDebrid
+STR_ENABLE_DISKCACHE_DESC=Skru på disk-cache
@@ -1157,7 +1157,7 @@ namespace Actions
        int ret = tmp_client.Size(path, &bytes_to_download);
        if (ret == 0)
        {
-            sprintf(status_message, "%s - %s", lang_strings[STR_FAILED], lang_strings[STR_CANNOT_READ_PKG_HDR_MSG]);
+            sprintf(status_message, "%s", tmp_client.LastResponse());
            tmp_client.Quit();
            activity_inprogess = false;
            Windows::SetModalMode(false);
@@ -128,18 +128,31 @@ std::vector<DirEntry> ApacheClient::ListDir(const std::string &path)
            tmp_string = std::string((const char *)value, value_len);
            if (tmp_string.compare("td") == 0)
            {
-                value = lxb_dom_node_text_content(node, &value_len);
+                // get the child <a> element
+                lxb_dom_node_t *a_node = NextChildElement(lxb_dom_interface_element(node));
+                if (a_node == nullptr) continue;
+
+                value = lxb_dom_element_local_name(lxb_dom_interface_element(a_node), &value_len);
                tmp_string = std::string((const char *)value, value_len);
-                tmp_string = Util::Rtrim(tmp_string, "/");
-                sprintf(entry.name, "%s", tmp_string.c_str());
-                sprintf(entry.directory, "%s", path.c_str());
-                if (path.length() > 0 && path[path.length() - 1] == '/')
+                if (tmp_string.compare("a") == 0)
                {
-                    sprintf(entry.path, "%s%s", path.c_str(), entry.name);
-                }
-                else
-                {
-                    sprintf(entry.path, "%s/%s", path.c_str(), entry.name);
+                    value = lxb_dom_element_get_attribute(lxb_dom_interface_element(a_node), (const lxb_char_t *)"href", 4, &value_len);
+                    tmp_string = std::string((const char *)value, value_len);
+                    tmp_string = Util::Rtrim(tmp_string, "/");
+                    tmp_string = BaseClient::UnEscape(tmp_string);
+                    if (tmp_string.compare("..") != 0)
+                    {
+                        sprintf(entry.directory, "%s", path.c_str());
+                        sprintf(entry.name, "%s", tmp_string.c_str());
+                        if (path.length() > 0 && path[path.length() - 1] == '/')
+                        {
+                            sprintf(entry.path, "%s%s", path.c_str(), entry.name);
+                        }
+                        else
+                        {
+                            sprintf(entry.path, "%s/%s", path.c_str(), entry.name);
+                        }
+                    }
                }
            }
            else continue; // not valid record
@@ -15,7 +15,119 @@ using httplib::Client;
 using httplib::Headers;
 using httplib::Result;

+struct InsensitiveCompare
+{
+    bool operator()(const std::string &a, const std::string &b) const
+    {
+        return strcasecmp(a.c_str(), b.c_str()) < 0;
+    }
+};
+
 static std::map<std::string, int> month_map = {{"Jan", 1}, {"Feb", 2}, {"Mar", 3}, {"Apr", 4}, {"May", 5}, {"Jun", 6}, {"Jul", 7}, {"Aug", 8}, {"Sep", 9}, {"Oct", 10}, {"Nov", 11}, {"Dec", 12}};
+static std::set<std::string, InsensitiveCompare> ignore_cookie_keys = {"path", "expires", "max-age", "domain", "secure"};
+
+std::string ArchiveOrgClient::GenerateRandomId(const int len)
+{
+    static const char alphanum[] = "0123456789abcdef";
+    std::string tmp_s;
+    tmp_s.reserve(len);
+
+    for (int i = 0; i < len; ++i) {
+        tmp_s += alphanum[rand() % (sizeof(alphanum) - 1)];
+    }
+    
+    return tmp_s;
+}
+
+int ArchiveOrgClient::Connect(const std::string &url, const std::string &username, const std::string &password)
+{
+    this->host_url = url;
+    size_t scheme_pos = url.find("://");
+    size_t root_pos = url.find("/", scheme_pos + 3);
+    if (root_pos != std::string::npos)
+    {
+        this->host_url = url.substr(0, root_pos);
+        this->base_path = url.substr(root_pos);
+    }
+    client = new httplib::Client(this->host_url);
+    client->set_keep_alive(true);
+    client->set_follow_location(true);
+    client->set_connection_timeout(30);
+    client->set_read_timeout(30);
+    client->enable_server_certificate_verification(false);
+
+    this->cookies = {
+        {"donation-identifier", GenerateRandomId(32)},
+        {"test-cookie", "1"},
+        {"abtest-identifier", GenerateRandomId(32)}
+    };
+
+    if (username.length() > 0)
+        return Login(username, password);
+    else if (Ping())
+        this->connected = true;
+    return 1;
+}
+
+int ArchiveOrgClient::Login(const std::string &username, const std::string &password)
+{
+    std::string url = std::string("/account/login");
+    Headers headers = {{ "User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:133.0) Gecko/20100101 Firefox/133.0"}};
+    SetCookies(headers);
+
+    MultipartFormDataItems items = {
+        {"username", username, "", ""},
+        {"password", password, "", ""},
+        {"remember", "true", "", ""},
+        {"referer", "https://archive.org/", "", ""},
+        {"login", "true", "", ""},
+        {"submit_by_js", "true", "", ""}};
+
+    if (auto res = client->Post(url, headers, items))
+    {
+        if (HTTP_SUCCESS(res->status))
+        {
+            if (res->has_header("Set-Cookie"))
+            {
+                int cookies_count = res->get_header_value_count("Set-Cookie");
+
+                for (int i = 0; i < cookies_count; i++)
+                {
+                    std::string cookie_str = res->get_header_value("Set-Cookie", i);
+
+                    std::vector<std::string> cookies = Util::Split(cookie_str, ";");
+                    for (std::vector<std::string>::iterator it = cookies.begin(); it != cookies.end();)
+                    {
+                        std::vector<std::string> cookie = Util::Split(*it, "=");
+                        std::string key = Util::Trim(cookie[0], " ");
+                        if (ignore_cookie_keys.find(key) == ignore_cookie_keys.end())
+                        {
+                            if (cookie.size() > 1)
+                                this->cookies[key] = Util::Trim(cookie[1], " ");
+                            else
+                                this->cookies[key] = "";
+                        }
+                        ++it;
+                    }
+                }
+                this->connected = true;
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
+    else
+    {
+        return 0;
+    }
+}

 std::vector<DirEntry> ArchiveOrgClient::ListDir(const std::string &path)
 {
@@ -23,9 +135,11 @@ std::vector<DirEntry> ArchiveOrgClient::ListDir(const std::string &path)
    DirEntry entry;
    Util::SetupPreviousFolder(path, &entry);
    out.push_back(entry);
+    Headers headers;
+    SetCookies(headers);

    std::string encoded_path = httplib::detail::encode_url(GetFullPath(path) + "/");
-    if (auto res = client->Get(encoded_path))
+    if (auto res = client->Get(encoded_path, headers))
    {
        lxb_status_t status;
        lxb_dom_attr_t *attr;
@@ -130,6 +244,13 @@ std::vector<DirEntry> ArchiveOrgClient::ListDir(const std::string &path)
            // td0 contains the <a> tag
            td_element = lxb_dom_collection_element(td_collection, 0);
            lxb_dom_node_t *a_node = NextChildElement(td_element);
+            // there is no a_node in protected links
+            if (a_node == nullptr)
+            {
+                lxb_dom_collection_destroy(td_collection, true);
+                continue;
+            }
+
            value = lxb_dom_element_local_name(lxb_dom_interface_element(a_node), &value_len);
            tmp_string = std::string((const char *)value, value_len);
            if (tmp_string.compare("a") != 0)
@@ -236,4 +357,4 @@ std::vector<DirEntry> ArchiveOrgClient::ListDir(const std::string &path)

 finish:
    return out;
-}
+}
@@ -11,7 +11,12 @@
 class ArchiveOrgClient : public BaseClient
 {
 public:
+    int Connect(const std::string &url, const std::string &username, const std::string &password);
    std::vector<DirEntry> ListDir(const std::string &path);
+
+private:
+    int Login(const std::string &username, const std::string &password);
+    std::string GenerateRandomId(const int len);
 };

-#endif
+#endif
@@ -20,6 +20,26 @@ BaseClient::~BaseClient()
        delete client;
 };

+int BaseClient::SetCookies(Headers &headers)
+{
+    if (this->cookies.size() > 0)
+    {
+        std::string cookie;
+        for (std::map<std::string, std::string>::iterator it = this->cookies.begin(); it != this->cookies.end();)
+        {
+            cookie.append(it->first).append("=").append(it->second);
+            if (std::next(it, 1) != this->cookies.end())
+            {
+                cookie.append("; ");
+            }
+            ++it;
+        }
+        headers.emplace("Cookie", cookie);
+    }
+
+    return 1;
+}
+
 int BaseClient::Connect(const std::string &url, const std::string &username, const std::string &password)
 {
    this->host_url = url;
@@ -81,7 +101,10 @@ int BaseClient::Rmdir(const std::string &path, bool recursive)

 int BaseClient::Size(const std::string &path, int64_t *size)
 {
-    if (auto res = client->Head(GetFullPath(path)))
+    Headers headers;
+    SetCookies(headers);
+
+    if (auto res = client->Head(GetFullPath(path), headers))
    {
        if (HTTP_SUCCESS(res->status))
        {
@@ -90,10 +113,12 @@ int BaseClient::Size(const std::string &path, int64_t *size)
                *size = atoll(content_length.c_str());
            return 1;
        }
-        else // Server doesn't support HEAD request. Try get range with 0 bytes and grab size from the response header 
+        else if (res->status == 405)// Server doesn't support HEAD request. Try get range with 0 bytes and grab size from the response header 
             // example: Content-Range: bytes 0-10/4372785
        {
            Headers headers = {{"Range", "bytes=0-1"}};
+            SetCookies(headers);
+
            if (auto range_res = client->Get(GetFullPath(path), headers))
            {
                if (HTTP_SUCCESS(range_res->status))
@@ -111,6 +136,10 @@ int BaseClient::Size(const std::string &path, int64_t *size)
                }
            }
        }
+        else
+        {
+            sprintf(this->response, "%d - %s", res->status, http_status_message(res->status));
+        }
    }
    else
    {
@@ -124,8 +153,10 @@ int BaseClient::Get(const std::string &outputfile, const std::string &path, uint
    std::ofstream file_stream(outputfile, std::ios::binary);
    bytes_transfered = 0;
    sceRtcGetCurrentTick(&prev_tick);
+    Headers headers;
+    SetCookies(headers);

-    if (auto res = client->Get(GetFullPath(path),
+    if (auto res = client->Get(GetFullPath(path), headers,
                               [&](const char *data, size_t data_length)
                               {
                                   file_stream.write(data, data_length);
@@ -145,7 +176,10 @@ int BaseClient::Get(const std::string &outputfile, const std::string &path, uint

 int BaseClient::Get(SplitFile *split_file, const std::string &path, uint64_t offset)
 {
-    if (auto res = client->Get(GetFullPath(path),
+    Headers headers;
+    SetCookies(headers);
+
+    if (auto res = client->Get(GetFullPath(path), headers,
                               [&](const char *data, size_t data_length)
                               {
                                   if (!split_file->IsClosed())
@@ -171,6 +205,8 @@ int BaseClient::GetRange(const std::string &path, DataSink &sink, uint64_t size,
    char range_header[64];
    sprintf(range_header, "bytes=%lu-%lu", offset, offset + size - 1);
    Headers headers = {{"Range", range_header}};
+    SetCookies(headers);
+
    size_t bytes_read = 0;
    if (auto res = client->Get(GetFullPath(path), headers,
                               [&](const char *data, size_t data_length)
@@ -194,6 +230,8 @@ int BaseClient::GetRange(const std::string &path, void *buffer, uint64_t size, u
    char range_header[64];
    sprintf(range_header, "bytes=%lu-%lu", offset, offset + size - 1);
    Headers headers = {{"Range", range_header}};
+    SetCookies(headers);
+
    size_t bytes_read = 0;
    std::vector<char> body;
    if (auto res = client->Get(GetFullPath(path), headers,
@@ -253,6 +291,8 @@ int BaseClient::Head(const std::string &path, void *buffer, uint64_t len)
    char range_header[64];
    sprintf(range_header, "bytes=%lu-%lu", 0L, len - 1);
    Headers headers = {{"Range", range_header}};
+    SetCookies(headers);
+
    size_t bytes_read = 0;
    std::vector<char> body;
    if (auto res = client->Get(GetFullPath(path), headers,
@@ -49,11 +49,14 @@ public:
    static std::string UnEscape(const std::string &url);

 protected:
+    int SetCookies(httplib::Headers &headers);
+
    httplib::Client *client;
    std::string base_path;
    std::string host_url;
    char response[512];
    bool connected = false;
+    std::map<std::string, std::string> cookies;
 };

 #endif
@@ -24,8 +24,6 @@
 #define FTP_CLIENT_READ 1
 #define FTP_CLIENT_WRITE 2

-#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
-
 FtpClient::FtpClient()
 {
 	mp_ftphandle = static_cast<ftphandle *>(calloc(1, sizeof(ftphandle)));
@@ -125,7 +123,7 @@ int FtpClient::Connect(const std::string &url, const std::string &user, const st
 	}
 	mp_ftphandle->handle = sControl;

-	if (ReadResponse('2', mp_ftphandle) == 0)
+	if (ReadResponse("2", mp_ftphandle) == 0)
 	{
 		close(mp_ftphandle->handle);
 		mp_ftphandle->handle = 0;
@@ -142,7 +140,7 @@ int FtpClient::Connect(const std::string &url, const std::string &user, const st
 		cmd = "USER anonymous";
 	}

-	if (!FtpSendCmd(cmd, '3', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "3", mp_ftphandle))
 	{
 		if (mp_ftphandle->ctrl != NULL)
 			return 1;
@@ -161,7 +159,7 @@ int FtpClient::Connect(const std::string &url, const std::string &user, const st

 	cmd = "PASS " + pass;
 	int ret;
-	if ((ret = FtpSendCmd(cmd, '2', mp_ftphandle)))
+	if ((ret = FtpSendCmd(cmd, "2", mp_ftphandle)))
 	{
 		mp_ftphandle->is_connected = true;
 	}
@@ -179,7 +177,7 @@ int FtpClient::Connect(const std::string &url, const std::string &user, const st
 *
 * return 1 if proper response received, 0 otherwise
 */
-int FtpClient::FtpSendCmd(const std::string &cmd, char expected_resp, ftphandle *nControl)
+int FtpClient::FtpSendCmd(const std::string &cmd, const std::string &expected_resp, ftphandle *nControl)
 {
 	char buf[512];
 	int x;
@@ -205,7 +203,7 @@ int FtpClient::FtpSendCmd(const std::string &cmd, char expected_resp, ftphandle
 * return 0 if first char doesn't match
 * return 1 if first char matches
 */
-int FtpClient::ReadResponse(char c, ftphandle *nControl)
+int FtpClient::ReadResponse(const std::string &c, ftphandle *nControl)
 {
 	char match[5];

@@ -228,7 +226,7 @@ int FtpClient::ReadResponse(char c, ftphandle *nControl)
 		} while (strncmp(nControl->response, match, 4));
 	}

-	if (nControl->response[0] == c)
+	if (c.find(nControl->response[0]) != std::string::npos)
 		return 1;
 	return 0;
 }
@@ -368,7 +366,7 @@ int FtpClient::FtpAccess(const std::string &path, accesstype type, transfermode
 		return 0;
 	}
 	sprintf(buf, "TYPE %c", mode);
-	if (!FtpSendCmd(buf, '2', nControl))
+	if (!FtpSendCmd(buf, "2", nControl))
 		return 0;

 	switch (type)
@@ -477,7 +475,7 @@ int FtpClient::FtpAcceptConnection(ftphandle *nData, ftphandle *nControl)
 	{
 		close(nData->handle);
 		nData->handle = 0;
-		ReadResponse('2', nControl);
+		ReadResponse("2", nControl);
 		rv = 0;
 	}

@@ -521,7 +519,7 @@ int FtpClient::FtpOpenPasv(ftphandle *nControl, ftphandle **nData, transfermode

 	memset(&sin, 0, l);
 	sin.in.sin_family = AF_INET;
-	if (!FtpSendCmd("PASV", '2', nControl))
+	if (!FtpSendCmd("PASV", "2", nControl))
 		return -1;
 	cp = strchr(nControl->response, '(');
 	if (cp == NULL)
@@ -542,7 +540,7 @@ int FtpClient::FtpOpenPasv(ftphandle *nControl, ftphandle **nData, transfermode
 	{
 		char buf[512];
 		sprintf(buf, "REST %lld", mp_ftphandle->offset);
-		if (!FtpSendCmd(buf, '3', nControl))
+		if (!FtpSendCmd(buf, "3", nControl))
 			return 0;
 	}

@@ -592,7 +590,7 @@ int FtpClient::FtpOpenPasv(ftphandle *nControl, ftphandle **nData, transfermode
 		return -1;
 	}

-	if (!ReadResponse('1', nControl))
+	if (!ReadResponse("1", nControl))
 	{
 		close(sData);
 		return -1;
@@ -717,7 +715,7 @@ int FtpClient::FtpOpenPort(ftphandle *nControl, ftphandle **nData, transfermode
 			(unsigned char)sin.sa.sa_data[5],
 			(unsigned char)sin.sa.sa_data[0],
 			(unsigned char)sin.sa.sa_data[1]);
-	if (!FtpSendCmd(buf, '2', nControl))
+	if (!FtpSendCmd(buf, "2", nControl))
 	{
 		close(sData);
 		return -1;
@@ -727,7 +725,7 @@ int FtpClient::FtpOpenPort(ftphandle *nControl, ftphandle **nData, transfermode
 	{
 		char buf[512];
 		sprintf(buf, "REST %lld", mp_ftphandle->offset);
-		if (!FtpSendCmd(buf, '3', nControl))
+		if (!FtpSendCmd(buf, "3", nControl))
 		{
 			close(sData);
 			return 0;
@@ -747,7 +745,7 @@ int FtpClient::FtpOpenPort(ftphandle *nControl, ftphandle **nData, transfermode
 		return -1;
 	}

-	if (!FtpSendCmd(cmd, '1', nControl))
+	if (!FtpSendCmd(cmd, "1", nControl))
 	{
 		FtpClose(*nData);
 		*nData = NULL;
@@ -1045,7 +1043,7 @@ int FtpClient::FtpClose(ftphandle *nData)
 	ctrl = nData->ctrl;
 	free(nData);
 	if (ctrl)
-		return ReadResponse('2', ctrl);
+		return ReadResponse("2", ctrl);
 	return 1;
 }

@@ -1061,7 +1059,7 @@ int FtpClient::Quit()
 		strcpy(mp_ftphandle->response, "error: no anwser from server\n");
 		return 0;
 	}
-	FtpSendCmd("QUIT", '2', mp_ftphandle);
+	FtpSendCmd("QUIT", "2", mp_ftphandle);
 	shutdown(mp_ftphandle->handle, SHUT_WR);
 	struct linger lng = {1, 0};
 	setsockopt(mp_ftphandle->handle, SOL_SOCKET, SO_LINGER, &lng, sizeof(lng));
@@ -1105,7 +1103,7 @@ int FtpClient::RawRead(void *buf, int max, ftphandle *handle)
 int FtpClient::Site(const std::string &cmd)
 {
 	std::string tmp = "SITE " + cmd;
-	if (!FtpSendCmd(tmp, '2', mp_ftphandle))
+	if (!FtpSendCmd(tmp, "2", mp_ftphandle))
 		return 0;
 	return 1;
 }
@@ -1118,7 +1116,7 @@ int FtpClient::Site(const std::string &cmd)

 int FtpClient::Raw(const std::string &cmd)
 {
-	if (!FtpSendCmd(cmd, '2', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "2", mp_ftphandle))
 		return 0;
 	return 1;
 }
@@ -1137,7 +1135,7 @@ int FtpClient::SysType(char *buf, int max)
 	int l = max;
 	char *b = buf;
 	char *s;
-	if (!FtpSendCmd("SYST", '2', mp_ftphandle))
+	if (!FtpSendCmd("SYST", "2", mp_ftphandle))
 		return 0;
 	s = &mp_ftphandle->response[4];
 	while ((--l) && (*s != ' '))
@@ -1154,7 +1152,7 @@ int FtpClient::SysType(char *buf, int max)
 int FtpClient::Mkdir(const std::string &path)
 {
 	std::string cmd = "MKD " + path;
-	if (!FtpSendCmd(cmd, '2', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "2", mp_ftphandle))
 		return 0;
 	return 1;
 }
@@ -1167,7 +1165,7 @@ int FtpClient::Mkdir(const std::string &path)
 int FtpClient::Chdir(const std::string &path)
 {
 	std::string cmd = "CWD " + path;
-	if (!FtpSendCmd(cmd, '2', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "2", mp_ftphandle))
 		return 0;
 	return 1;
 }
@@ -1179,7 +1177,7 @@ int FtpClient::Chdir(const std::string &path)
 */
 int FtpClient::Cdup()
 {
-	if (!FtpSendCmd("CDUP", '2', mp_ftphandle))
+	if (!FtpSendCmd("CDUP", "2", mp_ftphandle))
 		return 0;
 	return 1;
 }
@@ -1191,7 +1189,7 @@ int FtpClient::Cdup()
 */
 bool FtpClient::Noop()
 {
-	if (!FtpSendCmd("NOOP", '2', mp_ftphandle))
+	if (!FtpSendCmd("NOOP", "25", mp_ftphandle))
 		return 0;
 	return 1;
 }
@@ -1209,7 +1207,7 @@ bool FtpClient::Ping()
 int FtpClient::Rmdir(const std::string &path)
 {
 	std::string cmd = "RMD " + path;
-	if (!FtpSendCmd(cmd, '2', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "2", mp_ftphandle))
 		return 0;
 	return 1;
 }
@@ -1272,11 +1270,11 @@ int FtpClient::Size(const std::string &path, int64_t *size)
 		return 0;

 	sprintf(cmd, "TYPE %c", FtpClient::transfermode::image);
-	if (!FtpSendCmd(cmd, '2', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "2", mp_ftphandle))
 		return 0;

 	sprintf(cmd, "SIZE %s", path.c_str());
-	if (!FtpSendCmd(cmd, '2', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "2", mp_ftphandle))
 		rv = 0;
 	else
 	{
@@ -1408,10 +1406,10 @@ int FtpClient::Put(const std::string &inputfile, const std::string &path, uint64
 int FtpClient::Rename(const std::string &src, const std::string &dst)
 {
 	std::string cmd = "RNFR " + src;
-	if (!FtpSendCmd(cmd, '3', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "3", mp_ftphandle))
 		return 0;
 	cmd = "RNTO " + dst;
-	if (!FtpSendCmd(cmd, '2', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "2", mp_ftphandle))
 		return 0;

 	return 1;
@@ -1420,7 +1418,7 @@ int FtpClient::Rename(const std::string &src, const std::string &dst)
 int FtpClient::Delete(const std::string &path)
 {
 	std::string cmd = "DELE " + path;
-	if (!FtpSendCmd(cmd, '2', mp_ftphandle))
+	if (!FtpSendCmd(cmd, "2", mp_ftphandle))
 		return 0;
 	return 1;
 }
@@ -114,12 +114,12 @@ private:
 	char server[128];
 	int server_port;

-	int FtpSendCmd(const std::string &cmd, char expected_resp, ftphandle *nControl);
+	int FtpSendCmd(const std::string &cmd, const std::string &expected_resp, ftphandle *nControl);
 	ftphandle *RawOpen(const std::string &path, accesstype type, transfermode mode);
 	int RawClose(ftphandle *handle);
 	int RawWrite(void *buf, int len, ftphandle *handle);
 	int RawRead(void *buf, int max, ftphandle *handle);
-	int ReadResponse(char c, ftphandle *nControl);
+	int ReadResponse(const std::string &c, ftphandle *nControl);
 	int Readline(char *buf, int max, ftphandle *nControl);
 	int Writeline(char *buf, int len, ftphandle *nData);
 	void ClearHandle();
@@ -159,8 +159,8 @@ namespace CONFIG
                 "Site 11", "Site 12", "Site 13", "Site 14", "Site 15", "Site 16", "Site 17", "Site 18", "Site 19", "Site 20"};

        langs = { "Default", "Arabic", "Catalan", "Croatian", "Dutch", "English", "Euskera", "French", "Galego", "German", "Greek", 
-                  "Hungarian", "Indonesian", "Italiano", "Japanese", "Korean", "Polish", "Portuguese_BR", "Russian", "Romanian", "Ryukyuan", "Spanish", "Turkish",
-                  "Simplified Chinese", "Traditional Chinese", "Thai", "Ukrainian", "Vietnamese"};
+                  "Hungarian", "Indonesian", "Italiano", "Japanese", "Korean", "Norwegian", "Polish", "Portuguese_BR", "Russian", 
+                  "Romanian", "Ryukyuan", "Spanish", "Turkish", "Simplified Chinese", "Traditional Chinese", "Thai", "Ukrainian", "Vietnamese"};

        http_servers = {HTTP_SERVER_APACHE, HTTP_SERVER_MS_IIS, HTTP_SERVER_NGINX, HTTP_SERVER_NPX_SERVE, HTTP_SERVER_RCLONE, HTTP_SERVER_ARCHIVEORG, HTTP_SERVER_MYRIENT};
        text_file_extensions = { ".txt", ".ini", ".log", ".json", ".xml", ".html", ".xhtml", ".conf", ".config" };
@@ -258,6 +258,9 @@ namespace Lang
 			case ORBIS_SYSTEM_PARAM_LANG_ROMANIAN:
 				sprintf(langFile, "%s", "/app0/assets/langs/Romanian.ini");
 				break;
+			case ORBIS_SYSTEM_PARAM_LANG_NORWEGIAN:
+				sprintf(langFile, "%s", "/app0/assets/langs/Norwegian.ini");
+				break;
 			default:
 				sprintf(langFile, "%s", "/app0/assets/langs/English.ini");
 				break;
@@ -1292,7 +1292,7 @@ namespace HttpServer
                failed(res, 200, lang_strings[STR_CANT_EXTRACT_URL_MSG]);
                activity_inprogess = false;
                file_transfering = false;
-                Windows::SetModalMode(true);
+                Windows::SetModalMode(false);
                return;
            }
            delete(filehost);
@@ -1305,6 +1305,15 @@ namespace HttpServer

            BaseClient *baseclient = new BaseClient();
            baseclient->Connect(host, "", "");
+            
+            if (!baseclient->FileExists(path))
+            {
+                failed(res, 200, baseclient->LastResponse());
+                activity_inprogess = false;
+                file_transfering = false;
+                Windows::SetModalMode(false);
+                return;
+            }
            baseclient->Head(path, &header, sizeof(pkg_header));

            if (BE32(header.pkg_magic) == 0x7F434E54)
@@ -1322,7 +1331,7 @@ namespace HttpServer
                        failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
                        activity_inprogess = false;
                        file_transfering = false;
-                        Windows::SetModalMode(true);
+                        Windows::SetModalMode(false);
                        return;
                    }
                }
Author	SHA1	Message	Date
Chee Yee	b7fe46cb94	support archive.org protected urls	2025-01-11 21:25:55 -08:00
Chee Yee	3bcf136d2a	support archive.org protected urls	2025-01-10 21:06:19 -08:00
Chee Yee	e5d5ddb8bc	support for servers that does not permit NOOP	2025-01-10 21:05:16 -08:00
Chee Yee	3e4b5e3ea2	update to handle Norwegian lang	2024-11-08 22:55:32 -08:00
cy33hc	c4889ec160	Merge pull request #32 from xdpirate/master Add Norwegian translation	2024-11-08 22:33:05 -08:00
xdpirate	3076f4b179	Add Norwegian translation	2024-11-08 11:24:14 +01:00
Chee Yee	93fb338ce0	failed install to display server error message	2024-11-08 00:38:31 -08:00
Chee Yee	785a073bce	fixed issue parse apache2 httpd directory listing using docker image	2024-10-26 15:31:01 -07:00