Move #filter_vulnerable_version to come before `#filter_ignored_ver…

…sion`
Parnassius · Jun 22, 2021 · 7d0b62c · 7d0b62c
1 parent d68c097
commit 7d0b62c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/bundler/lib/dependabot/bundler/update_checker/latest_version_finder.rb b/bundler/lib/dependabot/bundler/update_checker/latest_version_finder.rb
@@ -56,10 +56,10 @@ def fetch_lowest_security_fix_version
 
           relevant_versions = dependency_source.versions
           relevant_versions = filter_prerelease_versions(relevant_versions)
-          relevant_versions = filter_ignored_versions(relevant_versions)
-          relevant_versions = filter_lower_versions(relevant_versions)
           relevant_versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(relevant_versions,
                                                                                                     security_advisories)
+          relevant_versions = filter_ignored_versions(relevant_versions)
+          relevant_versions = filter_lower_versions(relevant_versions)
 
           relevant_versions.min
         end

diff --git a/cargo/lib/dependabot/cargo/update_checker/latest_version_finder.rb b/cargo/lib/dependabot/cargo/update_checker/latest_version_finder.rb
@@ -42,10 +42,10 @@ def fetch_latest_version
         def fetch_lowest_security_fix_version
           versions = available_versions
           versions = filter_prerelease_versions(versions)
-          versions = filter_ignored_versions(versions)
-          versions = filter_lower_versions(versions)
           versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(versions,
                                                                                            security_advisories)
+          versions = filter_ignored_versions(versions)
+          versions = filter_lower_versions(versions)
 
           versions.min
         end

diff --git a/composer/lib/dependabot/composer/update_checker/latest_version_finder.rb b/composer/lib/dependabot/composer/update_checker/latest_version_finder.rb
@@ -46,10 +46,10 @@ def fetch_latest_version
         def fetch_lowest_security_fix_version
           versions = available_versions
           versions = filter_prerelease_versions(versions)
-          versions = filter_ignored_versions(versions)
-          versions = filter_lower_versions(versions)
           versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(versions,
                                                                                            security_advisories)
+          versions = filter_ignored_versions(versions)
+          versions = filter_lower_versions(versions)
 
           versions.min
         end

diff --git a/gradle/lib/dependabot/gradle/update_checker/version_finder.rb b/gradle/lib/dependabot/gradle/update_checker/version_finder.rb
@@ -47,10 +47,10 @@ def lowest_security_fix_version_details
           possible_versions = filter_prereleases(possible_versions)
           possible_versions = filter_date_based_versions(possible_versions)
           possible_versions = filter_version_types(possible_versions)
-          possible_versions = filter_ignored_versions(possible_versions)
-          possible_versions = filter_lower_versions(possible_versions)
           possible_versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(possible_versions,
                                                                                                     security_advisories)
+          possible_versions = filter_ignored_versions(possible_versions)
+          possible_versions = filter_lower_versions(possible_versions)
 
           possible_versions.first
         end

diff --git a/maven/lib/dependabot/maven/update_checker/version_finder.rb b/maven/lib/dependabot/maven/update_checker/version_finder.rb
@@ -44,10 +44,10 @@ def lowest_security_fix_version_details
           possible_versions = filter_prereleases(possible_versions)
           possible_versions = filter_date_based_versions(possible_versions)
           possible_versions = filter_version_types(possible_versions)
-          possible_versions = filter_ignored_versions(possible_versions)
-          possible_versions = filter_lower_versions(possible_versions)
           possible_versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(possible_versions,
                                                                                                     security_advisories)
+          possible_versions = filter_ignored_versions(possible_versions)
+          possible_versions = filter_lower_versions(possible_versions)
 
           possible_versions.find { |v| released?(v.fetch(:version)) }
         end

diff --git a/nuget/lib/dependabot/nuget/update_checker/version_finder.rb b/nuget/lib/dependabot/nuget/update_checker/version_finder.rb
@@ -43,11 +43,11 @@ def lowest_security_fix_version_details
             begin
               possible_versions = versions
               possible_versions = filter_prereleases(possible_versions)
-              possible_versions = filter_ignored_versions(possible_versions)
-              possible_versions = filter_lower_versions(possible_versions)
               possible_versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(
                 possible_versions, security_advisories
               )
+              possible_versions = filter_ignored_versions(possible_versions)
+              possible_versions = filter_lower_versions(possible_versions)
 
               possible_versions.min_by { |hash| hash.fetch(:version) }
             end

diff --git a/python/lib/dependabot/python/update_checker/latest_version_finder.rb b/python/lib/dependabot/python/update_checker/latest_version_finder.rb
@@ -72,10 +72,11 @@ def fetch_lowest_security_fix_version(python_version:)
           versions = filter_yanked_versions(versions)
           versions = filter_unsupported_versions(versions, python_version)
           versions = filter_prerelease_versions(versions)
-          versions = filter_ignored_versions(versions)
-          versions = filter_lower_versions(versions)
           versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(versions,
                                                                                            security_advisories)
+          versions = filter_ignored_versions(versions)
+          versions = filter_lower_versions(versions)
+
           versions.min
         end