Fix okhttp and version extraction

Author: alexivsn

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.securenative.java</groupId>
     <artifactId>securenative-java</artifactId>
     <packaging>jar</packaging>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <url>https://github.com/securenative/securenative-java</url>
 
     <name>${project.groupId}:${project.artifactId}:${project.version}</name>
@@ -133,7 +133,7 @@
        <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.1.0</version>
+            <version>3.14.8</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -156,7 +156,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>4.0.0</version>
+            <version>3.14.8</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -200,6 +200,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>

src/main/java/com/securenative/http/SecureNativeHTTPClient.java

@@ -36,7 +36,7 @@ public SecureNativeHTTPClient(SecureNativeOptions options) {
 
     @Override
     public HttpResponse post(String path, String payload) throws IOException {
-        RequestBody body = RequestBody.create(payload, JSON_MEDIA_TYPE);
+        RequestBody body = RequestBody.create(JSON_MEDIA_TYPE, payload);
 
         String url = String.format("%s/%s", this.options.getApiUrl(), path);
 

src/main/java/com/securenative/utils/VersionUtils.java

@@ -2,21 +2,53 @@
 
 import com.securenative.ResourceStream;
 import com.securenative.ResourceStreamImpl;
+import com.securenative.SecureNative;
+import com.securenative.config.ConfigurationManager;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 
+import java.io.InputStream;
+import java.util.Properties;
+
 public class VersionUtils {
     private static ResourceStream resourceStream = new ResourceStreamImpl();
 
-    public static String getVersion() {
+    public static void setResourceStream(ResourceStream resourceStream) {
+        VersionUtils.resourceStream = resourceStream;
+    }
+
+    public static synchronized String getVersion() {
+        String version = null;
+
+        // try to load from maven properties first
         try {
-            MavenXpp3Reader reader = new MavenXpp3Reader();
-            String POM_RESOURCE = "/META-INF/maven/com.securenative.java/pom.xml";
-            Model read = reader.read(resourceStream.getInputStream(POM_RESOURCE));
-            return read.getParent().getVersion();
+            Properties p = new Properties();
+            InputStream is = resourceStream.getInputStream("/META-INF/maven/com.securenative.java/securenative-java/pom.properties");
+            if (is != null) {
+                p.load(is);
+                version = p.getProperty("version", "");
+            }
         } catch (Exception e) {
-            return "unknown";
+            // ignore
         }
+
+        // fallback to using Java API
+        if (version == null) {
+            Package aPackage = VersionUtils.class.getPackage();
+            if (aPackage != null) {
+                version = aPackage.getImplementationVersion();
+                if (version == null) {
+                    version = aPackage.getSpecificationVersion();
+                }
+            }
+        }
+
+        if (version == null) {
+            // we could not compute the version so use a blank
+            version = "unknown";
+        }
+
+        return version;
     }
 }
 

src/test/java/com/securenative/utils/VersionTest.java

@@ -1,25 +1,35 @@
 package com.securenative.utils;
 
+import com.securenative.ResourceStreamImpl;
+import com.securenative.config.ConfigurationManager;
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
+import java.io.InputStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class VersionTest {
 
     @Test
-    public void testManifest() throws IOException {
-        URL res = org.junit.Assert.class.getResource(org.junit.Assert.class.getSimpleName() + ".class");
-        JarURLConnection conn = (JarURLConnection) res.openConnection();
-        Manifest mf = conn.getManifest();
-
-        Attributes atts = mf.getMainAttributes();
-        for (Object v : atts.values()) {
-            System.out.println(v);
-        }
+    public void testVersionExtraction() throws IOException {
+
+        String props = String.join(System.getProperty("line.separator"),
+                "version=1.0.0",
+                        "groupId=com.securenative.java",
+                        "artifactId=securenative-java");
+
+        InputStream inputStream = new ByteArrayInputStream(props.getBytes());
+        ResourceStreamImpl resourceStream = Mockito.spy(new ResourceStreamImpl());
+        Mockito.when(resourceStream.getInputStream("/META-INF/maven/com.securenative.java/securenative-java/pom.properties")).thenReturn(inputStream);
+
+        VersionUtils.setResourceStream(resourceStream);
+
+        assertThat(VersionUtils.getVersion()).isEqualTo("1.0.0");
+
+        // restore resource stream
+        VersionUtils.setResourceStream(new ResourceStreamImpl());
     }
 }