added http basic-auth

Author: tom zhou

bin/peer-proxy

@@ -19,6 +19,7 @@ var help = [
     "  -a  --authmode srv or both             SSL auth mode: srv or both",
     "  -k, --key      User key                Key for the registered user",
     "  -l, --level    srv or both             proxy level: srv or both server and web site",
+    "  -b  --basicauth user:pass              Http basic-auth as username:password",
     "  -u, --user     USER                    User to drop privileges once server socket is bound",
     "  -h, --help                             You're staring at it"
 ].join('\n');
@@ -27,12 +28,13 @@ if (argv.h || argv.help || Object.keys(argv).length === 2) {
   return util.puts(help);
 }
 
-var target   = argv.t || argv.target,
-    secmode  = argv.s || argv.secmode,
-    authmode = argv.a || argv.authmode,
-    user     = argv.u || argv.user,
-    usrkey   = argv.k || argv.key,
-    level    = argv.l || argv.level;
+var target    = argv.t || argv.target,
+    secmode   = argv.s || argv.secmode,
+    authmode  = argv.a || argv.authmode,
+    user      = argv.u || argv.user,
+    basicauth = argv.b || argv.basicauth,
+    level     = argv.l || argv.level,
+    usrkey    = argv.k || argv.key;
 
 
 // 
@@ -58,16 +60,25 @@ if (target) {
     return util.puts(help);
 }
 
+if (!basicauth) {
+	console.log('Warning: Please set http auth with -b username:password');
+}
+
 //
 // Create the server with the specified options
 //
 
 var server = new Proxy(websites, function(err, proxyURL){
-        console.log('Website                            Proxy URL(please open it on browser)');
-        for (var k in proxyURL) {
-            console.log(k+'        '+proxyURL[k]);
-        }
-    }, {secmode: secmode, usrkey: usrkey, sslmode: authmode, level: level});
+	console.log('Website                            Proxy URL(please open it on browser)');
+	for (var k in proxyURL) {
+		console.log(k+'        '+proxyURL[k]);
+	}
+}, 
+{
+	secmode: secmode, usrkey: usrkey, 
+	sslmode: authmode, level: level,
+	   auth: basicauth
+});
 
 //
 // Drop privileges if requested

lib/proxy.js

@@ -13,7 +13,10 @@ var WEBPP = require('iwebpp.io'),
     trumpet = require('trumpet'),
     NET = require('net'),
     UDT = require('udt');
-    
+
+// authentication module
+var httpauth = require('http-auth');
+
 // security hash
 // sipkey can be any user defined 4 integers
 var siphash = require('siphash'),
@@ -31,7 +34,9 @@ var Debug = 0;
 // -         options: user custom parameters, like {secmode: ..., usrkey: ..., mode: ..., domain: ..., endpoints: ..., turn: ...}
 // - options.secmode: ssl, enable ssl/https; acl, enable ssl/https,host-based ACL
 // - options.sslmode: srv, only verify server side cert; both, verify both server and client side cert
+///
 // -   options.level: srv, only proxy url/link on server side; both, proxy url/link on both server and web site
+// -    options.auth: http basic-auth as username:password
 var Proxy = module.exports = function(websites, fn, options){ 
     var self = this;
 
@@ -43,6 +48,16 @@ var Proxy = module.exports = function(websites, fn, options){
     options = options || {};
     options.level = options.level || 'srv';
 
+    // check basic auth
+    var basicauth = false;
+    if (options && options.auth) {
+    	var astr = options.auth.split(':');
+    	basicauth = {username: astr && astr[0], password: astr && astr[1]};
+    }
+
+    // check upload 
+    var fileupload = false;
+    
     // 0.
     // proxy cache and URLs
     self.proxyCache = {}; // http proxy for website
@@ -147,6 +162,19 @@ var Proxy = module.exports = function(websites, fn, options){
 	    // 4.1
 	    // add third-party connect middle-ware
 
+	    // 4.1.1
+	    // add http basic-auth module
+	    if (basicauth) {
+	    	var basic = httpauth.basic({
+	    		realm: "iwebpp.com"
+	    	}, function (username, password, callback) {
+	    		callback(username === basicauth.username && 
+	    				 password === basicauth.password);
+	    	});
+
+	    	appHttp.use(httpauth.connect(basic));
+	    }
+	    
 	    // 4.1.2
 	    // compress
 	    // TBD...

package.json

@@ -2,7 +2,7 @@
   "author": "Tom Zhou <[email protected]>",
   "name": "peer-proxy",
   "description": "Proxy web service from peer",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/InstantWebP2P/peer-proxy.git"
@@ -31,6 +31,7 @@
     "connect": "2.8.x",
     "jschardet": "1.0.x",
     "iconv-lite": "0.2.x",
-    "trumpet": "0.3.x"
+    "trumpet": "0.3.x",
+    "http-auth": "2.2.5"
   }
 }