Matrix-Mirrors/mjolnir
1
0
Fork 0
mirror of https://github.com/matrix-org/mjolnir.git synced 2024-10-01 01:36:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename test->getAnyRuleForEntity

Browse Source
This commit is contained in:
gnuxie 2022-10-17 13:39:17 +01:00
parent 1ce45a98ed
commit d500e73ffa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/models/AccessControlUnit.ts
View File

@ -59,7 +59,7 @@ class ListRuleCache {
* @param entity e.g. an mxid for a user, the server name for a server. * @param entity e.g. an mxid for a user, the server name for a server.
* @returns A single `ListRule` matching the entity. * @returns A single `ListRule` matching the entity.
*/ */
public test(entity: string): ListRule|null { public getAnyRuleForEntity(entity: string): ListRule|null {
const literalRule = this.literalRules.get(entity); const literalRule = this.literalRules.get(entity);
if (literalRule !== undefined) { if (literalRule !== undefined) {
return literalRule[0]; return literalRule[0];
@ -266,12 +266,12 @@ export default class AccessControlUnit {
private getAccessForEntity(entity: string, allowCache: ListRuleCache, bannedCache: ListRuleCache): EntityAccess { private getAccessForEntity(entity: string, allowCache: ListRuleCache, bannedCache: ListRuleCache): EntityAccess {
// Check if the entity is explicitly allowed. // Check if the entity is explicitly allowed.
// We have to infer that a rule exists for '*' if the allowCache is empty, otherwise you brick the ACL. // We have to infer that a rule exists for '*' if the allowCache is empty, otherwise you brick the ACL.
const allowRule = allowCache.test(entity); const allowRule = allowCache.getAnyRuleForEntity(entity);
if (allowRule === null && !allowCache.isEmpty()) { if (allowRule === null && !allowCache.isEmpty()) {
return { outcome: Access.NotAllowed } return { outcome: Access.NotAllowed }
} }
// Now check if the entity is banned. // Now check if the entity is banned.
const banRule = bannedCache.test(entity); const banRule = bannedCache.getAnyRuleForEntity(entity);
if (banRule !== null) { if (banRule !== null) {
return { outcome: Access.Banned, rule: banRule }; return { outcome: Access.Banned, rule: banRule };
} }