redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-21 04:07:46 +00:00
Code Activity

Add LauncherCore::autoLogin function, remove separate impls

Browse source 
Previously there was two separate auto-login functions, one in the cli
interface and one for the desktop interface. If I didn't stop myself,
there would probably be one in the tablet interface too!
This commit is contained in:
Joshua Goins 2022-09-05 16:14:07 -04:00
parent ce7854626f
commit f28f8c392d
6 changed files with 82 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
launcher/cli/src/cmdinterface.cpp
View file

@ -21,45 +21,7 @@ bool CMDInterface::parse(QCommandLineParser& parser, LauncherCore& core) {
if (parser.isSet(autologinOption)) {
auto& profile = core.getProfile(core.defaultProfileIndex);
if (!profile.rememberUsername || !profile.rememberPassword) {
qInfo() << "Profile does not have a username and/or password saved, autologin disabled.";
return false;
}
auto loop = new QEventLoop();
QString username, password;
auto usernameJob = new QKeychain::ReadPasswordJob("LauncherWindow");
usernameJob->setKey(profile.name + "-username");
usernameJob->start();
core.connect(
usernameJob, &QKeychain::ReadPasswordJob::finished, [loop, usernameJob, &username](QKeychain::Job* j) {
username = usernameJob->textData();
loop->quit();
});
loop->exec();
auto passwordJob = new QKeychain::ReadPasswordJob("LauncherWindow");
passwordJob->setKey(profile.name + "-password");
passwordJob->start();
core.connect(
passwordJob, &QKeychain::ReadPasswordJob::finished, [loop, passwordJob, &password](QKeychain::Job* j) {
password = passwordJob->textData();
loop->quit();
});
loop->exec();
auto info = new LoginInformation();
info->settings = &profile;
info->username = username;
info->password = password;
core.login(*info);
return core.autoLogin(profile);
}
return true;

4
launcher/core/CMakeLists.txt
View file

@ -53,7 +53,9 @@ target_link_libraries(astra_core PUBLIC
Qt5::Widgets # widgets is required by watchdog, to be fixed/removed later
Qt5::Quick # required for some type registrations
PRIVATE
astra_desktop) # desktop is currently required by the core, to be fixed/removed later
astra_desktop
cotp
crypto) # desktop is currently required by the core, to be fixed/removed later
if (ENABLE_WATCHDOG)
target_include_directories(astra_core PUBLIC ${TESSERACT_INCLUDE_DIRS} ${LEPTONICA_INCLUDE_DIRS})

9
launcher/core/include/launchercore.h
View file

@ -161,6 +161,15 @@ public:
*/
void login(LoginInformation& loginInformation);
/*
* Attempts to log into a profile without LoginInformation, which may or may not work depending on a combination of
* the password failing, OTP not being available to auto-generate, among other things.
*
* The launcher will still warn the user about any possible errors, however the call site will need to check the
* result to see whether they need to "reset" or show a failed state or not.
*/
bool autoLogin(ProfileSettings& settings);
/*
* Launches the game using the provided authentication.
*/

67
launcher/core/src/launchercore.cpp
View file

@ -19,6 +19,7 @@
#include <QUrlQuery>
#include <algorithm>
#include <keychain.h>
#include <cotp.h>
#include "assetupdater.h"
#include "encryptedarg.h"
@ -731,3 +732,69 @@ void LauncherCore::login(LoginInformation& loginInformation) {
squareBoot->checkGateStatus(&loginInformation);
}
}
bool LauncherCore::autoLogin(ProfileSettings& profile) {
auto loop = new QEventLoop();
QString username, password;
QString otpSecret;
auto usernameJob = new QKeychain::ReadPasswordJob("LauncherWindow");
usernameJob->setKey(profile.name + "-username");
usernameJob->start();
QObject::connect(
usernameJob, &QKeychain::ReadPasswordJob::finished, [loop, usernameJob, &username](QKeychain::Job* j) {
username = usernameJob->textData();
loop->quit();
});
loop->exec();
auto passwordJob = new QKeychain::ReadPasswordJob("LauncherWindow");
passwordJob->setKey(profile.name + "-password");
passwordJob->start();
QObject::connect(
passwordJob, &QKeychain::ReadPasswordJob::finished, [loop, passwordJob, &password](QKeychain::Job* j) {
password = passwordJob->textData();
loop->quit();
});
loop->exec();
// TODO: handle cases where the user doesn't want to store their OTP secret, so we have to manually prompt them
if(profile.useOneTimePassword && profile.rememberOTPSecret) {
auto otpJob = new QKeychain::ReadPasswordJob("LauncherWindow");
otpJob->setKey(profile.name + "-otpsecret");
otpJob->start();
QObject::connect(
otpJob, &QKeychain::ReadPasswordJob::finished, [loop, otpJob, &otpSecret](QKeychain::Job* j) {
otpSecret = otpJob->textData();
loop->quit();
});
loop->exec();
}
auto info = new LoginInformation();
info->settings = &profile;
info->username = username;
info->password = password;
if(profile.useOneTimePassword && !profile.rememberOTPSecret)
return false;
if(profile.useOneTimePassword && profile.rememberOTPSecret) {
// generate otp
char* totp = get_totp (otpSecret.toStdString().c_str(), 6, 30, SHA1, nullptr);
info->oneTimePassword = totp;
free (totp);
}
// TODO: when login fails, we need some way to propagate this back? or not?
login(*info);
return true;
}

4
launcher/desktop/CMakeLists.txt
View file

@ -24,6 +24,4 @@ target_link_libraries(astra_desktop PUBLIC
astra_core
Qt5::Core
Qt5::Widgets
Qt5::Network
cotp
crypto)
Qt5::Network)

60
launcher/desktop/src/autologinwindow.cpp
View file

@ -13,7 +13,6 @@
#include <QSpinBox>
#include <QToolTip>
#include <keychain.h>
#include <cotp.h>
#include "launchercore.h"
#include "launcherwindow.h"
@ -36,64 +35,7 @@ AutoLoginWindow::AutoLoginWindow(ProfileSettings& profile, LauncherCore& core, Q
auto autologinTimer = new QTimer();
connect(autologinTimer, &QTimer::timeout, [&, this, autologinTimer] {
// TODO: this is the second place where I have implemented this. this is a good idea to abstract, maybe? :-)
auto loop = new QEventLoop();
QString username, password;
QString otpSecret;
auto usernameJob = new QKeychain::ReadPasswordJob("LauncherWindow");
usernameJob->setKey(profile.name + "-username");
usernameJob->start();
QObject::connect(
usernameJob, &QKeychain::ReadPasswordJob::finished, [loop, usernameJob, &username](QKeychain::Job* j) {
username = usernameJob->textData();
loop->quit();
});
loop->exec();
auto passwordJob = new QKeychain::ReadPasswordJob("LauncherWindow");
passwordJob->setKey(profile.name + "-password");
passwordJob->start();
QObject::connect(
passwordJob, &QKeychain::ReadPasswordJob::finished, [loop, passwordJob, &password](QKeychain::Job* j) {
password = passwordJob->textData();
loop->quit();
});
loop->exec();
// TODO: handle cases where the user doesn't want to store their OTP secret, so we have to manually prompt them
if(profile.useOneTimePassword && profile.rememberOTPSecret) {
auto otpJob = new QKeychain::ReadPasswordJob("LauncherWindow");
otpJob->setKey(profile.name + "-otpsecret");
otpJob->start();
QObject::connect(
otpJob, &QKeychain::ReadPasswordJob::finished, [loop, otpJob, &otpSecret](QKeychain::Job* j) {
otpSecret = otpJob->textData();
loop->quit();
});
loop->exec();
}
auto info = new LoginInformation();
info->settings = &profile;
info->username = username;
info->password = password;
if(profile.useOneTimePassword && profile.rememberOTPSecret) {
// generate otp
char *totp = get_totp (otpSecret.toStdString().c_str(), 6, 30, SHA1, nullptr);
info->oneTimePassword = totp;
free (totp);
}
core.login(*info);
core.autoLogin(profile);
close();
autologinTimer->stop();