Fix auth rules again for power levels

See matrix-org/matrix-spec#1479
matrix-org · Mar 31, 2023 · 9706eb1 · 9706eb1
1 parent cd3cf50
commit 9706eb1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/server/models/PowerLevels.ts b/src/server/models/PowerLevels.ts
@@ -3,9 +3,13 @@ import {MatrixEvent} from "./event";
 type PowerAction = "invite" | "kick" | "ban" | "redact" | "notifications.room";
 
 export class PowerLevels {
-    public constructor(private event: MatrixEvent | undefined) {}
+    public constructor(private event: MatrixEvent | undefined, private createEvent: MatrixEvent) {}
 
     public getUserLevel(userId: string): number {
+        if (this.event === undefined) {
+            return userId === this.createEvent.sender ? 100 : 0;
+        }
+
         const explicitLevel = this.event?.content["users"]?.[userId];
         if (Number.isInteger(explicitLevel)) {
             return explicitLevel;
@@ -42,7 +46,7 @@ export class PowerLevels {
     }
 
     public canUserSend(userId: string, eventType: string, isState: boolean): boolean {
-        let requiredLevel = isState ? (this.event ? 50 : 0) : 0;
+        let requiredLevel = isState ? 50 : 0;
 
         const defaultLevel = isState ? this.event?.content["state_default"] : this.event?.content["events_default"];
         if (Number.isInteger(defaultLevel)) {

diff --git a/src/server/room_versions/impl/IDMimiLinearized00.ts b/src/server/room_versions/impl/IDMimiLinearized00.ts
@@ -280,7 +280,7 @@ export class IDMimiLinearized00 implements RoomVersion {
         const joinRule = joinRulesEv?.content["join_rule"] ?? "invite";
 
         const powerLevelsEv = currentState.get("m.room.power_levels", "");
-        const powerLevels = new PowerLevels(powerLevelsEv);
+        const powerLevels = new PowerLevels(powerLevelsEv, createEvent);
 
         const senderMembershipEv = currentState.get("m.room.member", event.sender);
         const senderMembership = senderMembershipEv?.content["membership"] ?? "leave";