Skip to content

Commit f8d0fb3

Browse files
Apply suggestions from linter
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 96e1a74 commit f8d0fb3

File tree

2 files changed

+22
-24
lines changed

2 files changed

+22
-24
lines changed

src/scitokens_internal.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -786,17 +786,15 @@ class Validator {
786786
if (!jwt.has_payload_claim("iss")) {
787787
return "<missing issuer>";
788788
}
789-
790789
// Get the raw claim and serialize it back to JSON
791790
const auto &claim = jwt.get_payload_claim("iss");
792791
std::string serialized = claim.to_json().serialize();
793-
794792
// Limit the size to prevent abuse
795793
const size_t max_issuer_length = 256;
796794
if (serialized.length() > max_issuer_length) {
797-
serialized = serialized.substr(0, max_issuer_length - 3) + "...";
795+
serialized =
796+
serialized.substr(0, max_issuer_length - 3) + "...";
798797
}
799-
800798
return serialized;
801799
} catch (...) {
802800
// If anything goes wrong, return a safe fallback

test/main.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -819,8 +819,8 @@ class IssuerSecurityTest : public ::testing::Test {
819819
ASSERT_TRUE(m_token.get() != nullptr);
820820

821821
// Store public key for verification
822-
auto rv = scitoken_store_public_ec_key("https://demo.scitokens.org/gtest",
823-
"1", ec_public, &err_msg);
822+
auto rv = scitoken_store_public_ec_key(
823+
"https://demo.scitokens.org/gtest", "1", ec_public, &err_msg);
824824
ASSERT_TRUE(rv == 0) << err_msg;
825825

826826
scitoken_set_lifetime(m_token.get(), 60);
@@ -843,7 +843,8 @@ TEST_F(IssuerSecurityTest, LongIssuerTruncation) {
843843

844844
// Create a very long issuer (1000 characters)
845845
std::string very_long_issuer(1000, 'A');
846-
auto rv = scitoken_set_claim_string(m_token.get(), "iss", very_long_issuer.c_str(), &err_msg);
846+
auto rv = scitoken_set_claim_string(m_token.get(), "iss",
847+
very_long_issuer.c_str(), &err_msg);
847848
ASSERT_TRUE(rv == 0) << err_msg;
848849

849850
char *token_value = nullptr;
@@ -852,22 +853,21 @@ TEST_F(IssuerSecurityTest, LongIssuerTruncation) {
852853
std::unique_ptr<char, decltype(&free)> token_value_ptr(token_value, free);
853854

854855
// Try to verify with a restricted issuer list to trigger error
855-
const char* allowed_issuers[] = {"https://good.issuer.com", nullptr};
856-
rv = scitoken_deserialize_v2(token_value, m_read_token.get(), allowed_issuers, &err_msg);
857-
856+
const char *allowed_issuers[] = {"https://good.issuer.com", nullptr};
857+
rv = scitoken_deserialize_v2(token_value, m_read_token.get(),
858+
allowed_issuers, &err_msg);
859+
858860
// Should fail
859861
ASSERT_FALSE(rv == 0);
860862
ASSERT_TRUE(err_msg != nullptr);
861-
862863
std::string error_message(err_msg);
863864
std::unique_ptr<char, decltype(&free)> err_msg_ptr(err_msg, free);
864-
865865
// Error message should be reasonable length (< 400 chars)
866866
EXPECT_LT(error_message.length(), 400);
867-
868867
// Should contain expected error text
869-
EXPECT_NE(error_message.find("is not in list of allowed issuers"), std::string::npos);
870-
868+
EXPECT_NE(error_message.find("is not in list of allowed issuers"),
869+
std::string::npos);
870+
871871
// Should contain truncated issuer with ellipsis
872872
EXPECT_NE(error_message.find("..."), std::string::npos);
873873
}
@@ -877,7 +877,8 @@ TEST_F(IssuerSecurityTest, SpecialCharacterIssuer) {
877877

878878
// Create an issuer with special characters and control chars
879879
std::string special_issuer = "https://bad.com/\"\n\t\r\x01\x1f";
880-
auto rv = scitoken_set_claim_string(m_token.get(), "iss", special_issuer.c_str(), &err_msg);
880+
auto rv = scitoken_set_claim_string(m_token.get(), "iss",
881+
special_issuer.c_str(), &err_msg);
881882
ASSERT_TRUE(rv == 0) << err_msg;
882883

883884
char *token_value = nullptr;
@@ -886,22 +887,21 @@ TEST_F(IssuerSecurityTest, SpecialCharacterIssuer) {
886887
std::unique_ptr<char, decltype(&free)> token_value_ptr(token_value, free);
887888

888889
// Try to verify with a restricted issuer list to trigger error
889-
const char* allowed_issuers[] = {"https://good.issuer.com", nullptr};
890-
rv = scitoken_deserialize_v2(token_value, m_read_token.get(), allowed_issuers, &err_msg);
891-
890+
const char *allowed_issuers[] = {"https://good.issuer.com", nullptr};
891+
rv = scitoken_deserialize_v2(token_value, m_read_token.get(),
892+
allowed_issuers, &err_msg);
893+
892894
// Should fail
893895
ASSERT_FALSE(rv == 0);
894896
ASSERT_TRUE(err_msg != nullptr);
895-
896897
std::string error_message(err_msg);
897898
std::unique_ptr<char, decltype(&free)> err_msg_ptr(err_msg, free);
898-
899899
// Error message should be reasonable length
900900
EXPECT_LT(error_message.length(), 300);
901-
902901
// Should contain expected error text
903-
EXPECT_NE(error_message.find("is not in list of allowed issuers"), std::string::npos);
904-
902+
EXPECT_NE(error_message.find("is not in list of allowed issuers"),
903+
std::string::npos);
904+
905905
// Should contain properly escaped JSON (with quotes)
906906
EXPECT_NE(error_message.find("\""), std::string::npos);
907907
}

0 commit comments

Comments
 (0)