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

Merge pull request #272 from Unleash/name_validator

Browse Source 
Simplify name validator
This commit is contained in:
Ivar Conradi Østhus 2017-11-02 13:21:18 +01:00 committed by GitHub
commit 68576e69f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/app.js
View File

@ -46,7 +46,13 @@ module.exports = function(config) {
})
);
app.use(validator([]));
app.use(
validator({
customValidators: {
isUrlFirendlyName: input => encodeURIComponent(input) === input,
},
})
);
if (publicFolder) {
app.use(baseUriPath, express.static(publicFolder));

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

@ -15,8 +15,6 @@ 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) {
@ -110,9 +108,7 @@ module.exports.router = function(config) {
router.post('/validate', (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);
req.checkBody('name', 'Name must be URL friendly').isUrlFirendlyName();
validateRequest(req)
.then(validateUniqueName)
@ -122,9 +118,8 @@ module.exports.router = function(config) {
router.post('/', (req, res) => {
req.checkBody('name', 'Name is required').notEmpty();
req
.checkBody('name', `Name must match format ${nameRegex.source}`)
.matches(nameRegex);
req.checkBody('name', 'Name must be URL friendly').isUrlFirendlyName();
const userName = extractUser(req);
validateRequest(req)

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

@ -96,7 +96,7 @@ test('should require at least one strategy when updating a feature toggle', t =>
.expect(400);
});
test('valid feature names pass validation', async t => {
test('valid feature names should pass validation', t => {
t.plan(0);
const { request, base } = getSetup();
@ -123,3 +123,30 @@ test('valid feature names pass validation', async t => {
)
);
});
test('invalid feature names should not pass validation', t => {
t.plan(0);
const { request, base } = getSetup();
const invalidNames = [
'some example',
'some$example',
'me&me',
' ',
'o2%ae',
];
return Promise.all(
invalidNames.map(name =>
request
.post(`${base}/api/admin/features`)
.send({
name,
enabled: false,
strategies: [{ name: 'default' }],
})
.set('Content-Type', 'application/json')
.expect(400)
)
);
});