From de41e5cbde36e41f5e2b56737456a4036255a8eb Mon Sep 17 00:00:00 2001 From: Moss Date: Fri, 30 Sep 2022 17:30:42 -0400 Subject: [PATCH] Episode: Fixed Getting Embedded Page --- src/episode.cpp | 250 +++++++++++++++++++++++++----------------------- src/episode.h | 3 +- 2 files changed, 131 insertions(+), 122 deletions(-) diff --git a/src/episode.cpp b/src/episode.cpp index 6271d1f..59d84ae 100644 --- a/src/episode.cpp +++ b/src/episode.cpp @@ -279,15 +279,15 @@ namespace dropout_dl { slist1 = nullptr; slist1 = curl_slist_append(slist1, "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:101.0) Gecko/20100101 Firefox/101.0"); - slist1 = curl_slist_append(slist1, "Accept: */*"); + slist1 = curl_slist_append(slist1, "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8"); slist1 = curl_slist_append(slist1, "Accept-Language: en-US,en;q=0.5"); slist1 = curl_slist_append(slist1, "Accept-Encoding: utf-8"); - slist1 = curl_slist_append(slist1, "Referer: https://embed.vhx.tv/"); - slist1 = curl_slist_append(slist1, "Origin: https://embed.vhx.tv"); slist1 = curl_slist_append(slist1, "DNT: 1"); slist1 = curl_slist_append(slist1, "Connection: keep-alive"); - slist1 = curl_slist_append(slist1, "Sec-Fetch-Dest: empty"); - slist1 = curl_slist_append(slist1, "Sec-Fetch-Mode: cors"); + slist1 = curl_slist_append(slist1, "Referer: https://www.dropout.tv/"); + slist1 = curl_slist_append(slist1, "Upgrade-Insecure-Requests: 1"); + slist1 = curl_slist_append(slist1, "Sec-Fetch-Dest: iframe"); + slist1 = curl_slist_append(slist1, "Sec-Fetch-Mode: navigate"); slist1 = curl_slist_append(slist1, "Sec-Fetch-Site: cross-site"); slist1 = curl_slist_append(slist1, "Sec-GPC: 1"); @@ -316,121 +316,6 @@ namespace dropout_dl { return config_page; } - void cookie::get_value_from_db(sqlite3 *db, const std::string &sql_query_base, const std::string& value, bool verbose, int (*callback)(void*,int,char**,char**)) { - std::string sql_mod_base = sql_query_base; - - if (sql_mod_base.find("WHERE") == std::string::npos) { - sql_mod_base += " WHERE "; - } - else { - sql_mod_base += " AND "; - } - - sql_mod_base += "name='" + this->name + "';"; - - std::string sql_value_query = "SELECT " + value + ' ' + sql_mod_base; - std::string sql_length_query = "SELECT length(" + value + ") " + sql_mod_base; - std::string tmp; - char *err_code = nullptr; - int rc; - - if (verbose) { - std::cout << sql_value_query << '\n' << sql_length_query << std::endl; - } - - rc = sqlite3_exec(db, sql_length_query.c_str(), callback, &tmp, &err_code); - - if (rc != SQLITE_OK) { - fprintf(stderr, "SQL error: %s\n", err_code); - sqlite3_free(err_code); - sqlite3_close(db); - exit(3); - } else if (verbose) { - std::cout << "Got " << this->name << " cookie length\n"; - } - - this->len = std::stoi(tmp); - - rc = sqlite3_exec(db, sql_value_query.c_str(), callback, &tmp, &err_code); - - if (rc != SQLITE_OK) { - fprintf(stderr, "SQL error: %s\n", err_code); - sqlite3_free(err_code); - sqlite3_close(db); - exit(3); - } else if (verbose) { - std::cout << "Got " << this->name << " cookie\n"; - } - - this->value = tmp; - } - - void cookie::format_from_chrome() { - this->value = this->value.substr(3); - this->len -= 3; - } - - void cookie::chrome_decrypt(const std::string &password, int iterations, const std::string &salt, int length) { - - this->format_from_chrome(); - - uint8_t key[32]; - - char output[this->len + 2]; - - char iv[16]; - - for (char& c : iv) { - c = ' '; - } - - for (char& c : output) { - c = 0; - } - - gcry_kdf_derive(password.c_str(), password.size(), GCRY_KDF_PBKDF2, GCRY_KDF_ARGON2ID, salt.c_str(), salt.size(), iterations, length, key); - - gcry_cipher_hd_t handle; - - gcry_cipher_open(&handle, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_CBC, 0); - - gcry_cipher_setkey(handle, (const void*) &key, length); - - gcry_cipher_setiv(handle, (const void*)&iv, 16); - - unsigned long err = gcry_cipher_decrypt(handle, output, this->len, this->value.c_str(), this->len); - - if (err) { - std::cout << gcry_strerror(err) << std::endl; - exit(2); - } - - - this->value = output; - - this->url_decode(); - - this->value = this->value.substr(0, this->len - 7); - this->len -= 7; - } - - void cookie::url_decode() { - std::string out; - - for (int i = 0; i < this->value.size() - 3; i++) { - if (substr_is(this->value, i, "%3D")) { - out += "="; - i += 2; - } - else { - out += this->value[i]; - } - } - - this->value = out; - this->len = out.size(); - } - std::vector episode::get_qualities() { if (!qualities.empty()) { return qualities; @@ -554,4 +439,129 @@ namespace dropout_dl { out << this->get_video_data(quality, series_directory + "/" + filename) << std::endl; } } + + + + // Cookie functions + + void cookie::get_value_from_db(sqlite3 *db, const std::string &sql_query_base, const std::string& value, bool verbose, int (*callback)(void*,int,char**,char**)) { + std::string sql_mod_base = sql_query_base; + + verbose = true; + + if (sql_mod_base.find("WHERE") == std::string::npos) { + sql_mod_base += " WHERE "; + } + else { + sql_mod_base += " AND "; + } + + sql_mod_base += "name='" + this->name + "';"; + + std::string sql_value_query = "SELECT " + value + ' ' + sql_mod_base; + std::string sql_length_query = "SELECT length(" + value + ") " + sql_mod_base; + std::string tmp; + char *err_code = nullptr; + int rc; + + if (verbose) { + std::cout << sql_value_query << '\n' << sql_length_query << std::endl; + } + + rc = sqlite3_exec(db, sql_length_query.c_str(), callback, &tmp, &err_code); + + if (rc != SQLITE_OK) { + fprintf(stderr, "SQL error: %s\n", err_code); + sqlite3_free(err_code); + sqlite3_close(db); + exit(3); + } else if (verbose) { + std::cout << "Got " << this->name << " cookie length\n"; + } + + if (tmp.empty()) { + std::cerr << "COOKIE SQLITE ERROR: No Cookie With Name " << this->name << " Exists\n"; + exit(0); + } + this->len = std::stoi(tmp); + + rc = sqlite3_exec(db, sql_value_query.c_str(), callback, &tmp, &err_code); + + if (rc != SQLITE_OK) { + fprintf(stderr, "SQL error: %s\n", err_code); + sqlite3_free(err_code); + sqlite3_close(db); + exit(3); + } else if (verbose) { + std::cout << "Got " << this->name << " cookie\n"; + } + + this->value = tmp; + } + + void cookie::format_from_chrome() { + this->value = this->value.substr(3); + this->len -= 3; + } + + void cookie::chrome_decrypt(const std::string &password, int iterations, const std::string &salt, int length) { + + this->format_from_chrome(); + + uint8_t key[32]; + + char output[this->len + 2]; + + char iv[16]; + + for (char& c : iv) { + c = ' '; + } + + for (char& c : output) { + c = 0; + } + + gcry_kdf_derive(password.c_str(), password.size(), GCRY_KDF_PBKDF2, GCRY_KDF_ARGON2ID, salt.c_str(), salt.size(), iterations, length, key); + + gcry_cipher_hd_t handle; + + gcry_cipher_open(&handle, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_CBC, 0); + + gcry_cipher_setkey(handle, (const void*) &key, length); + + gcry_cipher_setiv(handle, (const void*)&iv, 16); + + unsigned long err = gcry_cipher_decrypt(handle, output, this->len, this->value.c_str(), this->len); + + if (err) { + std::cout << gcry_strerror(err) << std::endl; + exit(2); + } + + + this->value = output; + + this->url_decode(); + + this->value = this->value.substr(0, this->len - 7); + this->len -= 7; + } + + void cookie::url_decode() { + std::string out; + + for (int i = 0; i < this->value.size() - 3; i++) { + if (substr_is(this->value, i, "%3D")) { + out += "="; + i += 2; + } + else { + out += this->value[i]; + } + } + + this->value = out; + this->len = out.size(); + } } // dropout_dl \ No newline at end of file diff --git a/src/episode.h b/src/episode.h index e034157..34f99c2 100644 --- a/src/episode.h +++ b/src/episode.h @@ -254,7 +254,6 @@ namespace dropout_dl { */ static std::string get_episode_page(const std::string& url, const std::string& auth_cookie, const std::string& session_cookie, bool verbose = false); - // Parsing /** * @@ -403,7 +402,7 @@ namespace dropout_dl { replace_all(this->config_url, "\\u0026", "&"); if (verbose) { - std::cout << "Got config url: " << this->embedded_url << '\n'; + std::cout << "Got config url: " << this->config_url << '\n'; } this->config_data = get_generic_page(this->config_url);