Mitmproxy process stop fix; rest-clients tests fix

Author: kiturutin

browserup-proxy-core/src/main/java/com/browserup/bup/mitmproxy/MitmProxyProcessManager.java

@@ -122,6 +122,7 @@ public void stop() {
 
     if (startedProcess != null) {
       Process process = startedProcess.getProcess();
+      process.children().forEach(ProcessHandle::destroy);
       process.destroy();
       Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> !process.isAlive());
     }

browserup-proxy-core/src/main/resources/mitmproxy/http_connect_capture.py

@@ -141,13 +141,17 @@ def error(self, flow):
 
         self.har_dump_addon.populate_har_entry_with_default_response(flow)
 
-        if 'Name or service not known' in str(original_error):
+        if self.is_dns_resolution_error(str(original_error)):
             self.proxy_to_server_resolution_failed(flow, req_host_port, original_error)
         elif isinstance(original_error, TcpTimeout):
             self.server_to_proxy_response_timed_out(flow, req_host_port, original_error)
         else:
             self.proxy_to_server_connection_failed(flow, original_error)
 
+    def is_dns_resolution_error(self, error_msg):
+        return 'getaddrinfo failed' in error_msg \
+               or 'Name or service not known' in error_msg
+
     # Populate data
 
     def populate_dns_timings(self, flow):

browserup-proxy-rest-clients/src/test/groovy/com/browserup/bup/ruby/RubyClientTest.groovy

@@ -58,13 +58,16 @@ class RubyClientTest extends WithRunningProxyRestTest {
         container = new GenericContainer(
                 new ImageFromDockerfile()
                         .withDockerfile(Paths.get(dockerfile.path)))
-                        .withEnv('PROXY_REST_HOST', 'host.testcontainers.internal')
-                        .withEnv('PROXY_REST_PORT', restServer.connectors[0].localPort as String)
-                        .withEnv('PROXY_PORT', proxy.port as String)
+                .withEnv('PROXY_REST_HOST', 'host.testcontainers.internal')
+                .withEnv('PROXY_REST_PORT', restServer.connectors[0].localPort as String)
+                .withEnv('PROXY_PORT', proxy.port as String)
 
         container.start()
+        container.followOutput({
+            LOG.debug('Container log: ' + it.utf8String)
+        })
 
-        Awaitility.await().atMost(10, TimeUnit.SECONDS).until({-> !container.isRunning()})
+        Awaitility.await().atMost(10, TimeUnit.SECONDS).until({ -> !container.isRunning() })
 
         LOG.info('Docker log: ' + container.getLogs())
 

browserup-proxy-rest-clients/src/test/javascript/test/javascript_test.js

@@ -7,10 +7,10 @@ var port = process.env.PROXY_PORT;
 var urlPattern = ".*";
 var callback = function(error, data, response) {
     if (error) {
-        console.error(error);
+        console.error('Error while calling API: ' + JSON.stringify(error));
         throw new Error(error);
     } else {
-        console.log('API called successfully. Returned data: ' + data);
+        console.log('API called successfully. Returned data: ' + JSON.stringify(data));
     }
 };
-api.entries(port, urlPattern, callback);
+api.entries(port, urlPattern, callback);

browserup-proxy-rest-clients/src/test/ruby/Dockerfile

@@ -14,7 +14,9 @@ RUN gem install ./openapi_client-1.0.0.gem
 COPY . /ruby/
 WORKDIR /ruby/
 
+RUN gem install bundler
+RUN bundle update --bundler
 RUN bundle config --delete frozen
 RUN bundle install
 
-CMD ["bundle", "exec", "rspec", "--backtrace"]
+CMD ["bundle", "exec", "rspec", "--backtrace"]