Windy/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2025-01-08 11:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Escape SMS JSON strings

Browse Source
This commit is contained in:
Anton Tananaev 2024-09-19 21:34:49 -07:00
parent 9c49ad3ecd
commit 66b538f036
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/traccar/sms/HttpSmsClient.java
View File

@ -16,6 +16,7 @@
*/
package org.traccar.sms;
import com.fasterxml.jackson.core.io.JsonStringEncoder;
import org.traccar.config.Config;
import org.traccar.config.Keys;
import org.traccar.helper.DataConverter;
@ -37,7 +38,6 @@ public class HttpSmsClient implements SmsManager {
private final String authorizationHeader;
private final String authorization;
private final String template;
private final boolean encode;
private final MediaType mediaType;
public HttpSmsClient(Config config, Client client) {
@ -58,25 +58,28 @@ public class HttpSmsClient implements SmsManager {
}
template = config.getString(Keys.SMS_HTTP_TEMPLATE).trim();
if (template.charAt(0) == '<') {
encode = false;
mediaType = MediaType.APPLICATION_XML_TYPE;
} else if (template.charAt(0) == '{' || template.charAt(0) == '[') {
encode = false;
mediaType = MediaType.APPLICATION_JSON_TYPE;
} else {
encode = true;
mediaType = MediaType.APPLICATION_FORM_URLENCODED_TYPE;
}
}
private String prepareValue(String value) throws UnsupportedEncodingException {
return encode ? URLEncoder.encode(value, StandardCharsets.UTF_8) : value;
if (mediaType == MediaType.APPLICATION_FORM_URLENCODED_TYPE) {
return URLEncoder.encode(value, StandardCharsets.UTF_8);
}
if (mediaType == MediaType.APPLICATION_JSON_TYPE) {
return new String(JsonStringEncoder.getInstance().quoteAsString(value));
}
return value;
}
private String preparePayload(String destAddress, String message) {
private String preparePayload(String phone, String message) {
try {
return template
.replace("{phone}", prepareValue(destAddress))
.replace("{phone}", prepareValue(phone))
.replace("{message}", prepareValue(message));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
@ -92,9 +95,9 @@ public class HttpSmsClient implements SmsManager {
}
@Override
public void sendMessage(String destAddress, String message, boolean command) throws MessageException {
public void sendMessage(String phone, String message, boolean command) throws MessageException {
try (Response response = getRequestBuilder()
.post(Entity.entity(preparePayload(destAddress, message), mediaType))) {
.post(Entity.entity(preparePayload(phone, message), mediaType))) {
if (response.getStatus() / 100 != 2) {
throw new MessageException(response.readEntity(String.class));
}

2
src/main/java/org/traccar/sms/SmsManager.java
View File

@ -20,6 +20,6 @@ import org.traccar.notification.MessageException;
public interface SmsManager {
void sendMessage(String destAddress, String message, boolean command) throws MessageException;
void sendMessage(String phone, String message, boolean command) throws MessageException;
}

14
src/main/java/org/traccar/sms/SnsSmsClient.java
View File

@ -47,15 +47,19 @@ public class SnsSmsClient implements SmsManager {
}
@Override
public void sendMessage(String destAddress, String message, boolean command) {
public void sendMessage(String phone, String message, boolean command) {
Map<String, MessageAttributeValue> smsAttributes = new HashMap<>();
smsAttributes.put("AWS.SNS.SMS.SenderID",
smsAttributes.put(
"AWS.SNS.SMS.SenderID",
new MessageAttributeValue().withStringValue("SNS").withDataType("String"));
smsAttributes.put("AWS.SNS.SMS.SMSType",
smsAttributes.put(
"AWS.SNS.SMS.SMSType",
new MessageAttributeValue().withStringValue("Transactional").withDataType("String"));
PublishRequest publishRequest = new PublishRequest().withMessage(message)
.withPhoneNumber(destAddress).withMessageAttributes(smsAttributes);
PublishRequest publishRequest = new PublishRequest()
.withMessage(message)
.withPhoneNumber(phone)
.withMessageAttributes(smsAttributes);
snsClient.publishAsync(publishRequest, new AsyncHandler<>() {
@Override