mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2025-11-14 22:30:07 +00:00
Compare commits
4 Commits
31c6ff0829
...
1.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
d9b6aedd5b
|
|||
|
|
145113062b | ||
| d717c5d74d | |||
| a6eb0e2349 |
@@ -53,7 +53,7 @@ namespace Database {
|
||||
|
||||
void updateAccountLevel(int accountId, int accountLevel);
|
||||
|
||||
// return true iff cookie is valid for the account.
|
||||
// return true if cookie is valid for the account.
|
||||
// invalidates the stored cookie afterwards
|
||||
bool checkCookie(int accountId, const char *cookie);
|
||||
|
||||
|
||||
@@ -130,7 +130,8 @@ bool Database::checkCookie(int accountId, const char *tryCookie) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* since cookies are immediately invalidated, we don't need to be concerned about
|
||||
/*
|
||||
* since cookies are immediately invalidated, we don't need to be concerned about
|
||||
* timing-related side channel attacks, so strcmp is fine here
|
||||
*/
|
||||
bool match = (strcmp(cookie, tryCookie) == 0);
|
||||
@@ -141,7 +142,7 @@ bool Database::checkCookie(int accountId, const char *tryCookie) {
|
||||
rc = sqlite3_step(stmt);
|
||||
sqlite3_finalize(stmt);
|
||||
if (rc != SQLITE_DONE)
|
||||
std::cout << "[WARN] Database fail on consumeCookie(): " << sqlite3_errmsg(db) << std::endl;
|
||||
std::cout << "[WARN] Database fail on checkCookie(): " << sqlite3_errmsg(db) << std::endl;
|
||||
|
||||
return match;
|
||||
}
|
||||
|
||||
@@ -682,8 +682,7 @@ bool CNLoginServer::isCharacterNameGood(std::string Firstname, std::string Lastn
|
||||
|
||||
bool CNLoginServer::isLoginTypeAllowed(LoginType loginType) {
|
||||
// the config file specifies "comma-separated" but tbh we don't care
|
||||
switch (loginType)
|
||||
{
|
||||
switch (loginType) {
|
||||
case LoginType::PASSWORD:
|
||||
return settings::AUTHMETHODS.find("password") != std::string::npos;
|
||||
case LoginType::COOKIE:
|
||||
|
||||
2
tdata
2
tdata
Submodule tdata updated: 8c98c83682...bdb611b092
5
vendor/bcrypt/bcrypt.c
vendored
5
vendor/bcrypt/bcrypt.c
vendored
@@ -22,13 +22,14 @@
|
||||
#endif
|
||||
#include <errno.h>
|
||||
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
// On windows we need to generate random bytes differently.
|
||||
#if defined(_WIN32) && !defined(_WIN64)
|
||||
typedef __int32 ssize_t;
|
||||
#elif defined(_WIN32) && defined(_WIN64)
|
||||
typedef __int64 ssize_t;
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
// On windows we need to generate random bytes differently.
|
||||
#define BCRYPT_HASHSIZE 60
|
||||
|
||||
#include "bcrypt.h"
|
||||
|
||||
Reference in New Issue
Block a user