Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Added file size limit to avatars and banners #1209

Merged
merged 2 commits into from
Jul 22, 2024
Merged

feat: Added file size limit to avatars and banners #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6310673
feat: Added file size limit to avatars and banners
Jaskowicz1 Jul 22, 2024
e5b0212
feat: moved the limit to a constexpr
Jaskowicz1 Jul 22, 2024
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
2 changes: 2 additions & 0 deletions include/dpp/user.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

namespace dpp {

constexpr uint32_t MAX_AVATAR_SIZE = 10240 * 1000; // 10240KB.

/**
* @brief Various bitmask flags used to represent information about a dpp::user
*/
Expand Down
9 changes: 9 additions & 0 deletions src/dpp/cluster/user.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,19 @@ void cluster::current_user_edit(const std::string &nickname, const std::string&
};

if (!avatar_blob.empty()) {
if(avatar_blob.size() > MAX_AVATAR_SIZE) { // Avatar limit is 10240 kb.
throw dpp::length_exception(err_icon_size, "Avatar file exceeds discord limit of 10240 kilobytes");
}
j["avatar"] = "data:" + mimetypes.find(avatar_type)->second + ";base64," + base64_encode((unsigned char const*)avatar_blob.data(), static_cast<unsigned int>(avatar_blob.length()));
}

if (!banner_blob.empty()) {
/* There doesn't seem to be a banner limit (probably due to the limit of 640x280)
* however, this is here as a precautionary.
*/
if(banner_blob.size() > MAX_AVATAR_SIZE) {
throw dpp::length_exception(err_icon_size, "Banner file exceeds discord limit of 10240 kilobytes");
}
j["banner"] = "data:" + mimetypes.find(banner_type)->second + ";base64," + base64_encode((unsigned char const*)banner_blob.data(), static_cast<unsigned int>(banner_blob.length()));
}

Expand Down
Loading