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

Removing extra exception aliases #257

Merged
merged 2 commits into from
Oct 5, 2022
Merged

Removing extra exception aliases #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
641cd47
remove exception outside of error namespace
Oct 4, 2022
c12d1bf
linter
Oct 4, 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
42 changes: 20 additions & 22 deletions include/jwt-cpp/jwt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,15 +362,8 @@ namespace jwt {
}
}
} // namespace error

// FIXME: Remove
// Keep backward compat at least for a couple of revisions
using error::ecdsa_exception;
using error::rsa_exception;
using error::signature_generation_exception;
using error::signature_verification_exception;
using error::token_verification_exception;
} // namespace jwt

namespace std {
template<>
struct is_error_code_enum<jwt::error::rsa_error> : true_type {};
Expand All @@ -383,6 +376,7 @@ namespace std {
template<>
struct is_error_code_enum<jwt::error::token_verification_error> : true_type {};
} // namespace std

namespace jwt {
/**
* \brief A collection for working with certificates
Expand Down Expand Up @@ -974,7 +968,7 @@ namespace jwt {
} else if (!public_key.empty()) {
pkey = helper::load_public_key_from_string(public_key, public_key_password);
} else
throw rsa_exception(error::rsa_error::no_key_provided);
throw error::rsa_exception(error::rsa_error::no_key_provided);
}
/**
* Sign jwt data
Expand Down Expand Up @@ -1084,13 +1078,13 @@ namespace jwt {
pkey = helper::load_public_ec_key_from_string(public_key, public_key_password);
check_public_key(pkey.get());
} else {
throw ecdsa_exception(error::ecdsa_error::no_key_provided);
throw error::ecdsa_exception(error::ecdsa_error::no_key_provided);
}
if (!pkey) throw ecdsa_exception(error::ecdsa_error::invalid_key);
if (!pkey) throw error::ecdsa_exception(error::ecdsa_error::invalid_key);

size_t keysize = EVP_PKEY_bits(pkey.get());
if (keysize != signature_length * 4 && (signature_length != 132 || keysize != 521))
throw ecdsa_exception(error::ecdsa_error::invalid_key_size);
throw error::ecdsa_exception(error::ecdsa_error::invalid_key_size);
}

/**
Expand Down Expand Up @@ -1190,25 +1184,29 @@ namespace jwt {
#ifdef JWT_OPENSSL_3_0
std::unique_ptr<EVP_PKEY_CTX, decltype(&EVP_PKEY_CTX_free)> ctx(
EVP_PKEY_CTX_new_from_pkey(nullptr, pkey, nullptr), EVP_PKEY_CTX_free);
if (!ctx) { throw ecdsa_exception(error::ecdsa_error::create_context_failed); }
if (EVP_PKEY_public_check(ctx.get()) != 1) { throw ecdsa_exception(error::ecdsa_error::invalid_key); }
if (!ctx) { throw error::ecdsa_exception(error::ecdsa_error::create_context_failed); }
if (EVP_PKEY_public_check(ctx.get()) != 1) {
throw error::ecdsa_exception(error::ecdsa_error::invalid_key);
}
#else
std::unique_ptr<EC_KEY, decltype(&EC_KEY_free)> eckey(EVP_PKEY_get1_EC_KEY(pkey), EC_KEY_free);
if (!eckey) { throw ecdsa_exception(error::ecdsa_error::invalid_key); }
if (EC_KEY_check_key(eckey.get()) == 0) throw ecdsa_exception(error::ecdsa_error::invalid_key);
if (!eckey) { throw error::ecdsa_exception(error::ecdsa_error::invalid_key); }
if (EC_KEY_check_key(eckey.get()) == 0) throw error::ecdsa_exception(error::ecdsa_error::invalid_key);
#endif
}

static void check_private_key(EVP_PKEY* pkey) {
#ifdef JWT_OPENSSL_3_0
std::unique_ptr<EVP_PKEY_CTX, decltype(&EVP_PKEY_CTX_free)> ctx(
EVP_PKEY_CTX_new_from_pkey(nullptr, pkey, nullptr), EVP_PKEY_CTX_free);
if (!ctx) { throw ecdsa_exception(error::ecdsa_error::create_context_failed); }
if (EVP_PKEY_private_check(ctx.get()) != 1) { throw ecdsa_exception(error::ecdsa_error::invalid_key); }
if (!ctx) { throw error::ecdsa_exception(error::ecdsa_error::create_context_failed); }
if (EVP_PKEY_private_check(ctx.get()) != 1) {
throw error::ecdsa_exception(error::ecdsa_error::invalid_key);
}
#else
std::unique_ptr<EC_KEY, decltype(&EC_KEY_free)> eckey(EVP_PKEY_get1_EC_KEY(pkey), EC_KEY_free);
if (!eckey) { throw ecdsa_exception(error::ecdsa_error::invalid_key); }
if (EC_KEY_check_key(eckey.get()) == 0) throw ecdsa_exception(error::ecdsa_error::invalid_key);
if (!eckey) { throw error::ecdsa_exception(error::ecdsa_error::invalid_key); }
if (EC_KEY_check_key(eckey.get()) == 0) throw error::ecdsa_exception(error::ecdsa_error::invalid_key);
#endif
}

Expand Down Expand Up @@ -1314,7 +1312,7 @@ namespace jwt {
} else if (!public_key.empty()) {
pkey = helper::load_public_key_from_string(public_key, public_key_password);
} else
throw ecdsa_exception(error::ecdsa_error::load_key_bio_read);
throw error::ecdsa_exception(error::ecdsa_error::load_key_bio_read);
}
/**
* Sign jwt data
Expand Down Expand Up @@ -1449,7 +1447,7 @@ namespace jwt {
} else if (!public_key.empty()) {
pkey = helper::load_public_key_from_string(public_key, public_key_password);
} else
throw rsa_exception(error::rsa_error::no_key_provided);
throw error::rsa_exception(error::rsa_error::no_key_provided);
}

/**
Expand Down
10 changes: 5 additions & 5 deletions tests/OpenSSLErrorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ TEST(OpenSSLErrorTest, ExtractPubkeyFromCert) {
try {
jwt::helper::extract_pubkey_from_cert(sample_cert, "");
FAIL(); // Should never reach this
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
});
}

Expand All @@ -516,7 +516,7 @@ TEST(OpenSSLErrorTest, ConvertCertBase64DerToPem) {
try {
jwt::helper::convert_base64_der_to_pem(sample_cert_base64_der);
FAIL(); // Should never reach this
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
});
}

Expand Down Expand Up @@ -545,7 +545,7 @@ TEST(OpenSSLErrorTest, LoadPublicKeyFromString) {
try {
jwt::helper::load_public_key_from_string(rsa_pub_key, "");
FAIL(); // Should never reach this
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
});
}

Expand Down Expand Up @@ -582,7 +582,7 @@ TEST(OpenSSLErrorTest, LoadPublicKeyCertFromString) {
try {
jwt::helper::load_public_key_from_string(sample_cert, "");
FAIL(); // Should never reach this
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
});
}

Expand Down Expand Up @@ -619,7 +619,7 @@ TEST(OpenSSLErrorTest, LoadPrivateKeyFromString) {
try {
jwt::helper::load_private_key_from_string(rsa_priv_key, "");
FAIL(); // Should never reach this
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
});
}

Expand Down
Loading