From: ofono@market.talbothome.com
To: ofono@ofono.org
Subject: [PATCH 06/10] MMSD: Allow for a user configurable max attachments size
Date: Fri, 19 Feb 2021 01:03:48 +0000 [thread overview]
Message-ID: <20210219010348.2937.32968@ml01.vlan13.01.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3762 bytes --]
To prevent a chat program from accidentally sending too large of an MMS,
this patch watches the attachments and sends back a failure if it is too large.
The default on here is 1.1 Megabytes (this is the default max size on Android).
I also made it user changable.
---
src/service.c | 38 ++++++++++++++++++++++++++++++++++----
1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/service.c b/src/service.c
index a9b07f6..58cd747 100644
--- a/src/service.c
+++ b/src/service.c
@@ -56,6 +56,7 @@
#define MAX_ATTACHMENTS_NUMBER 25
#define MAX_ATTEMPTS 3
+#define DEFAULT_MAX_ATTACHMENT_TOTAL_SIZE 1100000
#define SETTINGS_STORE "mms"
#define SETTINGS_GROUP "Settings"
@@ -100,6 +101,7 @@ struct mms_service {
GHashTable *messages;
GKeyFile *settings;
gboolean use_delivery_reports;
+ int max_attach_total_size;
};
enum mms_request_type {
@@ -146,7 +148,22 @@ static void mms_load_settings(struct mms_service *service)
g_key_file_set_boolean(service->settings, SETTINGS_GROUP,
"UseDeliveryReports",
service->use_delivery_reports);
+ error = NULL;
}
+
+ service->max_attach_total_size =
+ g_key_file_get_integer(service->settings, SETTINGS_GROUP,
+ "TotalMaxAttachmentSize", &error);
+
+ if (error) {
+ g_error_free(error);
+ service->max_attach_total_size = DEFAULT_MAX_ATTACHMENT_TOTAL_SIZE;
+ g_key_file_set_integer(service->settings, SETTINGS_GROUP,
+ "TotalMaxAttachmentSize",
+ service->max_attach_total_size);
+ }
+ mms_debug("Maximum Attachment Total Size (in bytes): %d", service->max_attach_total_size);
+
}
static void mms_request_destroy(struct mms_request *request)
@@ -414,10 +431,11 @@ static gboolean send_message_get_recipients(DBusMessageIter *top_iter,
}
static gboolean send_message_get_attachments(DBusMessageIter *top_iter,
- struct mms_message *msg)
+ struct mms_message *msg, struct mms_service *service)
{
DBusMessageIter attachments;
unsigned int attach_num = 0;
+ int attach_total_size = 0;
dbus_message_iter_recurse(top_iter, &attachments);
@@ -430,8 +448,10 @@ static gboolean send_message_get_attachments(DBusMessageIter *top_iter,
struct mms_attachment *attach;
void *ptr;
- if (++attach_num > MAX_ATTACHMENTS_NUMBER)
+ if (++attach_num > MAX_ATTACHMENTS_NUMBER) {
+ mms_error("Error: Too many attachments!");
return FALSE;
+ }
dbus_message_iter_recurse(&attachments, &entry);
@@ -466,6 +486,16 @@ static gboolean send_message_get_attachments(DBusMessageIter *top_iter,
return FALSE;
}
+ attach_total_size = attach_total_size + attach->length;
+
+ mms_debug("Total attachment size: %d", attach_total_size);
+ mms_debug("Maximum Attachment Total Size (in bytes): %d", service->max_attach_total_size);
+
+ if (attach_total_size > service->max_attach_total_size) {
+ mms_error("Error: Total Attachment size too large!");
+ return FALSE;
+ }
+
attach->data = ptr;
attach->content_id = g_strdup(id);
@@ -490,7 +520,7 @@ static gboolean send_message_get_attachments(DBusMessageIter *top_iter,
}
static gboolean send_message_get_args(DBusMessage *dbus_msg,
- struct mms_message *msg)
+ struct mms_message *msg, struct mms_service *service)
{
DBusMessageIter top_iter;
const char *smil;
@@ -536,7 +566,7 @@ static gboolean send_message_get_args(DBusMessage *dbus_msg,
if (dbus_message_iter_get_arg_type(&top_iter) != DBUS_TYPE_ARRAY)
return FALSE;
- return send_message_get_attachments(&top_iter, msg);
+ return send_message_get_attachments(&top_iter, msg, service);
}
static struct mms_request *create_request(enum mms_request_type type,
--
2.30.0
reply other threads:[~2021-02-19 1:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210219010348.2937.32968@ml01.vlan13.01.org \
--to=ofono@market.talbothome.com \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).