Skip to content

Added support for HS512 JWT signing algorithm #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yesuch-kore merged 1 commit into from
Oct 16, 2023
Merged

Added support for HS512 JWT signing algorithm #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
"appId": "test_app_id2"
}
},
"jwt": {
"jwtAlgorithm": "HS256",
"jwt-expiry": 60,
"st-67890":{
"jwtAlgorithm": "HS512",
"jwt-expiry": 60
}
},
"redis": {
"options": {
"host": "localhost",
Expand Down
4 changes: 3 additions & 1 deletion lib/app/middlewares/APIKeyMiddleware/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var jwt = require("jwt-simple");
var config = require('../../../../config');
var apiPrefix = config.app.apiPrefix;
var credentials = config.credentials;
var jwtProps = config.jwt;

function APIKeyMiddleware() {
var botIdregex = /(?<botId>st-[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-5[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})/;
Expand All @@ -17,6 +18,7 @@ function APIKeyMiddleware() {

var botId = url.match(botIdregex).groups.botId;
var cred = credentials[botId]?credentials[botId]:credentials;
var jwtAlg = (jwtProps[botId] ? jwtProps[botId].jwtAlgorithm : jwtProps.jwtAlgorithm) || "HS256" ; //Adding HS256 as default algorithm if config is not set.

if(_.has(header, 'apikey')){//DEPRECATED::SOON TO BE REMOVED
if(header.apikey===cred.apikey)
Expand All @@ -25,7 +27,7 @@ function APIKeyMiddleware() {
if(_.has(header, 'token')){
var appId;
try {
appId = jwt.decode(header.token, cred.apikey).appId;
appId = jwt.decode(header.token, cred.apikey, false, jwtAlg).appId;
} catch(e){
console.info("invalid jwt token");
}
Expand Down
18 changes: 15 additions & 3 deletions lib/sdk/lib/invokePlatformAPIs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,29 @@ var config = require("../../../config");
var { get, extend, has, isEmpty, set, clone } = require('lodash');

function getSignedJWTToken(botId) {
var appId, apiKey;
var appId, apiKey, jwtAlgorithm, jwtExpiry;
var defAlg = "HS256";

if (config.credentials[botId]) {
appId = config.credentials[botId].appId;
apiKey = config.credentials[botId].apikey;
} else {
appId = config.credentials.appId;
apiKey = config.credentials.apikey;
}

if (config.jwt[botId]) {
jwtAlgorithm = config.jwt[botId].jwtAlgorithm;
jwtExpiry = config.jwt[botId].jwtExpiry;
} else {
jwtAlgorithm = config.jwt.jwtAlgorithm;
jwtExpiry = config.jwt.jwtExpiry;
}

return jwt.encode({
appId: appId,
exp: Date.now()/1000 + (config.jwt_expiry || 60) //set the default expiry as 60 seconds
}, apiKey);
exp: Date.now()/1000 + (jwtExpiry || 60) //set the default expiry as 60 seconds
}, apiKey, (jwtAlgorithm || defAlg));
}

function makeRequest(url, method, body, opts) {
Expand All @@ -30,6 +41,7 @@ function makeRequest(url, method, body, opts) {
opts = opts || {};
headers = opts.headers || {};
headers['content-type'] = 'application/json';

headers.auth = getSignedJWTToken(botId);

extend(headers, clone(get(config, 'headers', {})));
Expand Down