Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-28 00:06:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #269 from theneva/patch-1

Browse Source 
Fix feature name validation regex
This commit is contained in:
Ivar Conradi Østhus 2017-10-23 19:10:03 +02:00 committed by GitHub
commit de496c337a
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,8 @@ const ValidationError = require('../../error/validation-error.js');
const validateRequest = require('../../error/validate-request');
const extractUser = require('../../extract-user');
const nameRegex = /^[0-9a-zA-Z\-._]+$/;
const handleErrors = (req, res, error) => {
logger.warn('Error creating or updating feature', error);
switch (error.constructor) {
@ -115,8 +117,8 @@ module.exports.router = function(config) {
router.post('/', (req, res) => {
req.checkBody('name', 'Name is required').notEmpty();
req
.checkBody('name', 'Name must match format ^[0-9a-zA-Z\\.\\-\\_]+$')
.matches(/^[0-9a-zA-Z\\.\\-\\_]+$/i);
.checkBody('name', `Name must match format ${nameRegex.source}`)
.matches(nameRegex);
const userName = extractUser(req);
validateRequest(req)

28
lib/routes/admin-api/feature.test.js
View File

@ -95,3 +95,31 @@ test('should require at least one strategy when updating a feature toggle', t =>
.set('Content-Type', 'application/json')
.expect(400);
});
test('valid feature names pass validation', async t => {
t.plan(0);
const { request, base } = getSetup();
const validNames = [
'com.example',
'com.exampleFeature',
'com.example-company.feature',
'com.example-company.exampleFeature',
'123',
'com.example-company.someFeature.123',
];
return Promise.all(
validNames.map(name =>
request
.post(`${base}/api/admin/features`)
.send({
name,
enabled: false,
strategies: [{ name: 'default' }],
})
.set('Content-Type', 'application/json')
.expect(201)
)
);
});