dedicated_room: fix token padding ...
... mebedtls' base64 routine has a strange behavioral issue where if the input is invalid, it will not report it as invalid, but rather returning a bunch of garbage data. This new round-tripping padding method should eliminate such issue.
This commit is contained in:
parent
1694c55d62
commit
aa11d73bba
|
@ -76,8 +76,18 @@ static constexpr char BanListMagic[] = "YuzuRoom-BanList-1";
|
||||||
static constexpr char token_delimiter{':'};
|
static constexpr char token_delimiter{':'};
|
||||||
|
|
||||||
static void PadToken(std::string& token) {
|
static void PadToken(std::string& token) {
|
||||||
const auto remainder = token.size() % 3;
|
std::size_t outlen = 0;
|
||||||
for (size_t i = 0; i < (3 - remainder); i++) {
|
|
||||||
|
std::array<unsigned char, 512> output{};
|
||||||
|
std::array<unsigned char, 2048> roundtrip{};
|
||||||
|
for (size_t i = 0; i < 3; i++) {
|
||||||
|
mbedtls_base64_decode(output.data(), output.size(), &outlen,
|
||||||
|
reinterpret_cast<const unsigned char*>(token.c_str()),
|
||||||
|
token.length());
|
||||||
|
mbedtls_base64_encode(roundtrip.data(), roundtrip.size(), &outlen, output.data(), outlen);
|
||||||
|
if (memcmp(roundtrip.data(), token.data(), token.size()) == 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
token.push_back('=');
|
token.push_back('=');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue