Added ability to sign requests with OAuth

.gitignore

@@ -1,2 +1,5 @@
+.classpath
+.project
+.settings
 target
 jcurl-all.jar

pom.xml

@@ -125,7 +125,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.4</version>
+            <version>1.18.12</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -168,10 +168,15 @@
             <artifactId>jopt-simple</artifactId>
             <version>4.9</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.10</version>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
+            <version>2.7</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -300,6 +305,11 @@
             <artifactId>jetty-client</artifactId>
             <version>9.3.7.v20160115</version>
         </dependency>
+        <dependency>
+            <groupId>oauth.signpost</groupId>
+            <artifactId>signpost-core</artifactId>
+            <version>1.2.1.1</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/JCurl.java

@@ -43,6 +43,14 @@ public static void main(String[] args) throws Exception {
     final OptionSpec<String> headerSpec;
     @NonNull
     final OptionSpec<String> engineOptionSpec;
+    @NonNull
+    final OptionSpec<String> consumerKeySpec;
+    @NonNull
+    final OptionSpec<String> consumerSecretSpec;
+    @NonNull
+    final OptionSpec<String> userTokenSpec;
+    @NonNull
+    final OptionSpec<String> userSecretSpec;
 
     public JCurl() {
         parser = new OptionParser();
@@ -67,6 +75,22 @@ public JCurl() {
             )
             .withRequiredArg()
             .ofType(String.class);
+        consumerKeySpec = parser
+            .acceptsAll(asList("consumerKey", "ck"), "OAuth consumer key")
+            .withRequiredArg()
+            .ofType(String.class);
+        consumerSecretSpec = parser
+            .acceptsAll(asList("consumerSecret", "cs"), "OAuth consumer secret")
+            .withRequiredArg()
+            .ofType(String.class);
+        userTokenSpec = parser
+            .acceptsAll(asList("userToken", "ut"), "OAuth user token")
+            .withRequiredArg()
+            .ofType(String.class);
+        userSecretSpec = parser
+            .acceptsAll(asList("userSecret", "us"), "OAuth user secret")
+            .withRequiredArg()
+            .ofType(String.class);
     }
 
     public ResponseEntity<String> execute(String... args) throws Exception {
@@ -109,6 +133,15 @@ public ResponseEntity<String> execute(String... args) throws Exception {
             }
         }
 
+        if (optionSet.has("consumerKey") && optionSet.has("consumerSecret")) {
+            options.setOAuthConsumerCredentials(new OAuthConsumerCredentials(optionSet.valueOf(consumerKeySpec),
+                    optionSet.valueOf(consumerSecretSpec)));
+        }
+        if (optionSet.has("userToken") && optionSet.has("userSecret")) {
+            options.setOAuthUserCredentials(
+                    new OAuthUserCredentials(optionSet.valueOf(userTokenSpec), optionSet.valueOf(userSecretSpec)));
+        }
+
         return engineType.getEngine().submit(options);
     }
 

src/main/java/JCurlRequestOptions.java

@@ -34,6 +34,8 @@ public class JCurlRequestOptions {
     private boolean parallel = false;
     private int count = 1;
     private final Map<String, String> headerMap = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+    private OAuthConsumerCredentials oAuthConsumerCredentials;
+    private OAuthUserCredentials oAuthUserCredentials;
 
     public JCurlRequestOptions() {
         headerMap.put("User-Agent", USER_AGENT);

src/main/java/OAuthConsumerCredentials.java

@@ -0,0 +1,9 @@
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@AllArgsConstructor
+@Data
+public class OAuthConsumerCredentials {
+    private String consumerKey;
+    private String consumerSecret;
+}

src/main/java/OAuthUserCredentials.java

@@ -0,0 +1,17 @@
+import java.util.HashMap;
+import java.util.Map;
+import java.util.SortedSet;
+
+import lombok.Data;
+
+@Data
+public class OAuthUserCredentials {
+    private String userToken;
+    private String userTokenSecret;
+    private Map<String, SortedSet<String>> userParameters = new HashMap<>();
+
+    public OAuthUserCredentials(String userToken, String userSecret) {
+	this.userToken = userToken;
+	this.userTokenSecret = userSecret;
+    }
+}

src/main/java/UrlEngine.java

@@ -15,19 +15,29 @@
  */
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
+import oauth.signpost.OAuth;
+import oauth.signpost.OAuthConsumer;
+import oauth.signpost.basic.DefaultOAuthConsumer;
+import oauth.signpost.http.HttpParameters;
+
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Map;
+import java.util.Random;
+import java.util.SortedSet;
 
 /**
  * @author Erich Eichinger
  * @since 01/03/2016
  */
 public class UrlEngine implements Engine {
+    private Random random = new Random();
+
     @Override
     public ResponseEntity<String> submit(JCurlRequestOptions requestOptions) throws Exception {
         System.setProperty("http.keepAlive", "true");
@@ -37,6 +47,29 @@ public ResponseEntity<String> submit(JCurlRequestOptions requestOptions) throws
 
         for (int i=0;i< requestOptions.getCount();i++) {
             HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+            OAuthConsumerCredentials oAuthConsumerCredentials = requestOptions.getOAuthConsumerCredentials();
+            if (oAuthConsumerCredentials != null) {
+                OAuthConsumer consumer = new DefaultOAuthConsumer(oAuthConsumerCredentials.getConsumerKey(),
+                        oAuthConsumerCredentials.getConsumerSecret());
+                OAuthUserCredentials oAuthUserCredentials = requestOptions.getOAuthUserCredentials();
+                if (oAuthUserCredentials != null) {
+                    consumer.setTokenWithSecret(oAuthUserCredentials.getUserToken(),
+                            oAuthUserCredentials.getUserTokenSecret());
+                    HttpParameters parameters = new HttpParameters();
+                    for (Map.Entry<String, SortedSet<String>> parameterEntry : oAuthUserCredentials.getUserParameters()
+                            .entrySet()) {
+                        parameters.put(parameterEntry.getKey(), parameterEntry.getValue());
+                    }
+                    if (!parameters.containsKey(OAuth.OAUTH_NONCE)) {
+                        String nonce = generateNonce();
+                        if (StringUtils.isNotBlank(nonce)) {
+                            parameters.put(OAuth.OAUTH_NONCE, nonce, true);
+                        }
+                    }
+                    consumer.setAdditionalParameters(parameters);
+                }
+                consumer.sign(con);
+            }
 
             // add request header
             con.setRequestMethod("GET");
@@ -46,10 +79,11 @@ public ResponseEntity<String> submit(JCurlRequestOptions requestOptions) throws
             }
 
             System.out.println("\nSending 'GET' request to URL : " + requestOptions.getUrl());
+            long startTime = System.currentTimeMillis();
             con.connect();
 
             int responseCode = con.getResponseCode();
-            System.out.println("Response Code : " + responseCode);
+            System.out.println("Response Code : " + responseCode + "    Total Time: " + (System.currentTimeMillis() - startTime));
 
             final InputStream is = con.getInputStream();
             String response = IOUtils.toString(is);
@@ -63,4 +97,12 @@ public ResponseEntity<String> submit(JCurlRequestOptions requestOptions) throws
         return responseEntity;
     }
 
+    private String generateNonce() {
+        String nonce = null;
+        if (this.random != null) {
+            nonce = Long.toString(this.random.nextLong());
+        }
+        return nonce;
+    }
+
 }