Skip to content

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

Fix sanitization of contact phone numbers

Acho Arnoldcad3d7eb8c55
diff --git a/api/pkg/requests/message_call_missed_request.go b/api/pkg/requests/message_call_missed_request.go
index bc9e832f..1f880775 100644
--- a/api/pkg/requests/message_call_missed_request.go
+++ b/api/pkg/requests/message_call_missed_request.go
@@ -22,7 +22,7 @@ type MessageCallMissed struct {
// Sanitize sets defaults to MessageReceive
func (input *MessageCallMissed) Sanitize() MessageCallMissed {
input.To = input.sanitizeAddress(input.To)
- input.From = input.sanitizeAddress(input.From)
+ input.From = input.sanitizeContact(input.To, input.From)
input.SIM = input.sanitizeSIM(input.SIM)
return *input
diff --git a/api/pkg/requests/message_receive_request.go b/api/pkg/requests/message_receive_request.go
index 82bcf9f7..f592761c 100644
--- a/api/pkg/requests/message_receive_request.go
+++ b/api/pkg/requests/message_receive_request.go
@@ -28,7 +28,7 @@ type MessageReceive struct {
// Sanitize sets defaults to MessageReceive
func (input *MessageReceive) Sanitize() MessageReceive {
input.To = input.sanitizeAddress(input.To)
- input.From = input.sanitizeAddress(input.From)
+ input.From = input.sanitizeContact(input.To, input.From)
if strings.TrimSpace(string(input.SIM)) == "" || input.SIM == ("DEFAULT") {
input.SIM = entities.SIM1
}
diff --git a/api/pkg/requests/request.go b/api/pkg/requests/request.go
index 9e58117f..e570d2ac 100644
--- a/api/pkg/requests/request.go
+++ b/api/pkg/requests/request.go
@@ -26,6 +26,25 @@ func (input *request) sanitizeAddress(value string) string {
return value
}
+func (input *request) sanitizeContact(owner string, contact string) string {
+ contact = strings.TrimSpace(contact)
+
+ if len(contact) < 8 || !input.isDigits(contact) {
+ return contact
+ }
+
+ regionPhoneNumber, err := phonenumbers.Parse(owner, phonenumbers.UNKNOWN_REGION)
+ if err != nil {
+ return contact
+ }
+
+ if number, err := phonenumbers.Parse(contact, phonenumbers.GetRegionCodeForNumber(regionPhoneNumber)); err == nil {
+ contact = phonenumbers.Format(number, phonenumbers.E164)
+ }
+
+ return contact
+}
+
// sanitizeBool sanitizes a boolean string
func (input *request) sanitizeBool(value string) string {
value = strings.TrimSpace(value)