implement conditional role tester
This commit is contained in:
parent
d77880aa4d
commit
683638b570
9 changed files with 222 additions and 125 deletions
|
|
@ -354,6 +354,39 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
|
|||
}
|
||||
}
|
||||
|
||||
@bindThis
|
||||
public annotateCond(user: MiUser, roles: MiRole[], value: RoleCondFormulaValue, followStats: FollowStats, results: { [k: string]: boolean }): boolean {
|
||||
let result: boolean;
|
||||
try {
|
||||
switch (value.type) {
|
||||
case 'and': {
|
||||
result = true;
|
||||
// Don't use every(), since that short-circuits.
|
||||
// We need to run annotateCond() on every condition.
|
||||
value.values.forEach(v => result = this.annotateCond(user, roles, v, followStats, results) && result);
|
||||
break;
|
||||
}
|
||||
case 'or': {
|
||||
result = false;
|
||||
value.values.forEach(v => result = this.annotateCond(user, roles, v, followStats, results) || result);
|
||||
break;
|
||||
}
|
||||
case 'not': {
|
||||
result = !this.annotateCond(user, roles, value.value, followStats, results);
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
result = this.evalCond(user, roles, value, followStats);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
// TODO: log error
|
||||
result = false;
|
||||
}
|
||||
results[value.id] = result;
|
||||
return result;
|
||||
}
|
||||
|
||||
@bindThis
|
||||
public async getRoles() {
|
||||
const roles = await this.rolesCache.fetch(() => this.rolesRepository.findBy({}));
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ export * as 'admin/relays/list' from './endpoints/admin/relays/list.js';
|
|||
export * as 'admin/relays/remove' from './endpoints/admin/relays/remove.js';
|
||||
export * as 'admin/reset-password' from './endpoints/admin/reset-password.js';
|
||||
export * as 'admin/resolve-abuse-user-report' from './endpoints/admin/resolve-abuse-user-report.js';
|
||||
export * as 'admin/roles/annotate-condition' from './endpoints/admin/roles/annotate-condition.js';
|
||||
export * as 'admin/roles/assign' from './endpoints/admin/roles/assign.js';
|
||||
export * as 'admin/roles/create' from './endpoints/admin/roles/create.js';
|
||||
export * as 'admin/roles/clone' from './endpoints/admin/roles/clone.js';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,71 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: bunnybeam and other Sharkey contributors
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
||||
import { Inject, Injectable } from '@nestjs/common';
|
||||
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||
import type { UsersRepository } from '@/models/_.js';
|
||||
import { DI } from '@/di-symbols.js';
|
||||
import { ApiError } from '@/server/api/error.js';
|
||||
import { RoleService } from '@/core/RoleService.js';
|
||||
import { CacheService } from '@/core/CacheService.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin', 'role'],
|
||||
|
||||
requireCredential: true,
|
||||
requireModerator: true,
|
||||
kind: 'read:admin:roles',
|
||||
|
||||
errors: {
|
||||
noSuchUser: {
|
||||
message: 'No such user.',
|
||||
code: 'NO_SUCH_USER',
|
||||
id: '34550050-3115-4443-b389-ce3e62eb9857',
|
||||
},
|
||||
},
|
||||
|
||||
res: {
|
||||
type: 'object',
|
||||
optional: false, nullable: false,
|
||||
additionalProperties: { type: 'boolean' },
|
||||
},
|
||||
} as const;
|
||||
|
||||
export const paramDef = {
|
||||
type: 'object',
|
||||
properties: {
|
||||
userId: { type: 'string', format: 'misskey:id' },
|
||||
condFormula: { type: 'object' },
|
||||
},
|
||||
required: [
|
||||
'userId',
|
||||
'condFormula',
|
||||
],
|
||||
} as const;
|
||||
|
||||
@Injectable()
|
||||
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
||||
constructor(
|
||||
@Inject(DI.usersRepository)
|
||||
private usersRepository: UsersRepository,
|
||||
|
||||
private roleService: RoleService,
|
||||
private cacheService: CacheService,
|
||||
) {
|
||||
super(meta, paramDef, async (ps) => {
|
||||
const user = await this.usersRepository.findOneBy({ id: ps.userId });
|
||||
if (user === null) {
|
||||
throw new ApiError(meta.errors.noSuchUser);
|
||||
}
|
||||
const followStats = await this.cacheService.getFollowStats(ps.userId);
|
||||
const roles = await this.roleService.getUserRoles(ps.userId);
|
||||
|
||||
const results: { [k: string]: boolean } = {};
|
||||
roleService.annotateCond(user, roles, ps.condFormula, followStats, results);
|
||||
return results;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue