Merge pull request #1 from frankiethekneeman/feature/decryptVerifyArray

Decrypt and Verify from an array of pertinent keys.

demo/consumerDemo.js

@@ -1,9 +1,9 @@
 var ServerosConsumer = require('../src/classes/ServerosConsumer')
-    , fs = require('fs') 
+    , fs = require('fs')
     , request = require('request')
     , Hawk = require('hawk')
     , masterPublicKey = fs.readFileSync('./demo/keys/master.pem') + ''
-    , myPrivateKey = fs.readFileSync('./demo/keys/serverA') 
+    , myPrivateKey = fs.readFileSync('./demo/keys/serverA')
     , masterServerLocation
     , consumer = new ServerosConsumer({
             id: 'Application A'

demo/keys/serverA2

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

demo/keys/serverA2.pem

@@ -0,0 +1,13 @@
+-----BEGIN RSA PUBLIC KEY-----
+MIICCAKCAgEA33IdtD14XyW35w1gRqC8X3kpvCP8AAFea+emN18fswDKRrU5rvmM
+qWk6lYbxJOHn0loifQPY2rhaN00t3zLzwtjYZWw3Xx08krltqQ1O+56bnBLf+xKk
+qGkzsoMNKa7H2EFbcS8iJnEgH2XL/TFhEaHhNbVG9VwWJ49d/+z4SfPzmF+M9YTt
+8p5l1eMg1K4BdNMTp3vpqZOL+2YufjMdISBXLUMT3miAkSf9eFj9UDjH+2JNtgUc
+QxU7XKHr1/wtFqfI2sh9iIexOUJ30SheqqkWn2hwBYfL6qHi4RE5i6bA2Ssq6Fmr
+I3XB8ZtGOcFP+yzulKMTHQk4NxZipDAvkdBWWMOdoyWeq/cyHHoL6HFf7HZ3Wqh2
+0fTL98qjQ0k7ybcJ/8qFwY3pSL4TP86i+2bojErnKzcnB9bZVAkzvXCtWpC+RaoC
+wiJa2XyDCIfc9L3qN4O4yiRg4sdCjo6kufSY8sn+ESV0iniSxUnUX0eYrEPErLjm
+l+jVjutEsIlPEKwyg6IBZ/3jzKdy0Lq/7F0PdoZ1lk+D06o/y+IaIiIIP/zpTxny
+fzEIIeOmXHTbOiyj138z8W9F/joZoCwGAT3Q2L2Hqva9C/Aq7iSZe4ULROz7BctC
+0/zyK32WznJgTN8Hrs4sMuLPZo3Y79IQlk6wjTyfUd1mAPDerHi1P6sCASM=
+-----END RSA PUBLIC KEY-----

demo/keys/serverA2.pem8

@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIDANBgkqhkiG9w0BAQEFAAOCAg0AMIICCAKCAgEA33IdtD14XyW35w1gRqC8
+X3kpvCP8AAFea+emN18fswDKRrU5rvmMqWk6lYbxJOHn0loifQPY2rhaN00t3zLz
+wtjYZWw3Xx08krltqQ1O+56bnBLf+xKkqGkzsoMNKa7H2EFbcS8iJnEgH2XL/TFh
+EaHhNbVG9VwWJ49d/+z4SfPzmF+M9YTt8p5l1eMg1K4BdNMTp3vpqZOL+2YufjMd
+ISBXLUMT3miAkSf9eFj9UDjH+2JNtgUcQxU7XKHr1/wtFqfI2sh9iIexOUJ30She
+qqkWn2hwBYfL6qHi4RE5i6bA2Ssq6FmrI3XB8ZtGOcFP+yzulKMTHQk4NxZipDAv
+kdBWWMOdoyWeq/cyHHoL6HFf7HZ3Wqh20fTL98qjQ0k7ybcJ/8qFwY3pSL4TP86i
++2bojErnKzcnB9bZVAkzvXCtWpC+RaoCwiJa2XyDCIfc9L3qN4O4yiRg4sdCjo6k
+ufSY8sn+ESV0iniSxUnUX0eYrEPErLjml+jVjutEsIlPEKwyg6IBZ/3jzKdy0Lq/
+7F0PdoZ1lk+D06o/y+IaIiIIP/zpTxnyfzEIIeOmXHTbOiyj138z8W9F/joZoCwG
+AT3Q2L2Hqva9C/Aq7iSZe4ULROz7BctC0/zyK32WznJgTN8Hrs4sMuLPZo3Y79IQ
+lk6wjTyfUd1mAPDerHi1P6sCASM=
+-----END PUBLIC KEY-----

demo/keys/serverA2.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEA33IdtD14XyW35w1gRqC8X3kpvCP8AAFea+emN18fswDKRrU5rvmMqWk6lYbxJOHn0loifQPY2rhaN00t3zLzwtjYZWw3Xx08krltqQ1O+56bnBLf+xKkqGkzsoMNKa7H2EFbcS8iJnEgH2XL/TFhEaHhNbVG9VwWJ49d/+z4SfPzmF+M9YTt8p5l1eMg1K4BdNMTp3vpqZOL+2YufjMdISBXLUMT3miAkSf9eFj9UDjH+2JNtgUcQxU7XKHr1/wtFqfI2sh9iIexOUJ30SheqqkWn2hwBYfL6qHi4RE5i6bA2Ssq6FmrI3XB8ZtGOcFP+yzulKMTHQk4NxZipDAvkdBWWMOdoyWeq/cyHHoL6HFf7HZ3Wqh20fTL98qjQ0k7ybcJ/8qFwY3pSL4TP86i+2bojErnKzcnB9bZVAkzvXCtWpC+RaoCwiJa2XyDCIfc9L3qN4O4yiRg4sdCjo6kufSY8sn+ESV0iniSxUnUX0eYrEPErLjml+jVjutEsIlPEKwyg6IBZ/3jzKdy0Lq/7F0PdoZ1lk+D06o/y+IaIiIIP/zpTxnyfzEIIeOmXHTbOiyj138z8W9F/joZoCwGAT3Q2L2Hqva9C/Aq7iSZe4ULROz7BctC0/zyK32WznJgTN8Hrs4sMuLPZo3Y79IQlk6wjTyfUd1mAPDerHi1P6s= [email protected]

demo/masterDemo.js

@@ -1,9 +1,13 @@
-var fs = require('fs') 
+var fs = require('fs')
     , publicKeys = {
-        "Application A": fs.readFileSync('./demo/keys/serverA.pem') + ''
+        "Application A": [
+            fs.readFileSync('./demo/keys/serverA2.pem') + ''
+            , fs.readFileSync('./demo/keys/serverA.pem') + ''
+        ]
         , "Application B": fs.readFileSync('./demo/keys/serverB.pem') + ''
     }
-    , myPrivateKey = fs.readFileSync('./demo/keys/master') 
+    , myPrivateKey = fs.readFileSync('./demo/keys/master')
+    , notMyPrivateKey = fs.readFileSync('./demo/keys/serverA')
     , keyFunction = function(id, requester, callback) {
         process.nextTick(function() {
             callback({
@@ -21,7 +25,7 @@ var fs = require('fs')
 
 var express = require('express')
     , master = new ServerosMaster({
-        privateKey: myPrivateKey
+        privateKey: [notMyPrivateKey, myPrivateKey]
         , publicKeyFunction: keyFunction
         , hashes: ['sha1', 'sha256', 'sha512']
         , ciphers: ['aes128', 'aes256', 'aes192']
@@ -32,6 +36,6 @@ master.addAuthenticationEndpoint(application);
 var server = application.listen(3500, 'localhost', function () {
     var host = server.address().address;
     var port = server.address().port;
-  
+
     console.log('Example app listening at http://%s:%s', host, port);
 });

demo/providerDemo.js

@@ -2,10 +2,10 @@ var ServerosServiceProvider = require('../src/classes/ServerosServiceProvider')
     , HawkAuthenticator = require('../src/classes/HawkAuthenticator')
     , Hawk = require('hawk')
     , express = require('express')
-    , fs = require('fs') 
+    , fs = require('fs')
     , bodyParser = require('body-parser')
     , masterPublicKey = fs.readFileSync('./demo/keys/master.pem') + ''
-    , myPrivateKey = fs.readFileSync('./demo/keys/serverB') 
+    , myPrivateKey = fs.readFileSync('./demo/keys/serverB')
     , application = express()
     , provider = new ServerosServiceProvider({
             id: 'Application B'
@@ -29,6 +29,6 @@ application.get('/test', function(req, res, next) {
 var server = application.listen(3501, 'localhost', function () {
     var host = server.address().address;
     var port = server.address().port;
-  
+
     console.log('Example app listening at http://%s:%s', host, port);
 });

index.js

@@ -6,17 +6,17 @@ module.exports = exports = {
     /**
      *  {@link Serveros.ServerosMaster ServerosMaster}
      */
-    ServerosMaster          : "./src/classes/ServerosMaster"          ,
+    ServerosMaster          : require("./src/classes/ServerosMaster")          ,
     /**
      *  {@link Serveros.ServerosServiceProvider ServerosServiceProvider}
      */
-    ServerosServiceProvider : "./src/classes/ServerosServiceProvider" ,
+    ServerosServiceProvider : require("./src/classes/ServerosServiceProvider") ,
     /**
      *  {@link Serveros.ServerosConsumer ServerosConsumer}
      */
-    ServerosConsumer        : "./src/classes/ServerosConsumer"        ,
+    ServerosConsumer        : require("./src/classes/ServerosConsumer")        ,
     /**
      *  {@link Plugins.HawkAuthenticator HawkAuthenticator}
      */
-    HawkAuthenticator       : "./src/classes/HawkAuthenticator"
+    HawkAuthenticator       : require("./src/classes/HawkAuthenticator")
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serveros",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Auth for networks of applications.",
   "repository": {
     "type": "git",