owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made database ID manipulations safer

Browse Source
This commit is contained in:
emeric
2021-09-20 23:53:38 +02:00
parent 598f01069e
commit 441aed622c
138 changed files with 2164 additions and 2054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/auth/impl/AuthServiceBase.cpp
+3 -3
View File
@@ -25,7 +25,7 @@
namespace Auth
{
Database::IdType
Database::UserId
AuthServiceBase::getOrCreateUser(Database::Session& session, std::string_view loginName)
{
auto transaction {session.createUniqueTransaction()};
@@ -41,11 +41,11 @@ namespace Auth
user.modify()->setType(type);
}
return user.id();
return user->getId();
}
void
AuthServiceBase::onUserAuthenticated(Database::Session& session, Database::IdType userId)
AuthServiceBase::onUserAuthenticated(Database::Session& session, Database::UserId userId)
{
auto transaction {session.createUniqueTransaction()};
Database::User::pointer user {Database::User::getById(session, userId)};
src/libs/auth/impl/AuthServiceBase.hpp
+2 -2
View File
@@ -32,7 +32,7 @@ namespace Auth
class AuthServiceBase
{
protected:
Database::IdType getOrCreateUser(Database::Session& session, std::string_view loginName);
void onUserAuthenticated(Database::Session& session, Database::IdType userId);
Database::UserId getOrCreateUser(Database::Session& session, std::string_view loginName);
void onUserAuthenticated(Database::Session& session, Database::UserId userId);
};
}
src/libs/auth/impl/AuthTokenService.cpp
+3 -3
View File
@@ -45,7 +45,7 @@ namespace Auth
}
std::string
AuthTokenService::createAuthToken(Database::Session& session, Database::IdType userId, const Wt::WDateTime& expiry)
AuthTokenService::createAuthToken(Database::Session& session, Database::UserId userId, const Wt::WDateTime& expiry)
{
const std::string secret {Wt::WRandom::generateId(32)};
const std::string secretHash {sha1Function.compute(secret, {})};
@@ -86,7 +86,7 @@ namespace Auth
LMS_LOG(UI, DEBUG) << "Found auth token for user '" << authToken->getUser()->getLoginName() << "'!";
AuthTokenService::AuthTokenProcessResult::AuthTokenInfo res {authToken->getUser().id(), authToken->getExpiry()};
AuthTokenService::AuthTokenProcessResult::AuthTokenInfo res {authToken->getUser()->getId(), authToken->getExpiry()};
authToken.remove();
return res;
@@ -123,7 +123,7 @@ namespace Auth
}
void
AuthTokenService::clearAuthTokens(Database::Session& session, Database::IdType userId)
AuthTokenService::clearAuthTokens(Database::Session& session, Database::UserId userId)
{
auto transaction {session.createUniqueTransaction()};
src/libs/auth/impl/AuthTokenService.hpp
+2 -2
View File
@@ -44,8 +44,8 @@ namespace Auth
private:
AuthTokenProcessResult processAuthToken(Database::Session& session, const boost::asio::ip::address& clientAddress, std::string_view tokenValue) override;
std::string createAuthToken(Database::Session& session, Database::IdType userId, const Wt::WDateTime& expiry) override;
void clearAuthTokens(Database::Session& session, Database::IdType userId) override;
std::string createAuthToken(Database::Session& session, Database::UserId userId, const Wt::WDateTime& expiry) override;
void clearAuthTokens(Database::Session& session, Database::UserId userId) override;
std::shared_mutex _mutex;
LoginThrottler _loginThrottler;
src/libs/auth/impl/PasswordServiceBase.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ namespace Auth
{
_loginThrottler.onGoodClientAttempt(clientAddress);
const Database::IdType userId {getOrCreateUser(session, loginName)};
const Database::UserId userId {getOrCreateUser(session, loginName)};
onUserAuthenticated(session, userId);
return {CheckResult::State::Granted, userId};
}
src/libs/auth/impl/http-headers/HttpHeadersEnvService.cpp
+2 -2
View File
@@ -43,7 +43,7 @@ namespace Auth
LMS_LOG(AUTH, DEBUG) << "Extracted login name = '" << loginName << "' from HTTP header";
const Database::IdType userId {getOrCreateUser(session, loginName)};
const Database::UserId userId {getOrCreateUser(session, loginName)};
onUserAuthenticated(session, userId);
return {CheckResult::State::Granted, userId};
}
@@ -57,7 +57,7 @@ namespace Auth
LMS_LOG(AUTH, DEBUG) << "Extracted login name = '" << loginName << "' from HTTP header";
const Database::IdType userId {getOrCreateUser(session, loginName)};
const Database::UserId userId {getOrCreateUser(session, loginName)};
onUserAuthenticated(session, userId);
return {CheckResult::State::Granted, userId};
}
src/libs/auth/impl/internal/InternalPasswordService.cpp
+2 -2
View File
@@ -96,13 +96,13 @@ namespace Auth
}
void
InternalPasswordService::setPassword(Database::Session& session, Database::IdType userId, std::string_view newPassword)
InternalPasswordService::setPassword(Database::Session& session, Database::UserId userId, std::string_view newPassword)
{
const Database::User::PasswordHash passwordHash {hashPassword(newPassword)};
auto transaction {session.createUniqueTransaction()};
const Database::User::pointer user {Database::User::getById(session, userId)};
Database::User::pointer user {Database::User::getById(session, userId)};
if (!user)
throw Exception {"User not found!"};
src/libs/auth/impl/internal/InternalPasswordService.hpp
+1 -1
View File
@@ -42,7 +42,7 @@ namespace Auth
bool canSetPasswords() const override;
PasswordAcceptabilityResult checkPasswordAcceptability(std::string_view loginName, const PasswordValidationContext& context) const override;
void setPassword(Database::Session& session, Database::IdType userId, std::string_view newPassword) override;
void setPassword(Database::Session& session, Database::UserId userId, std::string_view newPassword) override;
Database::User::PasswordHash hashPassword(std::string_view password) const;
void hashRandomPassword() const;
src/libs/auth/impl/pam/PAMPasswordService.cpp
+1 -1
View File
@@ -193,7 +193,7 @@ namespace Auth
}
void
PAMPasswordService::setPassword(Database::Session&, Database::IdType, std::string_view)
PAMPasswordService::setPassword(Database::Session&, Database::UserId, std::string_view)
{
throw NotImplementedException {};
}
src/libs/auth/impl/pam/PAMPasswordService.hpp
+1 -1
View File
@@ -38,7 +38,7 @@ namespace Auth
bool canSetPasswords() const override;
PasswordAcceptabilityResult checkPasswordAcceptability(std::string_view loginName, const PasswordValidationContext& context) const override;
void setPassword(Database::Session& session,
Database::IdType userId,
Database::UserId userId,
std::string_view newPassword) override;
};
}
src/libs/auth/include/auth/IAuthTokenService.hpp
+3 -3
View File
@@ -54,7 +54,7 @@ namespace Auth
struct AuthTokenInfo
{
Database::IdType userId;
Database::UserId userId;
Wt::WDateTime expiry;
};
@@ -66,8 +66,8 @@ namespace Auth
virtual AuthTokenProcessResult processAuthToken(Database::Session& session, const boost::asio::ip::address& clientAddress, std::string_view tokenValue) = 0;
// Returns a one time token
virtual std::string createAuthToken(Database::Session& session, Database::IdType userid, const Wt::WDateTime& expiry) = 0;
virtual void clearAuthTokens(Database::Session& session, Database::IdType userid) = 0;
virtual std::string createAuthToken(Database::Session& session, Database::UserId userid, const Wt::WDateTime& expiry) = 0;
virtual void clearAuthTokens(Database::Session& session, Database::UserId userid) = 0;
};
std::unique_ptr<IAuthTokenService> createAuthTokenService(std::size_t maxThrottlerEntryCount);
src/libs/auth/include/auth/IEnvService.hpp
+1 -1
View File
@@ -57,7 +57,7 @@ namespace Auth
};
State state {State::Denied};
std::optional<Database::IdType> userId {};
std::optional<Database::UserId> userId {};
};
virtual CheckResult processEnv(Database::Session& session, const Wt::WEnvironment& env) = 0;
src/libs/auth/include/auth/IPasswordService.hpp
+2 -2
View File
@@ -53,7 +53,7 @@ namespace Auth
Throttled,
};
State state {State::Denied};
std::optional<Database::IdType> userId {};
std::optional<Database::UserId> userId {};
std::optional<Wt::WDateTime> expiry {};
};
virtual CheckResult checkUserPassword(Database::Session& session,
@@ -70,7 +70,7 @@ namespace Auth
MustMatchLoginName,
};
virtual PasswordAcceptabilityResult checkPasswordAcceptability(std::string_view password, const PasswordValidationContext& context) const = 0;
virtual void setPassword(Database::Session& session, Database::IdType userId, std::string_view newPassword) = 0;
virtual void setPassword(Database::Session& session, Database::UserId userId, std::string_view newPassword) = 0;
};
std::unique_ptr<IPasswordService> createPasswordService(std::string_view authPasswordBackend, std::size_t maxThrottlerEntryCount, IAuthTokenService& authTokenService);