bundler 2.2.29 → 2.5.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1129 -4
- data/README.md +4 -8
- data/bundler.gemspec +11 -11
- data/exe/bundle +5 -26
- data/exe/bundler +1 -1
- data/lib/bundler/.document +1 -0
- data/lib/bundler/build_metadata.rb +4 -4
- data/lib/bundler/capistrano.rb +1 -1
- data/lib/bundler/checksum.rb +254 -0
- data/lib/bundler/ci_detector.rb +75 -0
- data/lib/bundler/cli/add.rb +4 -4
- data/lib/bundler/cli/binstubs.rb +10 -6
- data/lib/bundler/cli/cache.rb +1 -1
- data/lib/bundler/cli/check.rb +3 -3
- data/lib/bundler/cli/common.rb +13 -3
- data/lib/bundler/cli/config.rb +18 -8
- data/lib/bundler/cli/console.rb +5 -4
- data/lib/bundler/cli/doctor.rb +12 -5
- data/lib/bundler/cli/exec.rb +1 -1
- data/lib/bundler/cli/fund.rb +1 -1
- data/lib/bundler/cli/gem.rb +141 -48
- data/lib/bundler/cli/info.rb +27 -17
- data/lib/bundler/cli/init.rb +6 -2
- data/lib/bundler/cli/install.rb +22 -39
- data/lib/bundler/cli/issue.rb +5 -4
- data/lib/bundler/cli/lock.rb +36 -29
- data/lib/bundler/cli/open.rb +9 -9
- data/lib/bundler/cli/outdated.rb +19 -12
- data/lib/bundler/cli/platform.rb +8 -6
- data/lib/bundler/cli/plugin.rb +9 -15
- data/lib/bundler/cli/pristine.rb +38 -30
- data/lib/bundler/cli/show.rb +3 -3
- data/lib/bundler/cli/update.rb +12 -7
- data/lib/bundler/cli/viz.rb +1 -1
- data/lib/bundler/cli.rb +266 -285
- data/lib/bundler/compact_index_client/cache.rb +53 -67
- data/lib/bundler/compact_index_client/cache_file.rb +153 -0
- data/lib/bundler/compact_index_client/gem_parser.rb +7 -3
- data/lib/bundler/compact_index_client/parser.rb +84 -0
- data/lib/bundler/compact_index_client/updater.rb +83 -76
- data/lib/bundler/compact_index_client.rb +59 -87
- data/lib/bundler/constants.rb +9 -2
- data/lib/bundler/current_ruby.rb +12 -16
- data/lib/bundler/definition.rb +509 -319
- data/lib/bundler/dependency.rb +33 -71
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +88 -69
- data/lib/bundler/endpoint_specification.rb +32 -15
- data/lib/bundler/env.rb +5 -7
- data/lib/bundler/environment_preserver.rb +8 -22
- data/lib/bundler/errors.rb +101 -13
- data/lib/bundler/feature_flag.rb +0 -2
- data/lib/bundler/fetcher/base.rb +11 -11
- data/lib/bundler/fetcher/compact_index.rb +32 -52
- data/lib/bundler/fetcher/dependency.rb +3 -7
- data/lib/bundler/fetcher/downloader.rb +17 -16
- data/lib/bundler/fetcher/gem_remote_fetcher.rb +16 -0
- data/lib/bundler/fetcher/index.rb +2 -29
- data/lib/bundler/fetcher.rb +87 -79
- data/lib/bundler/force_platform.rb +18 -0
- data/lib/bundler/friendly_errors.rb +29 -40
- data/lib/bundler/gem_helper.rb +11 -23
- data/lib/bundler/gem_helpers.rb +30 -6
- data/lib/bundler/gem_version_promoter.rb +68 -109
- data/lib/bundler/graph.rb +9 -9
- data/lib/bundler/index.rb +71 -79
- data/lib/bundler/injector.rb +23 -11
- data/lib/bundler/inline.rb +11 -23
- data/lib/bundler/installer/gem_installer.rb +18 -11
- data/lib/bundler/installer/parallel_installer.rb +17 -65
- data/lib/bundler/installer/standalone.rb +56 -15
- data/lib/bundler/installer.rb +35 -61
- data/lib/bundler/lazy_specification.rb +92 -61
- data/lib/bundler/lockfile_generator.rb +12 -3
- data/lib/bundler/lockfile_parser.rb +137 -70
- data/lib/bundler/man/bundle-add.1 +19 -26
- data/lib/bundler/man/bundle-add.1.ronn +16 -4
- data/lib/bundler/man/bundle-binstubs.1 +4 -16
- data/lib/bundler/man/bundle-cache.1 +9 -24
- data/lib/bundler/man/bundle-cache.1.ronn +9 -2
- data/lib/bundler/man/bundle-check.1 +5 -12
- data/lib/bundler/man/bundle-check.1.ronn +3 -0
- data/lib/bundler/man/bundle-clean.1 +4 -11
- data/lib/bundler/man/bundle-clean.1.ronn +1 -1
- data/lib/bundler/man/bundle-config.1 +47 -224
- data/lib/bundler/man/bundle-config.1.ronn +40 -28
- data/lib/bundler/man/bundle-console.1 +35 -0
- data/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/lib/bundler/man/bundle-doctor.1 +4 -18
- data/lib/bundler/man/bundle-exec.1 +16 -77
- data/lib/bundler/man/bundle-exec.1.ronn +8 -9
- data/lib/bundler/man/bundle-gem.1 +45 -72
- data/lib/bundler/man/bundle-gem.1.ronn +32 -5
- data/lib/bundler/man/bundle-help.1 +9 -0
- data/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/lib/bundler/man/bundle-info.1 +5 -11
- data/lib/bundler/man/bundle-info.1.ronn +3 -3
- data/lib/bundler/man/bundle-init.1 +6 -11
- data/lib/bundler/man/bundle-init.1.ronn +2 -0
- data/lib/bundler/man/bundle-inject.1 +8 -18
- data/lib/bundler/man/bundle-inject.1.ronn +3 -1
- data/lib/bundler/man/bundle-install.1 +32 -155
- data/lib/bundler/man/bundle-install.1.ronn +11 -33
- data/lib/bundler/man/bundle-list.1 +4 -19
- data/lib/bundler/man/bundle-lock.1 +5 -29
- data/lib/bundler/man/bundle-open.1 +18 -18
- data/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/lib/bundler/man/bundle-outdated.1 +17 -72
- data/lib/bundler/man/bundle-outdated.1.ronn +13 -18
- data/lib/bundler/man/bundle-platform.1 +16 -28
- data/lib/bundler/man/bundle-platform.1.ronn +14 -7
- data/lib/bundler/man/bundle-plugin.1 +58 -0
- data/lib/bundler/man/bundle-plugin.1.ronn +63 -0
- data/lib/bundler/man/bundle-pristine.1 +5 -16
- data/lib/bundler/man/bundle-remove.1 +4 -14
- data/lib/bundler/man/bundle-show.1 +3 -10
- data/lib/bundler/man/bundle-update.1 +19 -138
- data/lib/bundler/man/bundle-update.1.ronn +2 -1
- data/lib/bundler/man/bundle-version.1 +22 -0
- data/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/lib/bundler/man/bundle-viz.1 +6 -15
- data/lib/bundler/man/bundle-viz.1.ronn +2 -0
- data/lib/bundler/man/bundle.1 +17 -51
- data/lib/bundler/man/bundle.1.ronn +12 -7
- data/lib/bundler/man/gemfile.5 +130 -346
- data/lib/bundler/man/gemfile.5.ronn +121 -86
- data/lib/bundler/man/index.txt +4 -0
- data/lib/bundler/match_metadata.rb +17 -0
- data/lib/bundler/match_platform.rb +1 -2
- data/lib/bundler/match_remote_metadata.rb +29 -0
- data/lib/bundler/mirror.rb +8 -10
- data/lib/bundler/plugin/api/source.rb +9 -13
- data/lib/bundler/plugin/index.rb +13 -5
- data/lib/bundler/plugin/installer/git.rb +0 -4
- data/lib/bundler/plugin/installer/path.rb +18 -0
- data/lib/bundler/plugin/installer/rubygems.rb +0 -8
- data/lib/bundler/plugin/installer.rb +42 -19
- data/lib/bundler/plugin/source_list.rb +4 -4
- data/lib/bundler/plugin.rb +16 -7
- data/lib/bundler/process_lock.rb +1 -1
- data/lib/bundler/remote_specification.rb +11 -5
- data/lib/bundler/resolver/base.rb +111 -0
- data/lib/bundler/resolver/candidate.rb +82 -0
- data/lib/bundler/resolver/incompatibility.rb +15 -0
- data/lib/bundler/resolver/package.rb +81 -0
- data/lib/bundler/resolver/root.rb +25 -0
- data/lib/bundler/resolver/spec_group.rb +53 -66
- data/lib/bundler/resolver.rb +419 -307
- data/lib/bundler/retry.rb +1 -1
- data/lib/bundler/ruby_dsl.rb +42 -7
- data/lib/bundler/ruby_version.rb +16 -22
- data/lib/bundler/rubygems_ext.rb +250 -64
- data/lib/bundler/rubygems_gem_installer.rb +90 -64
- data/lib/bundler/rubygems_integration.rb +81 -190
- data/lib/bundler/runtime.rb +8 -13
- data/lib/bundler/safe_marshal.rb +31 -0
- data/lib/bundler/self_manager.rb +206 -0
- data/lib/bundler/settings.rb +139 -57
- data/lib/bundler/setup.rb +13 -1
- data/lib/bundler/shared_helpers.rb +67 -36
- data/lib/bundler/source/git/git_proxy.rb +285 -82
- data/lib/bundler/source/git.rb +81 -41
- data/lib/bundler/source/metadata.rb +17 -16
- data/lib/bundler/source/path/installer.rb +1 -22
- data/lib/bundler/source/path.rb +13 -25
- data/lib/bundler/source/rubygems/remote.rb +1 -1
- data/lib/bundler/source/rubygems.rb +164 -234
- data/lib/bundler/source/rubygems_aggregate.rb +1 -1
- data/lib/bundler/source.rb +7 -6
- data/lib/bundler/source_list.rb +40 -32
- data/lib/bundler/source_map.rb +15 -2
- data/lib/bundler/spec_set.rb +156 -46
- data/lib/bundler/stub_specification.rb +18 -5
- data/lib/bundler/templates/Executable +3 -5
- data/lib/bundler/templates/Executable.bundler +7 -12
- data/lib/bundler/templates/Executable.standalone +4 -4
- data/lib/bundler/templates/Gemfile +0 -2
- data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +77 -29
- data/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/lib/bundler/templates/newgem/README.md.tt +7 -11
- data/lib/bundler/templates/newgem/Rakefile.tt +28 -4
- data/lib/bundler/templates/newgem/bin/console.tt +0 -4
- data/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
- data/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt +10 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +1 -1
- data/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +13 -3
- data/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
- data/lib/bundler/templates/newgem/newgem.gemspec.tt +25 -17
- data/lib/bundler/templates/newgem/rubocop.yml.tt +0 -5
- data/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/lib/bundler/templates/newgem/standard.yml.tt +3 -0
- data/lib/bundler/templates/newgem/test/minitest/{newgem_test.rb.tt → test_newgem.rb.tt} +1 -1
- data/lib/bundler/ui/rg_proxy.rb +1 -1
- data/lib/bundler/ui/shell.rb +38 -15
- data/lib/bundler/ui/silent.rb +21 -5
- data/lib/bundler/uri_credentials_filter.rb +2 -2
- data/lib/bundler/uri_normalizer.rb +23 -0
- data/lib/bundler/vendor/.document +1 -0
- data/lib/bundler/vendor/connection_pool/.document +1 -0
- data/lib/bundler/vendor/connection_pool/LICENSE +20 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +19 -21
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +1 -1
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +56 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +92 -78
- data/lib/bundler/vendor/fileutils/.document +1 -0
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1340 -410
- data/lib/bundler/vendor/net-http-persistent/.document +1 -0
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +4 -3
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +23 -11
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +1 -1
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +57 -57
- data/lib/bundler/vendor/pub_grub/.document +1 -0
- data/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +61 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +248 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/lib/bundler/vendor/thor/.document +1 -0
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +3 -2
- data/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +12 -14
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +16 -6
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -17
- data/lib/bundler/vendor/thor/lib/thor/base.rb +140 -14
- data/lib/bundler/vendor/thor/lib/thor/command.rb +13 -4
- data/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +10 -0
- data/lib/bundler/vendor/thor/lib/thor/error.rb +16 -20
- data/lib/bundler/vendor/thor/lib/thor/group.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/invocation.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/nested_context.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/parser/argument.rb +20 -1
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +33 -17
- data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +27 -8
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +63 -7
- data/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/runner.rb +40 -30
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +48 -154
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -46
- data/lib/bundler/vendor/thor/lib/thor/shell/column_printer.rb +29 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/html.rb +0 -45
- data/lib/bundler/vendor/thor/lib/thor/shell/table_printer.rb +134 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/terminal.rb +42 -0
- data/lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb +38 -0
- data/lib/bundler/vendor/thor/lib/thor/shell.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/util.rb +9 -8
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor.rb +155 -8
- data/lib/bundler/vendor/tsort/.document +1 -0
- data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/lib/bundler/vendor/tsort/lib/tsort.rb +455 -0
- data/lib/bundler/vendor/uri/.document +1 -0
- data/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/lib/bundler/vendor/uri/lib/uri/common.rb +316 -207
- data/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/generic.rb +33 -13
- data/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
- data/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
- data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +16 -23
- data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +105 -47
- data/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
- data/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
- data/lib/bundler/vendor/uri/lib/uri.rb +3 -3
- data/lib/bundler/vendored_net_http.rb +23 -0
- data/lib/bundler/vendored_persistent.rb +0 -36
- data/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/lib/bundler/vendored_timeout.rb +12 -0
- data/lib/bundler/{vendored_tmpdir.rb → vendored_tsort.rb} +1 -1
- data/lib/bundler/vendored_uri.rb +18 -1
- data/lib/bundler/version.rb +5 -1
- data/lib/bundler/vlad.rb +1 -1
- data/lib/bundler/worker.rb +7 -9
- data/lib/bundler/yaml_serializer.rb +21 -12
- data/lib/bundler.rb +114 -121
- metadata +87 -41
- data/lib/bundler/dep_proxy.rb +0 -55
- data/lib/bundler/gemdeps.rb +0 -29
- data/lib/bundler/psyched_yaml.rb +0 -22
- data/lib/bundler/templates/gems.rb +0 -8
- data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -5
- data/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +0 -66
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
- data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
- data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
- data/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
- data/lib/bundler/version_ranges.rb +0 -122
@@ -7,103 +7,89 @@ module Bundler
|
|
7
7
|
class Cache
|
8
8
|
attr_reader :directory
|
9
9
|
|
10
|
-
def initialize(directory)
|
10
|
+
def initialize(directory, fetcher = nil)
|
11
11
|
@directory = Pathname.new(directory).expand_path
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
12
|
+
@updater = Updater.new(fetcher) if fetcher
|
13
|
+
@mutex = Thread::Mutex.new
|
14
|
+
@endpoints = Set.new
|
18
15
|
|
19
|
-
|
20
|
-
|
16
|
+
@info_root = mkdir("info")
|
17
|
+
@special_characters_info_root = mkdir("info-special-characters")
|
18
|
+
@info_etag_root = mkdir("info-etags")
|
21
19
|
end
|
22
20
|
|
23
|
-
def
|
24
|
-
|
21
|
+
def names
|
22
|
+
fetch("names", names_path, names_etag_path)
|
25
23
|
end
|
26
24
|
|
27
25
|
def versions
|
28
|
-
|
29
|
-
info_checksums_by_name = {}
|
30
|
-
|
31
|
-
lines(versions_path).each do |line|
|
32
|
-
name, versions_string, info_checksum = line.split(" ", 3)
|
33
|
-
info_checksums_by_name[name] = info_checksum || ""
|
34
|
-
versions_string.split(",").each do |version|
|
35
|
-
if version.start_with?("-")
|
36
|
-
version = version[1..-1].split("-", 2).unshift(name)
|
37
|
-
versions_by_name[name].delete(version)
|
38
|
-
else
|
39
|
-
version = version.split("-", 2).unshift(name)
|
40
|
-
versions_by_name[name] << version
|
41
|
-
end
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
[versions_by_name, info_checksums_by_name]
|
26
|
+
fetch("versions", versions_path, versions_etag_path)
|
46
27
|
end
|
47
28
|
|
48
|
-
def
|
49
|
-
|
50
|
-
end
|
29
|
+
def info(name, remote_checksum = nil)
|
30
|
+
path = info_path(name)
|
51
31
|
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
checksums[name] = checksum
|
32
|
+
if remote_checksum && remote_checksum != SharedHelpers.checksum_for_file(path, :MD5)
|
33
|
+
fetch("info/#{name}", path, info_etag_path(name))
|
34
|
+
else
|
35
|
+
Bundler::CompactIndexClient.debug { "update skipped info/#{name} (#{remote_checksum ? "versions index checksum is nil" : "versions index checksum matches local"})" }
|
36
|
+
read(path)
|
58
37
|
end
|
59
|
-
|
60
|
-
checksums
|
61
38
|
end
|
62
39
|
|
63
|
-
def
|
64
|
-
|
65
|
-
parse_gem(line)
|
66
|
-
end
|
40
|
+
def reset!
|
41
|
+
@mutex.synchronize { @endpoints.clear }
|
67
42
|
end
|
68
43
|
|
44
|
+
private
|
45
|
+
|
46
|
+
def names_path = directory.join("names")
|
47
|
+
def names_etag_path = directory.join("names.etag")
|
48
|
+
def versions_path = directory.join("versions")
|
49
|
+
def versions_etag_path = directory.join("versions.etag")
|
50
|
+
|
69
51
|
def info_path(name)
|
70
52
|
name = name.to_s
|
71
|
-
|
53
|
+
# TODO: converge this into the info_root by hashing all filenames like info_etag_path
|
54
|
+
if /[^a-z0-9_-]/.match?(name)
|
72
55
|
name += "-#{SharedHelpers.digest(:MD5).hexdigest(name).downcase}"
|
73
|
-
|
56
|
+
@special_characters_info_root.join(name)
|
74
57
|
else
|
75
|
-
|
58
|
+
@info_root.join(name)
|
76
59
|
end
|
77
60
|
end
|
78
61
|
|
79
|
-
def
|
80
|
-
|
81
|
-
|
62
|
+
def info_etag_path(name)
|
63
|
+
name = name.to_s
|
64
|
+
@info_etag_root.join("#{name}-#{SharedHelpers.digest(:MD5).hexdigest(name).downcase}")
|
65
|
+
end
|
82
66
|
|
83
|
-
|
84
|
-
|
85
|
-
|
67
|
+
def mkdir(name)
|
68
|
+
directory.join(name).tap do |dir|
|
69
|
+
SharedHelpers.filesystem_access(dir) do
|
70
|
+
FileUtils.mkdir_p(dir)
|
71
|
+
end
|
72
|
+
end
|
86
73
|
end
|
87
74
|
|
88
|
-
|
75
|
+
def fetch(remote_path, path, etag_path)
|
76
|
+
if already_fetched?(remote_path)
|
77
|
+
Bundler::CompactIndexClient.debug { "already fetched #{remote_path}" }
|
78
|
+
else
|
79
|
+
Bundler::CompactIndexClient.debug { "fetching #{remote_path}" }
|
80
|
+
@updater&.update(remote_path, path, etag_path)
|
81
|
+
end
|
89
82
|
|
90
|
-
|
91
|
-
return [] unless path.file?
|
92
|
-
lines = SharedHelpers.filesystem_access(path, :read, &:read).split("\n")
|
93
|
-
header = lines.index("---")
|
94
|
-
header ? lines[header + 1..-1] : lines
|
83
|
+
read(path)
|
95
84
|
end
|
96
85
|
|
97
|
-
def
|
98
|
-
@
|
99
|
-
@dependency_parser.parse(line)
|
86
|
+
def already_fetched?(remote_path)
|
87
|
+
@mutex.synchronize { !@endpoints.add?(remote_path) }
|
100
88
|
end
|
101
89
|
|
102
|
-
def
|
103
|
-
|
104
|
-
|
105
|
-
directory.join("info-special-characters"),
|
106
|
-
]
|
90
|
+
def read(path)
|
91
|
+
return unless path.file?
|
92
|
+
SharedHelpers.filesystem_access(path, :read, &:read)
|
107
93
|
end
|
108
94
|
end
|
109
95
|
end
|
@@ -0,0 +1,153 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative "../vendored_fileutils"
|
4
|
+
require "rubygems/package"
|
5
|
+
|
6
|
+
module Bundler
|
7
|
+
class CompactIndexClient
|
8
|
+
# write cache files in a way that is robust to concurrent modifications
|
9
|
+
# if digests are given, the checksums will be verified
|
10
|
+
class CacheFile
|
11
|
+
DEFAULT_FILE_MODE = 0o644
|
12
|
+
private_constant :DEFAULT_FILE_MODE
|
13
|
+
|
14
|
+
class Error < RuntimeError; end
|
15
|
+
class ClosedError < Error; end
|
16
|
+
|
17
|
+
class DigestMismatchError < Error
|
18
|
+
def initialize(digests, expected_digests)
|
19
|
+
super "Calculated checksums #{digests.inspect} did not match expected #{expected_digests.inspect}."
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
# Initialize with a copy of the original file, then yield the instance.
|
24
|
+
def self.copy(path, &block)
|
25
|
+
new(path) do |file|
|
26
|
+
file.initialize_digests
|
27
|
+
|
28
|
+
SharedHelpers.filesystem_access(path, :read) do
|
29
|
+
path.open("rb") do |s|
|
30
|
+
file.open {|f| IO.copy_stream(s, f) }
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
yield file
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
# Write data to a temp file, then replace the original file with it verifying the digests if given.
|
39
|
+
def self.write(path, data, digests = nil)
|
40
|
+
return unless data
|
41
|
+
new(path) do |file|
|
42
|
+
file.digests = digests
|
43
|
+
file.write(data)
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
attr_reader :original_path, :path
|
48
|
+
|
49
|
+
def initialize(original_path, &block)
|
50
|
+
@original_path = original_path
|
51
|
+
@perm = original_path.file? ? original_path.stat.mode : DEFAULT_FILE_MODE
|
52
|
+
@path = original_path.sub(/$/, ".#{$$}.tmp")
|
53
|
+
return unless block_given?
|
54
|
+
begin
|
55
|
+
yield self
|
56
|
+
ensure
|
57
|
+
close
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
def size
|
62
|
+
path.size
|
63
|
+
end
|
64
|
+
|
65
|
+
# initialize the digests using CompactIndexClient::SUPPORTED_DIGESTS, or a subset based on keys.
|
66
|
+
def initialize_digests(keys = nil)
|
67
|
+
@digests = keys ? SUPPORTED_DIGESTS.slice(*keys) : SUPPORTED_DIGESTS.dup
|
68
|
+
@digests.transform_values! {|algo_class| SharedHelpers.digest(algo_class).new }
|
69
|
+
end
|
70
|
+
|
71
|
+
# reset the digests so they don't contain any previously read data
|
72
|
+
def reset_digests
|
73
|
+
@digests&.each_value(&:reset)
|
74
|
+
end
|
75
|
+
|
76
|
+
# set the digests that will be verified at the end
|
77
|
+
def digests=(expected_digests)
|
78
|
+
@expected_digests = expected_digests
|
79
|
+
|
80
|
+
if @expected_digests.nil?
|
81
|
+
@digests = nil
|
82
|
+
elsif @digests
|
83
|
+
@digests = @digests.slice(*@expected_digests.keys)
|
84
|
+
else
|
85
|
+
initialize_digests(@expected_digests.keys)
|
86
|
+
end
|
87
|
+
end
|
88
|
+
|
89
|
+
# remove this method when we stop generating md5 digests for legacy etags
|
90
|
+
def md5
|
91
|
+
@digests && @digests["md5"]
|
92
|
+
end
|
93
|
+
|
94
|
+
def digests?
|
95
|
+
@digests&.any?
|
96
|
+
end
|
97
|
+
|
98
|
+
# Open the temp file for writing, reusing original permissions, yielding the IO object.
|
99
|
+
def open(write_mode = "wb", perm = @perm, &block)
|
100
|
+
raise ClosedError, "Cannot reopen closed file" if @closed
|
101
|
+
SharedHelpers.filesystem_access(path, :write) do
|
102
|
+
path.open(write_mode, perm) do |f|
|
103
|
+
yield digests? ? Gem::Package::DigestIO.new(f, @digests) : f
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
# Returns false without appending when no digests since appending is too error prone to do without digests.
|
109
|
+
def append(data)
|
110
|
+
return false unless digests?
|
111
|
+
open("a") {|f| f.write data }
|
112
|
+
verify && commit
|
113
|
+
end
|
114
|
+
|
115
|
+
def write(data)
|
116
|
+
reset_digests
|
117
|
+
open {|f| f.write data }
|
118
|
+
commit!
|
119
|
+
end
|
120
|
+
|
121
|
+
def commit!
|
122
|
+
verify || raise(DigestMismatchError.new(@base64digests, @expected_digests))
|
123
|
+
commit
|
124
|
+
end
|
125
|
+
|
126
|
+
# Verify the digests, returning true on match, false on mismatch.
|
127
|
+
def verify
|
128
|
+
return true unless @expected_digests && digests?
|
129
|
+
@base64digests = @digests.transform_values!(&:base64digest)
|
130
|
+
@digests = nil
|
131
|
+
@base64digests.all? {|algo, digest| @expected_digests[algo] == digest }
|
132
|
+
end
|
133
|
+
|
134
|
+
# Replace the original file with the temp file without verifying digests.
|
135
|
+
# The file is permanently closed.
|
136
|
+
def commit
|
137
|
+
raise ClosedError, "Cannot commit closed file" if @closed
|
138
|
+
SharedHelpers.filesystem_access(original_path, :write) do
|
139
|
+
FileUtils.mv(path, original_path)
|
140
|
+
end
|
141
|
+
@closed = true
|
142
|
+
end
|
143
|
+
|
144
|
+
# Remove the temp file without replacing the original file.
|
145
|
+
# The file is permanently closed.
|
146
|
+
def close
|
147
|
+
return if @closed
|
148
|
+
FileUtils.remove_file(path) if @path&.file?
|
149
|
+
@closed = true
|
150
|
+
end
|
151
|
+
end
|
152
|
+
end
|
153
|
+
end
|
@@ -6,12 +6,15 @@ module Bundler
|
|
6
6
|
GemParser = Gem::Resolver::APISet::GemParser
|
7
7
|
else
|
8
8
|
class GemParser
|
9
|
+
EMPTY_ARRAY = [].freeze
|
10
|
+
private_constant :EMPTY_ARRAY
|
11
|
+
|
9
12
|
def parse(line)
|
10
13
|
version_and_platform, rest = line.split(" ", 2)
|
11
14
|
version, platform = version_and_platform.split("-", 2)
|
12
|
-
dependencies, requirements = rest.split("|", 2).map {|s| s.split(",") } if rest
|
13
|
-
dependencies = dependencies ? dependencies.map {|d| parse_dependency(d) } :
|
14
|
-
requirements = requirements ? requirements.map {|d| parse_dependency(d) } :
|
15
|
+
dependencies, requirements = rest.split("|", 2).map! {|s| s.split(",") } if rest
|
16
|
+
dependencies = dependencies ? dependencies.map! {|d| parse_dependency(d) } : EMPTY_ARRAY
|
17
|
+
requirements = requirements ? requirements.map! {|d| parse_dependency(d) } : EMPTY_ARRAY
|
15
18
|
[version, platform, dependencies, requirements]
|
16
19
|
end
|
17
20
|
|
@@ -20,6 +23,7 @@ module Bundler
|
|
20
23
|
def parse_dependency(string)
|
21
24
|
dependency = string.split(":")
|
22
25
|
dependency[-1] = dependency[-1].split("&") if dependency.size > 1
|
26
|
+
dependency[0] = -dependency[0]
|
23
27
|
dependency
|
24
28
|
end
|
25
29
|
end
|
@@ -0,0 +1,84 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Bundler
|
4
|
+
class CompactIndexClient
|
5
|
+
class Parser
|
6
|
+
# `compact_index` - an object responding to #names, #versions, #info(name, checksum),
|
7
|
+
# returning the file contents as a string
|
8
|
+
def initialize(compact_index)
|
9
|
+
@compact_index = compact_index
|
10
|
+
@info_checksums = nil
|
11
|
+
@versions_by_name = nil
|
12
|
+
@available = nil
|
13
|
+
@gem_parser = nil
|
14
|
+
end
|
15
|
+
|
16
|
+
def names
|
17
|
+
lines(@compact_index.names)
|
18
|
+
end
|
19
|
+
|
20
|
+
def versions
|
21
|
+
@versions_by_name ||= Hash.new {|hash, key| hash[key] = [] }
|
22
|
+
@info_checksums = {}
|
23
|
+
|
24
|
+
lines(@compact_index.versions).each do |line|
|
25
|
+
name, versions_string, checksum = line.split(" ", 3)
|
26
|
+
@info_checksums[name] = checksum || ""
|
27
|
+
versions_string.split(",") do |version|
|
28
|
+
delete = version.delete_prefix!("-")
|
29
|
+
version = version.split("-", 2).unshift(name)
|
30
|
+
if delete
|
31
|
+
@versions_by_name[name].delete(version)
|
32
|
+
else
|
33
|
+
@versions_by_name[name] << version
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
@versions_by_name
|
39
|
+
end
|
40
|
+
|
41
|
+
def info(name)
|
42
|
+
data = @compact_index.info(name, info_checksums[name])
|
43
|
+
lines(data).map {|line| gem_parser.parse(line).unshift(name) }
|
44
|
+
end
|
45
|
+
|
46
|
+
def available?
|
47
|
+
return @available unless @available.nil?
|
48
|
+
@available = !info_checksums.empty?
|
49
|
+
end
|
50
|
+
|
51
|
+
private
|
52
|
+
|
53
|
+
def info_checksums
|
54
|
+
@info_checksums ||= lines(@compact_index.versions).each_with_object({}) do |line, checksums|
|
55
|
+
parse_version_checksum(line, checksums)
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
def lines(data)
|
60
|
+
return [] if data.nil? || data.empty?
|
61
|
+
lines = data.split("\n")
|
62
|
+
header = lines.index("---")
|
63
|
+
header ? lines[header + 1..-1] : lines
|
64
|
+
end
|
65
|
+
|
66
|
+
def gem_parser
|
67
|
+
@gem_parser ||= GemParser.new
|
68
|
+
end
|
69
|
+
|
70
|
+
# This is mostly the same as `split(" ", 3)` but it avoids allocating extra objects.
|
71
|
+
# This method gets called at least once for every gem when parsing versions.
|
72
|
+
def parse_version_checksum(line, checksums)
|
73
|
+
return unless (name_end = line.index(" ")) # Artifactory bug causes blank lines in artifactor index files
|
74
|
+
return unless (checksum_start = line.index(" ", name_end + 1) + 1)
|
75
|
+
checksum_end = line.size - checksum_start
|
76
|
+
|
77
|
+
line.freeze # allows slicing into the string to not allocate a copy of the line
|
78
|
+
name = line[0, name_end]
|
79
|
+
checksum = line[checksum_start, checksum_end]
|
80
|
+
checksums[name.freeze] = checksum # freeze name since it is used as a hash key
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
84
|
+
end
|
@@ -1,107 +1,114 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require_relative "../vendored_fileutils"
|
4
|
-
|
5
3
|
module Bundler
|
6
4
|
class CompactIndexClient
|
7
5
|
class Updater
|
8
|
-
class
|
9
|
-
def initialize(path,
|
10
|
-
|
11
|
-
@server_checksum = server_checksum
|
12
|
-
@local_checksum = local_checksum
|
13
|
-
end
|
14
|
-
|
15
|
-
def message
|
16
|
-
"The checksum of /#{@path} does not match the checksum provided by the server! Something is wrong " \
|
17
|
-
"(local checksum is #{@local_checksum.inspect}, was expecting #{@server_checksum.inspect})."
|
6
|
+
class MismatchedChecksumError < Error
|
7
|
+
def initialize(path, message)
|
8
|
+
super "The checksum of /#{path} does not match the checksum provided by the server! Something is wrong. #{message}"
|
18
9
|
end
|
19
10
|
end
|
20
11
|
|
21
12
|
def initialize(fetcher)
|
22
13
|
@fetcher = fetcher
|
23
|
-
require_relative "../vendored_tmpdir"
|
24
14
|
end
|
25
15
|
|
26
|
-
def update(
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
if retrying.nil? && local_path.file?
|
34
|
-
SharedHelpers.filesystem_access(local_temp_path) do
|
35
|
-
FileUtils.cp local_path, local_temp_path
|
36
|
-
end
|
37
|
-
headers["If-None-Match"] = etag_for(local_temp_path)
|
38
|
-
headers["Range"] =
|
39
|
-
if local_temp_path.size.nonzero?
|
40
|
-
# Subtract a byte to ensure the range won't be empty.
|
41
|
-
# Avoids 416 (Range Not Satisfiable) responses.
|
42
|
-
"bytes=#{local_temp_path.size - 1}-"
|
43
|
-
else
|
44
|
-
"bytes=#{local_temp_path.size}-"
|
45
|
-
end
|
46
|
-
end
|
16
|
+
def update(remote_path, local_path, etag_path)
|
17
|
+
append(remote_path, local_path, etag_path) || replace(remote_path, local_path, etag_path)
|
18
|
+
rescue CacheFile::DigestMismatchError => e
|
19
|
+
raise MismatchedChecksumError.new(remote_path, e.message)
|
20
|
+
rescue Zlib::GzipFile::Error
|
21
|
+
raise Bundler::HTTPError
|
22
|
+
end
|
47
23
|
|
48
|
-
|
49
|
-
return nil if response.is_a?(Net::HTTPNotModified)
|
24
|
+
private
|
50
25
|
|
51
|
-
|
26
|
+
def append(remote_path, local_path, etag_path)
|
27
|
+
return false unless local_path.file? && local_path.size.nonzero?
|
52
28
|
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
local_temp_path.open("a") {|f| f << slice_body(content, 1..-1) }
|
29
|
+
CacheFile.copy(local_path) do |file|
|
30
|
+
etag = etag_path.read.tap(&:chomp!) if etag_path.file?
|
31
|
+
etag ||= generate_etag(etag_path, file) # Remove this after 2.5.0 has been out for a while.
|
57
32
|
|
58
|
-
|
59
|
-
|
60
|
-
|
33
|
+
# Subtract a byte to ensure the range won't be empty.
|
34
|
+
# Avoids 416 (Range Not Satisfiable) responses.
|
35
|
+
response = @fetcher.call(remote_path, request_headers(etag, file.size - 1))
|
36
|
+
break true if response.is_a?(Gem::Net::HTTPNotModified)
|
61
37
|
|
62
|
-
|
63
|
-
|
38
|
+
file.digests = parse_digests(response)
|
39
|
+
# server may ignore Range and return the full response
|
40
|
+
if response.is_a?(Gem::Net::HTTPPartialContent)
|
41
|
+
break false unless file.append(response.body.byteslice(1..-1))
|
42
|
+
else
|
43
|
+
file.write(response.body)
|
64
44
|
end
|
45
|
+
CacheFile.write(etag_path, etag_from_response(response))
|
46
|
+
true
|
47
|
+
end
|
48
|
+
end
|
65
49
|
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
50
|
+
# request without range header to get the full file or a 304 Not Modified
|
51
|
+
def replace(remote_path, local_path, etag_path)
|
52
|
+
etag = etag_path.read.tap(&:chomp!) if etag_path.file?
|
53
|
+
response = @fetcher.call(remote_path, request_headers(etag))
|
54
|
+
return true if response.is_a?(Gem::Net::HTTPNotModified)
|
55
|
+
CacheFile.write(local_path, response.body, parse_digests(response))
|
56
|
+
CacheFile.write(etag_path, etag_from_response(response))
|
57
|
+
end
|
72
58
|
|
73
|
-
|
74
|
-
|
75
|
-
|
59
|
+
def request_headers(etag, range_start = nil)
|
60
|
+
headers = {}
|
61
|
+
headers["Range"] = "bytes=#{range_start}-" if range_start
|
62
|
+
headers["If-None-Match"] = %("#{etag}") if etag
|
63
|
+
headers
|
64
|
+
end
|
76
65
|
|
77
|
-
|
78
|
-
|
79
|
-
rescue Errno::EACCES
|
80
|
-
raise Bundler::PermissionError,
|
81
|
-
"Bundler does not have write access to create a temp directory " \
|
82
|
-
"within #{Dir.tmpdir}. Bundler must have write access to your " \
|
83
|
-
"systems temp directory to function properly. "
|
84
|
-
rescue Zlib::GzipFile::Error
|
85
|
-
raise Bundler::HTTPError
|
66
|
+
def etag_for_request(etag_path)
|
67
|
+
etag_path.read.tap(&:chomp!) if etag_path.file?
|
86
68
|
end
|
87
69
|
|
88
|
-
|
89
|
-
|
90
|
-
|
70
|
+
# When first releasing this opaque etag feature, we want to generate the old MD5 etag
|
71
|
+
# based on the content of the file. After that it will always use the saved opaque etag.
|
72
|
+
# This transparently saves existing users with good caches from updating a bunch of files.
|
73
|
+
# Remove this behavior after 2.5.0 has been out for a while.
|
74
|
+
def generate_etag(etag_path, file)
|
75
|
+
etag = file.md5.hexdigest
|
76
|
+
CacheFile.write(etag_path, etag)
|
77
|
+
etag
|
91
78
|
end
|
92
79
|
|
93
|
-
def
|
94
|
-
|
80
|
+
def etag_from_response(response)
|
81
|
+
return unless response["ETag"]
|
82
|
+
etag = response["ETag"].delete_prefix("W/")
|
83
|
+
return if etag.delete_prefix!('"') && !etag.delete_suffix!('"')
|
84
|
+
etag
|
95
85
|
end
|
96
86
|
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
87
|
+
# Unwraps and returns a Hash of digest algorithms and base64 values
|
88
|
+
# according to RFC 8941 Structured Field Values for HTTP.
|
89
|
+
# https://www.rfc-editor.org/rfc/rfc8941#name-parsing-a-byte-sequence
|
90
|
+
# Ignores unsupported algorithms.
|
91
|
+
def parse_digests(response)
|
92
|
+
return unless header = response["Repr-Digest"] || response["Digest"]
|
93
|
+
digests = {}
|
94
|
+
header.split(",") do |param|
|
95
|
+
algorithm, value = param.split("=", 2)
|
96
|
+
algorithm.strip!
|
97
|
+
algorithm.downcase!
|
98
|
+
next unless SUPPORTED_DIGESTS.key?(algorithm)
|
99
|
+
next unless value = byte_sequence(value)
|
100
|
+
digests[algorithm] = value
|
104
101
|
end
|
102
|
+
digests.empty? ? nil : digests
|
103
|
+
end
|
104
|
+
|
105
|
+
# Unwrap surrounding colons (byte sequence)
|
106
|
+
# The wrapping characters must be matched or we return nil.
|
107
|
+
# Also handles quotes because right now rubygems.org sends them.
|
108
|
+
def byte_sequence(value)
|
109
|
+
return if value.delete_prefix!(":") && !value.delete_suffix!(":")
|
110
|
+
return if value.delete_prefix!('"') && !value.delete_suffix!('"')
|
111
|
+
value
|
105
112
|
end
|
106
113
|
end
|
107
114
|
end
|