Merge pull request #269 from pusher/investigate-decryption-failures

2.2.2 - Fix decryption failures

Author: daniellevass

CHANGELOG.md

@@ -1,5 +1,9 @@
 # pusher-websocket-java changelog
 
+### Version 2.2.2 - 6th July 2020
+
+* Fixed an issue where some private encrypted messages were not decrypted accurately by swapping our implementation of SecretBoxOpener for one provided by [Lazy Sodium](https://github.com/terl/lazysodium-java)
+
 ### Version 2.2.1 - 22nd April 2020
 
 * Changed PusherOptions `setForceTLS` and `isForceTLS` to `setUseTLS` and `isUseTLS` to align with the other client SDKs.

README.md

@@ -61,7 +61,7 @@ The pusher-java-client is available in Maven Central.
     <dependency>
       <groupId>com.pusher</groupId>
       <artifactId>pusher-java-client</artifactId>
-      <version>2.2.1</version>
+      <version>2.2.2</version>
     </dependency>
 </dependencies>
 ```
@@ -70,7 +70,7 @@ The pusher-java-client is available in Maven Central.
 
 ```groovy
 dependencies {
-  compile 'com.pusher:pusher-java-client:2.2.1'
+  compile 'com.pusher:pusher-java-client:2.2.2'
 }
 ```
 

build.gradle

@@ -22,7 +22,7 @@ apply plugin: 'signing'
 apply plugin: 'jacoco'
 
 group = "com.pusher"
-version = "2.2.1"
+version = "2.2.2"
 sourceCompatibility = "1.8"
 targetCompatibility = "1.8"
 
@@ -40,12 +40,16 @@ ext.sharedManifest = manifest {
 
 repositories {
 	mavenCentral()
+	jcenter()
 }
 
 dependencies {
 	compile "com.google.code.gson:gson:2.2.2"
 	compile "org.java-websocket:Java-WebSocket:1.4.0"
 
+	implementation "com.goterl.lazycode:lazysodium-java:4.2.6"
+	implementation "net.java.dev.jna:jna:5.5.0"
+
 	testCompile "org.mockito:mockito-all:1.8.5"
 	testCompile "org.powermock:powermock-module-junit4:1.4.11"
 	testCompile "org.powermock:powermock-api-mockito:1.4.11"
@@ -202,3 +206,10 @@ jacocoTestReport {
 	reports.html.enabled = false
 	reports.csv.enabled = false
 }
+
+// Test Logging - https://stackoverflow.com/a/42425815/2623314
+test {
+	testLogging {
+		showStandardStreams = true
+	}
+}

src/main/java/com/pusher/client/channel/impl/PrivateEncryptedChannelImpl.java

@@ -181,9 +181,9 @@ private PusherEvent decryptMessage(String message) {
         final EncryptedReceivedData encryptedReceivedData =
                 GSON.fromJson((String)receivedMessage.get("data"), EncryptedReceivedData.class);
 
-        String decryptedData = new String(secretBoxOpener.open(
+        String decryptedData = secretBoxOpener.open(
                 encryptedReceivedData.getCiphertext(),
-                encryptedReceivedData.getNonce()));
+                encryptedReceivedData.getNonce());
 
         receivedMessage.replace("data", decryptedData);