Merge branch 'master' into feature/reflect-traits

Author: aligirayhanozbay

example/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.14)
 project(jwt-cpp-examples)
 
 if(NOT TARGET jwt-cpp)

example/rsa-create.cpp

@@ -37,7 +37,7 @@ rK0/Ikt5ybqUzKCMJZg2VKGTxg==
 					 .set_type("JWT")
 					 .set_id("rsa-create-example")
 					 .set_issued_now()
-					 .set_expires_in(std::chrono::seconds{36000})
+					 .set_expires_in(std::chrono::hours{1})
 					 .set_payload_claim("sample", jwt::claim(std::string{"test"}))
 					 .sign(jwt::algorithm::rs256("", rsa_priv_key, "", ""));
 

example/traits/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.14)
 project(jwt-cpp-traits)
 
 if(NOT TARGET jwt-cpp)

include/jwt-cpp/jwt.h

@@ -722,13 +722,23 @@ namespace jwt {
 			if (key.substr(0, 27) == "-----BEGIN CERTIFICATE-----") {
 				auto epkey = helper::extract_pubkey_from_cert<error_category>(key, password, ec);
 				if (ec) return {};
-				const int len = static_cast<int>(epkey.size());
+				// Ensure the size fits into an int before casting
+				if (epkey.size() > static_cast<std::size_t>((std::numeric_limits<int>::max)())) {
+					ec = error_category::load_key_bio_write; // Add an appropriate error here
+					return {};
+				}
+				int len = static_cast<int>(epkey.size());
 				if (BIO_write(pubkey_bio.get(), epkey.data(), len) != len) {
 					ec = error_category::load_key_bio_write;
 					return {};
 				}
 			} else {
-				const int len = static_cast<int>(key.size());
+				// Ensure the size fits into an int before casting
+				if (key.size() > static_cast<std::size_t>((std::numeric_limits<int>::max)())) {
+					ec = error_category::load_key_bio_write; // Add an appropriate error here
+					return {};
+				}
+				int len = static_cast<int>(key.size());
 				if (BIO_write(pubkey_bio.get(), key.data(), len) != len) {
 					ec = error_category::load_key_bio_write;
 					return {};
@@ -2610,7 +2620,8 @@ namespace jwt {
 
 		JWT_CLAIM_EXPLICIT basic_claim(typename json_traits::string_type s) : val(std::move(s)) {}
 		JWT_CLAIM_EXPLICIT basic_claim(const date& d)
-			: val(typename json_traits::integer_type(std::chrono::system_clock::to_time_t(d))) {}
+			: val(typename json_traits::integer_type(
+				  std::chrono::duration_cast<std::chrono::seconds>(d.time_since_epoch()).count())) {}
 		JWT_CLAIM_EXPLICIT basic_claim(typename json_traits::array_type a) : val(std::move(a)) {}
 		JWT_CLAIM_EXPLICIT basic_claim(typename json_traits::value_type v) : val(std::move(v)) {}
 		JWT_CLAIM_EXPLICIT basic_claim(const set_t& s) : val(typename json_traits::array_type(s.begin(), s.end())) {}
@@ -2659,9 +2670,8 @@ namespace jwt {
 		 */
 		date as_date() const {
 			using std::chrono::system_clock;
-			if (get_type() == json::type::number)
-				return system_clock::from_time_t(static_cast<std::time_t>(std::round(as_number())));
-			return system_clock::from_time_t(static_cast<std::time_t>(as_integer()));
+			if (get_type() == json::type::number) return date(std::chrono::seconds(std::llround(as_number())));
+			return date(std::chrono::seconds(as_integer()));
 		}
 
 		/**
@@ -3246,8 +3256,8 @@ namespace jwt {
 		 * \param d token expiration timeout
 		 * \return *this to allow for method chaining
 		 */
-		template<class Rep>
-		builder& set_expires_in(const std::chrono::duration<Rep>& d) {
+		template<class Rep, class Period>
+		builder& set_expires_in(const std::chrono::duration<Rep, Period>& d) {
 			return set_payload_claim("exp", basic_claim<json_traits>(clock.now() + d));
 		}
 		/**

tests/cmake/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.14)
 project(jwt-cpp-installation-tests)
 
 set(TEST CACHE STRING "The test source file to be used")

tests/traits/BoostJsonTest.cpp

@@ -87,7 +87,7 @@ TEST(BoostJsonTest, VerifyTokenExpirationInValid) {
 	const auto token = jwt::create<jwt::traits::boost_json>()
 						   .set_issuer("auth0")
 						   .set_issued_now()
-						   .set_expires_in(std::chrono::seconds{3600})
+						   .set_expires_in(std::chrono::hours{1})
 						   .sign(jwt::algorithm::hs256{"secret"});
 
 	const auto decoded_token = jwt::decode<jwt::traits::boost_json>(token);

tests/traits/JsonconsTest.cpp

@@ -90,7 +90,7 @@ TEST(JsonconsTest, VerifyTokenExpirationInValid) {
 	const auto token = jwt::create<jwt::traits::danielaparker_jsoncons>()
 						   .set_issuer("auth0")
 						   .set_issued_now()
-						   .set_expires_in(std::chrono::seconds{3600})
+						   .set_expires_in(std::chrono::hours{1})
 						   .sign(jwt::algorithm::hs256{"secret"});
 
 	const auto decoded_token = jwt::decode<jwt::traits::danielaparker_jsoncons>(token);

tests/traits/NlohmannTest.cpp

@@ -86,7 +86,7 @@ TEST(NlohmannTest, VerifyTokenExpirationInValid) {
 	const auto token = jwt::create<jwt::traits::nlohmann_json>()
 						   .set_issuer("auth0")
 						   .set_issued_now()
-						   .set_expires_in(std::chrono::seconds{3600})
+						   .set_expires_in(std::chrono::hours{1})
 						   .sign(jwt::algorithm::hs256{"secret"});
 
 	const auto decoded_token = jwt::decode<jwt::traits::nlohmann_json>(token);

tests/traits/OspJsoncppTest.cpp

@@ -90,7 +90,7 @@ TEST(OspJsoncppTest, VerifyTokenExpirationInValid) {
 	const auto token = jwt::create<jwt::traits::open_source_parsers_jsoncpp>()
 						   .set_issuer("auth0")
 						   .set_issued_now()
-						   .set_expires_in(std::chrono::seconds{3600})
+						   .set_expires_in(std::chrono::hours{1})
 						   .sign(jwt::algorithm::hs256{"secret"});
 
 	const auto decoded_token = jwt::decode<jwt::traits::open_source_parsers_jsoncpp>(token);

tests/traits/TraitsTest.cpp.mustache

@@ -90,7 +90,7 @@ TEST({{test_suite_name}}, VerifyTokenExpirationInValid) {
 	const auto token = jwt::create<jwt::traits::{{traits_name}}>()
 						   .set_issuer("auth0")
 						   .set_issued_now()
-						   .set_expires_in(std::chrono::seconds{3600})
+						   .set_expires_in(std::chrono::hours{1})
 						   .sign(jwt::algorithm::hs256{"secret"});
 
 	const auto decoded_token = jwt::decode<jwt::traits::{{traits_name}}>(token);