Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-05-26 02:32:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make all tokens expire

Browse source 
Closes #335
This commit is contained in:
jvyden 2022-07-29 15:08:41 -04:00
parent a8410fe352
commit 4ba75f09a9
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
16 changed files with 188 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ProjectLighthouse.Servers.GameServer/Controllers/LoginController.cs
View file

@ -57,9 +57,10 @@ public class LoginController : ControllerBase
string ipAddress = remoteIpAddress.ToString();
await this.database.RemoveExpiredTokens();
// Get an existing token from the IP & username
GameToken? token = await this.database.GameTokens.Include
(t => t.User)
GameToken? token = await this.database.GameTokens.Include(t => t.User)
.FirstOrDefaultAsync(t => t.UserLocation == ipAddress && t.User.Username == npTicket.Username && !t.Used);
if (token == null) // If we cant find an existing token, try to generate a new one
@ -67,7 +68,8 @@ public class LoginController : ControllerBase
token = await this.database.AuthenticateUser(npTicket, ipAddress);
if (token == null)
{
Logger.Warn($"Unable to find/generate a token for username {npTicket.Username}", LogArea.Login);
Logger.Warn($"Unable to " +
$"find/generate a token for username {npTicket.Username}", LogArea.Login);
return this.StatusCode(403, ""); // If not, then 403.
}
}

2
ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
View file

@ -1,4 +1,5 @@
#nullable enable
using System.Globalization;
using LBPUnion.ProjectLighthouse.Configuration;
using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.Logging;
@ -75,6 +76,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.";
$"token.Used: {gameToken.Used}\n" +
$"token.UserLocation: {gameToken.UserLocation}\n" +
$"token.GameVersion: {gameToken.GameVersion}\n" +
$"token.ExpiresAt: {gameToken.ExpiresAt.ToString(CultureInfo.CurrentCulture)}\n" +
"---DEBUG INFO---" +
#endif
"\n"