Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions include/jwt-cpp/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,14 @@ namespace jwt {

inline padding count_padding(const std::string& base, const std::vector<std::string>& fills) {
for (const auto& fill : fills) {
if (base.size() < fill.size()) continue;
// Does the end of the input exactly match the fill pattern?
if (base.substr(base.size() - fill.size()) == fill) {
return padding{1, fill.length()} +
count_padding(base.substr(0, base.size() - fill.size()), fills);
}
// Try the next one if it does not match the end
if (base.size() < fill.size() || base.compare(base.size() - fill.size(), fill.size(), fill) != 0)
continue;

auto end = base.size() - fill.size();
while (end > fill.size() && base.compare(end - fill.size(), fill.size(), fill) == 0)
end -= fill.size();
return {(base.size() - end) / fill.size(), base.size() - end};
}

return {};
Expand Down
17 changes: 9 additions & 8 deletions tests/BaseTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ TEST(BaseTest, BaseDetailsCountPadding) {
ASSERT_EQ(padding{}, jwt::base::details::count_padding("ABC", {"~", "!"}));
ASSERT_EQ((padding{1, 1}), jwt::base::details::count_padding("ABC!", {"~", "!"}));
ASSERT_EQ((padding{1, 1}), jwt::base::details::count_padding("ABC~", {"~", "!"}));
ASSERT_EQ((padding{3, 3}), jwt::base::details::count_padding("ABC~~!", {"~", "!"}));
ASSERT_EQ((padding{3, 3}), jwt::base::details::count_padding("ABC!~~", {"~", "!"}));
ASSERT_EQ((padding{5, 5}), jwt::base::details::count_padding("ABC~~!~~", {"~", "!"}));

// Padding should be uniform and not change mid string
ASSERT_EQ((padding{1, 1}), jwt::base::details::count_padding("ABC~~!", {"~", "!"}));
ASSERT_EQ((padding{2, 2}), jwt::base::details::count_padding("ABC!~~", {"~", "!"}));
ASSERT_EQ((padding{2, 2}), jwt::base::details::count_padding("ABC~~!~~", {"~", "!"}));

ASSERT_EQ((padding{2, 6}), jwt::base::details::count_padding("MTIzNA%3d%3d", {"%3d", "%3D"}));
ASSERT_EQ((padding{2, 6}), jwt::base::details::count_padding("MTIzNA%3d%3D", {"%3d", "%3D"}));
ASSERT_EQ((padding{2, 6}), jwt::base::details::count_padding("MTIzNA%3D%3d", {"%3d", "%3D"}));
ASSERT_EQ((padding{1, 3}), jwt::base::details::count_padding("MTIzNA%3d%3D", {"%3d", "%3D"}));
ASSERT_EQ((padding{1, 3}), jwt::base::details::count_padding("MTIzNA%3D%3d", {"%3d", "%3D"}));
ASSERT_EQ((padding{2, 6}), jwt::base::details::count_padding("MTIzNA%3D%3D", {"%3d", "%3D"}));

// Some fake scenarios
Expand All @@ -63,7 +65,7 @@ TEST(BaseTest, BaseDetailsCountPadding) {
ASSERT_EQ((padding{1, 1}), jwt::base::details::count_padding("ABC~", {"~", "~~!"}));
ASSERT_EQ((padding{1, 3}), jwt::base::details::count_padding("ABC~~!", {"~", "~~!"}));
ASSERT_EQ((padding{2, 2}), jwt::base::details::count_padding("ABC!~~", {"~", "~~!"}));
ASSERT_EQ((padding{3, 5}), jwt::base::details::count_padding("ABC~~!~~", {"~", "~~!"}));
ASSERT_EQ((padding{2, 2}), jwt::base::details::count_padding("ABC~~!~~", {"~", "~~!"}));
ASSERT_EQ(padding{}, jwt::base::details::count_padding("ABC~~!~~", {}));
}

Expand All @@ -83,8 +85,7 @@ TEST(BaseTest, Base64DecodeURL) {

TEST(BaseTest, Base64DecodeURLCaseInsensitive) {
ASSERT_EQ("1", jwt::base::decode<jwt::alphabet::helper::base64url_percent_encoding>("MQ%3d%3d"));
ASSERT_EQ("1", jwt::base::decode<jwt::alphabet::helper::base64url_percent_encoding>("MQ%3D%3d"));
ASSERT_EQ("1", jwt::base::decode<jwt::alphabet::helper::base64url_percent_encoding>("MQ%3d%3D"));
ASSERT_EQ("1", jwt::base::decode<jwt::alphabet::helper::base64url_percent_encoding>("MQ%3D%3D"));
ASSERT_EQ("12", jwt::base::decode<jwt::alphabet::helper::base64url_percent_encoding>("MTI%3d"));
ASSERT_EQ("123", jwt::base::decode<jwt::alphabet::helper::base64url_percent_encoding>("MTIz"));
ASSERT_EQ("1234", jwt::base::decode<jwt::alphabet::helper::base64url_percent_encoding>("MTIzNA%3d%3d"));
Expand Down
Loading