dependabot-gradle 0.140.0 → 0.141.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c10e93ed6824f1ff0c9a4bf32a46ba702f9d2380b577de8efa4ba066e5af07a
-  data.tar.gz: d60bad161a4809828623cc6edbe3a3d4973ac032ba08e19141d214f6699fdc2d
+  metadata.gz: 4b3e9087c952024616b39e11e395e4a923296b0cbc94ede34cda99adcf0fc5a1
+  data.tar.gz: d68d70e32d8a6c223584c486862b01fe418b434ebe9645bc4341198f27c07443
 SHA512:
-  metadata.gz: '0979a440f06b0662374bc26aac5c6bdae48bcadee99a776d1b60e29f8248957e4a161dd7522202ae96d35391f6e8a0cbd57035b5cfb835014a41d8e2047bd5ba'
-  data.tar.gz: 6fa978f1b83b930d844b8bd253a496ce4ca5476a38f9985ae1b43246b653eb84a6f1fc704d1312ebdc96a4c992d58d1a9fb3905237744ea12acaecb3bea73879
+  metadata.gz: 62989a5291d8a4d8a43ae81bfa29a7523742286b2ae459041cd5ec948de3269349feb86575dd2bdc4693008e2d054ccb4a88f4c21745d0798cee8ebd475e82dc
+  data.tar.gz: bf0021b48256c7859417a86c19084b3a33a22c447dbfebfa8ed81a574d7a5c816c6ea650d1ad3c037f7bdea52f92b88bcff787f2e97ff850b5c30801e5aebbe1

data/lib/dependabot/gradle/metadata_finder.rb

@@ -5,6 +5,7 @@ require "dependabot/metadata_finders"
 require "dependabot/metadata_finders/base"
 require "dependabot/file_fetchers/base"
 require "dependabot/gradle/file_parser/repositories_finder"
+require "dependabot/maven/utils/auth_headers_finder"
 
 module Dependabot
   module Gradle
@@ -112,7 +113,7 @@ module Dependabot
           "#{dependency.version}/"\
           "#{artifact_id}-#{dependency.version}.pom",
           idempotent: true,
-          **SharedHelpers.excon_defaults(headers: auth_details)
+          **SharedHelpers.excon_defaults(headers: auth_headers)
         )
 
         @dependency_pom_file = Nokogiri::XML(response.body)
@@ -135,7 +136,7 @@ module Dependabot
           "#{version}/"\
           "#{artifact_id}-#{version}.pom",
           idempotent: true,
-          **SharedHelpers.excon_defaults(headers: auth_details)
+          **SharedHelpers.excon_defaults(headers: auth_headers)
         )
 
         Nokogiri::XML(response.body)
@@ -170,21 +171,8 @@ module Dependabot
         plugin? && dependency.requirements.any? { |r| r.fetch(:groups).include? "kotlin" }
       end
 
-      def auth_details
-        cred =
-          credentials.select { |c| c["type"] == "maven_repository" }.
-          find do |c|
-            cred_url = c.fetch("url").gsub(%r{/+$}, "")
-            next false unless cred_url == maven_repo_url
-
-            c.fetch("username", nil)
-          end
-
-        return {} unless cred
-
-        token = cred.fetch("username") + ":" + cred.fetch("password")
-        encoded_token = Base64.encode64(token).delete("\n")
-        { "Authorization" => "Basic #{encoded_token}" }
+      def auth_headers
+        @auth_headers ||= Dependabot::Maven::Utils::AuthHeadersFinder.new(credentials).auth_headers(maven_repo_url)
       end
     end
   end

data/lib/dependabot/gradle/update_checker/version_finder.rb

@@ -6,6 +6,7 @@ require "dependabot/gradle/file_parser/repositories_finder"
 require "dependabot/gradle/update_checker"
 require "dependabot/gradle/version"
 require "dependabot/gradle/requirement"
+require "dependabot/maven/utils/auth_headers_finder"
 
 module Dependabot
   module Gradle
@@ -184,10 +185,8 @@ module Dependabot
             begin
               response = Excon.get(
                 dependency_metadata_url(repository_details.fetch("url")),
-                user: repository_details.fetch("username"),
-                password: repository_details.fetch("password"),
                 idempotent: true,
-                **SharedHelpers.excon_defaults
+                **Dependabot::SharedHelpers.excon_defaults(headers: repository_details.fetch("auth_headers"))
               )
               check_response(response, repository_details.fetch("url"))
               Nokogiri::XML(response.body)
@@ -226,10 +225,10 @@ module Dependabot
 
           @repositories =
             details.reject do |repo|
-              next if repo["password"]
+              next if repo["auth_headers"]
 
-              # Reject this entry if an identical one with a password exists
-              details.any? { |r| r["url"] == repo["url"] && r["password"] }
+              # Reject this entry if an identical one with non-empty auth_headers exists
+              details.any? { |r| r["url"] == repo["url"] && r["auth_headers"] != {} }
             end
         end
 
@@ -239,8 +238,7 @@ module Dependabot
             map do |cred|
             {
               "url" => cred.fetch("url").gsub(%r{/+$}, ""),
-              "username" => cred.fetch("username", nil),
-              "password" => cred.fetch("password", nil)
+              "auth_headers" => auth_headers(cred.fetch("url").gsub(%r{/+$}, ""))
             }
           end
         end
@@ -258,7 +256,7 @@ module Dependabot
                 target_dependency_file: target_file
               ).repository_urls.
                 map do |url|
-                  { "url" => url, "username" => nil, "password" => nil }
+                  { "url" => url, "auth_headers" => {} }
                 end
             end.uniq
         end
@@ -266,8 +264,7 @@ module Dependabot
         def plugin_repository_details
           [{
             "url" => GRADLE_PLUGINS_REPO,
-            "username" => nil,
-            "password" => nil
+            "auth_headers" => {}
           }] + dependency_repository_details
         end
 
@@ -333,6 +330,14 @@ module Dependabot
         def version_class
           Gradle::Version
         end
+
+        def auth_headers_finder
+          @auth_headers_finder ||= Dependabot::Maven::Utils::AuthHeadersFinder.new(credentials)
+        end
+
+        def auth_headers(maven_repo_url)
+          auth_headers_finder.auth_headers(maven_repo_url)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-gradle
 version: !ruby/object:Gem::Version
-  version: 0.140.0
+  version: 0.141.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.140.0
+        version: 0.141.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.140.0
+        version: 0.141.1
+- !ruby/object:Gem::Dependency
+  name: dependabot-maven
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.141.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.141.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement