Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

Added a filesize validation to make sure we're under 1.5MB

Jake Daynes8a19b1d9021c
diff --git a/android/app/src/main/java/com/httpsms/SmsManagerService.kt b/android/app/src/main/java/com/httpsms/SmsManagerService.kt
index 196c3868..59fbdad8 100644
--- a/android/app/src/main/java/com/httpsms/SmsManagerService.kt
+++ b/android/app/src/main/java/com/httpsms/SmsManagerService.kt
@@ -77,19 +77,8 @@ class SmsManagerService {
}
}
- fun sendMultimediaMessage(
- context: Context,
- pduUri: android.net.Uri,
- sim: String,
- sentIntent: PendingIntent
- ) {
+ fun sendMultimediaMessage(context: Context, pduUri: android.net.Uri, sim: String, sentIntent: PendingIntent) {
val smsManager = getSmsManager(context, sim)
- smsManager.sendMultimediaMessage(
- context,
- pduUri,
- null,
- null,
- sentIntent
- )
+ smsManager.sendMultimediaMessage(context, pduUri, null, null, sentIntent)
}
}
diff --git a/api/pkg/validators/bulk_message_handler_validator.go b/api/pkg/validators/bulk_message_handler_validator.go
index 84844392..b96829af 100644
--- a/api/pkg/validators/bulk_message_handler_validator.go
+++ b/api/pkg/validators/bulk_message_handler_validator.go
@@ -221,7 +221,7 @@ func (v *BulkMessageHandlerValidator) validateMessages(messages []*requests.Bulk
if message.AttachmentURLs != "" {
urls := strings.Split(message.AttachmentURLs, ",")
-
+
if len(urls) > 10 {
result.Add("document", fmt.Sprintf("Row [%d]: You cannot attach more than 10 files per message.", index+2))
}
@@ -237,6 +237,10 @@ func (v *BulkMessageHandlerValidator) validateMessages(messages []*requests.Bulk
result.Add("document", fmt.Sprintf("Row [%d]: The attachment URL [%s] has an invalid url format.", index+2, cleanURL))
} else if parsedURL.Scheme != "http" && parsedURL.Scheme != "https" {
result.Add("document", fmt.Sprintf("Row [%d]: The attachment URL [%s] must use http or https.", index+2, cleanURL))
+ } else {
+ if err := validateAttachmentURL(cleanURL); err != nil {
+ result.Add("attachments", fmt.Sprintf("Row [%d]: The attachment URL [%s] failed validation: %s", index+2, cleanURL, err.Error()))
+ }
}
}
}
diff --git a/api/pkg/validators/message_handler_validator.go b/api/pkg/validators/message_handler_validator.go
index 20a8ed9f..ffbdd778 100644
--- a/api/pkg/validators/message_handler_validator.go
+++ b/api/pkg/validators/message_handler_validator.go
@@ -123,6 +123,10 @@ func (validator MessageHandlerValidator) ValidateMessageSend(ctx context.Context
result.Add("attachments", fmt.Sprintf("attachment at index %d has an invalid url format", i))
} else if parsedURL.Scheme != "http" && parsedURL.Scheme != "https" {
result.Add("attachments", fmt.Sprintf("attachment at index %d must use http or https scheme", i))
+ } else {
+ if err := validateAttachmentURL(attachment.URL); err != nil {
+ result.Add("attachments", fmt.Sprintf("attachment at index %d failed validation: %s", i, err.Error()))
+ }
}
}
}
diff --git a/api/pkg/validators/validator.go b/api/pkg/validators/validator.go
index bc7111e8..bcef0a9b 100644
--- a/api/pkg/validators/validator.go
+++ b/api/pkg/validators/validator.go
@@ -2,9 +2,11 @@ package validators
import (
"fmt"
+ "net/http"
"net/url"
"regexp"
"strings"
+ "time"
"github.com/NdoleStudio/httpsms/pkg/events"
@@ -160,3 +162,32 @@ func (validator *validator) ValidateUUID(ID string, name string) url.Values {
return v.ValidateStruct()
}
+
+func validateAttachmentURL(attachmentURL string) error {
+ client := &http.Client{
+ Timeout: 5 * time.Second,
+ }
+
+ req, err := http.NewRequest(http.MethodHead, attachmentURL, nil)
+ if err != nil {
+ return fmt.Errorf("invalid url format")
+ }
+
+ resp, err := client.Do(req)
+ if err != nil {
+ return fmt.Errorf("could not reach the url")
+ }
+ defer resp.Body.Close()
+
+ if resp.StatusCode < 200 || resp.StatusCode >= 400 {
+ return fmt.Errorf("url returned an error status code: %d", resp.StatusCode)
+ }
+
+ const maxSizeBytes = 1.5 * 1024 * 1024
+
+ if resp.ContentLength > int64(maxSizeBytes) {
+ return fmt.Errorf("file size (%.2f MB) exceeds the 1.5 MB carrier limit", float64(resp.ContentLength)/(1024*1024))
+ }
+
+ return nil
+}