186526/unpkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Combine parse + blacklist middleware

Browse Source
This commit is contained in:
MICHAEL JACKSON
2017-08-16 14:55:40 -07:00
parent ce493823d3
commit b6b477e096
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/middleware/checkBlacklist.js
View File

@ -1,14 +0,0 @@
const blacklist = require('../PackageBlacklist').blacklist
/**
* Check the blacklist to see if we can serve files from this package.
*/
function checkBlacklist(req, res, next) {
if (blacklist.includes(req.packageName)) {
res.status(403).type('text').send(`Package ${req.packageName} is blacklisted`)
} else {
next()
}
}
module.exports = checkBlacklist

9
server/middleware/parseURL.js → server/middleware/parsePackageURL.js
View File

@ -1,10 +1,11 @@
const validateNPMPackageName = require('validate-npm-package-name')
const PackageBlacklist = require('../PackageBlacklist').blacklist
const PackageURL = require('../PackageURL')
/**
* Parse and validate the URL.
*/
function parseURL(req, res, next) {
function parsePackageURL(req, res, next) {
const url = PackageURL.parse(req.url)
if (url == null)
@ -16,6 +17,10 @@ function parseURL(req, res, next) {
if (nameErrors)
return res.status(403).type('text').send(`Invalid package name: ${url.packageName} (${nameErrors.join(', ')})`)
// Do not allow packages that have been blacklisted.
if (PackageBlacklist.includes(req.packageName))
return res.status(403).type('text').send(`Package ${req.packageName} is blacklisted`)
req.packageName = url.packageName
req.packageVersion = url.packageVersion
req.packageSpec = `${req.packageName}@${req.packageVersion}`
@ -27,4 +32,4 @@ function parseURL(req, res, next) {
next()
}
module.exports = parseURL
module.exports = parsePackageURL