rework authentication and some other crap for optimizing sql parallelism
This commit is contained in:
@@ -8,7 +8,7 @@ namespace MareSynchronos.API
|
|||||||
{
|
{
|
||||||
public class API
|
public class API
|
||||||
{
|
{
|
||||||
public const int Version = 3;
|
public const int Version = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class FilesHubAPI
|
public class FilesHubAPI
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Concurrent;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Data;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
@@ -17,71 +17,41 @@ namespace MareSynchronosServer.Authentication
|
|||||||
{
|
{
|
||||||
public class SecretKeyAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
|
public class SecretKeyAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
|
||||||
{
|
{
|
||||||
public static ConcurrentDictionary<string, object> IdentificationLocks = new();
|
|
||||||
private readonly MareDbContext _mareDbContext;
|
private readonly MareDbContext _mareDbContext;
|
||||||
public const string AuthScheme = "SecretKeyAuth";
|
public const string AuthScheme = "SecretKeyAuth";
|
||||||
|
|
||||||
protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
|
protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
|
||||||
{
|
{
|
||||||
if (!Request.Headers.ContainsKey("Authorization") || !Request.Headers.ContainsKey("CharacterNameHash"))
|
if (!Request.Headers.ContainsKey("Authorization"))
|
||||||
return AuthenticateResult.Fail("Failed Authorization");
|
return AuthenticateResult.Fail("Failed Authorization");
|
||||||
|
|
||||||
var authHeader = Request.Headers["Authorization"].ToString();
|
var authHeader = Request.Headers["Authorization"].ToString();
|
||||||
var charNameHeader = Request.Headers["CharacterNameHash"].ToString();
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(authHeader) || string.IsNullOrEmpty(charNameHeader) || charNameHeader == "--")
|
if (string.IsNullOrEmpty(authHeader))
|
||||||
return AuthenticateResult.Fail("Failed Authorization");
|
return AuthenticateResult.Fail("Failed Authorization");
|
||||||
|
|
||||||
var isBanned = await _mareDbContext.BannedUsers.AnyAsync(u => u.CharacterIdentification == charNameHeader);
|
|
||||||
if (isBanned)
|
|
||||||
{
|
|
||||||
return AuthenticateResult.Fail("Banned");
|
|
||||||
}
|
|
||||||
|
|
||||||
using var sha256 = SHA256.Create();
|
using var sha256 = SHA256.Create();
|
||||||
var hashedHeader = BitConverter.ToString(sha256.ComputeHash(Encoding.UTF8.GetBytes(authHeader))).Replace("-", "");
|
var hashedHeader = BitConverter.ToString(sha256.ComputeHash(Encoding.UTF8.GetBytes(authHeader))).Replace("-", "");
|
||||||
var user = _mareDbContext.Users.SingleOrDefault(m => m.SecretKey == hashedHeader);
|
var user = await _mareDbContext.Users.AsNoTracking().SingleOrDefaultAsync(m => m.SecretKey == hashedHeader);
|
||||||
|
|
||||||
if (user == null)
|
if (user == null)
|
||||||
{
|
{
|
||||||
return AuthenticateResult.Fail("Failed Authorization");
|
return AuthenticateResult.Fail("Failed Authorization");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!IdentificationLocks.TryGetValue(charNameHeader, out var lockObject))
|
|
||||||
{
|
|
||||||
lockObject = new();
|
|
||||||
IdentificationLocks[charNameHeader] = lockObject;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (user.CharacterIdentification != charNameHeader)
|
|
||||||
{
|
|
||||||
lock (lockObject)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
user.CharacterIdentification = charNameHeader;
|
|
||||||
_mareDbContext.Users.Update(user);
|
|
||||||
_mareDbContext.SaveChanges();
|
|
||||||
}
|
|
||||||
catch (DbUpdateConcurrencyException)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var claims = new List<Claim> {
|
var claims = new List<Claim> {
|
||||||
new Claim(ClaimTypes.Name, user.CharacterIdentification),
|
|
||||||
new Claim(ClaimTypes.NameIdentifier, user.UID)
|
new Claim(ClaimTypes.NameIdentifier, user.UID)
|
||||||
};
|
};
|
||||||
|
|
||||||
var identity = new ClaimsIdentity(claims, nameof(SecretKeyAuthenticationHandler));
|
var identity = new ClaimsIdentity(claims, nameof(SecretKeyAuthenticationHandler));
|
||||||
var principal = new ClaimsPrincipal(identity);
|
var principal = new ClaimsPrincipal(identity);
|
||||||
var ticket = new AuthenticationTicket(principal, this.Scheme.Name);
|
var ticket = new AuthenticationTicket(principal, Scheme.Name);
|
||||||
|
|
||||||
return AuthenticateResult.Success(ticket);
|
return AuthenticateResult.Success(ticket);
|
||||||
}
|
}
|
||||||
|
|
||||||
public SecretKeyAuthenticationHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, MareDbContext mareDbContext) : base(options, logger, encoder, clock)
|
public SecretKeyAuthenticationHandler(IOptionsMonitor<AuthenticationSchemeOptions> options,
|
||||||
|
MareDbContext mareDbContext, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
|
||||||
{
|
{
|
||||||
_mareDbContext = mareDbContext;
|
_mareDbContext = mareDbContext;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Data;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MareSynchronosServer.Data;
|
using MareSynchronosServer.Data;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
@@ -43,35 +45,38 @@ namespace MareSynchronosServer
|
|||||||
|
|
||||||
_logger.LogInformation($"Cleaning up files older than {filesOlderThanDays} days");
|
_logger.LogInformation($"Cleaning up files older than {filesOlderThanDays} days");
|
||||||
|
|
||||||
using var scope = _services.CreateScope();
|
try
|
||||||
var dbContext = scope.ServiceProvider.GetService<MareDbContext>()!;
|
|
||||||
|
|
||||||
var prevTime = DateTime.Now.Subtract(TimeSpan.FromDays(filesOlderThanDays));
|
|
||||||
var filesToDelete =
|
|
||||||
dbContext.Files.Where(f => f.LastAccessTime < prevTime);
|
|
||||||
dbContext.RemoveRange(filesToDelete);
|
|
||||||
dbContext.SaveChanges();
|
|
||||||
foreach (var file in filesToDelete)
|
|
||||||
{
|
{
|
||||||
var fileName = Path.Combine(_configuration["CacheDirectory"], file.Hash);
|
using var scope = _services.CreateScope();
|
||||||
if (File.Exists(fileName))
|
var dbContext = scope.ServiceProvider.GetService<MareDbContext>()!;
|
||||||
{
|
|
||||||
_logger.LogInformation("Deleting: " + fileName);
|
|
||||||
File.Delete(fileName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var allFiles = dbContext.Files.Where(f => f.Uploaded);
|
|
||||||
foreach (var file in allFiles)
|
|
||||||
{
|
|
||||||
var fileName = Path.Combine(_configuration["CacheDirectory"], file.Hash);
|
|
||||||
if (!File.Exists(fileName))
|
|
||||||
{
|
|
||||||
_logger.LogInformation("File does not exist anymore: " + fileName);
|
|
||||||
dbContext.Files.Remove(file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dbContext.SaveChanges();
|
var prevTime = DateTime.Now.Subtract(TimeSpan.FromDays(filesOlderThanDays));
|
||||||
|
|
||||||
|
dbContext.Database.BeginTransaction(IsolationLevel.Snapshot);
|
||||||
|
var allFiles = dbContext.Files.Where(f => f.Uploaded);
|
||||||
|
foreach (var file in allFiles)
|
||||||
|
{
|
||||||
|
var fileName = Path.Combine(_configuration["CacheDirectory"], file.Hash);
|
||||||
|
if (!File.Exists(fileName))
|
||||||
|
{
|
||||||
|
_logger.LogInformation("File does not exist anymore: " + fileName);
|
||||||
|
dbContext.Files.Remove(file);
|
||||||
|
} else if (new FileInfo(fileName).LastAccessTime < prevTime)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("File outdated: " + fileName);
|
||||||
|
dbContext.Files.Remove(file);
|
||||||
|
File.Delete(fileName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.LogInformation($"Cleanup complete");
|
||||||
|
|
||||||
|
dbContext.SaveChanges();
|
||||||
|
dbContext.Database.CommitTransaction();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task StopAsync(CancellationToken cancellationToken)
|
public Task StopAsync(CancellationToken cancellationToken)
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ namespace MareSynchronosServer.Hubs
|
|||||||
{
|
{
|
||||||
if (!IsModerator) return null;
|
if (!IsModerator) return null;
|
||||||
|
|
||||||
return await DbContext.BannedUsers.Select(b => new BannedUserDto()
|
return await DbContext.BannedUsers.AsNoTracking().Select(b => new BannedUserDto()
|
||||||
{
|
{
|
||||||
CharacterHash = b.CharacterIdentification,
|
CharacterHash = b.CharacterIdentification,
|
||||||
Reason = b.Reason
|
Reason = b.Reason
|
||||||
@@ -94,7 +94,7 @@ namespace MareSynchronosServer.Hubs
|
|||||||
{
|
{
|
||||||
if (!IsModerator) return null;
|
if (!IsModerator) return null;
|
||||||
|
|
||||||
return await DbContext.ForbiddenUploadEntries.Select(b => new ForbiddenFileDto()
|
return await DbContext.ForbiddenUploadEntries.AsNoTracking().Select(b => new ForbiddenFileDto()
|
||||||
{
|
{
|
||||||
Hash = b.Hash,
|
Hash = b.Hash,
|
||||||
ForbiddenBy = b.ForbiddenBy
|
ForbiddenBy = b.ForbiddenBy
|
||||||
@@ -107,7 +107,7 @@ namespace MareSynchronosServer.Hubs
|
|||||||
{
|
{
|
||||||
if (!IsModerator) return null;
|
if (!IsModerator) return null;
|
||||||
|
|
||||||
return await DbContext.Users.Where(b => !string.IsNullOrEmpty(b.CharacterIdentification)).Select(b => new OnlineUserDto
|
return await DbContext.Users.AsNoTracking().Where(b => !string.IsNullOrEmpty(b.CharacterIdentification)).Select(b => new OnlineUserDto
|
||||||
{
|
{
|
||||||
CharacterNameHash = b.CharacterIdentification,
|
CharacterNameHash = b.CharacterIdentification,
|
||||||
UID = b.UID,
|
UID = b.UID,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using System.Security.Claims;
|
|||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using MareSynchronosServer.Data;
|
using MareSynchronosServer.Data;
|
||||||
using Microsoft.AspNetCore.SignalR;
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace MareSynchronosServer.Hubs
|
namespace MareSynchronosServer.Hubs
|
||||||
@@ -20,9 +21,9 @@ namespace MareSynchronosServer.Hubs
|
|||||||
|
|
||||||
protected string AuthenticatedUserId => Context.User?.Claims?.SingleOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value ?? "Unknown";
|
protected string AuthenticatedUserId => Context.User?.Claims?.SingleOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value ?? "Unknown";
|
||||||
|
|
||||||
protected Models.User? GetAuthenticatedUser()
|
protected Models.User GetAuthenticatedUserUntracked()
|
||||||
{
|
{
|
||||||
return DbContext.Users.Single(u => u.UID == AuthenticatedUserId);
|
return DbContext.Users.AsNoTrackingWithIdentityResolution().Single(u => u.UID == AuthenticatedUserId);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Models.User? GetUserFromCID(string cid)
|
protected Models.User? GetUserFromCID(string cid)
|
||||||
|
|||||||
@@ -22,16 +22,22 @@ namespace MareSynchronosServer.Hubs
|
|||||||
}
|
}
|
||||||
|
|
||||||
[HubMethodName(ConnectionHubAPI.InvokeHeartbeat)]
|
[HubMethodName(ConnectionHubAPI.InvokeHeartbeat)]
|
||||||
public async Task<ConnectionDto> Heartbeat()
|
public async Task<ConnectionDto> Heartbeat(string? characterIdentification)
|
||||||
{
|
{
|
||||||
var userId = Context.User!.Claims.SingleOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value;
|
var userId = Context.User!.Claims.SingleOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
|
||||||
|
Logger.LogInformation("Connection from " + userId + ", CI: " + characterIdentification);
|
||||||
|
|
||||||
await Clients.Caller.SendAsync(ConnectionHubAPI.OnUpdateSystemInfo, _systemInfoService.SystemInfoDto);
|
await Clients.Caller.SendAsync(ConnectionHubAPI.OnUpdateSystemInfo, _systemInfoService.SystemInfoDto);
|
||||||
|
|
||||||
if (userId != null)
|
var isBanned = await DbContext.BannedUsers.AsNoTracking().AnyAsync(u => u.CharacterIdentification == characterIdentification);
|
||||||
|
|
||||||
|
if (userId != null && !isBanned && !string.IsNullOrEmpty(characterIdentification))
|
||||||
{
|
{
|
||||||
Logger.LogInformation("Connection from " + userId);
|
Logger.LogInformation("Connection from " + userId);
|
||||||
var user = (await DbContext.Users.SingleAsync(u => u.UID == userId));
|
var user = (await DbContext.Users.SingleAsync(u => u.UID == userId));
|
||||||
|
user.CharacterIdentification = characterIdentification;
|
||||||
|
await DbContext.SaveChangesAsync();
|
||||||
return new ConnectionDto
|
return new ConnectionDto
|
||||||
{
|
{
|
||||||
ServerVersion = API.Version,
|
ServerVersion = API.Version,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Data;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -62,11 +63,9 @@ namespace MareSynchronosServer.Hubs
|
|||||||
{
|
{
|
||||||
Logger.LogInformation("User " + AuthenticatedUserId + " downloading file: " + hash);
|
Logger.LogInformation("User " + AuthenticatedUserId + " downloading file: " + hash);
|
||||||
|
|
||||||
var file = DbContext.Files.SingleOrDefault(f => f.Hash == hash);
|
var file = DbContext.Files.AsNoTracking()
|
||||||
|
.SingleOrDefault(f => f.Hash == hash);
|
||||||
if (file == null) yield break;
|
if (file == null) yield break;
|
||||||
file.LastAccessTime = DateTime.Now;
|
|
||||||
DbContext.Update(file);
|
|
||||||
await DbContext.SaveChangesAsync(ct);
|
|
||||||
var chunkSize = 1024 * 512; // 512kb
|
var chunkSize = 1024 * 512; // 512kb
|
||||||
int readByteCount;
|
int readByteCount;
|
||||||
var buffer = new byte[chunkSize];
|
var buffer = new byte[chunkSize];
|
||||||
@@ -85,8 +84,9 @@ namespace MareSynchronosServer.Hubs
|
|||||||
[HubMethodName(FilesHubAPI.InvokeGetFileSize)]
|
[HubMethodName(FilesHubAPI.InvokeGetFileSize)]
|
||||||
public async Task<DownloadFileDto> GetFileSize(string hash)
|
public async Task<DownloadFileDto> GetFileSize(string hash)
|
||||||
{
|
{
|
||||||
var file = await DbContext.Files.SingleOrDefaultAsync(f => f.Hash == hash);
|
var file = await DbContext.Files.AsNoTracking().SingleOrDefaultAsync(f => f.Hash == hash);
|
||||||
var forbidden = DbContext.ForbiddenUploadEntries.SingleOrDefault(f => f.Hash == hash);
|
var forbidden = DbContext.ForbiddenUploadEntries.AsNoTracking().
|
||||||
|
SingleOrDefault(f => f.Hash == hash);
|
||||||
var fileInfo = new FileInfo(Path.Combine(BasePath, hash));
|
var fileInfo = new FileInfo(Path.Combine(BasePath, hash));
|
||||||
long fileSize = 0;
|
long fileSize = 0;
|
||||||
try
|
try
|
||||||
@@ -122,7 +122,8 @@ namespace MareSynchronosServer.Hubs
|
|||||||
public async Task<bool> IsUploadFinished()
|
public async Task<bool> IsUploadFinished()
|
||||||
{
|
{
|
||||||
var userUid = AuthenticatedUserId;
|
var userUid = AuthenticatedUserId;
|
||||||
return await DbContext.Files.AnyAsync(f => f.Uploader.UID == userUid && !f.Uploaded);
|
return await DbContext.Files.AsNoTracking()
|
||||||
|
.AnyAsync(f => f.Uploader.UID == userUid && !f.Uploaded);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Task OnDisconnectedAsync(Exception exception)
|
public override Task OnDisconnectedAsync(Exception exception)
|
||||||
@@ -140,7 +141,7 @@ namespace MareSynchronosServer.Hubs
|
|||||||
{
|
{
|
||||||
fileListHashes = fileListHashes.Where(f => !string.IsNullOrEmpty(f)).Distinct().ToList();
|
fileListHashes = fileListHashes.Where(f => !string.IsNullOrEmpty(f)).Distinct().ToList();
|
||||||
Logger.LogInformation("User " + AuthenticatedUserId + " sending files");
|
Logger.LogInformation("User " + AuthenticatedUserId + " sending files");
|
||||||
var forbiddenFiles = DbContext.ForbiddenUploadEntries.Where(f => fileListHashes.Contains(f.Hash));
|
var forbiddenFiles = DbContext.ForbiddenUploadEntries.AsNoTracking().Where(f => fileListHashes.Contains(f.Hash));
|
||||||
var filesToUpload = new List<UploadFileDto>();
|
var filesToUpload = new List<UploadFileDto>();
|
||||||
filesToUpload.AddRange(forbiddenFiles.Select(f => new UploadFileDto()
|
filesToUpload.AddRange(forbiddenFiles.Select(f => new UploadFileDto()
|
||||||
{
|
{
|
||||||
@@ -217,6 +218,7 @@ namespace MareSynchronosServer.Hubs
|
|||||||
Logger.LogWarning($"Computed file hash was not expected file hash. Computed: {computedHashString}, Expected {hash}");
|
Logger.LogWarning($"Computed file hash was not expected file hash. Computed: {computedHashString}, Expected {hash}");
|
||||||
DbContext.Remove(relatedFile);
|
DbContext.Remove(relatedFile);
|
||||||
await DbContext.SaveChangesAsync();
|
await DbContext.SaveChangesAsync();
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,6 +235,7 @@ namespace MareSynchronosServer.Hubs
|
|||||||
DbContext.Remove(relatedFile);
|
DbContext.Remove(relatedFile);
|
||||||
await DbContext.SaveChangesAsync();
|
await DbContext.SaveChangesAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Data;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@@ -54,14 +55,16 @@ namespace MareSynchronosServer.Hubs
|
|||||||
{
|
{
|
||||||
Logger.LogInformation("User " + AuthenticatedUserId + " requested online characters");
|
Logger.LogInformation("User " + AuthenticatedUserId + " requested online characters");
|
||||||
|
|
||||||
var ownUser = DbContext.Users.Single(u => u.UID == AuthenticatedUserId);
|
var ownUser = GetAuthenticatedUserUntracked();
|
||||||
var otherUsers = await DbContext.ClientPairs
|
|
||||||
|
var otherUsers = await DbContext.ClientPairs.AsNoTracking()
|
||||||
|
.Include(u => u.User)
|
||||||
|
.Include(u => u.OtherUser)
|
||||||
|
.Where(w => w.User.UID == ownUser.UID && !w.IsPaused)
|
||||||
|
.Where(w => !string.IsNullOrEmpty(w.OtherUser.CharacterIdentification))
|
||||||
|
.Select(e => e.OtherUser).ToListAsync();
|
||||||
|
var otherEntries = await DbContext.ClientPairs.AsNoTracking()
|
||||||
.Include(u => u.User)
|
.Include(u => u.User)
|
||||||
.Include(u => u.OtherUser)
|
|
||||||
.Where(w => w.User == ownUser && !w.IsPaused)
|
|
||||||
.Where(w => !string.IsNullOrEmpty(w.OtherUser.CharacterIdentification))
|
|
||||||
.Select(e => e.OtherUser).ToListAsync();
|
|
||||||
var otherEntries = await DbContext.ClientPairs.Include(u => u.User)
|
|
||||||
.Where(u => otherUsers.Any(e => e == u.User) && u.OtherUser == ownUser && !u.IsPaused).ToListAsync();
|
.Where(u => otherUsers.Any(e => e == u.User) && u.OtherUser == ownUser && !u.IsPaused).ToListAsync();
|
||||||
|
|
||||||
await Clients.Users(otherEntries.Select(e => e.User.UID)).SendAsync(UserHubAPI.OnAddOnlinePairedPlayer, ownUser.CharacterIdentification);
|
await Clients.Users(otherEntries.Select(e => e.User.UID)).SendAsync(UserHubAPI.OnAddOnlinePairedPlayer, ownUser.CharacterIdentification);
|
||||||
@@ -79,8 +82,7 @@ namespace MareSynchronosServer.Hubs
|
|||||||
public async Task<List<ClientPairDto>> GetPairedClients()
|
public async Task<List<ClientPairDto>> GetPairedClients()
|
||||||
{
|
{
|
||||||
string userid = AuthenticatedUserId;
|
string userid = AuthenticatedUserId;
|
||||||
var user = GetAuthenticatedUser();
|
var pairs = await DbContext.ClientPairs.AsNoTracking()
|
||||||
var pairs = await DbContext.ClientPairs
|
|
||||||
.Include(u => u.OtherUser)
|
.Include(u => u.OtherUser)
|
||||||
.Include(u => u.User)
|
.Include(u => u.User)
|
||||||
.Where(w => w.User.UID == userid)
|
.Where(w => w.User.UID == userid)
|
||||||
@@ -100,22 +102,23 @@ namespace MareSynchronosServer.Hubs
|
|||||||
|
|
||||||
public override async Task OnDisconnectedAsync(Exception exception)
|
public override async Task OnDisconnectedAsync(Exception exception)
|
||||||
{
|
{
|
||||||
var user = DbContext.Users.SingleOrDefault(u => u.UID == AuthenticatedUserId);
|
var user = DbContext.Users.AsNoTracking().SingleOrDefault(u => u.UID == AuthenticatedUserId);
|
||||||
if (user != null)
|
if (user != null && !string.IsNullOrEmpty(user.CharacterIdentification))
|
||||||
{
|
{
|
||||||
Logger.LogInformation("Disconnect from " + AuthenticatedUserId);
|
Logger.LogInformation("Disconnect from " + AuthenticatedUserId);
|
||||||
|
|
||||||
var otherUsers = DbContext.ClientPairs
|
var otherUsers = DbContext.ClientPairs.AsNoTracking()
|
||||||
.Include(u => u.User)
|
.Include(u => u.User)
|
||||||
.Include(u => u.OtherUser)
|
.Include(u => u.OtherUser)
|
||||||
.Where(w => w.User == user && !w.IsPaused)
|
.Where(w => w.User.UID == user.UID && !w.IsPaused)
|
||||||
.Where(w => !string.IsNullOrEmpty(w.OtherUser.CharacterIdentification))
|
.Where(w => !string.IsNullOrEmpty(w.OtherUser.CharacterIdentification))
|
||||||
.Select(e => e.OtherUser).ToList();
|
.Select(e => e.OtherUser).ToList();
|
||||||
var otherEntries = DbContext.ClientPairs.Include(u => u.User)
|
var otherEntries = DbContext.ClientPairs.AsNoTracking().Include(u => u.User)
|
||||||
.Where(u => otherUsers.Any(e => e == u.User) && u.OtherUser == user && !u.IsPaused).ToList();
|
.Where(u => otherUsers.Any(e => e == u.User) && u.OtherUser.UID == user.UID && !u.IsPaused).ToList();
|
||||||
await Clients.Users(otherEntries.Select(e => e.User.UID)).SendAsync(UserHubAPI.OnRemoveOnlinePairedPlayer, user.CharacterIdentification);
|
await Clients.Users(otherEntries.Select(e => e.User.UID)).SendAsync(UserHubAPI.OnRemoveOnlinePairedPlayer, user.CharacterIdentification);
|
||||||
|
|
||||||
user.CharacterIdentification = null;
|
|
||||||
|
DbContext.Users.Single(u => u.UID == AuthenticatedUserId).CharacterIdentification = null;
|
||||||
await DbContext.SaveChangesAsync();
|
await DbContext.SaveChangesAsync();
|
||||||
|
|
||||||
await Clients.All.SendAsync("UsersOnline",
|
await Clients.All.SendAsync("UsersOnline",
|
||||||
@@ -132,7 +135,7 @@ namespace MareSynchronosServer.Hubs
|
|||||||
Logger.LogInformation("User " + AuthenticatedUserId + " pushing character data to " + visibleCharacterIds.Count + " visible clients");
|
Logger.LogInformation("User " + AuthenticatedUserId + " pushing character data to " + visibleCharacterIds.Count + " visible clients");
|
||||||
|
|
||||||
var uid = AuthenticatedUserId;
|
var uid = AuthenticatedUserId;
|
||||||
var entriesHavingThisUser = DbContext.ClientPairs
|
var entriesHavingThisUser = DbContext.ClientPairs.AsNoTracking()
|
||||||
.Include(w => w.User)
|
.Include(w => w.User)
|
||||||
.Include(w => w.OtherUser)
|
.Include(w => w.OtherUser)
|
||||||
.Where(w => w.OtherUser.UID == uid && !w.IsPaused
|
.Where(w => w.OtherUser.UID == uid && !w.IsPaused
|
||||||
@@ -140,7 +143,8 @@ namespace MareSynchronosServer.Hubs
|
|||||||
|
|
||||||
foreach (var pair in entriesHavingThisUser)
|
foreach (var pair in entriesHavingThisUser)
|
||||||
{
|
{
|
||||||
var ownEntry = DbContext.ClientPairs.SingleOrDefault(w =>
|
var ownEntry = DbContext.ClientPairs.AsNoTracking()
|
||||||
|
.SingleOrDefault(w =>
|
||||||
w.User.UID == uid && w.OtherUser.UID == pair.User.UID);
|
w.User.UID == uid && w.OtherUser.UID == pair.User.UID);
|
||||||
if (ownEntry == null || ownEntry.IsPaused) continue;
|
if (ownEntry == null || ownEntry.IsPaused) continue;
|
||||||
await Clients.User(pair.User.UID).SendAsync(UserHubAPI.OnReceiveCharacterData, characterCache,
|
await Clients.User(pair.User.UID).SendAsync(UserHubAPI.OnReceiveCharacterData, characterCache,
|
||||||
@@ -189,10 +193,13 @@ namespace MareSynchronosServer.Hubs
|
|||||||
{
|
{
|
||||||
if (uid == AuthenticatedUserId) return;
|
if (uid == AuthenticatedUserId) return;
|
||||||
uid = uid.Trim();
|
uid = uid.Trim();
|
||||||
var user = await DbContext.Users.SingleAsync(u => u.UID == AuthenticatedUserId);
|
var user = DbContext.Users.Single(u => u.UID == AuthenticatedUserId);
|
||||||
var otherUser = await DbContext.Users.SingleOrDefaultAsync(u => u.UID == uid);
|
|
||||||
|
var otherUser = await DbContext.Users
|
||||||
|
.SingleOrDefaultAsync(u => u.UID == uid);
|
||||||
var existingEntry =
|
var existingEntry =
|
||||||
await DbContext.ClientPairs.SingleOrDefaultAsync(p =>
|
await DbContext.ClientPairs.AsNoTracking()
|
||||||
|
.SingleOrDefaultAsync(p =>
|
||||||
p.User.UID == AuthenticatedUserId && p.OtherUser.UID == uid);
|
p.User.UID == AuthenticatedUserId && p.OtherUser.UID == uid);
|
||||||
if (otherUser == null || existingEntry != null) return;
|
if (otherUser == null || existingEntry != null) return;
|
||||||
Logger.LogInformation("User " + AuthenticatedUserId + " adding " + uid + " to whitelist");
|
Logger.LogInformation("User " + AuthenticatedUserId + " adding " + uid + " to whitelist");
|
||||||
@@ -239,8 +246,10 @@ namespace MareSynchronosServer.Hubs
|
|||||||
public async Task SendPairedClientPauseChange(string uid, bool isPaused)
|
public async Task SendPairedClientPauseChange(string uid, bool isPaused)
|
||||||
{
|
{
|
||||||
if (uid == AuthenticatedUserId) return;
|
if (uid == AuthenticatedUserId) return;
|
||||||
var user = DbContext.Users.Single(u => u.UID == AuthenticatedUserId);
|
var user = DbContext.Users.AsNoTracking()
|
||||||
var otherUser = await DbContext.Users.SingleOrDefaultAsync(u => u.UID == uid);
|
.Single(u => u.UID == AuthenticatedUserId);
|
||||||
|
var otherUser = await DbContext.Users.AsNoTracking()
|
||||||
|
.SingleOrDefaultAsync(u => u.UID == uid);
|
||||||
if (otherUser == null) return;
|
if (otherUser == null) return;
|
||||||
Logger.LogInformation("User " + AuthenticatedUserId + " changed pause status with " + uid + " to " + isPaused);
|
Logger.LogInformation("User " + AuthenticatedUserId + " changed pause status with " + uid + " to " + isPaused);
|
||||||
ClientPair wl =
|
ClientPair wl =
|
||||||
@@ -312,6 +321,6 @@ namespace MareSynchronosServer.Hubs
|
|||||||
}
|
}
|
||||||
|
|
||||||
private ClientPair OppositeEntry(string otherUID) =>
|
private ClientPair OppositeEntry(string otherUID) =>
|
||||||
DbContext.ClientPairs.SingleOrDefault(w => w.User.UID == otherUID && w.OtherUser.UID == AuthenticatedUserId);
|
DbContext.ClientPairs.AsNoTracking().SingleOrDefault(w => w.User.UID == otherUID && w.OtherUser.UID == AuthenticatedUserId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
176
MareSynchronosServer/MareSynchronosServer/Migrations/20220710104014_AddTimestampToAllTables.Designer.cs
generated
Normal file
176
MareSynchronosServer/MareSynchronosServer/Migrations/20220710104014_AddTimestampToAllTables.Designer.cs
generated
Normal file
@@ -0,0 +1,176 @@
|
|||||||
|
// <auto-generated />
|
||||||
|
using System;
|
||||||
|
using MareSynchronosServer.Data;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
|
using Microsoft.EntityFrameworkCore.Metadata;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace MareSynchronosServer.Migrations
|
||||||
|
{
|
||||||
|
[DbContext(typeof(MareDbContext))]
|
||||||
|
[Migration("20220710104014_AddTimestampToAllTables")]
|
||||||
|
partial class AddTimestampToAllTables
|
||||||
|
{
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder
|
||||||
|
.HasAnnotation("ProductVersion", "6.0.6")
|
||||||
|
.HasAnnotation("Relational:MaxIdentifierLength", 128);
|
||||||
|
|
||||||
|
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
|
||||||
|
|
||||||
|
modelBuilder.Entity("MareSynchronosServer.Models.Banned", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("CharacterIdentification")
|
||||||
|
.HasColumnType("nvarchar(450)");
|
||||||
|
|
||||||
|
b.Property<string>("Reason")
|
||||||
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
||||||
|
b.Property<byte[]>("Timestamp")
|
||||||
|
.IsConcurrencyToken()
|
||||||
|
.ValueGeneratedOnAddOrUpdate()
|
||||||
|
.HasColumnType("rowversion");
|
||||||
|
|
||||||
|
b.HasKey("CharacterIdentification");
|
||||||
|
|
||||||
|
b.ToTable("BannedUsers", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("MareSynchronosServer.Models.ClientPair", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
|
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
|
||||||
|
|
||||||
|
b.Property<bool>("AllowReceivingMessages")
|
||||||
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
b.Property<bool>("IsPaused")
|
||||||
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
b.Property<string>("OtherUserUID")
|
||||||
|
.HasColumnType("nvarchar(450)");
|
||||||
|
|
||||||
|
b.Property<byte[]>("Timestamp")
|
||||||
|
.IsConcurrencyToken()
|
||||||
|
.ValueGeneratedOnAddOrUpdate()
|
||||||
|
.HasColumnType("rowversion");
|
||||||
|
|
||||||
|
b.Property<string>("UserUID")
|
||||||
|
.HasColumnType("nvarchar(450)");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("OtherUserUID");
|
||||||
|
|
||||||
|
b.HasIndex("UserUID");
|
||||||
|
|
||||||
|
b.ToTable("ClientPairs", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("MareSynchronosServer.Models.FileCache", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("Hash")
|
||||||
|
.HasColumnType("nvarchar(450)");
|
||||||
|
|
||||||
|
b.Property<DateTime>("LastAccessTime")
|
||||||
|
.HasColumnType("datetime2");
|
||||||
|
|
||||||
|
b.Property<byte[]>("Timestamp")
|
||||||
|
.IsConcurrencyToken()
|
||||||
|
.ValueGeneratedOnAddOrUpdate()
|
||||||
|
.HasColumnType("rowversion");
|
||||||
|
|
||||||
|
b.Property<bool>("Uploaded")
|
||||||
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
b.Property<string>("UploaderUID")
|
||||||
|
.HasColumnType("nvarchar(450)");
|
||||||
|
|
||||||
|
b.HasKey("Hash");
|
||||||
|
|
||||||
|
b.HasIndex("UploaderUID");
|
||||||
|
|
||||||
|
b.ToTable("FileCaches", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("MareSynchronosServer.Models.ForbiddenUploadEntry", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("Hash")
|
||||||
|
.HasColumnType("nvarchar(450)");
|
||||||
|
|
||||||
|
b.Property<string>("ForbiddenBy")
|
||||||
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
||||||
|
b.Property<byte[]>("Timestamp")
|
||||||
|
.IsConcurrencyToken()
|
||||||
|
.ValueGeneratedOnAddOrUpdate()
|
||||||
|
.HasColumnType("rowversion");
|
||||||
|
|
||||||
|
b.HasKey("Hash");
|
||||||
|
|
||||||
|
b.ToTable("ForbiddenUploadEntries", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("MareSynchronosServer.Models.User", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("UID")
|
||||||
|
.HasColumnType("nvarchar(450)");
|
||||||
|
|
||||||
|
b.Property<string>("CharacterIdentification")
|
||||||
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
||||||
|
b.Property<bool>("IsAdmin")
|
||||||
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
b.Property<bool>("IsModerator")
|
||||||
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
b.Property<string>("SecretKey")
|
||||||
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
||||||
|
b.Property<byte[]>("Timestamp")
|
||||||
|
.IsConcurrencyToken()
|
||||||
|
.ValueGeneratedOnAddOrUpdate()
|
||||||
|
.HasColumnType("rowversion");
|
||||||
|
|
||||||
|
b.HasKey("UID");
|
||||||
|
|
||||||
|
b.ToTable("Users", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("MareSynchronosServer.Models.ClientPair", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("MareSynchronosServer.Models.User", "OtherUser")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("OtherUserUID");
|
||||||
|
|
||||||
|
b.HasOne("MareSynchronosServer.Models.User", "User")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("UserUID");
|
||||||
|
|
||||||
|
b.Navigation("OtherUser");
|
||||||
|
|
||||||
|
b.Navigation("User");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("MareSynchronosServer.Models.FileCache", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("MareSynchronosServer.Models.User", "Uploader")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("UploaderUID");
|
||||||
|
|
||||||
|
b.Navigation("Uploader");
|
||||||
|
});
|
||||||
|
#pragma warning restore 612, 618
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace MareSynchronosServer.Migrations
|
||||||
|
{
|
||||||
|
public partial class AddTimestampToAllTables : Migration
|
||||||
|
{
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<byte[]>(
|
||||||
|
name: "Timestamp",
|
||||||
|
table: "ForbiddenUploadEntries",
|
||||||
|
type: "rowversion",
|
||||||
|
rowVersion: true,
|
||||||
|
nullable: true);
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<byte[]>(
|
||||||
|
name: "Timestamp",
|
||||||
|
table: "BannedUsers",
|
||||||
|
type: "rowversion",
|
||||||
|
rowVersion: true,
|
||||||
|
nullable: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "Timestamp",
|
||||||
|
table: "ForbiddenUploadEntries");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "Timestamp",
|
||||||
|
table: "BannedUsers");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -30,6 +30,11 @@ namespace MareSynchronosServer.Migrations
|
|||||||
b.Property<string>("Reason")
|
b.Property<string>("Reason")
|
||||||
.HasColumnType("nvarchar(max)");
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
||||||
|
b.Property<byte[]>("Timestamp")
|
||||||
|
.IsConcurrencyToken()
|
||||||
|
.ValueGeneratedOnAddOrUpdate()
|
||||||
|
.HasColumnType("rowversion");
|
||||||
|
|
||||||
b.HasKey("CharacterIdentification");
|
b.HasKey("CharacterIdentification");
|
||||||
|
|
||||||
b.ToTable("BannedUsers", (string)null);
|
b.ToTable("BannedUsers", (string)null);
|
||||||
@@ -103,6 +108,11 @@ namespace MareSynchronosServer.Migrations
|
|||||||
b.Property<string>("ForbiddenBy")
|
b.Property<string>("ForbiddenBy")
|
||||||
.HasColumnType("nvarchar(max)");
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
||||||
|
b.Property<byte[]>("Timestamp")
|
||||||
|
.IsConcurrencyToken()
|
||||||
|
.ValueGeneratedOnAddOrUpdate()
|
||||||
|
.HasColumnType("rowversion");
|
||||||
|
|
||||||
b.HasKey("Hash");
|
b.HasKey("Hash");
|
||||||
|
|
||||||
b.ToTable("ForbiddenUploadEntries", (string)null);
|
b.ToTable("ForbiddenUploadEntries", (string)null);
|
||||||
|
|||||||
@@ -7,5 +7,7 @@ namespace MareSynchronosServer.Models
|
|||||||
[Key]
|
[Key]
|
||||||
public string CharacterIdentification { get; set; }
|
public string CharacterIdentification { get; set; }
|
||||||
public string Reason { get; set; }
|
public string Reason { get; set; }
|
||||||
|
[Timestamp]
|
||||||
|
public byte[] Timestamp { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,5 +7,7 @@ namespace MareSynchronosServer.Models
|
|||||||
[Key]
|
[Key]
|
||||||
public string Hash { get; set; }
|
public string Hash { get; set; }
|
||||||
public string ForbiddenBy { get; set; }
|
public string ForbiddenBy { get; set; }
|
||||||
|
[Timestamp]
|
||||||
|
public byte[] Timestamp { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,10 +41,12 @@ namespace MareSynchronosServer
|
|||||||
services.AddSingleton<SystemInfoService, SystemInfoService>();
|
services.AddSingleton<SystemInfoService, SystemInfoService>();
|
||||||
services.AddSingleton<IUserIdProvider, IdBasedUserIdProvider>();
|
services.AddSingleton<IUserIdProvider, IdBasedUserIdProvider>();
|
||||||
|
|
||||||
services.AddDbContext<MareDbContext>(options =>
|
services.AddDbContextPool<MareDbContext>(options =>
|
||||||
{
|
{
|
||||||
options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection"));
|
options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection"), builder =>
|
||||||
});
|
{
|
||||||
|
});
|
||||||
|
}, 32000);
|
||||||
|
|
||||||
services.AddHostedService<FileCleanupService>();
|
services.AddHostedService<FileCleanupService>();
|
||||||
services.AddHostedService(provider => provider.GetService<SystemInfoService>());
|
services.AddHostedService(provider => provider.GetService<SystemInfoService>());
|
||||||
|
|||||||
Reference in New Issue
Block a user