@boxyhq/saml-jackson 0.1.5-beta.115 → 0.1.5-beta.119

package/.github/workflows/main.yml

@@ -98,7 +98,7 @@ jobs:
 
       - name: Get short SHA
         id: slug
-        run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
+        run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-7)"
 
       - name: Set up Docker Buildx
         id: buildx

package/README.md

@@ -1,33 +1,36 @@
 # SAML Jackson (not fiction anymore)
- 
+
 SAML service [SAML in a box from BoxyHQ]
- 
+
 You need someone like Jules Winnfield to save you from the vagaries of SAML login.
- 
+
 # Source code visualizer
+
 [CodeSee codebase visualizer](https://app.codesee.io/maps/public/53e91640-23b5-11ec-a724-79d7dd589517)
- 
+
 # Getting Started
- 
+
 There are two ways to use this repo.
+
 - As an npm library (for Express compatible frameworks)
 - As a separate service
- 
+
 ## Install as an npm library
+
 Jackson is available as an [npm package](https://www.npmjs.com/package/@boxyhq/saml-jackson) that can be integrated into Express.js routes. The library should be usable with other node.js web application frameworks but is currently untested. Please file an issue or submit a PR if you encounter any issues.
- 
+
 ```
 npm i @boxyhq/saml-jackson
 ```
- 
+
 ### Add Express Routes
- 
+
 ```
 // express
 const express = require('express');
 const router = express.Router();
 const cors = require('cors'); // needed if you are calling the token userinfo endpoints from the frontend
- 
+
 // Set the required options. Refer to https://github.com/boxyhq/jackson#configuration for the full list
 const opts = {
   externalUrl: 'https://my-cool-app.com',
@@ -36,9 +39,9 @@ const opts = {
   db: {
     engine: 'mongo',
     url: 'mongodb://localhost:27017/my-cool-app',
-  }  
+  }
 };
- 
+
 
 let apiController;
 let oauthController;
@@ -49,17 +52,17 @@ async function init() {
   apiController = ret.apiController;
   oauthController = ret.oauthController;
 }
- 
+
 // express.js middlewares needed to parse json and x-www-form-urlencoded
 router.use(express.json());
 router.use(express.urlencoded({ extended: true }));
- 
+
 // SAML config API. You should pass this route through your authentication checks, do not expose this on the public interface without proper authentication in place.
 router.post('/api/v1/saml/config', async (req, res) => {
   try {
     // apply your authentication flow (or ensure this route has passed through your auth middleware)
     ...
- 
+
     // only when properly authenticated, call the config function
     res.json(await apiController.config(req.body));
   } catch (err) {
@@ -68,7 +71,7 @@ router.post('/api/v1/saml/config', async (req, res) => {
     });
   }
 });
- 
+
 // OAuth 2.0 flow
 router.get('/oauth/authorize', async (req, res) => {
   try {
@@ -77,7 +80,7 @@ router.get('/oauth/authorize', async (req, res) => {
     res.status(500).send(err.message);
   }
 });
- 
+
 router.post('/oauth/saml', async (req, res) => {
   try {
     await oauthController.samlResponse(req, res);
@@ -85,7 +88,7 @@ router.post('/oauth/saml', async (req, res) => {
     res.status(500).send(err.message);
   }
 });
- 
+
 router.post('/oauth/token', cors(), async (req, res) => {
   try {
     await oauthController.token(req, res);
@@ -93,7 +96,7 @@ router.post('/oauth/token', cors(), async (req, res) => {
     res.status(500).send(err.message);
   }
 });
- 
+
 router.get('/oauth/userinfo', cors(), async (req, res) => {
   try {
     await oauthController.userInfo(req, res);
@@ -101,15 +104,16 @@ router.get('/oauth/userinfo', cors(), async (req, res) => {
     res.status(500).send(err.message);
   }
 });
- 
+
 // set the router
 app.use('/sso', router);
- 
+
 ```
- 
+
 ## Deployment as a service: Docker
+
 The docker container can be found at [boxyhq/jackson](https://hub.docker.com/r/boxyhq/jackson/tags). It is preferable to use a specific version instead of the `latest` tag. Jackson uses two ports (configurable if needed, see below) 5000 and 6000. 6000 is the internal port and ideally should not be exposed to a public network.
- 
+
 ```
 docker run -p 5000:5000 -p 6000:6000 boxyhq/jackson:78e9099d
 ```
@@ -119,17 +123,19 @@ Refer to https://github.com/boxyhq/jackson#configuration for the full configurat
 Kubernetes and docker-compose deployment files will be coming soon.
 
 ## Usage
- 
+
 ### 1. Setting up SAML with your customer's Identity Provider
+
 Please follow the instructions [here](https://docs.google.com/document/d/1fk---Z9Ln59u-2toGKUkyO3BF6Dh3dscT2u4J2xHANE) to guide your customers in setting up SAML correctly for your product(s). You should create a copy of the doc and modify it with your custom settings, we have used the values that work for our demo apps.
- 
+
 ### 2. SAML config API
+
 Once your customer has set up the SAML app on their Identity Provider, the Identity Provider will generate an IdP or SP metadata file. Some Identity Providers only generate an IdP metadata file but it usually works for the SP login flow as well. It is an XML file that contains various attributes Jackson needs to validate incoming SAML login requests. This step is the equivalent of setting an OAuth 2.0 app and generating a client ID and client secret that will be used in the login flow.
- 
+
 You will need to provide a place in the UI for your customers (The account settings page is usually a good place for this) to configure this and then call the API below.
- 
+
 The following API call sets up the configuration in Jackson:
- 
+
 ```
 curl --location --request POST 'http://localhost:6000/api/v1/saml/config' \
 --header 'Content-Type: application/x-www-form-urlencoded' \
@@ -139,24 +145,27 @@ curl --location --request POST 'http://localhost:6000/api/v1/saml/config' \
 --data-urlencode 'tenant=boxyhq.com' \
 --data-urlencode 'product=demo'
 ```
- 
+
 - rawMetadata: The XML metadata file your customer gets from their Identity Provider
 - defaultRedirectUrl: The redirect URL to use in the IdP login flow. Jackson will call this URL after completing an IdP login flow
 - redirectUrl: JSON encoded array containing a list of allowed redirect URLs. Jackson will disallow any redirects not on this list (or not the default URL above)
 - tenant: Jackson supports a multi-tenant architecture, this is a unique identifier you set from your side that relates back to your customer's tenant. This is normally an email, domain, an account id, or user-id
 - product: Jackson support multiple products, this is a unique identifier you set from your side that relates back to the product your customer is using
- 
-The response returns a JSON with `client_id` and `client_secret` that can be stored against your tenant and product for a more secure OAuth 2.0 flow. If you do not want to store the `client_id` and `client_secret` you can alternatively use `client_id=tentant=<tenantID>&product=<productID>` and any arbitrary value for `client_secret` when setting up the OAuth 2.0 flow.
- 
+
+The response returns a JSON with `client_id` and `client_secret` that can be stored against your tenant and product for a more secure OAuth 2.0 flow. If you do not want to store the `client_id` and `client_secret` you can alternatively use `client_id=tenant=<tenantID>&product=<productID>` and any arbitrary value for `client_secret` when setting up the OAuth 2.0 flow.
+
 ### 3. OAuth 2.0 Flow
+
 Jackson has been designed to abstract the SAML login flow as a pure OAuth 2.0 flow. This means it's compatible with any standard OAuth 2.0 library out there, both client-side and server-side. It is important to remember that SAML is configured per customer unlike OAuth 2.0 where you can have a single OAuth app supporting logins for all customers.
- 
+
 Jackson also supports the PKCE authorization flow (https://oauth.net/2/pkce/), so you can protect your SPAs.
- 
+
 If for any reason you need to implement the flow on your own, the steps are outlined below:
- 
+
 ### 4. Authorize
+
 The OAuth flow begins with redirecting your user to the `authorize` URL:
+
 ```
 https://localhost:5000/oauth/authorize
   ?response_type=code&provider=saml
@@ -164,16 +173,18 @@ https://localhost:5000/oauth/authorize
   &redirect_uri=<redirect URL>
   &state=<randomly generated state id>
 ```
- 
+
 - response_type=code: This is the only supported type for now but maybe extended in the future
-- client_id: Use the client_id returned by the SAML config API or use `tentant=<tenantID>&product=<productID>` to use the tenant and product IDs instead
+- client_id: Use the client_id returned by the SAML config API or use `tenant=<tenantID>&product=<productID>` to use the tenant and product IDs instead. **Note:** Please don't forget to URL encode the query parameters including `client_id`.
 - redirect_uri: This is where the user will be taken back once the authorization flow is complete
 - state: Use a randomly generated string as the state, this will be echoed back as a query parameter when taking the user back to the `redirect_uri` above. You should validate the state to prevent XSRF attacks
- 
+
 ### 5. Code Exchange
+
 After successful authorization, the user is redirected back to the `redirect_uri`. The query parameters will include the `code` and `state` parameters. You should validate that the state matches the one you sent in the `authorize` request.
- 
+
 The code can then be exchanged for a token by making the following request:
+
 ```
 curl --request POST \
   --url 'http://localhost:5000/oauth/token' \
@@ -184,12 +195,14 @@ curl --request POST \
   --data 'redirect_uri=<redirect URL>' \
   --data code=<code from the query parameter above>
 ```
+
 - grant_type=authorization_code: This is the only supported flow, for now. We might extend this in the future
-- client_id: Use the client_id returned by the SAML config API or use `tentant=<tenantID>&product=<productID>` to use the tenant and product IDs instead
+- client_id: Use the client_id returned by the SAML config API or use `tenant=<tenantID>&product=<productID>` to use the tenant and product IDs instead. **Note:** Please don't forget to URL encode the query parameters including `client_id`.
 - client_secret: Use the client_secret returned by the SAML config API or any arbitrary value if using the tenant and product in the clientID
 - redirect_uri: This is where the user will be taken back once the authorization flow is complete. Use the same redirect_uri as the previous request
- 
+
 If everything goes well you should receive a JSON response that includes the access token. This token is needed for the next step where we fetch the user profile.
+
 ```
 {
   "access_token": <access token>,
@@ -197,17 +210,20 @@ If everything goes well you should receive a JSON response that includes the acc
   "expires_in": 300
 }
 ```
- 
+
 ### 6. Profile Request
+
 The short-lived access token can now be used to request the user's profile. You'll need to make the following request:
+
 ```
 curl --request GET \
   --url https://localhost:5000/oauth/me \
   --header 'authorization: Bearer <access token>' \
   --header 'content-type: application/json'
 ```
- 
+
 If everything goes well you should receive a JSON response with the user's profile:
+
 ```
 {
   "email": "sjackson@coolstartup.com",
@@ -216,53 +232,60 @@ If everything goes well you should receive a JSON response with the user's profi
   "lastName": "Jackson",
 }
 ```
- 
+
 - email: The email address of the user as provided by the Identity Provider
 - id: The id of the user as provided by the Identity Provider
 - firstName: The first name of the user as provided by the Identity Provider
 - lastName: The last name of the user as provided by the Identity Provider
- 
+
 ## Examples
+
 To Do
- 
+
 ## Database Support
+
 Jackson currently supports the following databases.
- 
+
 - Postgres
 - CockroachDB
 - MySQL
 - MariaDB
 - MongoDB
 - Redis
- 
+
 ## Configuration
+
 Configuration is done via env vars (and in the case of the npm library via an options object).
- 
+
 The following options are supported and will have to be configured during deployment.
- 
+
 | Key                               | Description                                                                                                                                                                                                                                                                                                                                                                                                          | Default                         |
-|-----------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------|
+| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------- |
 | HOST_URL                          | The URL to bind to                                                                                                                                                                                                                                                                                                                                                                                                   | `localhost`                     |
 | HOST_PORT                         | The port to bind to                                                                                                                                                                                                                                                                                                                                                                                                  | `5000`                          |
 | EXTERNAL_URL (npm: externalUrl)   | The public URL to reach this service, used internally for documenting the SAML configuration instructions.                                                                                                                                                                                                                                                                                                           | `http://{HOST_URL}:{HOST_PORT}` |
 | INTERNAL_HOST_URL                 | The URL to bind to expose the internal APIs. Do not configure this to a public network.                                                                                                                                                                                                                                                                                                                              | `localhost`                     |
 | INTERNAL_HOST_PORT                | The port to bind to for the internal APIs.                                                                                                                                                                                                                                                                                                                                                                           | `6000`                          |
-| SAML_AUDIENCE (npm: samlAudience) | This is just an identifier to validate the SAML audience, this value will also get configured in the SAML apps created by your customers.  Once set do not change this value unless you get your customers to reconfigure their SAML again. It is case-sensitive. This does not have to be a real URL.                                                                                                               | `https://saml.boxyhq.com`       |
+| SAML_AUDIENCE (npm: samlAudience) | This is just an identifier to validate the SAML audience, this value will also get configured in the SAML apps created by your customers. Once set do not change this value unless you get your customers to reconfigure their SAML again. It is case-sensitive. This does not have to be a real URL.                                                                                                                | `https://saml.boxyhq.com`       |
 | IDP_ENABLED (npm: idpEnabled)     | Set to `true` to enable IdP initiated login for SAML. SP initiated login is the only recommended flow but you might have to support IdP login at times.                                                                                                                                                                                                                                                              | `false`                         |
 | DB_ENGINE (npm: db.engine)        | Supported values are `redis`, `sql`, `mongo`, `mem`.                                                                                                                                                                                                                                                                                                                                                                 | `sql`                           |
 | DB_URL (npm: db.url)              | The database URL to connect to. For example `postgres://postgres:postgres@localhost:5450/jackson`                                                                                                                                                                                                                                                                                                                    |                                 |
 | DB_TYPE (npm: db.type)            | Only needed when DB_ENGINE is `sql`. Supported values are `postgres`, `cockroachdb`, `mysql`, `mariadb`.                                                                                                                                                                                                                                                                                                             | `postgres`                      |
 | PRE_LOADED_CONFIG                 | If you only need a single tenant or a handful of pre-configured tenants then this config will help you read and load SAML configs. It works well with the mem DB engine so you don't have to configure any external databases for this to work (though it works with those as well). This is a path (absolute or relative) to a directory that contains files organized in the format described in the next section. |                                 |
- 
+
 ## Pre-loaded SAML Configuration
+
 If PRE_LOADED_CONFIG is set then it should point to a directory with the following structure (example below):-
+
 ```
 boxyhq.js
 boxyhq.xml
 anothertenant.js
 anothertenant.xml
 ```
+
 The JS file has the following structure:-
+
 ```
 module.exports = {
   defaultRedirectUrl: 'http://localhost:3000/login/saml',
@@ -271,29 +294,34 @@ module.exports = {
   product: 'demo',
 };
 ```
+
 The XML file (should share the name with the .js file) is the raw XML metadata file you receive from your Identity Provider. Please ensure it is saved in the `utf-8` encoding.
- 
+
 The config and XML above correspond to the `SAML API config` (see below).
- 
+
 ## SAML Login flows
+
 There are two kinds of SAML login flows - SP-initiated and IdP-initiated. We highly recommend sticking to the SP-initiated flow since it is more secure but Jackson also supports the IdP-initiated flow if you enable it. For an in-depth understanding of SAML and the two flows please refer to Okta's comprehensive guide - https://developer.okta.com/docs/concepts/saml/.
- 
+
 ## Contributing
+
 Thanks for taking the time to contribute! Contributions are what make the open-source community such an amazing place to learn, inspire, and create. Any contributions you make will benefit everybody else and are appreciated.
- 
+
 Please try to create bug reports that are:
- 
+
 - _Reproducible._ Include steps to reproduce the problem.
 - _Specific._ Include as much detail as possible: which version, what environment, etc.
 - _Unique._ Do not duplicate existing opened issues.
 - _Scoped to a Single Bug._ One bug per report.
- 
+
 ## Support
+
 Reach out to the maintainer at one of the following places:
 
 - [GitHub Discussions](https://github.com/boxyhq/jackson/discussions)
 - [GitHub Issues](https://github.com/boxyhq/jackson/issues)
 - The email which is located [in GitHub profile](https://github.com/deepakprabhakara)
- 
+
 ## License
+
 [Apache 2.0 License](https://github.com/boxyhq/jackson/blob/main/LICENSE)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxyhq/saml-jackson",
-  "version": "0.1.5-beta.115",
+  "version": "0.1.5-beta.119",
   "license": "Apache 2.0",
   "description": "SAML 2.0 service",
   "main": "src/index.js",

package/src/controller/oauth.js

@@ -2,7 +2,7 @@ const crypto = require('crypto');
 
 const saml = require('../saml/saml.js');
 const codeVerifier = require('./oauth/code-verifier.js');
-const { indexNames } = require('./utils.js');
+const { indexNames, extractAuthToken } = require('./utils.js');
 const dbutils = require('../db/utils.js');
 const redirect = require('./oauth/redirect.js');
 const allowed = require('./oauth/allowed.js');
@@ -15,16 +15,6 @@ let options;
 
 const relayStatePrefix = 'boxyhq_jackson_';
 
-const extractBearerToken = (req) => {
-  const authHeader = req.get('authorization');
-  const parts = (authHeader || '').split(' ');
-  if (parts.length > 1) {
-    return parts[1];
-  }
-
-  return null;
-};
-
 function getEncodedClientId(client_id) {
   try {
     const sp = new URLSearchParams(client_id);
@@ -303,7 +293,7 @@ const token = async (req, res) => {
 };
 
 const userInfo = async (req, res) => {
-  let token = extractBearerToken(req);
+  let token = extractAuthToken(req);
 
   // check for query param
   if (!token) {

package/src/controller/utils.js

@@ -3,6 +3,17 @@ const indexNames = {
   tenantProduct: 'tenantProduct',
 };
 
+const extractAuthToken = (req) => {
+  const authHeader = req.get('authorization');
+  const parts = (authHeader || '').split(' ');
+  if (parts.length > 1) {
+    return parts[1];
+  }
+
+  return null;
+};
+
 module.exports = {
   indexNames,
+  extractAuthToken,
 };

package/src/env.js

@@ -7,6 +7,8 @@ const samlPath = process.env.SAML_PATH || '/oauth/saml';
 const internalHostUrl = process.env.INTERNAL_HOST_URL || 'localhost';
 const internalHostPort = (process.env.INTERNAL_HOST_PORT || '6000') * 1;
 
+const apiKeys = (process.env.JACKSON_API_KEYS || '').split(',');
+
 const samlAudience = process.env.SAML_AUDIENCE;
 const preLoadedConfig = process.env.PRE_LOADED_CONFIG;
 
@@ -27,6 +29,7 @@ module.exports = {
   preLoadedConfig,
   internalHostUrl,
   internalHostPort,
+  apiKeys,
   idpEnabled,
   db,
   useInternalServer: !(

package/src/jackson.js

@@ -2,6 +2,7 @@ const express = require('express');
 const cors = require('cors');
 
 const env = require('./env.js');
+const { extractAuthToken } = require('./controller/utils.js');
 
 let apiController;
 let oauthController;
@@ -66,8 +67,18 @@ if (env.useInternalServer) {
   internalApp.use(express.urlencoded({ extended: true }));
 }
 
+const validateApiKey = (token) => {
+  return env.apiKeys.includes(token);
+};
+
 internalApp.post(apiPath + '/config', async (req, res) => {
   try {
+    const apiKey = extractAuthToken(req);
+    if (!validateApiKey(apiKey)) {
+      res.status(401).send('Unauthorized');
+      return;
+    }
+
     res.json(await apiController.config(req.body));
   } catch (err) {
     res.status(500).json({