mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-26 16:46:12 +01:00
fix: checking correct permissions for user search (#8371)
* fix: checking correct permissions for user search * fix: missing permissions porperty in openapi /api/search
This commit is contained in:
@@ -4542,6 +4542,13 @@ paths:
|
|||||||
type: string
|
type: string
|
||||||
searchDefaultSortBy:
|
searchDefaultSortBy:
|
||||||
type: string
|
type: string
|
||||||
|
permissions:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
users:
|
||||||
|
type: boolean
|
||||||
|
content:
|
||||||
|
type: boolean
|
||||||
required:
|
required:
|
||||||
- posts
|
- posts
|
||||||
- matchCount
|
- matchCount
|
||||||
@@ -4556,6 +4563,7 @@ paths:
|
|||||||
- showAsTopics
|
- showAsTopics
|
||||||
- title
|
- title
|
||||||
- searchDefaultSortBy
|
- searchDefaultSortBy
|
||||||
|
- permissions
|
||||||
- $ref: components/schemas/Pagination.yaml#/Pagination
|
- $ref: components/schemas/Pagination.yaml#/Pagination
|
||||||
- $ref: components/schemas/Breadcrumbs.yaml#/Breadcrumbs
|
- $ref: components/schemas/Breadcrumbs.yaml#/Breadcrumbs
|
||||||
- $ref: components/schemas/CommonProps.yaml#/CommonProps
|
- $ref: components/schemas/CommonProps.yaml#/CommonProps
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ const search = require('../search');
|
|||||||
const categories = require('../categories');
|
const categories = require('../categories');
|
||||||
const pagination = require('../pagination');
|
const pagination = require('../pagination');
|
||||||
const privileges = require('../privileges');
|
const privileges = require('../privileges');
|
||||||
|
const utils = require('../utils');
|
||||||
const helpers = require('./helpers');
|
const helpers = require('./helpers');
|
||||||
|
|
||||||
const searchController = module.exports;
|
const searchController = module.exports;
|
||||||
@@ -21,7 +22,13 @@ searchController.search = async function (req, res, next) {
|
|||||||
|
|
||||||
const searchOnly = parseInt(req.query.searchOnly, 10) === 1;
|
const searchOnly = parseInt(req.query.searchOnly, 10) === 1;
|
||||||
|
|
||||||
const allowed = await privileges.global.can('search:content', req.uid);
|
const permissions = await utils.promiseParallel({
|
||||||
|
users: privileges.global.can('search:users', req.uid),
|
||||||
|
content: privileges.global.can('search:content', req.uid),
|
||||||
|
});
|
||||||
|
|
||||||
|
const allowed = (req.query.in === 'users') ? permissions.users : permissions.content;
|
||||||
|
|
||||||
if (!allowed) {
|
if (!allowed) {
|
||||||
return helpers.notAllowed(req, res);
|
return helpers.notAllowed(req, res);
|
||||||
}
|
}
|
||||||
@@ -77,6 +84,8 @@ searchController.search = async function (req, res, next) {
|
|||||||
searchData.title = '[[global:header.search]]';
|
searchData.title = '[[global:header.search]]';
|
||||||
|
|
||||||
searchData.searchDefaultSortBy = meta.config.searchDefaultSortBy || '';
|
searchData.searchDefaultSortBy = meta.config.searchDefaultSortBy || '';
|
||||||
|
searchData.permissions = permissions;
|
||||||
|
|
||||||
res.render('search', searchData);
|
res.render('search', searchData);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user