Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use the new "secret storage" to store the retroachievements token

Browse Source
This commit is contained in:
Henrik Rydgård 2023-06-26 10:01:20 +02:00
parent 864b2bbb31
commit 4134acc492
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -131,3 +131,5 @@ CMakeFiles
.cache/ .cache/
build build
libretro/obj/local libretro/obj/local
ppsspp_retroachievements.dat

4
Core/Config.cpp
View File

@ -276,9 +276,9 @@ static const ConfigSetting achievementSettings[] = {
ConfigSetting("AchievementsLogBadMemReads", &g_Config.bAchievementsLogBadMemReads, false, CfgFlag::DEFAULT), ConfigSetting("AchievementsLogBadMemReads", &g_Config.bAchievementsLogBadMemReads, false, CfgFlag::DEFAULT),
// Achievements login info. Note that password is NOT stored, only a login token. // Achievements login info. Note that password is NOT stored, only a login token.
// Still, we may wanna store it more securely than in PPSSPP.ini, especially on Android. // And that login token is stored separately from the ini, see NativeSaveSecret.
ConfigSetting("AchievementsUserName", &g_Config.sAchievementsUserName, "", CfgFlag::DEFAULT), ConfigSetting("AchievementsUserName", &g_Config.sAchievementsUserName, "", CfgFlag::DEFAULT),
ConfigSetting("AchievementsToken", &g_Config.sAchievementsToken, "", CfgFlag::DEFAULT), ConfigSetting("AchievementsToken", &g_Config.sAchievementsToken, "", CfgFlag::DONT_SAVE),
ConfigSetting("AchievementsLoginTimestamp", &g_Config.sAchievementsLoginTimestamp, "", CfgFlag::DEFAULT), ConfigSetting("AchievementsLoginTimestamp", &g_Config.sAchievementsLoginTimestamp, "", CfgFlag::DEFAULT),
}; };

2
Core/Config.h
View File

@ -497,7 +497,7 @@ public:
// Achivements login info. Note that password is NOT stored, only a login token. // Achivements login info. Note that password is NOT stored, only a login token.
// Still, we may wanna store it more securely than in PPSSPP.ini, especially on Android. // Still, we may wanna store it more securely than in PPSSPP.ini, especially on Android.
std::string sAchievementsUserName; std::string sAchievementsUserName;
std::string sAchievementsToken; std::string sAchievementsToken; // Not saved, to be used if you want to manually make your RA login persistent. See Native_SaveSecret for the normal case.
std::string sAchievementsLoginTimestamp; std::string sAchievementsLoginTimestamp;
// Various directories. Autoconfigured, not read from ini. // Various directories. Autoconfigured, not read from ini.

8
UI/NativeApp.cpp
View File

@ -1430,12 +1430,16 @@ void NativeSaveSecret(const char *nameOfSecret, const std::string &data) {
// On Android, that corresponds to the app private directory. On other platforms, // On Android, that corresponds to the app private directory. On other platforms,
// the location is less secure unfortunately - to be improved. // the location is less secure unfortunately - to be improved.
Path path = GetSecretPath(nameOfSecret); Path path = GetSecretPath(nameOfSecret);
File::WriteDataToFile(false, data.data(), data.size(), path); if (!File::WriteDataToFile(false, data.data(), data.size(), path)) {
WARN_LOG(SYSTEM, "Failed to write secret '%s' to path '%s'", nameOfSecret, path.c_str());
}
} }
std::string NativeLoadSecret(const char *nameOfSecret) { std::string NativeLoadSecret(const char *nameOfSecret) {
Path path = GetSecretPath(nameOfSecret); Path path = GetSecretPath(nameOfSecret);
std::string data; std::string data;
File::ReadFileToString(false, path, data); if (!File::ReadFileToString(false, path, data)) {
WARN_LOG(SYSTEM, "Failed to read secret '%s' from path '%s'", nameOfSecret, path.c_str());
}
return data; return data;
} }

13
UI/RetroAchievements.cpp
View File

@ -31,6 +31,7 @@
#include "Common/File/Path.h" #include "Common/File/Path.h"
#include "Common/File/FileUtil.h" #include "Common/File/FileUtil.h"
#include "Common/Net/HTTPClient.h" #include "Common/Net/HTTPClient.h"
#include "Common/System/NativeApp.h"
#include "Common/TimeUtil.h" #include "Common/TimeUtil.h"
#include "Common/Data/Text/I18n.h" #include "Common/Data/Text/I18n.h"
#include "Common/Serialize/Serializer.h" #include "Common/Serialize/Serializer.h"
@ -162,6 +163,9 @@ static constexpr UI::UISound INFO_SOUND_NAME = UI::UISound::SELECT;
static constexpr UI::UISound UNLOCK_SOUND_NAME = UI::UISound::TOGGLE_ON; static constexpr UI::UISound UNLOCK_SOUND_NAME = UI::UISound::TOGGLE_ON;
static constexpr UI::UISound LBSUBMIT_SOUND_NAME = UI::UISound::TOGGLE_OFF; static constexpr UI::UISound LBSUBMIT_SOUND_NAME = UI::UISound::TOGGLE_OFF;
// It's the name of the secret, not a secret name - the value is not secret :)
static const char *RA_TOKEN_SECRET_NAME = "retroachievements ";
static void FormattedError(const char *format, ...); static void FormattedError(const char *format, ...);
static void LogFailedResponseJSON(const Common::HTTPDownloader::Request::Data &data); static void LogFailedResponseJSON(const Common::HTTPDownloader::Request::Data &data);
static void CheevosEventHandler(const rc_runtime_event_t *runtime_event); static void CheevosEventHandler(const rc_runtime_event_t *runtime_event);
@ -577,7 +581,10 @@ void Achievements::Initialize()
s_last_ping_time = time_now_d(); s_last_ping_time = time_now_d();
s_username = g_Config.sAchievementsUserName; s_username = g_Config.sAchievementsUserName;
s_api_token = g_Config.sAchievementsToken; s_api_token = NativeLoadSecret(RA_TOKEN_SECRET_NAME);
if (s_api_token.empty()) {
s_api_token = g_Config.sAchievementsToken;
}
s_logged_in = (!s_username.empty() && !s_api_token.empty()); s_logged_in = (!s_username.empty() && !s_api_token.empty());
// this is just the non-SSL path. // this is just the non-SSL path.
@ -991,8 +998,8 @@ void Achievements::LoginCallback(s32 status_code, std::string content_type, Comm
// save to config // save to config
g_Config.sAchievementsUserName = username; g_Config.sAchievementsUserName = username;
g_Config.sAchievementsToken = api_token;
g_Config.sAchievementsLoginTimestamp = StringFromFormat("%llu", (unsigned long long)std::time(nullptr)); g_Config.sAchievementsLoginTimestamp = StringFromFormat("%llu", (unsigned long long)std::time(nullptr));
NativeSaveSecret(RA_TOKEN_SECRET_NAME, api_token);
g_Config.Save("AchievementsLogin"); g_Config.Save("AchievementsLogin");
@ -1059,7 +1066,7 @@ void Achievements::Logout()
// remove from config // remove from config
g_Config.sAchievementsUserName.clear(); g_Config.sAchievementsUserName.clear();
g_Config.sAchievementsToken.clear(); NativeSaveSecret(RA_TOKEN_SECRET_NAME, "");
g_Config.sAchievementsLoginTimestamp.clear(); g_Config.sAchievementsLoginTimestamp.clear();
g_Config.Save("Achievements logout"); g_Config.Save("Achievements logout");
} }