Saverr/spotifykeydumper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix download URL parser

Browse Source
This commit is contained in:
Johnny Doo 2020-11-21 10:46:55 +01:00
parent 1c62192cd8
commit a3ea56345d
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
SpotifyKeyDumper/Utils.cpp
View File

@ -1,6 +1,7 @@
#include "pch.h" #include "pch.h"
#include "Utils.h" #include "Utils.h"
#include "aes.h" #include "aes.h"
#include <regex>
const uint8_t IV[] = { 0x72, 0xE0, 0x67, 0xFB, 0xDD, 0xCB, 0xCF, 0x77, 0xEB, 0xE8, 0xBC, 0x64, 0x3F, 0x63, 0x0D, 0x93 }; const uint8_t IV[] = { 0x72, 0xE0, 0x67, 0xFB, 0xDD, 0xCB, 0xCF, 0x77, 0xEB, 0xE8, 0xBC, 0x64, 0x3F, 0x63, 0x0D, 0x93 };
@ -135,6 +136,7 @@ struct SongInfo
static const std::string albumSearchPattern = "\x68\x65\x69\x67\x68\x74\x22\x20\x3A\x20\x36\x34\x30"; static const std::string albumSearchPattern = "\x68\x65\x69\x67\x68\x74\x22\x20\x3A\x20\x36\x34\x30";
static const std::wstring songDirRoot = L"Downloads"; static const std::wstring songDirRoot = L"Downloads";
static const std::string songRegex = "https?:\\/\\/(?:www\.)?([-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6})\\b([-a-zA-Z0-9()@:%_\\+.~#?&\\/\\/=]*)";
static std::wstring songDir = songDirRoot; static std::wstring songDir = songDirRoot;
void Utils::DownloadSong(std::string fileId, std::string trackUri, std::string key, std::string authToken) void Utils::DownloadSong(std::string fileId, std::string trackUri, std::string key, std::string authToken)
{ {
@ -156,15 +158,36 @@ void Utils::DownloadSong(std::string fileId, std::string trackUri, std::string k
} }
// Parse storage resolve response to get the encrypted song data's URL // Parse storage resolve response to get the encrypted song data's URL
std::string songHost = (srStr.substr(srStr.find("https://") + 8)) std::string songHost;
.erase(srStr.substr(srStr.find("https://") + 8).find("/audio/")); std::string songPath;
std::string songPath = srStr.substr(srStr.find("/audio/")).erase(srStr.substr(srStr.find("/audio/")).find("=") + 85); try {
std::regex re(songRegex);
std::smatch match;
if (std::regex_search(srStr, match, re) && match.size() > 1) {
songHost = match.str(1);
songPath = match.str(2);
}
else {
std::cout << "Error: Download URL not found" << std::endl;
return;
}
}
catch (std::regex_error& e) {
// Syntax error in the regular expression
std::cout << "Error: regex_error" << std::endl;
return;
}
// Download encrypted song data from Spotify // Download encrypted song data from Spotify
std::string songStr = DownloadSpotifyUrl(songHost, songPath, ""); std::string songStr = DownloadSpotifyUrl(songHost, songPath, "");
//std::cout << "URL: " << songHost + songPath << std::endl; //std::cout << "URL: " << songHost + songPath << std::endl;
if (songStr.empty()) {
std::cout << "Error: Could not download audio" << std::endl;
return;
}
if (songStr.substr(0, 6).compare("<HTML>") == 0) if (songStr.substr(0, 6).compare("<HTML>") == 0)
{ {
std::cout << "Error: " + songStr << std::endl; std::cout << "Error: " + songStr << std::endl;