swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-24 09:12:51 -04:00
Code Issues Projects Releases Wiki Activity

add "json for modern c++" json.hpp file and implement it; it is in a higher level dir so we can add it elsewhere if need be; up next we want to add an option to have an endpoint GET requested on character creation with the suid and character name

Browse Source
This commit is contained in:
DarthArgus
2016-04-17 02:06:13 +00:00
parent c7f986bafc
commit 61298b7468
6 changed files with 8940 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/LoginServer/src/shared/ClientConnection.cpp
+26 -13
View File
@@ -25,7 +25,9 @@
#include <algorithm>
#include <curl/curl.h>
#include <json.hpp>
using json = nlohmann::json;
//-----------------------------------------------------------------------
ClientConnection::ClientConnection(UdpConnectionMT * u, TcpClient * t) :
@@ -211,38 +213,49 @@ void ClientConnection::validateClient(const std::string & id, const std::string
LOG("LoginClientConnection", ("validateClient() for stationId (%lu) at IP (%s), id (%s) key (%s), skipping validating session", m_stationId, getRemoteAddress().c_str(), id.c_str(), key.c_str()));
if (ConfigLoginServer::getUseExternalAuth() == true)
std::string authURL = std::string(ConfigLoginServer::getExternalAuthUrl());
if (ConfigLoginServer::getUseExternalAuth() == true && !(authURL.empty()))
{
CURL *curl;
CURLcode res;
std::string readBuffer;
curl = curl_easy_init();
if (curl)
{
std::string username(curl_easy_escape(curl, id.c_str(), id.length()));
std::string password(curl_easy_escape(curl, key.c_str(), key.length()));
curl_easy_setopt(curl, CURLOPT_URL, ("phpauthurl" + username + "&pw=" + password).c_str());
curl_easy_setopt(curl, CURLOPT_URL, (authURL + username + "&pw=" + password).c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &readBuffer);
res = curl_easy_perform(curl);
if (res == CURLE_OK && !(readBuffer.empty()))
{
json j = json::parse(readBuffer);
curl_easy_cleanup(curl);
if (j["status"] == "success")
{
LoginServer::getInstance().onValidateClient(suid, id, this, true, NULL, 0xFFFFFFFF, 0xFFFFFFFF);
}
else
{
ErrorMessage err("Login Failed", j["userMessage"]);
this->send(err, true);
}
// where possible we'll use http status codes - later this will become json and this nonsense isn't necessary
if (readBuffer == "1")
{
LoginServer::getInstance().onValidateClient(suid, id, this, true, NULL, 0xFFFFFFFF, 0xFFFFFFFF);
}
else if (readBuffer == "2")
{
ErrorMessage err("Login Failed", "You have been banned.");
this->send(err, true);
}
else
{
ErrorMessage err("Login Failed", "Invalid username or password.");
ErrorMessage err("Login Failed", "Error connecting to authentication service.");
this->send(err, true);
}
curl_easy_cleanup(curl);
}
}
else