OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Server: fix makefriends validation and tests

pull/10/head
Chocobozzz 2016-08-21 10:08:40 +02:00
parent 6c1a098b41
commit d57d6f2605
6 changed files with 145 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server.js
View File

@ -53,7 +53,13 @@ app.use(bodyParser.json())
app.use(bodyParser.urlencoded({ extended: false }))
// Validate some params for the API
app.use(expressValidator({
customValidators: Object.assign({}, customValidators.misc, customValidators.users, customValidators.videos)
customValidators: Object.assign(
{},
customValidators.misc,
customValidators.pods,
customValidators.users,
customValidators.videos
)
}))
// ----------- Views, routes and static files -----------

2
server/helpers/custom-validators/index.js
View File

@ -1,11 +1,13 @@
'use strict'
const miscValidators = require('./misc')
const podsValidators = require('./pods')
const usersValidators = require('./users')
const videosValidators = require('./videos')
const validators = {
misc: miscValidators,
pods: podsValidators,
users: usersValidators,
videos: videosValidators
}

11
server/helpers/custom-validators/misc.js
View File

@ -1,11 +1,8 @@
'use strict'
const validator = require('express-validator').validator
const miscValidators = {
exists: exists,
isArray: isArray,
isEachUrl: isEachUrl
isArray: isArray
}
function exists (value) {
@ -16,12 +13,6 @@ function isArray (value) {
return Array.isArray(value)
}
function isEachUrl (urls) {
return urls.every(function (url) {
return validator.isURL(url)
})
}
// ---------------------------------------------------------------------------
module.exports = miscValidators

21
server/helpers/custom-validators/pods.js Normal file
View File

@ -0,0 +1,21 @@
'use strict'
const validator = require('express-validator').validator
const miscValidators = require('./misc')
const podsValidators = {
isEachUniqueUrlValid: isEachUniqueUrlValid
}
function isEachUniqueUrlValid (urls) {
return miscValidators.isArray(urls) &&
urls.length !== 0 &&
urls.every(function (url) {
return validator.isURL(url) && urls.indexOf(url) === urls.lastIndexOf(url)
})
}
// ---------------------------------------------------------------------------
module.exports = podsValidators

27
server/middlewares/validators/pods.js
View File

@ -10,23 +10,24 @@ const validatorsPod = {
}
function makeFriends (req, res, next) {
req.checkBody('urls', 'Should have an array of urls').isArray()
req.checkBody('urls', 'Should be an url').isEachUrl()
req.checkBody('urls', 'Should have an array of unique urls').isEachUniqueUrlValid()
logger.debug('Checking makeFriends parameters', { parameters: req.body })
friends.hasFriends(function (err, hasFriends) {
if (err) {
logger.error('Cannot know if we have friends.', { error: err })
res.sendStatus(500)
}
checkErrors(req, res, function () {
friends.hasFriends(function (err, hasFriends) {
if (err) {
logger.error('Cannot know if we have friends.', { error: err })
res.sendStatus(500)
}
if (hasFriends === true) {
// We need to quit our friends before make new ones
res.sendStatus(409)
} else {
return next()
}
if (hasFriends === true) {
// We need to quit our friends before make new ones
res.sendStatus(409)
} else {
return next()
}
})
})
}

191
server/tests/api/check-params.js
View File

@ -44,6 +44,106 @@ describe('Test parameters validator', function () {
describe('Of the pods API', function () {
const path = '/api/v1/pods/'
describe('When making friends', function () {
let userAccessToken = null
before(function (done) {
usersUtils.createUser(server.url, server.accessToken, 'user1', 'password', function () {
server.user = {
username: 'user1',
password: 'password'
}
loginUtils.loginAndGetAccessToken(server, function (err, accessToken) {
if (err) throw err
userAccessToken = accessToken
done()
})
})
})
describe('When making friends', function () {
const body = {
urls: [ 'http://localhost:9002' ]
}
it('Should fail without urls', function (done) {
request(server.url)
.post(path + '/makefriends')
.set('Authorization', 'Bearer ' + server.accessToken)
.set('Accept', 'application/json')
.expect(400, done)
})
it('Should fail with urls is not an array', function (done) {
request(server.url)
.post(path + '/makefriends')
.send({ urls: 'http://localhost:9002' })
.set('Authorization', 'Bearer ' + server.accessToken)
.set('Accept', 'application/json')
.expect(400, done)
})
it('Should fail if the array is not composed by urls', function (done) {
request(server.url)
.post(path + '/makefriends')
.send({ urls: [ 'http://localhost:9002', 'localhost:coucou' ] })
.set('Authorization', 'Bearer ' + server.accessToken)
.set('Accept', 'application/json')
.expect(400, done)
})
it('Should fail if urls are not unique', function (done) {
request(server.url)
.post(path + '/makefriends')
.send({ urls: [ 'http://localhost:9002', 'http://localhost:9002' ] })
.set('Authorization', 'Bearer ' + server.accessToken)
.set('Accept', 'application/json')
.expect(400, done)
})
it('Should fail with a invalid token', function (done) {
request(server.url)
.post(path + '/makefriends')
.send(body)
.set('Authorization', 'Bearer faketoken')
.set('Accept', 'application/json')
.expect(401, done)
})
it('Should fail if the user is not an administrator', function (done) {
request(server.url)
.post(path + '/makefriends')
.send(body)
.set('Authorization', 'Bearer ' + userAccessToken)
.set('Accept', 'application/json')
.expect(403, done)
})
})
describe('When quitting friends', function () {
it('Should fail with a invalid token', function (done) {
request(server.url)
.get(path + '/quitfriends')
.query({ start: 'hello' })
.set('Authorization', 'Bearer faketoken')
.set('Accept', 'application/json')
.expect(401, done)
})
it('Should fail if the user is not an administrator', function (done) {
request(server.url)
.get(path + '/quitfriends')
.query({ start: 'hello' })
.set('Authorization', 'Bearer ' + userAccessToken)
.set('Accept', 'application/json')
.expect(403, done)
})
})
})
describe('When adding a pod', function () {
it('Should fail with nothing', function (done) {
const data = {}
@ -86,97 +186,6 @@ describe('Test parameters validator', function () {
requestsUtils.makePostBodyRequest(server.url, path, null, data, done, 200)
})
})
describe('For the friends API', function () {
let userAccessToken = null
before(function (done) {
usersUtils.createUser(server.url, server.accessToken, 'user1', 'password', function () {
server.user = {
username: 'user1',
password: 'password'
}
loginUtils.loginAndGetAccessToken(server, function (err, accessToken) {
if (err) throw err
userAccessToken = accessToken
done()
})
})
})
describe('When making friends', function () {
const body = {
urls: [ 'http://localhost:9002' ]
}
it('Should fail without urls', function (done) {
request(server.url)
.post(path + '/makefriends')
.set('Authorization', 'Bearer faketoken')
.set('Accept', 'application/json')
.expect(401, done)
})
it('Should fail with urls is not an array', function (done) {
request(server.url)
.post(path + '/makefriends')
.send({ urls: 'http://localhost:9002' })
.set('Authorization', 'Bearer faketoken')
.set('Accept', 'application/json')
.expect(401, done)
})
it('Should fail if the array is not composed by urls', function (done) {
request(server.url)
.post(path + '/makefriends')
.send({ urls: [ 'http://localhost:9002', 'localhost:coucou' ] })
.set('Authorization', 'Bearer faketoken')
.set('Accept', 'application/json')
.expect(401, done)
})
it('Should fail with a invalid token', function (done) {
request(server.url)
.post(path + '/makefriends')
.send(body)
.set('Authorization', 'Bearer faketoken')
.set('Accept', 'application/json')
.expect(401, done)
})
it('Should fail if the user is not an administrator', function (done) {
request(server.url)
.post(path + '/makefriends')
.send(body)
.set('Authorization', 'Bearer ' + userAccessToken)
.set('Accept', 'application/json')
.expect(403, done)
})
})
describe('When quitting friends', function () {
it('Should fail with a invalid token', function (done) {
request(server.url)
.get(path + '/quitfriends')
.query({ start: 'hello' })
.set('Authorization', 'Bearer faketoken')
.set('Accept', 'application/json')
.expect(401, done)
})
it('Should fail if the user is not an administrator', function (done) {
request(server.url)
.get(path + '/quitfriends')
.query({ start: 'hello' })
.set('Authorization', 'Bearer ' + userAccessToken)
.set('Accept', 'application/json')
.expect(403, done)
})
})
})
})
describe('Of the videos API', function () {