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

do not allow to ban or remove owner or moderators from syncshell

Browse Source
This commit is contained in:
Stanley Dimant
2022-10-06 22:24:41 +02:00
parent 520a2299d0
commit 7f3029e82c
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,6 +390,8 @@ public partial class MareHub
var (userExists, groupPair) = await TryValidateUserInGroup(gid, uid).ConfigureAwait(false); var (userExists, groupPair) = await TryValidateUserInGroup(gid, uid).ConfigureAwait(false);
if (!userExists) return; if (!userExists) return;
if (groupPair.IsModerator || string.Equals(group.OwnerUID, uid, StringComparison.Ordinal)) return;
_logger.LogCallInfo(Api.SendGroupRemoveUser, gid, uid, "Success"); _logger.LogCallInfo(Api.SendGroupRemoveUser, gid, uid, "Success");
_dbContext.GroupPairs.Remove(groupPair); _dbContext.GroupPairs.Remove(groupPair);
@@ -426,12 +428,14 @@ public partial class MareHub
{ {
_logger.LogCallInfo(Api.SendBanUserFromGroup, gid, uid); _logger.LogCallInfo(Api.SendBanUserFromGroup, gid, uid);
var (userHasRights, _) = await TryValidateGroupModeratorOrOwner(gid).ConfigureAwait(false); var (userHasRights, group) = await TryValidateGroupModeratorOrOwner(gid).ConfigureAwait(false);
if (!userHasRights) return; if (!userHasRights) return;
var (userExists, groupPair) = await TryValidateUserInGroup(gid, uid).ConfigureAwait(false); var (userExists, groupPair) = await TryValidateUserInGroup(gid, uid).ConfigureAwait(false);
if (!userExists) return; if (!userExists) return;
if (groupPair.IsModerator || string.Equals(group.OwnerUID, uid, StringComparison.Ordinal)) return;
var alias = string.IsNullOrEmpty(groupPair.GroupUser.Alias) ? "-" : groupPair.GroupUser.Alias; var alias = string.IsNullOrEmpty(groupPair.GroupUser.Alias) ? "-" : groupPair.GroupUser.Alias;
var ban = new GroupBan() var ban = new GroupBan()
{ {
@@ -495,9 +499,9 @@ public partial class MareHub
[Authorize(AuthenticationSchemes = SecretKeyGrpcAuthenticationHandler.AuthScheme)] [Authorize(AuthenticationSchemes = SecretKeyGrpcAuthenticationHandler.AuthScheme)]
[HubMethodName(Api.SendGroupSetModerator)] [HubMethodName(Api.SendGroupSetModerator)]
public async Task SetModerator(string gid, string uid, bool isModerator) public async Task SetModerator(string gid, string uid, bool isGroupModerator)
{ {
_logger.LogCallInfo(Api.SendGroupSetModerator, gid, uid, IsModerator); _logger.LogCallInfo(Api.SendGroupSetModerator, gid, uid, isGroupModerator);
var (userHasRights, _) = await TryValidateOwner(gid).ConfigureAwait(false); var (userHasRights, _) = await TryValidateOwner(gid).ConfigureAwait(false);
if (!userHasRights) return; if (!userHasRights) return;
@@ -505,7 +509,7 @@ public partial class MareHub
var (userExists, userPair) = await TryValidateUserInGroup(gid, uid).ConfigureAwait(false); var (userExists, userPair) = await TryValidateUserInGroup(gid, uid).ConfigureAwait(false);
if (!userExists) return; if (!userExists) return;
userPair.IsModerator = IsModerator; userPair.IsModerator = isGroupModerator;
await _dbContext.SaveChangesAsync().ConfigureAwait(false); await _dbContext.SaveChangesAsync().ConfigureAwait(false);
var groupPairs = await _dbContext.GroupPairs.Where(g => g.GroupGID == gid).ToListAsync().ConfigureAwait(false); var groupPairs = await _dbContext.GroupPairs.Where(g => g.GroupGID == gid).ToListAsync().ConfigureAwait(false);
@@ -513,18 +517,18 @@ public partial class MareHub
await Clients.User(uid).SendAsync(Api.OnGroupChange, new GroupDto() await Clients.User(uid).SendAsync(Api.OnGroupChange, new GroupDto()
{ {
GID = gid, GID = gid,
IsModerator = IsModerator IsModerator = isGroupModerator
}).ConfigureAwait(false); }).ConfigureAwait(false);
await Clients.Users(groupPairs.Where(p => !string.Equals(p.GroupUserUID, uid, StringComparison.Ordinal)) await Clients.Users(groupPairs.Where(p => !string.Equals(p.GroupUserUID, uid, StringComparison.Ordinal))
.Select(g => g.GroupUserUID)).SendAsync(Api.OnGroupUserChange, new GroupPairDto() .Select(g => g.GroupUserUID)).SendAsync(Api.OnGroupUserChange, new GroupPairDto()
{ {
GroupGID = gid, GroupGID = gid,
IsModerator = isModerator, IsModerator = isGroupModerator,
UserUID = uid UserUID = uid
}).ConfigureAwait(false); }).ConfigureAwait(false);
_logger.LogCallInfo(Api.SendGroupSetModerator, gid, uid, IsModerator, "Success"); _logger.LogCallInfo(Api.SendGroupSetModerator, gid, uid, isGroupModerator, "Success");
} }
[Authorize(AuthenticationSchemes = SecretKeyGrpcAuthenticationHandler.AuthScheme)] [Authorize(AuthenticationSchemes = SecretKeyGrpcAuthenticationHandler.AuthScheme)]