Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a test for mode changes correctly applying to users. #1732

Merged
merged 22 commits into from
Jun 8, 2023
Merged

Add a test for mode changes correctly applying to users. #1732

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3e34b35
Add powerlevel e2e test
Half-Shot Jun 2, 2023
c274c46
Log failures properly
Half-Shot Jun 2, 2023
97eb228
Log when we don't know a mode value
Half-Shot Jun 2, 2023
58d006f
Set sensible mode defaults
Half-Shot Jun 2, 2023
67d28c3
Remove mistaken log line
Half-Shot Jun 2, 2023
e492e51
Remove consistent return lint rule
Half-Shot Jun 2, 2023
2ba8027
changelog
Half-Shot Jun 2, 2023
02c6f63
update changelog
Half-Shot Jun 2, 2023
9f841ce
Improve userPrefixes check
Half-Shot Jun 2, 2023
c14df2e
Catch failures to kill redis
Half-Shot Jun 5, 2023
3785fb2
Don't call quit twice
Half-Shot Jun 5, 2023
876f356
Remove duplicate test
Half-Shot Jun 5, 2023
4a0b9e7
Fix unit test
Half-Shot Jun 5, 2023
f3d949d
Disable passkey enc
Half-Shot Jun 5, 2023
7213877
sneaky fix to stop logging pong timeouts erronously
Half-Shot Jun 5, 2023
3e2dabe
Remove comment
Half-Shot Jun 5, 2023
7d95d7d
Drop console line
Half-Shot Jun 5, 2023
6b67c8d
Review tweaks
Half-Shot Jun 8, 2023
4b7c818
Fix changelog
Half-Shot Jun 8, 2023
93bda41
Add a loop to check all power levels
Half-Shot Jun 8, 2023
d2f236c
Add ability to check for the right PL
Half-Shot Jun 8, 2023
7a1e0a8
Don't wait for charlie's matrix membership
Half-Shot Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/1732.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes cases where powerlevel changes may not be correctly applied upon mode change.
1 change: 0 additions & 1 deletion changelog.d/1732.misc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/bridge/IrcHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ export class IrcHandler {
* @return {Promise} which is resolved/rejected when the request finishes.
*/
public async onMode(req: BridgeRequest, server: IrcServer, channel: string, by: string,
mode: string, enabled: boolean, arg: string|null): Promise<BridgeRequestErr|void> {
mode: string, enabled: boolean, arg: string|null): Promise<BridgeRequestErr|undefined> {
this.incrementMetric("mode");
req.log.info(
"onMode(%s) in %s by %s (arg=%s)",
Expand Down
12 changes: 7 additions & 5 deletions src/bridge/RoomAccessSyncer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ export class RoomAccessSyncer {

// Bridge usermodes to power levels
const modeToPower = server.getModePowerMap();
if (typeof modeToPower[mode] !== "number") {
if (mode in modeToPower === false) {
Half-Shot marked this conversation as resolved.
Show resolved Hide resolved
req.log.debug(`Mode '${mode}' is not known`);
// Not an operator power mode
return;
Expand Down Expand Up @@ -289,7 +289,7 @@ export class RoomAccessSyncer {
`${enabled ? level : 0} to ${userId}`
);

let didFail = false;
let failureCause: Error|undefined;
for (const room of matrixRooms) {
const roomId = room.getId();
const powerLevelMap = await (this.getCurrentPowerlevels(roomId)) || {};
Expand Down Expand Up @@ -324,11 +324,13 @@ export class RoomAccessSyncer {
}
catch (ex) {
req.log.warn(`Failed to grant PL in ${roomId}`, ex);
didFail = true;
failureCause = ex;
}
}
if (didFail) {
throw new Error('Failed to update PL in soime rooms');
if (failureCause) {
// There *can* be multiple failures, but just use the first one.
// We still log all failures above.
throw new Error('Failed to update PL in some rooms', { cause: failureCause });
}
}
/**
Expand Down