TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 15:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sanitize sticker URL inputs.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-06-07 15:44:21 -04:00
parent 967e9dd9a7
commit 99848f98d3
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/thoughtcrime/securesms/stickers/StickerUrl.java
View File

@ -5,6 +5,8 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import com.google.android.gms.common.util.Hex;
import org.whispersystems.libsignal.util.Pair; import org.whispersystems.libsignal.util.Pair;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
@ -24,7 +26,7 @@ public class StickerUrl {
String packId = uri.getQueryParameter("pack_id"); String packId = uri.getQueryParameter("pack_id");
String packKey = uri.getQueryParameter("pack_key"); String packKey = uri.getQueryParameter("pack_key");
if (TextUtils.isEmpty(packId) || TextUtils.isEmpty(packKey)) { if (TextUtils.isEmpty(packId) || TextUtils.isEmpty(packKey) || !isValidHex(packId) || !isValidHex(packKey)) {
return Optional.absent(); return Optional.absent();
} }
@ -45,7 +47,12 @@ public class StickerUrl {
Matcher matcher = STICKER_URL_PATTERN.matcher(url); Matcher matcher = STICKER_URL_PATTERN.matcher(url);
if (matcher.matches() && matcher.groupCount() == 2) { if (matcher.matches() && matcher.groupCount() == 2) {
return Optional.of(new Pair<>(matcher.group(1), matcher.group(2))); String packId = matcher.group(1);
String packKey = matcher.group(2);
if (isValidHex(packId) && isValidHex(packKey)) {
return Optional.of(new Pair<>(packId, packKey));
}
} }
return Optional.absent(); return Optional.absent();
@ -54,4 +61,13 @@ public class StickerUrl {
public static String createShareLink(@NonNull String packId, @NonNull String packKey) { public static String createShareLink(@NonNull String packId, @NonNull String packKey) {
return "https://signal.org/addstickers/#pack_id=" + packId + "&pack_key=" + packKey; return "https://signal.org/addstickers/#pack_id=" + packId + "&pack_key=" + packKey;
} }
private static boolean isValidHex(String value) {
try {
Hex.stringToBytes(value);
return true;
} catch (Exception e) {
return false;
}
}
} }