t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

potential fixes for userpurge

Browse Source
This commit is contained in:
rootdarkarchon
2022-12-14 17:36:28 +01:00
parent 2b56e3245b
commit 87fdd55c50
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
View File

@@ -316,7 +316,7 @@ public partial class MareHub
{ {
_logger.LogCallInfo(MareHubLogger.Args(gid, "Deleted")); _logger.LogCallInfo(MareHubLogger.Args(gid, "Deleted"));
_dbContext.Remove(group); _dbContext.Groups.Remove(group);
} }
else else
{ {

8
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
View File

@@ -40,7 +40,7 @@ public partial class MareHub
await _authServiceClient.RemoveAuthAsync(new UidMessage() { Uid = userid }).ConfigureAwait(false); await _authServiceClient.RemoveAuthAsync(new UidMessage() { Uid = userid }).ConfigureAwait(false);
_dbContext.RemoveRange(ownPairData); _dbContext.ClientPairs.RemoveRange(ownPairData);
await _dbContext.SaveChangesAsync().ConfigureAwait(false); await _dbContext.SaveChangesAsync().ConfigureAwait(false);
var otherPairData = await _dbContext.ClientPairs.Include(u => u.User) var otherPairData = await _dbContext.ClientPairs.Include(u => u.User)
.Where(u => u.OtherUser.UID == userid).AsNoTracking().ToListAsync().ConfigureAwait(false); .Where(u => u.OtherUser.UID == userid).AsNoTracking().ToListAsync().ConfigureAwait(false);
@@ -60,9 +60,9 @@ public partial class MareHub
_mareMetrics.IncCounter(MetricsAPI.CounterUsersRegisteredDeleted, 1); _mareMetrics.IncCounter(MetricsAPI.CounterUsersRegisteredDeleted, 1);
_dbContext.RemoveRange(otherPairData); _dbContext.ClientPairs.RemoveRange(otherPairData);
_dbContext.Remove(userEntry); _dbContext.Users.Remove(userEntry);
_dbContext.Remove(auth); _dbContext.Auth.Remove(auth);
await _dbContext.SaveChangesAsync().ConfigureAwait(false); await _dbContext.SaveChangesAsync().ConfigureAwait(false);
} }

35
MareSynchronosServer/MareSynchronosServices/CleanupService.cs
View File

@@ -128,6 +128,8 @@ public class CleanupService : IHostedService, IDisposable
public async Task PurgeUser(User user, MareDbContext dbContext) public async Task PurgeUser(User user, MareDbContext dbContext)
{ {
_logger.LogInformation("Purging user: {uid}", user.UID);
var lodestone = dbContext.LodeStoneAuth.SingleOrDefault(a => a.User.UID == user.UID); var lodestone = dbContext.LodeStoneAuth.SingleOrDefault(a => a.User.UID == user.UID);
if (lodestone != null) if (lodestone != null)
@@ -143,46 +145,47 @@ public class CleanupService : IHostedService, IDisposable
dbContext.Files.RemoveRange(userFiles); dbContext.Files.RemoveRange(userFiles);
var ownPairData = dbContext.ClientPairs.Where(u => u.User.UID == user.UID).ToList(); var ownPairData = dbContext.ClientPairs.Where(u => u.User.UID == user.UID).ToList();
dbContext.ClientPairs.RemoveRange(ownPairData);
dbContext.RemoveRange(ownPairData);
var otherPairData = dbContext.ClientPairs.Include(u => u.User) var otherPairData = dbContext.ClientPairs.Include(u => u.User)
.Where(u => u.OtherUser.UID == user.UID).ToList(); .Where(u => u.OtherUser.UID == user.UID).ToList();
dbContext.ClientPairs.RemoveRange(otherPairData);
var userGroupPairs = await dbContext.GroupPairs.Include(g => g.Group).Where(u => u.GroupUserUID == user.UID).ToListAsync().ConfigureAwait(false); var userJoinedGroups = await dbContext.GroupPairs.Include(g => g.Group).Where(u => u.GroupUserUID == user.UID).ToListAsync().ConfigureAwait(false);
foreach (var groupPair in userGroupPairs) foreach (var userGroupPair in userJoinedGroups)
{ {
bool ownerHasLeft = string.Equals(groupPair.Group.OwnerUID, user.UID, StringComparison.Ordinal); bool ownerHasLeft = string.Equals(userGroupPair.Group.OwnerUID, user.UID, StringComparison.Ordinal);
if (ownerHasLeft) if (ownerHasLeft)
{ {
var groupPairs = await dbContext.GroupPairs.Where(g => g.GroupGID == groupPair.GroupGID).ToListAsync().ConfigureAwait(false); var groupPairs = await dbContext.GroupPairs.Where(g => g.GroupGID == userGroupPair.GroupGID).ToListAsync().ConfigureAwait(false);
if (!groupPairs.Any()) if (!groupPairs.Any())
{ {
_logger.LogInformation("Group {gid} has no new owner, deleting", groupPair.GroupGID); _logger.LogInformation("Group {gid} has no new owner, deleting", userGroupPair.GroupGID);
dbContext.Remove(groupPair.Group); dbContext.Groups.Remove(userGroupPair.Group);
} }
else else
{ {
var groupHasMigrated = await SharedDbFunctions.MigrateOrDeleteGroup(dbContext, groupPair.Group, groupPairs, _configuration.GetValue<int>("MaxExistingGroupsByUser", 3)).ConfigureAwait(false); var groupHasMigrated = await SharedDbFunctions.MigrateOrDeleteGroup(dbContext, userGroupPair.Group, groupPairs, _configuration.GetValue<int>("MaxExistingGroupsByUser", 3)).ConfigureAwait(false);
continue;
} }
} }
else else
{ {
dbContext.Remove(groupPair); dbContext.GroupPairs.Remove(userGroupPair);
} }
dbContext.SaveChanges(); await dbContext.SaveChangesAsync();
} }
_logger.LogInformation("User purged: {uid}", user.UID); _logger.LogInformation("User purged: {uid}", user.UID);
metrics.DecGauge(MetricsAPI.GaugeUsersRegistered, 1); dbContext.Auth.Remove(auth);
dbContext.Users.Remove(user);
dbContext.RemoveRange(otherPairData); await dbContext.SaveChangesAsync();
dbContext.Remove(auth);
dbContext.Remove(user); metrics.DecGauge(MetricsAPI.GaugeUsersRegistered, 1);
} }
public Task StopAsync(CancellationToken cancellationToken) public Task StopAsync(CancellationToken cancellationToken)