Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #106 from AttorneyOnline/login-changes

Browse Source 
Change /login to use a "prompt" based system
This commit is contained in:
Denton Poss 2021-05-01 19:56:47 -05:00 committed by GitHub
commit 220b9373fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 75 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/aoclient.h
View File

@ -289,6 +289,11 @@ class AOClient : public QObject {
*/
bool testimony_saving = false;
/**
* @brief If true, the client's next OOC message will be interpreted as a moderator login.
*/
bool is_logging_in = false;
public slots:
/**
* @brief A slot for when the client disconnects from the server.
@ -688,11 +693,9 @@ class AOClient : public QObject {
///@{
/**
* @brief Logs the user in as a moderator.
* @brief Sets the client to be in the process of logging in, setting is_logging_in to **true**.
*
* @details If the authorisation type is `"simple"`, then this command expects one argument, the **global moderator password**.
*
* If the authorisation type is `"advanced"`, then it requires two arguments, the **moderator's username** and the **matching password**.
* @details No arguments.
*
* @iscommand
*/
@ -1899,7 +1902,7 @@ class AOClient : public QObject {
* See @ref CommandInfo "the type's documentation" for more details.
*/
const QMap<QString, CommandInfo> commands {
{"login", {ACLFlags.value("NONE"), 1, &AOClient::cmdLogin}},
{"login", {ACLFlags.value("NONE"), 0, &AOClient::cmdLogin}},
{"getareas", {ACLFlags.value("NONE"), 0, &AOClient::cmdGetAreas}},
{"getarea", {ACLFlags.value("NONE"), 0, &AOClient::cmdGetArea}},
{"ban", {ACLFlags.value("BAN"), 2, &AOClient::cmdBan}},
@ -2087,6 +2090,13 @@ class AOClient : public QObject {
* @brief The size, in bytes, of the last data the client sent to the server.
*/
int last_read;
/**
* @brief A helper function for logging in a client as moderator.
*
* @param message The OOC message the client has sent.
*/
void loginAttempt(QString message);
};
#endif // AOCLIENT_H

41
src/commands/authentication.cpp
View File

@ -26,46 +26,21 @@ void AOClient::cmdLogin(int argc, QStringList argv)
sendServerMessage("You are already logged in!");
return;
}
if (server->auth_type == "simple") {
if (server->modpass == "") {
sendServerMessage("No modpass is set! Please set a modpass before authenticating.");
}
else if(argv[0] == server->modpass) {
sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button."
sendServerMessage("Logged in as a moderator."); // pre-2.9.1 clients are hardcoded to display the mod UI when this string is sent in OOC
authenticated = true;
}
else {
sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful."
sendServerMessage("Incorrect password.");
}
server->areas.value(current_area)->logger->logLogin(this, authenticated, "moderator");
}
else if (server->auth_type == "advanced") {
if (argc < 2) {
sendServerMessage("You must specify a username and a password");
sendServerMessage("No modpass is set. Please set a modpass before logging in.");
return;
}
QString username = argv[0];
QString password = argv[1];
if (server->db_manager->authenticate(username, password)) {
moderator_name = username;
authenticated = true;
sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button."
if (version.release <= 2 && version.major <= 9 && version.minor <= 0)
sendServerMessage("Logged in as a moderator."); // pre-2.9.1 clients are hardcoded to display the mod UI when this string is sent in OOC
sendServerMessage("Welcome, " + username);
}
else {
sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful."
sendServerMessage("Incorrect password.");
sendServerMessage("Entering login prompt.\nPlease enter the server modpass.");
is_logging_in = true;
return;
}
server->areas.value(current_area)->logger->logLogin(this, authenticated, username);
}
else {
qWarning() << "config.ini has an unrecognized auth_type!";
sendServerMessage("Config.ini contains an invalid auth_type, please check your config.");
else if (server->auth_type == "advanced") {
sendServerMessage("Entering login prompt.\nPlease enter your username and password.");
is_logging_in = true;
return;
}
}

52
src/packets.cpp
View File

@ -186,6 +186,11 @@ void AOClient::pktOocChat(AreaData* area, int argc, QStringList argv, AOPacket p
return;
}
if (is_logging_in) {
loginAttempt(argv[1]);
return;
}
QString message = dezalgo(argv[1]);
if (message.length() == 0 || message.length() > server->max_chars)
return;
@ -832,3 +837,50 @@ QString AOClient::decodeMessage(QString incoming_message)
.replace("<and>", "&");
return decoded_message;
}
void AOClient::loginAttempt(QString message)
{
if (server->auth_type == "simple") {
if (message == server->modpass) {
sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button."
sendServerMessage("Logged in as a moderator."); // pre-2.9.1 clients are hardcoded to display the mod UI when this string is sent in OOC
authenticated = true;
}
else {
sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful."
sendServerMessage("Incorrect password.");
}
server->areas.value(current_area)->logger->logLogin(this, authenticated, "moderator");
}
else if (server->auth_type == "advanced") {
QStringList login = message.split(" ");
if (login.size() < 2) {
sendServerMessage("You must specify a username and a password");
sendServerMessage("Exiting login prompt.");
is_logging_in = false;
return;
}
QString username = login[0];
QString password = login[1];
if (server->db_manager->authenticate(username, password)) {
moderator_name = username;
authenticated = true;
sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button."
if (version.release <= 2 && version.major <= 9 && version.minor <= 0)
sendServerMessage("Logged in as a moderator."); // pre-2.9.1 clients are hardcoded to display the mod UI when this string is sent in OOC
sendServerMessage("Welcome, " + username);
}
else {
sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful."
sendServerMessage("Incorrect password.");
}
server->areas.value(current_area)->logger->logLogin(this, authenticated, username);
}
else {
qWarning() << "config.ini has an unrecognized auth_type!";
sendServerMessage("Config.ini contains an invalid auth_type, please check your config.");
}
sendServerMessage("Exiting login prompt.");
is_logging_in = false;
return;
}