Skip to content

FIX: Reading Base64 JWT conforming to RFC-4648 #4

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

Open
reneme wants to merge 2 commits into
base: master
Choose a base branch
from
Open

FIX: Reading Base64 JWT conforming to RFC-4648 #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7edd6fa
FIX: reading base64 JWT conforming to RFC-4648
reneme Dec 7, 2017
a7741a4
FIX: white-space knit pick
reneme Dec 7, 2017
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
16 changes: 12 additions & 4 deletions src/qjsonwebtoken.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,14 @@ QString QJsonWebToken::getToken()
return m_byteAllData + "." + byteSignatureBase64;
}

static QByteArray readBase64(QString strToken) {
// decode based on RFC-4648 URI safe encoding
strToken.replace('-', '+');
strToken.replace('_', '/');

return QByteArray::fromBase64(strToken.toUtf8());
}

bool QJsonWebToken::setToken(QString strToken)
{
// assume base64 encoded at first, if not try decoding
Expand All @@ -214,8 +222,8 @@ bool QJsonWebToken::setToken(QString strToken)
// check all parts are valid using another instance,
// so we dont overwrite this instance in case of error
QJsonWebToken tempTokenObj;
if ( !tempTokenObj.setHeaderQStr(QByteArray::fromBase64(listJwtParts.at(0).toUtf8())) ||
!tempTokenObj.setPayloadQStr(QByteArray::fromBase64(listJwtParts.at(1).toUtf8())) )
if ( !tempTokenObj.setHeaderQStr(readBase64(listJwtParts.at(0))) ||
!tempTokenObj.setPayloadQStr(readBase64(listJwtParts.at(1))) )
{
// try unencoded
if (!tempTokenObj.setHeaderQStr(listJwtParts.at(0)) ||
Expand All @@ -233,8 +241,8 @@ bool QJsonWebToken::setToken(QString strToken)
setPayloadQStr(tempTokenObj.getPayloadQStr());
if (isBase64Encoded)
{ // unencode
m_byteSignature = QByteArray::fromBase64(listJwtParts.at(2).toUtf8());
}
m_byteSignature = readBase64(listJwtParts.at(2));
}
else
{
m_byteSignature = listJwtParts.at(2).toUtf8();
Expand Down