diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..3701d80 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,22 @@ +(The MIT License) + +Copyright (c) 2012 Dwolla <michael@dwolla.com> + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +'Software'), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index b7abaae..cf27f3e 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ IP Filter: A light-weight IP address based filtering system This package provides easy IP based access control. This can be achieved either by blacklisting certain IPs and whitelisting all others, or whitelisting certain IPs and blacklisting all others. -[![Build Status](https://secure.travis-ci.org/Dwolla/node-ipfilter.png?branch=master)](http://travis-ci.org/Dwolla/node-ipfilter) +[![Build Status](https://secure.travis-ci.org/baminteractive/node-ipfilter.png?branch=master)](http://travis-ci.org/baminteractive/node-ipfilter) ## Version -0.0.4 +0.0.5 ## Requirements - [Node](http://github.com/ry/node) @@ -53,8 +53,30 @@ app.use(ipfilter(ips, {mode: 'allow'})); app.listen(3000); ``` +Using CIDR subnet masks for ranges: + +```javascript +// Init dependencies +var express = require('express') + , ipfilter = require('ipfilter') + , app = express.createServer() + ; + +// Blacklist the following IPs +var ips = ['127.0.0.1/24']; + +// Create the server +app.use(ipfilter(ips, {mode: 'allow'})); +app.listen(3000); +``` + ## Changelog +0.0.5 + +* Added ability to block by subnet mask (i.e. 127.0.0.1/24) +* Added tests for cidr functionality + 0.0.4 * Add tests @@ -67,7 +89,7 @@ app.listen(3000); ## Credits -Michael Schonfeld <michael@dwolla.com> +BaM Interactive ## License diff --git a/humans.txt b/humans.txt new file mode 100644 index 0000000..f1168b9 --- /dev/null +++ b/humans.txt @@ -0,0 +1,6 @@ +/* TEAM */ +Ryan Billingsley +Your title: Senior Interactive Developer +Site: code.bamideas.com +Twitter: interactivebam +Location: Indianapolis, IN, USA. \ No newline at end of file diff --git a/package.json b/package.json index abb1696..5ce461c 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "ipfilter", "description": "A light-weight IP address based filtering system", - "version": "0.0.4", - "author": "Michael Schonfeld ", + "version": "0.0.5", + "author": "BaM Interactive ", "dependencies": { "underscore": "1.3.3", "netmask": "~1.0.4", @@ -20,11 +20,11 @@ ], "repository": { "type": "git", - "url": "http://github.com/dwolla/node-ipfilter.git" + "url": "http://github.com/baminteractive/node-ipfilter.git" }, "main": "index.js", "scripts": { "test": "mocha -R spec" }, - "license": "BSD" + "license": "MIT" }