github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-15 23:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactored base64 utils to share implementation and reduce code duplication.

Browse Source
This commit is contained in:
Eduardo Arias 2024-08-19 10:25:36 -07:00
parent 34da8eeeee
commit fedec96a7e
1 changed files with 21 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/utils/base64.cc
View File

@ -23,33 +23,30 @@
#include "mbedtls/base64.h" #include "mbedtls/base64.h"
template<typename Operation>
inline std::string base64Helper(const char *data, const unsigned int len, Operation op) {
size_t out_len = 0;
op(nullptr, 0, &out_len,
reinterpret_cast<const unsigned char *>(data), len);
std::string ret(out_len, {});
if(out_len > 0) {
op(reinterpret_cast<unsigned char *>(ret.data()), ret.size(), &out_len,
reinterpret_cast<const unsigned char *>(data), len);
ret.resize(out_len);
}
return ret;
}
namespace modsecurity { namespace modsecurity {
namespace Utils { namespace Utils {
std::string Base64::encode(const std::string& data) { std::string Base64::encode(const std::string& data) {
size_t encoded_len = 0; return base64Helper(data.c_str(), data.size(), mbedtls_base64_encode);
unsigned char *d;
std::string ret;
mbedtls_base64_encode(NULL, 0, &encoded_len,
reinterpret_cast<const unsigned char*>(data.c_str()), data.size());
d = reinterpret_cast<unsigned char*>(malloc(sizeof(char) * encoded_len));
if (d == NULL) {
return data;
}
memset(d, '\0', encoded_len);
mbedtls_base64_encode(d, encoded_len, &encoded_len,
(unsigned char*) data.c_str(), data.size());
ret.assign(reinterpret_cast<const char*>(d), encoded_len);
free(d);
return ret;
} }
@ -63,53 +60,12 @@ std::string Base64::decode(const std::string& data, bool forgiven) {
std::string Base64::decode(const std::string& data) { std::string Base64::decode(const std::string& data) {
size_t decoded_len = 0; return base64Helper(data.c_str(), strlen(data.c_str()), mbedtls_base64_decode);
unsigned char *d;
std::string ret;
size_t len = strlen(data.c_str());
mbedtls_base64_decode(NULL, 0, &decoded_len,
reinterpret_cast<const unsigned char*>(data.c_str()), len);
d = reinterpret_cast<unsigned char*>(malloc(sizeof(char) * decoded_len));
if (d == NULL) {
return data;
}
memset(d, '\0', decoded_len);
mbedtls_base64_decode(d, decoded_len, &decoded_len,
reinterpret_cast<const unsigned char*>(data.c_str()), len);
ret.assign(reinterpret_cast<const char*>(d), decoded_len);
free(d);
return ret;
} }
std::string Base64::decode_forgiven(const std::string& data) { std::string Base64::decode_forgiven(const std::string& data) {
size_t decoded_len = 0; return base64Helper(data.c_str(), data.size(), decode_forgiven_engine);
unsigned char *d;
std::string ret;
decode_forgiven_engine(NULL, 0, &decoded_len,
reinterpret_cast<const unsigned char*>(data.c_str()), data.size());
d = reinterpret_cast<unsigned char*>(malloc(sizeof(char) * decoded_len));
if (d == NULL) {
return data;
}
memset(d, '\0', decoded_len);
decode_forgiven_engine(d, decoded_len, &decoded_len,
reinterpret_cast<const unsigned char*>(data.c_str()), data.size());
ret.assign(reinterpret_cast<const char*>(d), decoded_len);
free(d);
return ret;
} }
@ -215,6 +171,5 @@ void Base64::decode_forgiven_engine(unsigned char *plain_text,
} }
} }
} // namespace Utils } // namespace Utils
} // namespace modsecurity } // namespace modsecurity