Merge pull request #1611 from jitsi/fix-token-pubkey

Fixes using public key to verify tokens.
Tested in production.
This commit is contained in:
Aaron van Meerten 2017-05-25 17:29:06 -05:00 committed by GitHub
commit d65295db8b
1 changed files with 5 additions and 4 deletions

View File

@ -149,9 +149,10 @@ end
--- Verifies token
-- @param token the token to verify
-- @param secret the secret to use to verify token
-- @return nil and error or the extracted claims from the token
function Util:verify_token(token)
local claims, err = jwt.decode(token, self.appSecret, true);
function Util:verify_token(token, secret)
local claims, err = jwt.decode(token, secret, true);
if claims == nil then
return nil, err;
end
@ -217,9 +218,9 @@ function Util:process_and_verify_token(session)
-- now verify the whole token
local claims, msg;
if self.asapKeyServer then
claims, msg = self:verify_token(session.auth_token);
claims, msg = self:verify_token(session.auth_token, pubKey);
else
claims, msg = self:verify_token(session.auth_token);
claims, msg = self:verify_token(session.auth_token, self.appSecret);
end
if claims ~= nil then
-- Binds room name to the session which is later checked on MUC join