From 4154119ea53212020888f9c5b42266ad4f18deb6 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 7 Feb 2014 22:02:02 +0000
Subject: [PATCH] Convert to and from UTF-8 without catching impossible
exceptions.
All JVMs must support UTF-8 encoding.
---
briar-api/src/org/briarproject/api/Author.java | 12 ++++--------
.../src/org/briarproject/api/messaging/Group.java | 12 ++++--------
.../briarproject/messaging/MessageFactoryImpl.java | 3 ++-
.../src/org/briarproject/serial/ReaderImpl.java | 3 ++-
.../src/org/briarproject/serial/WriterImpl.java | 3 ++-
.../org/briarproject/plugins/modem/ModemImpl.java | 1 +
6 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/briar-api/src/org/briarproject/api/Author.java b/briar-api/src/org/briarproject/api/Author.java
index 0ff392f9f9..5c77dad608 100644
--- a/briar-api/src/org/briarproject/api/Author.java
+++ b/briar-api/src/org/briarproject/api/Author.java
@@ -2,7 +2,7 @@ package org.briarproject.api;
import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
/** A pseudonym for a user. */
public class Author {
@@ -14,13 +14,9 @@ public class Author {
private final byte[] publicKey;
public Author(AuthorId id, String name, byte[] publicKey) {
- if(name.length() == 0) throw new IllegalArgumentException();
- try {
- if(name.getBytes("UTF-8").length > MAX_AUTHOR_NAME_LENGTH)
- throw new IllegalArgumentException();
- } catch(UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
+ int length = name.getBytes(Charset.forName("UTF-8")).length;
+ if(length == 0 || length > MAX_AUTHOR_NAME_LENGTH)
+ throw new IllegalArgumentException();
this.id = id;
this.name = name;
this.publicKey = publicKey;
diff --git a/briar-api/src/org/briarproject/api/messaging/Group.java b/briar-api/src/org/briarproject/api/messaging/Group.java
index b7662e276d..20488c021d 100644
--- a/briar-api/src/org/briarproject/api/messaging/Group.java
+++ b/briar-api/src/org/briarproject/api/messaging/Group.java
@@ -3,7 +3,7 @@ package org.briarproject.api.messaging;
import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
/** A group to which users may subscribe. */
public class Group {
@@ -13,13 +13,9 @@ public class Group {
private final byte[] salt;
public Group(GroupId id, String name, byte[] salt) {
- if(name.length() == 0) throw new IllegalArgumentException();
- try {
- if(name.getBytes("UTF-8").length > MAX_GROUP_NAME_LENGTH)
- throw new IllegalArgumentException();
- } catch(UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
+ int length = name.getBytes(Charset.forName("UTF-8")).length;
+ if(length == 0 || length > MAX_GROUP_NAME_LENGTH)
+ throw new IllegalArgumentException();
if(salt.length != GROUP_SALT_LENGTH)
throw new IllegalArgumentException();
this.id = id;
diff --git a/briar-core/src/org/briarproject/messaging/MessageFactoryImpl.java b/briar-core/src/org/briarproject/messaging/MessageFactoryImpl.java
index f32905e533..4b144ad5b3 100644
--- a/briar-core/src/org/briarproject/messaging/MessageFactoryImpl.java
+++ b/briar-core/src/org/briarproject/messaging/MessageFactoryImpl.java
@@ -31,6 +31,7 @@ import org.briarproject.api.serial.DigestingConsumer;
import org.briarproject.api.serial.SigningConsumer;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
+import org.briarproject.util.StringUtils;
class MessageFactoryImpl implements MessageFactory {
@@ -68,7 +69,7 @@ class MessageFactoryImpl implements MessageFactory {
// Validate the arguments
if((author == null) != (privateKey == null))
throw new IllegalArgumentException();
- if(contentType.getBytes("UTF-8").length > MAX_CONTENT_TYPE_LENGTH)
+ if(StringUtils.toUtf8(contentType).length > MAX_CONTENT_TYPE_LENGTH)
throw new IllegalArgumentException();
if(body.length > MAX_BODY_LENGTH)
throw new IllegalArgumentException();
diff --git a/briar-core/src/org/briarproject/serial/ReaderImpl.java b/briar-core/src/org/briarproject/serial/ReaderImpl.java
index b8710776f6..4398485dc9 100644
--- a/briar-core/src/org/briarproject/serial/ReaderImpl.java
+++ b/briar-core/src/org/briarproject/serial/ReaderImpl.java
@@ -21,6 +21,7 @@ import static org.briarproject.serial.Tag.TRUE;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
@@ -234,7 +235,7 @@ class ReaderImpl implements Reader {
if(length < 0 || length > maxLength) throw new FormatException();
if(length == 0) return "";
readIntoBuffer(length, true);
- return new String(buf, 0, length, "UTF-8");
+ return new String(buf, 0, length, Charset.forName("UTF-8"));
}
private int readStringLength(boolean consume) throws IOException {
diff --git a/briar-core/src/org/briarproject/serial/WriterImpl.java b/briar-core/src/org/briarproject/serial/WriterImpl.java
index 45995cdb0e..5555573a8d 100644
--- a/briar-core/src/org/briarproject/serial/WriterImpl.java
+++ b/briar-core/src/org/briarproject/serial/WriterImpl.java
@@ -16,6 +16,7 @@ import static org.briarproject.serial.Tag.TRUE;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -102,7 +103,7 @@ class WriterImpl implements Writer {
}
public void writeString(String s) throws IOException {
- byte[] b = s.getBytes("UTF-8");
+ byte[] b = s.getBytes(Charset.forName("UTF-8"));
if(b.length <= Byte.MAX_VALUE) {
write(STRING_8);
write((byte) b.length);
diff --git a/briar-desktop/src/org/briarproject/plugins/modem/ModemImpl.java b/briar-desktop/src/org/briarproject/plugins/modem/ModemImpl.java
index 52817c7320..45fec1e13a 100644
--- a/briar-desktop/src/org/briarproject/plugins/modem/ModemImpl.java
+++ b/briar-desktop/src/org/briarproject/plugins/modem/ModemImpl.java
@@ -307,6 +307,7 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
for(int i = 0; i < b.length; i++) {
line[lineLen] = b[i];
if(b[i] == '\n') {
+ // FIXME: Use CharsetDecoder to catch invalid ASCII
String s = new String(line, 0, lineLen, "US-ASCII").trim();
lineLen = 0;
if(LOG.isLoggable(INFO)) LOG.info("Modem status: " + s);
--
GitLab