Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

hook domain-server to user DomainServerWebSessionData class

Browse source
This commit is contained in:
Stephen Birarda 2014-07-21 17:32:38 -07:00
parent e75ed2c4fa
commit f78a1f7033
4 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
domain-server/src/DomainServer.cpp
View file

@ -43,7 +43,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
_networkReplyUUIDMap(), _networkReplyUUIDMap(),
_sessionAuthenticationHash(), _sessionAuthenticationHash(),
_webAuthenticationStateSet(), _webAuthenticationStateSet(),
_cookieProfileJSONHash(), _cookieSessionHash(),
_settingsManager() _settingsManager()
{ {
setOrganizationName("High Fidelity"); setOrganizationName("High Fidelity");
@ -1281,10 +1281,10 @@ bool DomainServer::isAuthenticatedRequest(HTTPConnection* connection, const QUrl
cookieUUID = cookieUUIDRegex.cap(1); cookieUUID = cookieUUIDRegex.cap(1);
} }
if (!cookieUUID.isNull() && _cookieProfileJSONHash.contains(cookieUUID)) { if (!cookieUUID.isNull() && _cookieSessionHash.contains(cookieUUID)) {
// pull the QJSONObject for the user with this cookie UUID // pull the QJSONObject for the user with this cookie UUID
QJsonObject profileObject = _cookieProfileJSONHash.value(cookieUUID); DomainServerWebSessionData sessionData = _cookieSessionHash.value(cookieUUID);
QString profileUsername = profileObject.value("username").toString(); QString profileUsername = sessionData.getUsername();
if (_argumentVariantMap.value(ADMIN_USERS_CONFIG_KEY).toJsonValue().toArray().contains(profileUsername)) { if (_argumentVariantMap.value(ADMIN_USERS_CONFIG_KEY).toJsonValue().toArray().contains(profileUsername)) {
// this is an authenticated user // this is an authenticated user
@ -1404,7 +1404,7 @@ Headers DomainServer::setupCookieHeadersFromProfileReply(QNetworkReply* profileR
QJsonDocument profileDocument = QJsonDocument::fromJson(profileReply->readAll()); QJsonDocument profileDocument = QJsonDocument::fromJson(profileReply->readAll());
// add the profile to our in-memory data structure so we know who the user is when they send us their cookie // add the profile to our in-memory data structure so we know who the user is when they send us their cookie
_cookieProfileJSONHash.insert(cookieUUID, profileDocument.object()["data"].toObject()["user"].toObject()); _cookieSessionHash.insert(cookieUUID, DomainServerWebSessionData(profileDocument));
// setup expiry for cookie to 1 month from today // setup expiry for cookie to 1 month from today
QDateTime cookieExpiry = QDateTime::currentDateTimeUtc().addMonths(1); QDateTime cookieExpiry = QDateTime::currentDateTimeUtc().addMonths(1);

3
domain-server/src/DomainServer.h
View file

@ -25,6 +25,7 @@
#include <LimitedNodeList.h> #include <LimitedNodeList.h>
#include "DomainServerSettingsManager.h" #include "DomainServerSettingsManager.h"
#include "DomainServerWebSessionData.h"
#include "WalletTransaction.h" #include "WalletTransaction.h"
#include "PendingAssignedNodeData.h" #include "PendingAssignedNodeData.h"
@ -115,7 +116,7 @@ private:
QHash<QUuid, QString> _sessionAuthenticationHash; QHash<QUuid, QString> _sessionAuthenticationHash;
QSet<QUuid> _webAuthenticationStateSet; QSet<QUuid> _webAuthenticationStateSet;
QHash<QUuid, QJsonObject> _cookieProfileJSONHash; QHash<QUuid, DomainServerWebSessionData> _cookieSessionHash;
DomainServerSettingsManager _settingsManager; DomainServerSettingsManager _settingsManager;
}; };

28
domain-server/src/DomainServerWebSessionData.cpp
View file

@ -14,6 +14,13 @@
#include "DomainServerWebSessionData.h" #include "DomainServerWebSessionData.h"
DomainServerWebSessionData::DomainServerWebSessionData() :
_username(),
_roles()
{
}
DomainServerWebSessionData::DomainServerWebSessionData(const QJsonDocument& profileDocument) : DomainServerWebSessionData::DomainServerWebSessionData(const QJsonDocument& profileDocument) :
_roles() _roles()
{ {
@ -23,4 +30,23 @@ DomainServerWebSessionData::DomainServerWebSessionData(const QJsonDocument& prof
foreach(const QJsonValue& rolesValue, profileDocument.object()["user"].toObject()["roles"].toObject()) { foreach(const QJsonValue& rolesValue, profileDocument.object()["user"].toObject()["roles"].toObject()) {
_roles.insert(rolesValue.toString()); _roles.insert(rolesValue.toString());
} }
} }
DomainServerWebSessionData::DomainServerWebSessionData(const DomainServerWebSessionData& otherSessionData) {
_username = otherSessionData._username;
_roles = otherSessionData._roles;
}
DomainServerWebSessionData& DomainServerWebSessionData::operator=(const DomainServerWebSessionData& otherSessionData) {
DomainServerWebSessionData temp(otherSessionData);
swap(temp);
return *this;
}
void DomainServerWebSessionData::swap(DomainServerWebSessionData& otherSessionData) {
using std::swap;
swap(_username, otherSessionData._username);
swap(_roles, otherSessionData._roles);
}

5
domain-server/src/DomainServerWebSessionData.h
View file

@ -18,12 +18,17 @@
class DomainServerWebSessionData : public QObject { class DomainServerWebSessionData : public QObject {
Q_OBJECT Q_OBJECT
public: public:
DomainServerWebSessionData();
DomainServerWebSessionData(const QJsonDocument& profileDocument); DomainServerWebSessionData(const QJsonDocument& profileDocument);
DomainServerWebSessionData(const DomainServerWebSessionData& otherSessionData);
DomainServerWebSessionData& operator=(const DomainServerWebSessionData& otherSessionData);
const QString& getUsername() const { return _username; } const QString& getUsername() const { return _username; }
const QSet<QString>& getRoles() const { return _roles; } const QSet<QString>& getRoles() const { return _roles; }
private: private:
void swap(DomainServerWebSessionData& otherSessionData);
QString _username; QString _username;
QSet<QString> _roles; QSet<QString> _roles;
}; };