Merge pull request #850 from dmikusa-pivotal/main

Add basic auth support when using APPD_CONF_HTTP_URL to fetch configuration from a remote server.

Author: ekcasey

lib/java_buildpack/framework/app_dynamics_agent.rb

@@ -148,7 +148,11 @@ def check_if_resource_exists(resource_uri, conf_file)
         begin
           opts = { use_ssl: true } if resource_uri.scheme == 'https'
           response = Net::HTTP.start(resource_uri.host, resource_uri.port, opts) do |http|
-            http.request_head(resource_uri)
+            req = Net::HTTP::Head.new(resource_uri)
+            if resource_uri.user != '' || resource_uri.password != ''
+              req.basic_auth(resource_uri.user, resource_uri.password)
+            end
+            http.request(req)
           end
         rescue StandardError => e
           @logger.error { "Request failure: #{e.message}" }

spec/java_buildpack/framework/app_dynamics_agent_spec.rb

@@ -190,6 +190,29 @@
         end
       end
 
+      context do
+        let(:environment) { { 'APPD_CONF_HTTP_URL' => 'https://user:[email protected]' } }
+
+        it 'sets APPD_CONF_HTTP_URL env var to download config files over HTTPS with Basic Auth',
+           cache_fixture: 'stub-app-dynamics-agent.zip' do
+
+          config_files = %w[logging/log4j2.xml logging/log4j.xml app-agent-config.xml controller-info.xml
+                            service-endpoint.xml transactions.xml custom-interceptors.xml
+                            custom-activity-correlation.xml]
+
+          config_files.each do |file|
+            allow(application_cache).to receive(:get)
+              .with("https://user:[email protected]/java/#{file}")
+            allow(Net::HTTP).to receive(:start).with('foo.com', 443, use_ssl: true).and_call_original
+            stub_request(:head, "https://foo.com/java/#{file}")
+              .with(headers: { 'Accept' => '*/*', 'Host' => 'foo.com', 'User-Agent' => 'Ruby',
+                               'Authorization' => 'Basic dXNlcjpwYXNz' })
+              .to_return(status: 200, body: '', headers: {})
+          end
+          component.compile
+        end
+      end
+
       context do
 
         let(:environment) { { 'APPD_CONF_DIR' => 'BOOT-INF/classes/appdynamics/conf' } }