Merge branch 'master' into dependabot/npm_and_yarn/passport-saml-3.1.2

GluuFederation · Sep 11, 2021 · 93853fd · 93853fd
2 parents 2099657 + 70879ca
commit 93853fd
Show file tree

Hide file tree

Showing 9 changed files with 323 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [5.3.0](https://github.com/GluuFederation/gluu-passport/compare/v5.2.0...v5.3.0) (2021-09-03)
+
+
+### Features
+
+* **httpProxy:** add support to global http proxy ([#333](https://github.com/GluuFederation/gluu-passport/issues/333)) ([121a629](https://github.com/GluuFederation/gluu-passport/commit/121a629189e36d7b500ea10d82459d6906cda030))
+
+
+### Bug Fixes
+
+* **package-lock.json:** update node-xtraverse due to vulnerability in xmldom ([#327](https://github.com/GluuFederation/gluu-passport/issues/327)) ([903ebb4](https://github.com/GluuFederation/gluu-passport/commit/903ebb4b9e5900496c883d5e5e1f72fb39992a32))
+* remove decimal points from Client assertion JWT exp time ([#315](https://github.com/GluuFederation/gluu-passport/issues/315)) ([6ba5b9b](https://github.com/GluuFederation/gluu-passport/commit/6ba5b9bc687e1cdd7cc17fb22053e659f961282b)), closes [#313](https://github.com/GluuFederation/gluu-passport/issues/313) [#313](https://github.com/GluuFederation/gluu-passport/issues/313) [#313](https://github.com/GluuFederation/gluu-passport/issues/313)
+
 ### [5.2.1](https://github.com/GluuFederation/gluu-passport/compare/v5.2.0...v5.2.1) (2021-07-30)
 
 

diff --git a/config/production.js b/config/production.js
@@ -5,5 +5,8 @@ module.exports = {
   rateLimitWindowMs: 24 * 60 * 60 * 1000, // 24 hrs in milliseconds
   rateLimitMaxRequestAllow: 1000,
   cookieSameSite: 'none',
-  cookieSecure: true
+  cookieSecure: true,
+  HTTP_PROXY: process.env.HTTP_PROXY,
+  HTTPS_PROXY: process.env.HTTPS_PROXY,
+  NO_PROXY: process.env.NO_PROXY
 }
diff --git a/config/test.js b/config/test.js
@@ -238,6 +238,10 @@ const rateLimitMaxRequestAllow = 100
 const cookieSameSite = 'none'
 const cookieSecure = true
 
+const HTTP_PROXY = 'http://localhost:3128'
+const HTTPS_PROXY = 'http://localhost:3129'
+const NO_PROXY = 'localhost,127.0.0.1'
+
 module.exports = {
   saltFile,
   passportConfig,
@@ -247,5 +251,8 @@ module.exports = {
   passportFile,
   passportConfigAuthorizedResponse,
   cookieSameSite,
-  cookieSecure
+  cookieSecure,
+  HTTP_PROXY,
+  NO_PROXY,
+  HTTPS_PROXY
 }