http: fix curl logging bug

https://codereview.appspot.com/8839043/

Author: Yaniv Inbar

google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java

@@ -872,8 +872,9 @@ public HttpResponse execute() throws IOException {
       if (loggable) {
         logger.config(logbuf.toString());
         if (curlbuf != null) {
-          curlbuf.append(" -- ");
-          curlbuf.append(urlString);
+          curlbuf.append(" -- '");
+          curlbuf.append(urlString.replaceAll("\'", "'\"'\"'"));
+          curlbuf.append("'");
           if (streamingContent != null) {
             curlbuf.append(" << $$$");
           }

google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java

@@ -19,6 +19,7 @@
 import com.google.api.client.testing.http.MockHttpUnsuccessfulResponseHandler;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
+import com.google.api.client.testing.util.LogRecordingHandler;
 import com.google.api.client.util.Key;
 import com.google.api.client.util.LoggingStreamingContent;
 import com.google.api.client.util.StringUtils;
@@ -41,6 +42,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
 
 /**
  * Tests {@link HttpRequest}.
@@ -951,4 +953,22 @@ public void testExecute_redirectWithIncorrectContentRetryableSetting() throws Ex
     assertEquals(200, resp.getStatusCode());
     assertEquals(2, fakeTransport.lowLevelExecCalls);
   }
+
+  public void testExecute_curlLogger() throws Exception {
+    LogRecordingHandler recorder = new LogRecordingHandler();
+    HttpTransport.LOGGER.setLevel(Level.CONFIG);
+    HttpTransport.LOGGER.addHandler(recorder);
+    new MockHttpTransport().createRequestFactory()
+        .buildGetRequest(new GenericUrl("http://google.com/#q=a'b'c")).execute();
+    boolean found = false;
+    for (String message : recorder.messages()) {
+      if (message.startsWith("curl")) {
+        found = true;
+        assertEquals("curl -v --compressed -H 'Accept-Encoding: gzip' -H 'User-Agent: "
+            + HttpRequest.USER_AGENT_SUFFIX + "' -- 'http://google.com/#q=a'\"'\"'b'\"'\"'c'",
+            message);
+      }
+    }
+    assertTrue(found);
+  }
 }