Separated functional tests from unit tests and added extra validation

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+.DS_Store

.jshintrc

@@ -0,0 +1,39 @@
+{
+  "camelcase": false,
+  "curly": false,
+
+  "node": true,
+  "esnext": true,
+  "bitwise": true,
+  "eqeqeq": true,
+  "immed": true,
+  "indent": 2,
+  "latedef": false,
+  "newcap": true,
+  "noarg": true,
+  "regexp": true,
+  "undef": true,
+  "strict": false,
+  "smarttabs": true,
+  "expr": true,
+
+  "evil": true,
+  "browser": true,
+  "regexdash": true,
+  "wsh": true,
+  "trailing": true,
+  "sub": true,
+  "unused": true,
+  "laxcomma": true,
+  "nonbsp": true,
+
+  "globals": {
+    "after": false,
+    "before": false,
+    "afterEach": false,
+    "beforeEach": false,
+    "describe": false,
+    "it": false,
+    "escape": false
+  }
+}

.travis.yml

@@ -0,0 +1,5 @@
+language: node_js
+before_install: npm i -g [email protected]
+node_js:
+  - 4
+  - 6

LICENSE

@@ -1,20 +1,21 @@
-(The MIT License)
+The MIT License (MIT)
 
-Copyright (c) 2011 Matias Woloski (Auth10)
+Copyright (c) 2015 Auth0, Inc. <[email protected]> (http://auth0.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:
+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.
+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.

README.md

@@ -1,6 +1,8 @@
 Passport-wsfed-saml2
 =============
 
+[![Build Status](https://travis-ci.org/auth0/passport-wsfed-saml2.png)](https://travis-ci.org/auth0/passport-wsfed-saml2)
+
 This is a ws-federation protocol + SAML2 tokens authentication provider for [Passport](http://passportjs.org/).
 
 The code was originally based on Henri Bergius's [passport-saml](https://github.com/bergie/passport-saml) library.
@@ -15,7 +17,7 @@ Passport-wsfed-saml2 has been tested to work with both [Windows Azure Active Dir
 
 ### Configure strategy
 
-This example utilizes a development namespace (auth10-dev) on [Windows Azure Access Control Service](https://www.windowsazure.com/en-us/home/features/identity/) and is using Google as the only identity provider configured for the sample application. 
+This example utilizes a development namespace (auth10-dev) on [Windows Azure Access Control Service](https://www.windowsazure.com/en-us/home/features/identity/) and is using Google as the only identity provider configured for the sample application.
 
 
 ```javascript
@@ -44,10 +46,84 @@ You need to provide a route corresponding to the `path` configuration parameter
 
 ```javascript
 app.post('/login/callback',
-  passport.authenticate('wsfedsaml2', { failureRedirect: '/', failureFlash: true }),
+  passport.authenticate('wsfed-saml2', { failureRedirect: '/', failureFlash: true }),
   function(req, res) {
     res.redirect('/');
   }
 );
 ```
 
+### Jwt
+
+Although this started as wsfed&saml we added support for wsfed&jwt. Usage is
+
+~~~javascript
+passport.use(new wsfedsaml2(
+  {
+    jwt: {
+      //same options than node-jsonwebtoken
+      algorithm: 'RS256'
+    },
+    cert: 'MIIDFjCCAf6gAwIBAgIQDRRprj9lv5RBvaQdlFltDzANBgkqhkiG9w0BAQUFADAvMS0wKwYDVQQDEyRhdXRoMTAtZGV2LmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwHhcNMTEwOTIxMDMzMjMyWhcNMTIwOTIwMDkzMjMyWjAvMS0wKwYDVQQDEyRhdXRoMTAtZGV2LmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEIAEB/KKT3ehNMy2MQEyJIQ14CnZ8DC2FZgL5Gw3UBSdRb9JinK/gw7yOQtwKfJUqeoZaUSAAdcdbgqwVxOnMBfWiYX7DGlEznSfqYVnjOWjqqjpoe0h6RaOkdWovDtoidmqVV1tWRJFjkj895clPxkLpnqqcycfXtSdZen0SroGyirD2mhMc9ccLbJ3zRnBNjlvpo5zow1zYows09tNC2EhGROL/OS4JNRQnJRICZC+WkA7Igf3xb4btJOzIPYhFiqCGrd/81CHmAyEuNzyc60I5yomDQfZ91Eb5Uk3F7mlfAlYB2aZwDwldLSOlVE8G1E5xFexF/5KyPC4ShNodAgMBAAGjLjAsMAsGA1UdDwQEAwIE8DAdBgNVHQ4EFgQUyYfx/r0czsPgTzitqey+fGMQpkcwDQYJKoZIhvcNAQEFBQADggEBAB5dgQlM3tKS+/cjlvMCPjZH0Iqo/Wxecri3YWi2iVziZ/TQ3dSV+J/iTyduN7rJmFQzTsNERcsgyAwblwnEKXXvlWo8G/+VDIMh3zVPNQFKns5WPkfkhoSVlnZPTQ8zdXAcWgDXbCgvdqIPozdgL+4l0W0XVL1ugA4/hmMXh4TyNd9Qj7MWvlmwVjevpSqN4wG735jAZFHb/L/vvc91uKqP+JvLNj8tPFVxatzi56X1V8jBM61Hx1Z9D0RCDjtmcQVysVEylW9O6mNy6ZrhLm0q5yecWudfBbTKDqRoCHQRjrMU2c5q/ZFDtgjLim7FaNxFbgTyjeRCPclEhfemYVg='
+  },
+  function(profile, done) {
+    findByEmail(profile.email, function(err, user) {
+      if (err) {
+        return done(err);
+      }
+      return done(null, user);
+    });
+  })
+));
+~~~
+
+### Configure strategy for ADFS (WS-Fed)
+
+This example utilizes a strategy with ADFS using WS-Fed.
+
+```javascript
+passport.use('wsfed-saml2', new wsfedsaml2({
+	// ADFS RP identifier
+	realm: 'urn:node:wsfedapp',
+	identityProviderUrl: 'https://my-adfs/adfs/ls',
+	// ADFS token signing certificate
+	thumbprint: '5D27....D27E'
+	// or options.cert: fs.readFileSync("adfs_signing_key.cer") 
+}, function (profile, done) {
+ // ...
+}));
+
+```
+
+### Configure strategy for ADFS (SAMLp)
+
+This example utilizes a strategy using SAMLp and RP token encryption.
+
+```javascript
+passport.use('wsfed-saml2', new wsfedsaml2({
+	// ADFS RP identifier
+	realm: 'urn:node:samlapp',
+	identityProviderUrl: 'https://my-adfs/adfs/ls',
+    // ADFS token signing certificate
+    thumbprint: '5D27...D27E',
+	// or options.cert: fs.readFileSync("adfs_signing_key.cer") 
+    protocol: "samlp",
+	// This is the private key (use case where ADFS 
+	// is configured for RP token encryption)
+    decryptionKey: fs.readFileSync("server.key")
+}, function (profile, done) {
+ // ...
+}));
+```
+
+## Issue Reporting
+
+If you have found a bug or if you have a feature request, please report them at this repository issues section. Please do not report security vulnerabilities on the public GitHub issue tracker. The [Responsible Disclosure Program](https://auth0.com/whitehat) details the procedure for disclosing security issues.
+
+## Author
+
+[Auth0](auth0.com)
+
+## License
+
+This project is licensed under the MIT license. See the [LICENSE](LICENSE) file for more info.

examples/auth0/app.js

@@ -0,0 +1,90 @@
+var express = require('express');
+var passport = require('passport');
+var Strategy = require('../../lib/passport-wsfed-saml2/index').Strategy;
+var http = require('http');
+
+passport.serializeUser(function(user, done) {
+  done(null, user);
+});
+
+passport.deserializeUser(function(id, done) {
+  done(null, id);
+});
+
+passport.use(new Strategy(
+  {
+    protocol: 'samlp',
+    path: '/login/callback',
+    realm: 'urn:saml-example',
+    homeRealm: '',
+    // identityProviderUrl: 'https://mdocs.auth0.com/samlp/dVrQZOG4gkBhzcLartSgW2v7kSnvW5XR?connection=github',
+    // thumbprint: 'c5b930896e3f4e2cc1d6d1ceb68f4d3de90deee6'
+    identityProviderUrl: 'https://login0.myauth0.com/samlp/wklezTET2P3iYA54Sraju8qFN0ohdI0G',
+    thumbprints: ['dba77ba142ff38d5076b4310700709c470d53790']
+  }, function(profile, done) {
+    console.log("Auth with", profile);
+    if (!profile.email) {
+      return done(new Error("No email found"), null);
+    }
+    done(null, profile);
+  }
+));
+
+var app = express();
+
+// configure Express
+app.configure(function() {
+  app.set('views', __dirname + '/views');
+  app.set('view engine', 'ejs');
+  app.use(express.logger());
+  app.use(express.cookieParser());
+  app.use(express.bodyParser());
+  app.use(express.methodOverride());
+  app.use(express.session({ secret: 'keyboard cat' }));
+  app.use(passport.initialize());
+  app.use(passport.session());
+  app.use(app.router);
+  app.use(express.static(__dirname + '/../../public'));
+});
+
+
+app.get('/', function(req, res){
+  res.render('index', { user: req.user });
+});
+
+app.get('/account', ensureAuthenticated, function(req, res){
+  res.render('account', { user: req.user });
+});
+
+app.get('/login',
+  passport.authenticate('wsfed-saml2', { failureRedirect: '/', forceAuthn: true }),
+  function(req, res) {
+    res.redirect('/');
+  }
+);
+
+app.post('/login/callback',
+  passport.authenticate('wsfed-saml2', { failureRedirect: '/' }),
+  function(req, res) {
+    res.redirect('/');
+  }
+);
+
+app.get('/logout', function(req, res){
+  req.logout();
+  res.redirect('/');
+});
+
+http.createServer(app).listen(3000, function () {
+  console.log("Server listening in http://localhost:3000");
+});
+
+// Simple route middleware to ensure user is authenticated.
+//   Use this route middleware on any resource that needs to be protected.  If
+//   the request is authenticated (typically via a persistent login session),
+//   the request will proceed.  Otherwise, the user will be redirected to the
+//   login page.
+function ensureAuthenticated(req, res, next) {
+  if (req.isAuthenticated()) { return next(); }
+  res.redirect('/login');
+}

examples/auth0/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "passport-azure-acs-sample",
+  "version": "0.0.0",
+  "dependencies": {
+    "express": ">= 0.0.0",
+    "ejs": ">= 0.0.0",
+    "passport": ">= 0.0.0",
+    "passport-azure-acs": ">= 0.0.0"
+  }
+}

examples/auth0/views/account.ejs

@@ -0,0 +1,2 @@
+<p>ID: <%= user.id %></p>
+<p>Name: <%= user.displayName %></p>

examples/auth0/views/index.ejs

@@ -0,0 +1,5 @@
+<% if (!user) { %>
+<h2>Welcome! Please log in.</h2>
+<% } else { %>
+<h2>Hello, <%= user.email %>.</h2>
+<% } %>

examples/auth0/views/layout.ejs

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Passport-Windows Azure Access Control Service Example</title>
+	</head>
+	<body>
+		<% if (!user) { %>
+			<p>
+			<a href="/">Home</a> | 
+			<a href="/login">Log In</a>
+			</p>
+		<% } else { %>
+			<p>
+			<a href="/">Home</a> | 
+			<a href="/account">Account</a> | 
+			<a href="/logout">Log Out</a>
+			</p>
+		<% } %>
+		<%- body %>
+	</body>
+</html>