Skip to content
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

Support loading jwk from json #221

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
+596 −217
Draft

Support loading jwk from json #221

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
acaf9c5
move jwk above verifier
kleinmrk Feb 23, 2022
89b4e8a
validate claims in separate method
kleinmrk Feb 23, 2022
0cadf3d
read rsa public key from JWK
kleinmrk Feb 1, 2022
7a735e7
add allow_key interface
kleinmrk Mar 3, 2022
a631f06
add interfaces to set pkeys directly to ECDSA and PSS algorithms
kleinmrk Apr 3, 2022
58fe6bc
prevent duplicate lookup when searching for verification algorithm
kleinmrk Apr 10, 2022
70c9a0c
enable user defined base64 decoding function
kleinmrk Apr 11, 2022
bb1409a
do not use std::make_unique
kleinmrk Apr 11, 2022
ea8f066
enable user defined base64 decoding function
kleinmrk Apr 23, 2022
55b5b14
move supported algorithms to the verifier class
kleinmrk Apr 23, 2022
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
Prev Previous commit
Next Next commit
enable user defined base64 decoding function
@kleinmrk
kleinmrk committed Oct 2, 2022
commit 70c9a0ca182a794cf03893b08da892467e0eeded
35 changes: 26 additions & 9 deletions include/jwt-cpp/jwt.h
View file
Original file line number Diff line number Diff line change
@@ -3206,13 +3206,28 @@ namespace jwt {
const details::map_of_claims<json_traits> jwk_claims;

public:
template<typename Decode>
jwk(const typename json_traits::string_type& str, Decode&& decode)
: jwk(details::map_of_claims<json_traits>::parse_claims(str), decode) {}

template<typename Decode>
jwk(const typename json_traits::value_type& json, Decode&& decode)
: jwk(json_traits::as_object(json), decode) {}

template<typename Decode>
jwk(const typename json_traits::object_type& json, Decode&& decode)
: jwk_claims(json), k(build_key(jwk_claims, decode)) {}

#ifndef JWT_DISABLE_BASE64
JWT_CLAIM_EXPLICIT jwk(const typename json_traits::string_type& str)
: jwk(details::map_of_claims<json_traits>::parse_claims(str)) {}

JWT_CLAIM_EXPLICIT jwk(const typename json_traits::value_type& json) : jwk(json_traits::as_object(json)) {}

JWT_CLAIM_EXPLICIT jwk(const typename json_traits::object_type& json)
: jwk_claims(json), k(build_key(jwk_claims)) {
: jwk(json, [](const typename json_traits::string_type& str) {
return base::decode<alphabet::base64url>(base::pad<alphabet::base64url>(str));
}) {
// https://datatracker.ietf.org/doc/html/rfc7518#section-6.1
// * indicate required params
// "kty"* : "EC", "RSA", "oct"
@@ -3229,6 +3244,7 @@ namespace jwt {
// if "oct", then "k"*
// if "oct", then SHOULD contain "alg"
}
#endif

/**
* Get key type claim
@@ -3418,12 +3434,12 @@ namespace jwt {
}

private:
static helper::evp_pkey_handle build_rsa_key(const details::map_of_claims<json_traits>& claims) {
template<typename Decode>
static helper::evp_pkey_handle build_rsa_key(const details::map_of_claims<json_traits>& claims,
Decode&& decode) {
EVP_PKEY* evp_key = nullptr;
auto n = jwt::helper::raw2bn(
base::decode<alphabet::base64url>(base::pad<alphabet::base64url>(claims.get_claim("n").as_string())));
auto e = jwt::helper::raw2bn(
base::decode<alphabet::base64url>(base::pad<alphabet::base64url>(claims.get_claim("e").as_string())));
auto n = jwt::helper::raw2bn(decode(claims.get_claim("n").as_string()));
auto e = jwt::helper::raw2bn(decode(claims.get_claim("e").as_string()));
#ifdef JWT_OPENSSL_3_0
// https://www.openssl.org/docs/manmaster/man7/EVP_PKEY-RSA.html
// see https://www.openssl.org/docs/man3.0/man3/EVP_PKEY_fromdata.html
@@ -3456,7 +3472,8 @@ namespace jwt {
#endif
}

static key build_key(const details::map_of_claims<json_traits>& claims) {
template<typename Decode>
static key build_key(const details::map_of_claims<json_traits>& claims, Decode&& decode) {
if (!claims.has_claim("kty")) {
// TODO: custom exception or error code
throw std::runtime_error("missing required claim \"kty\"");
@@ -3468,12 +3485,12 @@ namespace jwt {
}

if (claims.get_claim("kty").as_string() == "RSA") {
return key::asymmetric(build_rsa_key(claims));
return key::asymmetric(build_rsa_key(claims, decode));
} else if (claims.get_claim("kty").as_string() == "EC") {
// TODO: build EC key
throw std::runtime_error("not implemented");
} else if (claims.get_claim("kty").as_string() == "oct") {
return key::symmetric(base::decode<alphabet::base64url>(claims.get_claim("k").as_string()));
return key::symmetric(decode(claims.get_claim("k").as_string()));
} else {
// TODO: do not build error messages like this
throw std::runtime_error("unknown key type (\"kty\"):" + claims.get_claim("kty").as_string());