Skip to content

Commit

Permalink
chore: Improve permissions check on instances endpoints (#32334)
Browse files Browse the repository at this point in the history
  • Loading branch information
matheusbsilva137 authored and ggazzo committed May 9, 2024
1 parent 1e059f9 commit 0e3f714
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
7 changes: 1 addition & 6 deletions apps/meteor/app/api/server/v1/instances.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { InstanceStatus } from '@rocket.chat/models';

import { isRunningMs } from '../../../../server/lib/isRunningMs';
import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
import { API } from '../api';
import { getInstanceList } from '../helpers/getInstanceList';

Expand All @@ -15,13 +14,9 @@ const getConnections = (() => {

API.v1.addRoute(
'instances.get',
{ authRequired: true },
{ authRequired: true, permissionsRequired: ['view-statistics'] },
{
async get() {
if (!(await hasPermissionAsync(this.userId, 'view-statistics'))) {
return API.v1.unauthorized();
}

const instanceRecords = await InstanceStatus.find().toArray();

const connections = await getConnections();
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/end-to-end/api/00-miscellaneous.js
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ describe('miscellaneous', function () {
.expect(403)
.expect((res) => {
expect(res.body).to.have.property('success', false);
expect(res.body).to.have.property('error', 'unauthorized');
expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
})
.end(done);
});
Expand Down

0 comments on commit 0e3f714

Please sign in to comment.