Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-09 00:18:00 +01:00
Code Issues Projects Releases Wiki Activity

Refactored controllers, moved checkPermission to permission-checker.js middleware

Browse Source
This commit is contained in:
Benjamin Ludewig 2018-12-19 14:50:01 +01:00 committed by Ivar Conradi Østhus
parent b38da68d28
commit 175208c105
11 changed files with 72 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/middleware/permission-checker.js Normal file
View File

@ -0,0 +1,29 @@
'use strict';
const MissingPermission = require('../missing-permission');
const { ADMIN } = require('../permissions');
module.exports = function(config, permission) {
if (!permission || !config.extendedPermissions) {
return (req, res, next) => next();
}
return (req, res, next) => {
if (
req.user &&
req.user.permissions &&
(req.user.permissions.indexOf(ADMIN) !== -1 ||
req.user.permissions.indexOf(permission) !== -1)
) {
return next();
}
return res
.status(403)
.json(
new MissingPermission({
permission,
message: `You require ${permission} to perform this action`,
})
)
.end();
};
};

9
lib/permissions.test.js → lib/middleware/permission-checker.test.js
View File

@ -1,10 +1,10 @@
'use strict';
const test = require('ava');
const store = require('./../test/fixtures/store');
const { requirePermission } = require('./permissions');
const store = require('../../test/fixtures/store');
const checkPermission = require('./permission-checker');
const supertest = require('supertest');
const getApp = require('./app');
const getApp = require('../app');
const { EventEmitter } = require('events');
const eventBus = new EventEmitter();
@ -16,13 +16,12 @@ function getSetup(preRouterHook) {
baseUriPath: base,
stores,
eventBus,
extendedPermissions: true,
preRouterHook(_app) {
preRouterHook(_app);
_app.get(
`${base}/protectedResource`,
requirePermission('READ'),
checkPermission({ extendedPermissions: true }, 'READ'),
(req, res) => {
res.status(200)
.json({ message: 'OK' })

25
lib/permissions.js
View File

@ -1,7 +1,5 @@
'use strict';
const MissingPermission = require('./missing-permission');
const ADMIN = 'ADMIN';
const CREATE_FEATURE = 'CREATE_FEATURE';
const UPDATE_FEATURE = 'UPDATE_FEATURE';
@ -11,30 +9,7 @@ const UPDATE_STRATEGY = 'UPDATE_STRATEGY';
const DELETE_STRATEGY = 'DELETE_STRATEGY';
const UPDATE_APPLICATION = 'UPDATE_APPLICATION';
function requirePermission(permission) {
return (req, res, next) => {
if (
req.user &&
req.user.permissions &&
(req.user.permissions.indexOf(ADMIN) !== -1 ||
req.user.permissions.indexOf(permission) !== -1)
) {
return next();
}
return res
.status(403)
.json(
new MissingPermission({
permission,
message: `You require ${permission} to perform this action`,
})
)
.end();
};
}
module.exports = {
requirePermission,
ADMIN,
CREATE_FEATURE,
UPDATE_FEATURE,

8
lib/routes/admin-api/archive.js
View File

@ -8,10 +8,10 @@ const extractUser = require('../../extract-user');
const { UPDATE_FEATURE } = require('../../permissions');
class ArchiveController extends Controller {
constructor(extendedPerms, { featureToggleStore, eventStore }) {
super(extendedPerms);
this.featureToggleStore = featureToggleStore;
this.eventStore = eventStore;
constructor(config) {
super(config);
this.featureToggleStore = config.stores.featureToggleStore;
this.eventStore = config.stores.eventStore;
this.get('/features', this.getArchivedFeatures);
this.post('/revive/:name', this.reviveFeatureToggle, UPDATE_FEATURE);

6
lib/routes/admin-api/event.js
View File

@ -6,9 +6,9 @@ const eventDiffer = require('../../event-differ');
const version = 1;
class EventController extends Controller {
constructor({ eventStore }) {
super();
this.eventStore = eventStore;
constructor(config) {
super(config);
this.eventStore = config.stores.eventStore;
this.get('/', this.getEvents);
this.get('/:name', this.getEventsForToggle);
}

8
lib/routes/admin-api/feature.js
View File

@ -20,10 +20,10 @@ const { featureShema, nameSchema } = require('./feature-schema');
const version = 1;
class FeatureController extends Controller {
constructor(extendedPerms, { featureToggleStore, eventStore }) {
super(extendedPerms);
this.featureToggleStore = featureToggleStore;
this.eventStore = eventStore;
constructor(config) {
super(config);
this.featureToggleStore = config.stores.featureToggleStore;
this.eventStore = config.stores.eventStore;
this.get('/', this.getAllToggles);
this.post('/', this.createToggle, CREATE_FEATURE);

20
lib/routes/admin-api/index.js
View File

@ -11,21 +11,15 @@ const apiDef = require('./api-def.json');
class AdminApi extends Controller {
constructor(config) {
super();
const stores = config.stores;
const perms = config.extendedPermissions;
super(config);
this.app.get('/', this.index);
this.app.use('/features', new FeatureController(perms, stores).router);
this.app.use('/archive', new ArchiveController(perms, stores).router);
this.app.use(
'/strategies',
new StrategyController(perms, stores).router
);
this.app.use('/events', new EventController(stores).router);
this.app.use('/metrics', new MetricsController(perms, stores).router);
this.app.use('/user', new UserController(perms).router);
this.app.use('/features', new FeatureController(config).router);
this.app.use('/archive', new ArchiveController(config).router);
this.app.use('/strategies', new StrategyController(config).router);
this.app.use('/events', new EventController(config).router);
this.app.use('/metrics', new MetricsController(config).router);
this.app.use('/user', new UserController(config).router);
}
index(req, res) {

11
lib/routes/admin-api/metrics.js
View File

@ -8,17 +8,16 @@ const schema = require('./metrics-schema');
const { UPDATE_APPLICATION } = require('../../permissions');
class MetricsController extends Controller {
constructor(
extendedPerms,
{
constructor(config) {
super(config);
const {
clientMetricsStore,
clientInstanceStore,
clientApplicationsStore,
strategyStore,
featureToggleStore,
}
) {
super(extendedPerms);
} = config.stores;
this.metrics = new ClientMetrics(clientMetricsStore);
this.clientInstanceStore = clientInstanceStore;
this.clientApplicationsStore = clientApplicationsStore;

8
lib/routes/admin-api/strategy.js
View File

@ -16,10 +16,10 @@ const {
const version = 1;
class StrategyController extends Controller {
constructor(extendedPerms, { strategyStore, eventStore }) {
super(extendedPerms);
this.strategyStore = strategyStore;
this.eventStore = eventStore;
constructor(config) {
super(config);
this.strategyStore = config.stores.strategyStore;
this.eventStore = config.stores.eventStore;
this.get('/', this.getAllStratgies);
this.get('/:name', this.getStrategy);

8
lib/routes/admin-api/user.js
View File

@ -3,8 +3,8 @@
const Controller = require('../controller');
class UserController extends Controller {
constructor(perms) {
super(perms);
constructor(config) {
super(config);
this.get('/', this.getUser);
this.get('/logout', this.logout);
}
@ -12,8 +12,10 @@ class UserController extends Controller {
getUser(req, res) {
if (req.user) {
const user = Object.assign({}, req.user);
if (!this.extendedPermissions) {
if (!this.config.extendedPermissions) {
delete user.permissions;
} else if (!Array.isArray(user.permissions)) {
user.permissions = [];
}
return res
.status(200)

21
lib/routes/controller.js
View File

@ -1,28 +1,21 @@
'use strict';
const { Router } = require('express');
const { requirePermission } = require('./../permissions');
const checkPermission = require('../middleware/permission-checker');
/**
* Base class for Controllers to standardize binding to express Router.
*/
class Controller {
constructor(extendedPermissions) {
constructor(config) {
const router = Router();
this.app = router;
this.extendedPermissions = extendedPermissions;
}
checkPermission(permission) {
if (this.extendedPermissions && permission) {
return requirePermission(permission);
}
return (res, req, next) => next();
this.config = config;
}
get(path, handler, permission) {
this.app.get(
path,
this.checkPermission(permission),
checkPermission(this.config, permission),
handler.bind(this)
);
}
@ -30,7 +23,7 @@ class Controller {
post(path, handler, permission) {
this.app.post(
path,
this.checkPermission(permission),
checkPermission(this.config, permission),
handler.bind(this)
);
}
@ -38,7 +31,7 @@ class Controller {
put(path, handler, permission) {
this.app.put(
path,
this.checkPermission(permission),
checkPermission(this.config, permission),
handler.bind(this)
);
}
@ -46,7 +39,7 @@ class Controller {
delete(path, handler, permission) {
this.app.delete(
path,
this.checkPermission(permission),
checkPermission(this.config, permission),
handler.bind(this)
);
}