diff options
author | Kat Marchán <kzm@sykosomatic.org> | 2017-05-31 08:51:59 +0300 |
---|---|---|
committer | Kat Marchán <kzm@sykosomatic.org> | 2017-05-31 09:01:45 +0300 |
commit | 80ab521f18d34df109de0c5dc9eb1cde5ff6d7e8 (patch) | |
tree | ae5390bce0346497b34af7e5d298fb2aa0c83cde /node_modules/npm-user-validate | |
parent | e61e68dac4fa51c0540a064204a75b19f8052e58 (diff) |
deps: pull in dependency updates with bugfixes
* new pacote fixes several git-related bugs
* ssri update fixes crash on early node@4 versions
* make-fetch-happen update fixes more proxy-related issues
* npm-user-validate adds regex for blocking usernames with illegal chars
Credit: @zkat
Diffstat (limited to 'node_modules/npm-user-validate')
-rw-r--r-- | node_modules/npm-user-validate/.npmignore | 13 | ||||
-rw-r--r-- | node_modules/npm-user-validate/.travis.yml | 7 | ||||
-rw-r--r-- | node_modules/npm-user-validate/npm-user-validate.js | 15 | ||||
-rw-r--r-- | node_modules/npm-user-validate/package.json | 39 | ||||
-rw-r--r-- | node_modules/npm-user-validate/test/email.test.js | 26 | ||||
-rw-r--r-- | node_modules/npm-user-validate/test/pw.test.js | 32 | ||||
-rw-r--r-- | node_modules/npm-user-validate/test/username.test.js | 42 |
7 files changed, 33 insertions, 141 deletions
diff --git a/node_modules/npm-user-validate/.npmignore b/node_modules/npm-user-validate/.npmignore deleted file mode 100644 index 39747c08b..000000000 --- a/node_modules/npm-user-validate/.npmignore +++ /dev/null @@ -1,13 +0,0 @@ -*.swp -.*.swp - -.DS_Store -*~ -.project -.settings -npm-debug.log -coverage.html -.idea -lib-cov - -node_modules
\ No newline at end of file diff --git a/node_modules/npm-user-validate/.travis.yml b/node_modules/npm-user-validate/.travis.yml deleted file mode 100644 index 6ff074b74..000000000 --- a/node_modules/npm-user-validate/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: node_js -before_install: -- npm install -g npm@latest -sudo: false -node_js: - - "0.8" - - "0.10" diff --git a/node_modules/npm-user-validate/npm-user-validate.js b/node_modules/npm-user-validate/npm-user-validate.js index 3a645ec93..9250ce33a 100644 --- a/node_modules/npm-user-validate/npm-user-validate.js +++ b/node_modules/npm-user-validate/npm-user-validate.js @@ -1,19 +1,23 @@ exports.email = email exports.pw = pw exports.username = username - var requirements = exports.requirements = { username: { length: 'Name length must be less than or equal to 214 characters long', lowerCase: 'Name must be lowercase', urlSafe: 'Name may not contain non-url-safe chars', - dot: 'Name may not start with "."' + dot: 'Name may not start with "."', + illegal: 'Name may not contain illegal character' }, password: {}, email: { valid: 'Email must be an email address' } -}; +} + +var illegalCharacterRe = new RegExp('([' + [ + "'" +].join() + '])') function username (un) { if (un !== un.toLowerCase()) { @@ -32,6 +36,11 @@ function username (un) { return new Error(requirements.username.length) } + var illegal = un.match(illegalCharacterRe) + if (illegal) { + return new Error(requirements.username.illegal + ' "' + illegal[0] + '"') + } + return null } diff --git a/node_modules/npm-user-validate/package.json b/node_modules/npm-user-validate/package.json index d6e30bd54..df646cd05 100644 --- a/node_modules/npm-user-validate/package.json +++ b/node_modules/npm-user-validate/package.json @@ -1,42 +1,46 @@ { - "_from": "npm-user-validate@~0.1.5", - "_id": "npm-user-validate@0.1.5", - "_integrity": "sha1-UkZdUMLSApSlcSW5lrrtv1bFAEs=", + "_from": "npm-user-validate@latest", + "_id": "npm-user-validate@1.0.0", + "_inBundle": false, + "_integrity": "sha1-jOyg9c6gTU6TUZ73LQVXp1Ei6VE=", "_location": "/npm-user-validate", "_phantomChildren": {}, "_requested": { - "type": "range", + "type": "tag", "registry": true, - "raw": "npm-user-validate@~0.1.5", + "raw": "npm-user-validate@latest", "name": "npm-user-validate", "escapedName": "npm-user-validate", - "rawSpec": "~0.1.5", + "rawSpec": "latest", "saveSpec": null, - "fetchSpec": "~0.1.5" + "fetchSpec": "latest" }, "_requiredBy": [ + "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.5.tgz", - "_shasum": "52465d50c2d20294a57125b996baedbf56c5004b", - "_shrinkwrap": null, - "_spec": "npm-user-validate@~0.1.5", + "_resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz", + "_shasum": "8ceca0f5cea04d4e93519ef72d0557a75122e951", + "_spec": "npm-user-validate@latest", "_where": "/Users/zkat/Documents/code/npm", "author": { "name": "Robert Kowalski", "email": "rok@kowalski.gd" }, - "bin": null, "bugs": { "url": "https://github.com/npm/npm-user-validate/issues" }, "bundleDependencies": false, - "dependencies": {}, "deprecated": false, "description": "User validations for npm", "devDependencies": { - "tap": "^1.2.0" + "standard": "^8.4.0", + "standard-version": "^3.0.0", + "tap": "^7.1.2" }, + "files": [ + "npm-user-validate.js" + ], "homepage": "https://github.com/npm/npm-user-validate#readme", "keywords": [ "npm", @@ -46,14 +50,13 @@ "license": "BSD-2-Clause", "main": "npm-user-validate.js", "name": "npm-user-validate", - "optionalDependencies": {}, - "peerDependencies": {}, "repository": { "type": "git", "url": "git://github.com/npm/npm-user-validate.git" }, "scripts": { - "test": "tap test/*.js" + "pretest": "standard", + "test": "tap --100 test/*.js" }, - "version": "0.1.5" + "version": "1.0.0" } diff --git a/node_modules/npm-user-validate/test/email.test.js b/node_modules/npm-user-validate/test/email.test.js deleted file mode 100644 index 1060a9354..000000000 --- a/node_modules/npm-user-validate/test/email.test.js +++ /dev/null @@ -1,26 +0,0 @@ -var test = require('tap').test -var v = require('../npm-user-validate.js').email - -test('email misses an @', function (t) { - err = v('namedomain') - t.type(err, 'object') - t.end() -}) - -test('email misses a dot', function (t) { - err = v('name@domain') - t.type(err, 'object') - t.end() -}) - -test('email misses a string before the @', function (t) { - err = v('@domain') - t.type(err, 'object') - t.end() -}) - -test('email is ok', function (t) { - err = v('name@domain.com') - t.type(err, 'null') - t.end() -})
\ No newline at end of file diff --git a/node_modules/npm-user-validate/test/pw.test.js b/node_modules/npm-user-validate/test/pw.test.js deleted file mode 100644 index d57401da0..000000000 --- a/node_modules/npm-user-validate/test/pw.test.js +++ /dev/null @@ -1,32 +0,0 @@ -var test = require('tap').test -var v = require('../npm-user-validate.js').pw - -test('pw contains a \'', function (t) { - err = v('\'') - t.type(err, 'null') - t.end() -}) - -test('pw contains a :', function (t) { - err = v(':') - t.type(err, 'null') - t.end() -}) - -test('pw contains a @', function (t) { - err = v('@') - t.notOk(err, 'null') - t.end() -}) - -test('pw contains a "', function (t) { - err = v('"') - t.type(err, 'null') - t.end() -}) - -test('pw is ok', function (t) { - err = v('duck') - t.type(err, 'null') - t.end() -}) diff --git a/node_modules/npm-user-validate/test/username.test.js b/node_modules/npm-user-validate/test/username.test.js deleted file mode 100644 index aa0e6b33d..000000000 --- a/node_modules/npm-user-validate/test/username.test.js +++ /dev/null @@ -1,42 +0,0 @@ -var test = require('tap').test -var v = require('../npm-user-validate.js').username - -test('username must be lowercase', function (t) { - var err = v('ERRR') - t.type(err, 'object') - t.match(err.message, /lowercase/) - t.end() -}) - -test('username may not contain non-url-safe chars', function (t) { - var err = v('f ') - t.type(err, 'object') - t.match(err.message, /url-safe/) - t.end() -}) - -test('username may not start with "."', function (t) { - var err = v('.username') - t.type(err, 'object') - t.match(err.message, /start with.*\./) - t.end() -}) - -test('username may not be longer than 214 characters', function (t) { - var err = v('bacon-ipsum-dolor-amet-tongue-short-loin-landjaeger-tenderloin-ball-tip-pork-loin-porchetta-pig-pork-chop-beef-ribs-pork-belly--shankle-t-bone-turducken-tongue-landjaeger-pork-loin-beef-chicken-short-loin-and-pickle') - t.type(err, 'object') - t.match(err.message, /less than or equal to 214/) - t.end() -}); - -test('username may be as long as 214 characters', function (t) { - var err = v('bacon-ipsum-dolor-amet-tongue-short-loin-landjaeger-tenderloin-ball-tip-pork-loin-porchetta-pig-pork-chop-beef-ribs-pork-belly--shankle-t-bone-turducken-tongue-landjaeger-pork-loin-beef-chicken-short-loin-porchetta') - t.type(err, 'null') - t.end() -}); - -test('username is ok', function (t) { - var err = v('ente') - t.type(err, 'null') - t.end() -}) |