rubygems-update 3.3.26 → 3.4.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1334 -1088
- data/CONTRIBUTING.md +31 -8
- data/Manifest.txt +49 -35
- data/POLICIES.md +15 -13
- data/README.md +19 -6
- data/bundler/CHANGELOG.md +290 -1
- data/bundler/README.md +3 -6
- data/bundler/UPGRADING.md +1 -1
- data/bundler/bundler.gemspec +2 -2
- data/bundler/exe/bundle +5 -16
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli/add.rb +1 -1
- data/bundler/lib/bundler/cli/binstubs.rb +5 -1
- data/bundler/lib/bundler/cli/check.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +1 -0
- data/bundler/lib/bundler/cli/console.rb +2 -2
- data/bundler/lib/bundler/cli/doctor.rb +4 -6
- data/bundler/lib/bundler/cli/gem.rb +62 -40
- data/bundler/lib/bundler/cli/init.rb +2 -2
- data/bundler/lib/bundler/cli/install.rb +2 -3
- data/bundler/lib/bundler/cli/lock.rb +8 -5
- data/bundler/lib/bundler/cli/open.rb +6 -4
- data/bundler/lib/bundler/cli/outdated.rb +1 -3
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +45 -2
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/updater.rb +40 -39
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +2 -0
- data/bundler/lib/bundler/definition.rb +163 -82
- data/bundler/lib/bundler/dependency.rb +13 -12
- data/bundler/lib/bundler/digest.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +3 -3
- data/bundler/lib/bundler/endpoint_specification.rb +0 -4
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/environment_preserver.rb +3 -2
- data/bundler/lib/bundler/errors.rb +1 -11
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher/compact_index.rb +9 -11
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -6
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
- data/bundler/lib/bundler/fetcher.rb +4 -8
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +0 -3
- data/bundler/lib/bundler/gem_version_promoter.rb +52 -86
- data/bundler/lib/bundler/graph.rb +3 -3
- data/bundler/lib/bundler/index.rb +7 -15
- data/bundler/lib/bundler/injector.rb +2 -2
- data/bundler/lib/bundler/inline.rb +8 -10
- data/bundler/lib/bundler/installer/parallel_installer.rb +3 -33
- data/bundler/lib/bundler/installer/standalone.rb +12 -8
- data/bundler/lib/bundler/installer.rb +10 -24
- data/bundler/lib/bundler/lazy_specification.rb +42 -42
- data/bundler/lib/bundler/lockfile_generator.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +17 -16
- data/bundler/lib/bundler/man/bundle-add.1 +1 -1
- data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/lib/bundler/man/bundle-cache.1 +3 -3
- data/bundler/lib/bundler/man/bundle-cache.1.ronn +2 -2
- data/bundler/lib/bundler/man/bundle-check.1 +1 -1
- data/bundler/lib/bundler/man/bundle-clean.1 +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +2 -5
- data/bundler/lib/bundler/man/bundle-config.1.ronn +1 -4
- data/bundler/lib/bundler/man/bundle-console.1 +1 -1
- data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/lib/bundler/man/bundle-exec.1 +5 -5
- data/bundler/lib/bundler/man/bundle-exec.1.ronn +5 -5
- data/bundler/lib/bundler/man/bundle-gem.1 +27 -37
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +5 -5
- data/bundler/lib/bundler/man/bundle-help.1 +1 -1
- data/bundler/lib/bundler/man/bundle-info.1 +1 -1
- data/bundler/lib/bundler/man/bundle-init.1 +5 -1
- data/bundler/lib/bundler/man/bundle-init.1.ronn +2 -0
- data/bundler/lib/bundler/man/bundle-inject.1 +1 -1
- data/bundler/lib/bundler/man/bundle-install.1 +1 -30
- data/bundler/lib/bundler/man/bundle-install.1.ronn +0 -29
- data/bundler/lib/bundler/man/bundle-list.1 +1 -1
- data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
- data/bundler/lib/bundler/man/bundle-open.1 +22 -2
- data/bundler/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +13 -9
- data/bundler/lib/bundler/man/bundle-outdated.1.ronn +12 -9
- data/bundler/lib/bundler/man/bundle-platform.1 +2 -2
- data/bundler/lib/bundler/man/bundle-platform.1.ronn +1 -1
- data/bundler/lib/bundler/man/bundle-plugin.1 +1 -1
- data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
- data/bundler/lib/bundler/man/bundle-show.1 +1 -1
- data/bundler/lib/bundler/man/bundle-update.1 +1 -1
- data/bundler/lib/bundler/man/bundle-version.1 +1 -1
- data/bundler/lib/bundler/man/bundle-viz.1 +1 -1
- data/bundler/lib/bundler/man/bundle.1 +1 -1
- data/bundler/lib/bundler/man/gemfile.5 +2 -2
- data/bundler/lib/bundler/man/gemfile.5.ronn +1 -1
- data/bundler/lib/bundler/mirror.rb +5 -7
- data/bundler/lib/bundler/plugin/index.rb +4 -4
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -4
- data/bundler/lib/bundler/plugin/installer.rb +5 -2
- data/bundler/lib/bundler/plugin.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +2 -6
- data/bundler/lib/bundler/resolver/base.rb +72 -15
- data/bundler/lib/bundler/resolver/candidate.rb +94 -0
- data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
- data/bundler/lib/bundler/resolver/package.rb +72 -0
- data/bundler/lib/bundler/resolver/root.rb +25 -0
- data/bundler/lib/bundler/resolver/spec_group.rb +26 -36
- data/bundler/lib/bundler/resolver.rb +324 -277
- data/bundler/lib/bundler/ruby_version.rb +1 -1
- data/bundler/lib/bundler/rubygems_ext.rb +16 -9
- data/bundler/lib/bundler/rubygems_gem_installer.rb +4 -2
- data/bundler/lib/bundler/rubygems_integration.rb +10 -14
- data/bundler/lib/bundler/runtime.rb +2 -6
- data/bundler/lib/bundler/safe_marshal.rb +31 -0
- data/bundler/lib/bundler/settings.rb +4 -10
- data/bundler/lib/bundler/setup.rb +4 -1
- data/bundler/lib/bundler/shared_helpers.rb +2 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +237 -74
- data/bundler/lib/bundler/source/git.rb +48 -30
- data/bundler/lib/bundler/source/metadata.rb +0 -1
- data/bundler/lib/bundler/source/path/installer.rb +1 -22
- data/bundler/lib/bundler/source/path.rb +6 -6
- data/bundler/lib/bundler/source/rubygems.rb +26 -81
- data/bundler/lib/bundler/source.rb +1 -1
- data/bundler/lib/bundler/source_list.rb +8 -2
- data/bundler/lib/bundler/spec_set.rb +22 -14
- data/bundler/lib/bundler/templates/Executable +1 -1
- data/bundler/lib/bundler/templates/Executable.bundler +5 -10
- data/bundler/lib/bundler/templates/Executable.standalone +2 -0
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/README.md.tt +6 -4
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +12 -1
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +0 -4
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +8 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +9 -2
- data/bundler/lib/bundler/ui/shell.rb +35 -12
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/uri_normalizer.rb +23 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1351 -409
- data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
- data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +248 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +15 -9
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -6
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -2
- data/bundler/lib/bundler/vendored_persistent.rb +1 -33
- data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/version.rb +5 -1
- data/bundler/lib/bundler/worker.rb +5 -7
- data/bundler/lib/bundler.rb +21 -72
- data/{bin → exe}/gem +3 -4
- data/{bin → exe}/update_rubygems +8 -6
- data/lib/rubygems/available_set.rb +1 -0
- data/lib/rubygems/basic_specification.rb +1 -0
- data/lib/rubygems/bundler_version_finder.rb +1 -1
- data/lib/rubygems/command.rb +16 -7
- data/lib/rubygems/command_manager.rb +23 -8
- data/lib/rubygems/commands/build_command.rb +4 -0
- data/lib/rubygems/commands/cert_command.rb +1 -0
- data/lib/rubygems/commands/check_command.rb +1 -0
- data/lib/rubygems/commands/cleanup_command.rb +1 -0
- data/lib/rubygems/commands/contents_command.rb +1 -0
- data/lib/rubygems/commands/dependency_command.rb +1 -0
- data/lib/rubygems/commands/environment_command.rb +1 -0
- data/lib/rubygems/commands/exec_command.rb +249 -0
- data/lib/rubygems/commands/fetch_command.rb +2 -1
- data/lib/rubygems/commands/generate_index_command.rb +1 -0
- data/lib/rubygems/commands/help_command.rb +4 -3
- data/lib/rubygems/commands/install_command.rb +8 -3
- data/lib/rubygems/commands/list_command.rb +1 -0
- data/lib/rubygems/commands/lock_command.rb +1 -0
- data/lib/rubygems/commands/mirror_command.rb +1 -0
- data/lib/rubygems/commands/open_command.rb +1 -0
- data/lib/rubygems/commands/outdated_command.rb +1 -0
- data/lib/rubygems/commands/owner_command.rb +6 -3
- data/lib/rubygems/commands/pristine_command.rb +10 -0
- data/lib/rubygems/commands/push_command.rb +1 -0
- data/lib/rubygems/commands/query_command.rb +1 -0
- data/lib/rubygems/commands/rdoc_command.rb +4 -2
- data/lib/rubygems/commands/search_command.rb +1 -0
- data/lib/rubygems/commands/server_command.rb +1 -0
- data/lib/rubygems/commands/setup_command.rb +4 -3
- data/lib/rubygems/commands/signin_command.rb +1 -0
- data/lib/rubygems/commands/signout_command.rb +1 -0
- data/lib/rubygems/commands/sources_command.rb +1 -0
- data/lib/rubygems/commands/specification_command.rb +1 -0
- data/lib/rubygems/commands/stale_command.rb +1 -0
- data/lib/rubygems/commands/uninstall_command.rb +4 -0
- data/lib/rubygems/commands/unpack_command.rb +2 -1
- data/lib/rubygems/commands/update_command.rb +2 -7
- data/lib/rubygems/commands/which_command.rb +1 -0
- data/lib/rubygems/commands/yank_command.rb +1 -0
- data/lib/rubygems/config_file.rb +34 -0
- data/lib/rubygems/core_ext/kernel_gem.rb +0 -5
- data/lib/rubygems/core_ext/kernel_require.rb +108 -114
- data/lib/rubygems/core_ext/kernel_warn.rb +33 -37
- data/lib/rubygems/core_ext/tcpsocket_init.rb +2 -0
- data/lib/rubygems/defaults.rb +17 -2
- data/lib/rubygems/dependency.rb +6 -2
- data/lib/rubygems/dependency_installer.rb +25 -24
- data/lib/rubygems/dependency_list.rb +1 -0
- data/lib/rubygems/deprecate.rb +3 -2
- data/lib/rubygems/doctor.rb +1 -0
- data/lib/rubygems/errors.rb +1 -0
- data/lib/rubygems/exceptions.rb +11 -3
- data/lib/rubygems/ext/build_error.rb +1 -0
- data/lib/rubygems/ext/builder.rb +23 -7
- data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +9 -5
- data/lib/rubygems/ext/cargo_builder.rb +145 -110
- data/lib/rubygems/ext/configure_builder.rb +1 -0
- data/lib/rubygems/ext/ext_conf_builder.rb +4 -2
- data/lib/rubygems/ext/rake_builder.rb +5 -3
- data/lib/rubygems/ext.rb +1 -0
- data/lib/rubygems/gem_runner.rb +1 -0
- data/lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb +163 -0
- data/lib/rubygems/gemcutter_utilities/webauthn_listener.rb +105 -0
- data/lib/rubygems/gemcutter_utilities/webauthn_poller.rb +78 -0
- data/lib/rubygems/gemcutter_utilities.rb +53 -6
- data/lib/rubygems/indexer.rb +2 -1
- data/lib/rubygems/install_default_message.rb +1 -0
- data/lib/rubygems/install_message.rb +1 -0
- data/lib/rubygems/install_update_options.rb +1 -0
- data/lib/rubygems/installer.rb +22 -6
- data/lib/rubygems/local_remote_options.rb +1 -0
- data/lib/rubygems/mock_gem_ui.rb +1 -0
- data/lib/rubygems/name_tuple.rb +1 -0
- data/lib/rubygems/optparse/lib/optparse.rb +20 -15
- data/lib/rubygems/package/digest_io.rb +1 -0
- data/lib/rubygems/package/file_source.rb +1 -0
- data/lib/rubygems/package/io_source.rb +1 -0
- data/lib/rubygems/package/old.rb +1 -0
- data/lib/rubygems/package/source.rb +1 -0
- data/lib/rubygems/package/tar_header.rb +13 -12
- data/lib/rubygems/package/tar_reader/entry.rb +89 -7
- data/lib/rubygems/package/tar_reader.rb +1 -28
- data/lib/rubygems/package/tar_writer.rb +1 -0
- data/lib/rubygems/package.rb +1 -0
- data/lib/rubygems/package_task.rb +1 -0
- data/lib/rubygems/path_support.rb +1 -0
- data/lib/rubygems/platform.rb +4 -5
- data/lib/rubygems/psych_tree.rb +1 -0
- data/lib/rubygems/rdoc.rb +1 -0
- data/lib/rubygems/remote_fetcher.rb +1 -0
- data/lib/rubygems/request/http_pool.rb +1 -0
- data/lib/rubygems/request/https_pool.rb +1 -0
- data/lib/rubygems/request.rb +1 -0
- data/lib/rubygems/request_set/gem_dependency_api.rb +105 -105
- data/lib/rubygems/request_set/lockfile/parser.rb +1 -0
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
- data/lib/rubygems/request_set/lockfile.rb +1 -0
- data/lib/rubygems/request_set.rb +3 -2
- data/lib/rubygems/requirement.rb +9 -8
- data/lib/rubygems/resolver/activation_request.rb +1 -0
- data/lib/rubygems/resolver/api_set.rb +1 -0
- data/lib/rubygems/resolver/api_specification.rb +1 -0
- data/lib/rubygems/resolver/best_set.rb +1 -0
- data/lib/rubygems/resolver/composed_set.rb +1 -0
- data/lib/rubygems/resolver/conflict.rb +1 -0
- data/lib/rubygems/resolver/current_set.rb +1 -0
- data/lib/rubygems/resolver/dependency_request.rb +1 -0
- data/lib/rubygems/resolver/git_set.rb +1 -0
- data/lib/rubygems/resolver/git_specification.rb +1 -0
- data/lib/rubygems/resolver/index_set.rb +1 -0
- data/lib/rubygems/resolver/index_specification.rb +1 -0
- data/lib/rubygems/resolver/installed_specification.rb +1 -0
- data/lib/rubygems/resolver/installer_set.rb +5 -2
- data/lib/rubygems/resolver/local_specification.rb +1 -0
- data/lib/rubygems/resolver/lock_set.rb +1 -0
- data/lib/rubygems/resolver/lock_specification.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +32 -26
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/rubygems/resolver/molinillo.rb +1 -0
- data/lib/rubygems/resolver/requirement_list.rb +1 -0
- data/lib/rubygems/resolver/set.rb +1 -0
- data/lib/rubygems/resolver/source_set.rb +2 -0
- data/lib/rubygems/resolver/spec_specification.rb +1 -0
- data/lib/rubygems/resolver/specification.rb +1 -0
- data/lib/rubygems/resolver/stats.rb +2 -1
- data/lib/rubygems/resolver/vendor_set.rb +1 -0
- data/lib/rubygems/resolver/vendor_specification.rb +1 -0
- data/lib/rubygems/resolver.rb +1 -0
- data/lib/rubygems/s3_uri_signer.rb +4 -2
- data/lib/rubygems/safe_yaml.rb +2 -0
- data/lib/rubygems/security/policies.rb +41 -40
- data/lib/rubygems/security/policy.rb +1 -0
- data/lib/rubygems/security/signer.rb +1 -0
- data/lib/rubygems/security/trust_dir.rb +2 -1
- data/lib/rubygems/security.rb +4 -16
- data/lib/rubygems/security_option.rb +1 -0
- data/lib/rubygems/shellwords.rb +3 -0
- data/lib/rubygems/source/git.rb +1 -1
- data/lib/rubygems/source/installed.rb +1 -0
- data/lib/rubygems/source/local.rb +1 -0
- data/lib/rubygems/source/lock.rb +1 -0
- data/lib/rubygems/source/specific_file.rb +1 -0
- data/lib/rubygems/source/vendor.rb +1 -0
- data/lib/rubygems/source.rb +2 -2
- data/lib/rubygems/spec_fetcher.rb +1 -0
- data/lib/rubygems/specification.rb +58 -52
- data/lib/rubygems/specification_policy.rb +21 -0
- data/lib/rubygems/stub_specification.rb +10 -8
- data/lib/rubygems/text.rb +2 -2
- data/lib/rubygems/tsort/lib/tsort.rb +308 -310
- data/lib/rubygems/uninstaller.rb +1 -0
- data/lib/rubygems/update_suggestion.rb +69 -0
- data/lib/rubygems/user_interaction.rb +2 -0
- data/lib/rubygems/util/licenses.rb +3 -2
- data/lib/rubygems/util/list.rb +1 -0
- data/lib/rubygems/util.rb +2 -5
- data/lib/rubygems/validator.rb +2 -1
- data/lib/rubygems/version.rb +2 -2
- data/lib/rubygems/version_option.rb +1 -0
- data/lib/rubygems.rb +32 -11
- data/rubygems-update.gemspec +6 -4
- data/setup.rb +1 -0
- data/test/rubygems/bad_rake.rb +1 -0
- data/test/rubygems/bundler_test_gem.rb +421 -0
- data/test/rubygems/fake_certlib/openssl.rb +1 -0
- data/test/rubygems/good_rake.rb +1 -0
- data/test/rubygems/helper.rb +23 -6
- data/test/rubygems/installer_test_case.rb +1 -0
- data/test/rubygems/multifactor_auth_utilities.rb +111 -0
- data/test/rubygems/package/tar_test_case.rb +51 -15
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -0
- data/test/rubygems/plugin/load/rubygems_plugin.rb +1 -0
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -0
- data/test/rubygems/rubygems/commands/crash_command.rb +1 -0
- data/test/rubygems/rubygems_plugin.rb +1 -0
- data/test/rubygems/simple_gem.rb +2 -1
- data/test/rubygems/specifications/bar-0.0.2.gemspec +2 -0
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +2 -0
- data/test/rubygems/test_bundled_ca.rb +3 -2
- data/test/rubygems/test_config.rb +2 -1
- data/test/rubygems/test_deprecate.rb +2 -1
- data/test/rubygems/test_exit.rb +7 -1
- data/test/rubygems/test_gem.rb +41 -421
- data/test/rubygems/test_gem_available_set.rb +1 -0
- data/test/rubygems/test_gem_bundler_version_finder.rb +5 -3
- data/test/rubygems/test_gem_command.rb +1 -0
- data/test/rubygems/test_gem_command_manager.rb +67 -1
- data/test/rubygems/test_gem_commands_build_command.rb +11 -0
- data/test/rubygems/test_gem_commands_cert_command.rb +1 -0
- data/test/rubygems/test_gem_commands_check_command.rb +1 -0
- data/test/rubygems/test_gem_commands_cleanup_command.rb +1 -0
- data/test/rubygems/test_gem_commands_contents_command.rb +1 -0
- data/test/rubygems/test_gem_commands_dependency_command.rb +1 -0
- data/test/rubygems/test_gem_commands_environment_command.rb +1 -0
- data/test/rubygems/test_gem_commands_exec_command.rb +853 -0
- data/test/rubygems/test_gem_commands_fetch_command.rb +1 -0
- data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -0
- data/test/rubygems/test_gem_commands_help_command.rb +1 -0
- data/test/rubygems/test_gem_commands_info_command.rb +1 -0
- data/test/rubygems/test_gem_commands_install_command.rb +21 -1
- data/test/rubygems/test_gem_commands_list_command.rb +1 -0
- data/test/rubygems/test_gem_commands_lock_command.rb +1 -0
- data/test/rubygems/test_gem_commands_mirror.rb +1 -0
- data/test/rubygems/test_gem_commands_open_command.rb +1 -0
- data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
- data/test/rubygems/test_gem_commands_owner_command.rb +103 -7
- data/test/rubygems/test_gem_commands_pristine_command.rb +50 -1
- data/test/rubygems/test_gem_commands_push_command.rb +110 -6
- data/test/rubygems/test_gem_commands_query_command.rb +1 -0
- data/test/rubygems/test_gem_commands_search_command.rb +1 -0
- data/test/rubygems/test_gem_commands_server_command.rb +1 -0
- data/test/rubygems/test_gem_commands_setup_command.rb +4 -11
- data/test/rubygems/test_gem_commands_signin_command.rb +1 -0
- data/test/rubygems/test_gem_commands_sources_command.rb +1 -0
- data/test/rubygems/test_gem_commands_specification_command.rb +1 -0
- data/test/rubygems/test_gem_commands_stale_command.rb +1 -0
- data/test/rubygems/test_gem_commands_uninstall_command.rb +32 -14
- data/test/rubygems/test_gem_commands_unpack_command.rb +1 -0
- data/test/rubygems/test_gem_commands_update_command.rb +7 -6
- data/test/rubygems/test_gem_commands_which_command.rb +1 -0
- data/test/rubygems/test_gem_commands_yank_command.rb +120 -1
- data/test/rubygems/test_gem_config_file.rb +2 -1
- data/test/rubygems/test_gem_dependency.rb +3 -0
- data/test/rubygems/test_gem_dependency_installer.rb +35 -0
- data/test/rubygems/test_gem_dependency_list.rb +1 -0
- data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -0
- data/test/rubygems/test_gem_doctor.rb +1 -0
- data/test/rubygems/test_gem_ext_builder.rb +7 -8
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +4 -4
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{Cargo.lock → ext/custom_name_lib/Cargo.lock} +22 -32
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{Cargo.toml → ext/custom_name_lib/Cargo.toml} +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{src → ext/custom_name_lib/src}/lib.rs +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +3 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +36 -32
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +2 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +12 -0
- data/test/rubygems/test_gem_ext_cargo_builder.rb +33 -44
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +17 -16
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +5 -20
- data/test/rubygems/test_gem_ext_cmake_builder.rb +1 -0
- data/test/rubygems/test_gem_ext_configure_builder.rb +1 -0
- data/test/rubygems/test_gem_ext_rake_builder.rb +1 -0
- data/test/rubygems/test_gem_gem_runner.rb +8 -2
- data/test/rubygems/test_gem_gemcutter_utilities.rb +130 -48
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +1 -0
- data/test/rubygems/test_gem_indexer.rb +40 -20
- data/test/rubygems/test_gem_install_update_options.rb +1 -0
- data/test/rubygems/test_gem_installer.rb +120 -5
- data/test/rubygems/test_gem_local_remote_options.rb +1 -0
- data/test/rubygems/test_gem_name_tuple.rb +1 -0
- data/test/rubygems/test_gem_package.rb +0 -25
- data/test/rubygems/test_gem_package_old.rb +1 -0
- data/test/rubygems/test_gem_package_tar_header.rb +14 -13
- data/test/rubygems/test_gem_package_tar_reader.rb +49 -1
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +152 -6
- data/test/rubygems/test_gem_package_tar_writer.rb +1 -0
- data/test/rubygems/test_gem_package_task.rb +1 -0
- data/test/rubygems/test_gem_path_support.rb +1 -0
- data/test/rubygems/test_gem_platform.rb +60 -60
- data/test/rubygems/test_gem_rdoc.rb +1 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +6 -5
- data/test/rubygems/test_gem_request.rb +10 -4
- data/test/rubygems/test_gem_request_connection_pools.rb +1 -0
- data/test/rubygems/test_gem_request_set.rb +3 -2
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +11 -10
- data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +7 -6
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +1 -0
- data/test/rubygems/test_gem_requirement.rb +2 -1
- data/test/rubygems/test_gem_resolver.rb +1 -0
- data/test/rubygems/test_gem_resolver_activation_request.rb +1 -0
- data/test/rubygems/test_gem_resolver_api_set.rb +13 -12
- data/test/rubygems/test_gem_resolver_api_specification.rb +20 -19
- data/test/rubygems/test_gem_resolver_best_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_composed_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -0
- data/test/rubygems/test_gem_resolver_dependency_request.rb +1 -0
- data/test/rubygems/test_gem_resolver_git_set.rb +10 -9
- data/test/rubygems/test_gem_resolver_git_specification.rb +3 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_index_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_installed_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_installer_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_local_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_lock_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_lock_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -0
- data/test/rubygems/test_gem_resolver_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_vendor_set.rb +1 -0
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +1 -0
- data/test/rubygems/test_gem_security.rb +1 -0
- data/test/rubygems/test_gem_security_policy.rb +10 -10
- data/test/rubygems/test_gem_security_signer.rb +1 -0
- data/test/rubygems/test_gem_security_trust_dir.rb +3 -2
- data/test/rubygems/test_gem_silent_ui.rb +1 -0
- data/test/rubygems/test_gem_source.rb +2 -1
- data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
- data/test/rubygems/test_gem_source_git.rb +14 -12
- data/test/rubygems/test_gem_source_installed.rb +2 -1
- data/test/rubygems/test_gem_source_list.rb +1 -0
- data/test/rubygems/test_gem_source_local.rb +1 -0
- data/test/rubygems/test_gem_source_lock.rb +4 -3
- data/test/rubygems/test_gem_source_specific_file.rb +1 -0
- data/test/rubygems/test_gem_source_subpath_problem.rb +1 -0
- data/test/rubygems/test_gem_source_vendor.rb +2 -1
- data/test/rubygems/test_gem_spec_fetcher.rb +1 -0
- data/test/rubygems/test_gem_specification.rb +95 -39
- data/test/rubygems/test_gem_stream_ui.rb +34 -3
- data/test/rubygems/test_gem_stub_specification.rb +1 -0
- data/test/rubygems/test_gem_text.rb +1 -0
- data/test/rubygems/test_gem_uninstaller.rb +6 -5
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +1 -0
- data/test/rubygems/test_gem_update_suggestion.rb +209 -0
- data/test/rubygems/test_gem_uri.rb +2 -0
- data/test/rubygems/test_gem_uri_formatter.rb +1 -0
- data/test/rubygems/test_gem_util.rb +1 -0
- data/test/rubygems/test_gem_version.rb +3 -2
- data/test/rubygems/test_gem_version_option.rb +1 -0
- data/test/rubygems/test_kernel.rb +12 -17
- data/test/rubygems/test_project_sanity.rb +32 -3
- data/test/rubygems/test_remote_fetch_error.rb +2 -1
- data/test/rubygems/test_require.rb +70 -55
- data/test/rubygems/test_rubygems.rb +2 -0
- data/test/rubygems/test_webauthn_listener.rb +143 -0
- data/test/rubygems/test_webauthn_listener_response.rb +93 -0
- data/test/rubygems/test_webauthn_poller.rb +124 -0
- data/test/rubygems/utilities.rb +45 -3
- data/test/test_changelog_generator.rb +1 -1
- metadata +59 -43
- data/bundler/lib/bundler/templates/gems.rb +0 -5
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -5
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/bundler/lib/bundler/vendor/molinillo/LICENSE +0 -9
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -149
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
- data/bundler/lib/bundler/vendored_molinillo.rb +0 -4
- data/bundler/lib/bundler/version_ranges.rb +0 -122
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb +0 -21
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb +0 -21
@@ -1,11 +1,14 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require_relative "helper"
|
4
|
+
require_relative "test_gem_update_suggestion"
|
3
5
|
require "rubygems/commands/install_command"
|
4
6
|
require "rubygems/request_set"
|
5
7
|
require "rubygems/rdoc"
|
6
8
|
|
7
9
|
class TestGemCommandsInstallCommand < Gem::TestCase
|
8
10
|
def setup
|
11
|
+
@orig_args = Gem::Command.build_args
|
9
12
|
super
|
10
13
|
common_installer_setup
|
11
14
|
|
@@ -13,7 +16,6 @@ class TestGemCommandsInstallCommand < Gem::TestCase
|
|
13
16
|
@cmd.options[:document] = []
|
14
17
|
|
15
18
|
@gemdeps = "tmp_install_gemdeps"
|
16
|
-
@orig_args = Gem::Command.build_args
|
17
19
|
|
18
20
|
common_installer_setup
|
19
21
|
end
|
@@ -1550,4 +1552,22 @@ ERROR: Possible alternatives: non_existent_with_hint
|
|
1550
1552
|
assert_equal " a-3", out.shift
|
1551
1553
|
assert_empty out
|
1552
1554
|
end
|
1555
|
+
|
1556
|
+
def test_suggest_update_if_enabled
|
1557
|
+
TestUpdateSuggestion.with_eglible_environment(cmd: @cmd) do
|
1558
|
+
spec_fetcher do |fetcher|
|
1559
|
+
fetcher.gem "a", 2
|
1560
|
+
end
|
1561
|
+
|
1562
|
+
@cmd.options[:args] = %w[a]
|
1563
|
+
|
1564
|
+
use_ui @ui do
|
1565
|
+
assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
|
1566
|
+
@cmd.execute
|
1567
|
+
end
|
1568
|
+
end
|
1569
|
+
|
1570
|
+
assert_includes @ui.output, "A new release of RubyGems is available: 1.2.3 → 2.0.0!"
|
1571
|
+
end
|
1572
|
+
end
|
1553
1573
|
end
|
@@ -1,5 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require_relative "helper"
|
4
|
+
require_relative "multifactor_auth_utilities"
|
3
5
|
require "rubygems/commands/owner_command"
|
4
6
|
|
5
7
|
class TestGemCommandsOwnerCommand < Gem::TestCase
|
@@ -10,7 +12,7 @@ class TestGemCommandsOwnerCommand < Gem::TestCase
|
|
10
12
|
|
11
13
|
ENV["RUBYGEMS_HOST"] = nil
|
12
14
|
@stub_ui = Gem::MockGemUi.new
|
13
|
-
@stub_fetcher = Gem::
|
15
|
+
@stub_fetcher = Gem::MultifactorAuthFetcher.new
|
14
16
|
Gem::RemoteFetcher.fetcher = @stub_fetcher
|
15
17
|
Gem.configuration = nil
|
16
18
|
Gem.configuration.rubygems_api_key = "ed244fbf2b1a52e012da8616c512fa47f9aa5250"
|
@@ -323,13 +325,8 @@ EOF
|
|
323
325
|
end
|
324
326
|
|
325
327
|
def test_otp_verified_success
|
326
|
-
response_fail = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
|
327
328
|
response_success = "Owner added successfully."
|
328
|
-
|
329
|
-
@stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [
|
330
|
-
HTTPResponseFactory.create(body: response_fail, code: 401, msg: "Unauthorized"),
|
331
|
-
HTTPResponseFactory.create(body: response_success, code: 200, msg: "OK"),
|
332
|
-
]
|
329
|
+
@stub_fetcher.respond_with_require_otp("#{Gem.host}/api/v1/gems/freewill/owners", response_success)
|
333
330
|
|
334
331
|
@otp_ui = Gem::MockGemUi.new "111111\n"
|
335
332
|
use_ui @otp_ui do
|
@@ -345,6 +342,8 @@ EOF
|
|
345
342
|
def test_otp_verified_failure
|
346
343
|
response = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
|
347
344
|
@stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = HTTPResponseFactory.create(body: response, code: 401, msg: "Unauthorized")
|
345
|
+
@stub_fetcher.data["#{Gem.host}/api/v1/webauthn_verification"] =
|
346
|
+
HTTPResponseFactory.create(body: "You don't have any security devices", code: 422, msg: "Unprocessable Entity")
|
348
347
|
|
349
348
|
@otp_ui = Gem::MockGemUi.new "111111\n"
|
350
349
|
use_ui @otp_ui do
|
@@ -357,6 +356,103 @@ EOF
|
|
357
356
|
assert_equal "111111", @stub_fetcher.last_request["OTP"]
|
358
357
|
end
|
359
358
|
|
359
|
+
def test_with_webauthn_enabled_success
|
360
|
+
response_success = "Owner added successfully."
|
361
|
+
server = Gem::MockTCPServer.new
|
362
|
+
|
363
|
+
@stub_fetcher.respond_with_require_otp("#{Gem.host}/api/v1/gems/freewill/owners", response_success)
|
364
|
+
@stub_fetcher.respond_with_webauthn_url
|
365
|
+
|
366
|
+
TCPServer.stub(:new, server) do
|
367
|
+
Gem::GemcutterUtilities::WebauthnListener.stub(:listener_thread, Thread.new { Thread.current[:otp] = "Uvh6T57tkWuUnWYo" }) do
|
368
|
+
use_ui @stub_ui do
|
369
|
+
@cmd.add_owners("freewill", ["user-new1@example.com"])
|
370
|
+
end
|
371
|
+
end
|
372
|
+
end
|
373
|
+
|
374
|
+
assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
|
375
|
+
"to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
|
376
|
+
"you can re-run the gem signin command with the `--otp [your_code]` option.", @stub_ui.output
|
377
|
+
assert_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
|
378
|
+
assert_equal "Uvh6T57tkWuUnWYo", @stub_fetcher.last_request["OTP"]
|
379
|
+
assert_match response_success, @stub_ui.output
|
380
|
+
end
|
381
|
+
|
382
|
+
def test_with_webauthn_enabled_failure
|
383
|
+
response_success = "Owner added successfully."
|
384
|
+
server = Gem::MockTCPServer.new
|
385
|
+
error = Gem::WebauthnVerificationError.new("Something went wrong")
|
386
|
+
|
387
|
+
@stub_fetcher.respond_with_require_otp("#{Gem.host}/api/v1/gems/freewill/owners", response_success)
|
388
|
+
@stub_fetcher.respond_with_webauthn_url
|
389
|
+
|
390
|
+
TCPServer.stub(:new, server) do
|
391
|
+
Gem::GemcutterUtilities::WebauthnListener.stub(:listener_thread, Thread.new { Thread.current[:error] = error }) do
|
392
|
+
use_ui @stub_ui do
|
393
|
+
@cmd.add_owners("freewill", ["user-new1@example.com"])
|
394
|
+
end
|
395
|
+
end
|
396
|
+
end
|
397
|
+
|
398
|
+
assert_match @stub_fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
|
399
|
+
assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
|
400
|
+
"to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
|
401
|
+
"you can re-run the gem signin command with the `--otp [your_code]` option.", @stub_ui.output
|
402
|
+
assert_match "ERROR: Security device verification failed: Something went wrong", @stub_ui.error
|
403
|
+
refute_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
|
404
|
+
refute_match response_success, @stub_ui.output
|
405
|
+
end
|
406
|
+
|
407
|
+
def test_with_webauthn_enabled_success_with_polling
|
408
|
+
response_success = "Owner added successfully."
|
409
|
+
server = Gem::MockTCPServer.new
|
410
|
+
|
411
|
+
@stub_fetcher.respond_with_require_otp("#{Gem.host}/api/v1/gems/freewill/owners", response_success)
|
412
|
+
@stub_fetcher.respond_with_webauthn_url
|
413
|
+
@stub_fetcher.respond_with_webauthn_polling("Uvh6T57tkWuUnWYo")
|
414
|
+
|
415
|
+
TCPServer.stub(:new, server) do
|
416
|
+
use_ui @stub_ui do
|
417
|
+
@cmd.add_owners("freewill", ["user-new1@example.com"])
|
418
|
+
end
|
419
|
+
end
|
420
|
+
|
421
|
+
assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
|
422
|
+
"to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin " \
|
423
|
+
"command with the `--otp [your_code]` option.", @stub_ui.output
|
424
|
+
assert_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
|
425
|
+
assert_equal "Uvh6T57tkWuUnWYo", @stub_fetcher.last_request["OTP"]
|
426
|
+
assert_match response_success, @stub_ui.output
|
427
|
+
end
|
428
|
+
|
429
|
+
def test_with_webauthn_enabled_failure_with_polling
|
430
|
+
response_success = "Owner added successfully."
|
431
|
+
server = Gem::MockTCPServer.new
|
432
|
+
|
433
|
+
@stub_fetcher.respond_with_require_otp(
|
434
|
+
"#{Gem.host}/api/v1/gems/freewill/owners",
|
435
|
+
response_success
|
436
|
+
)
|
437
|
+
@stub_fetcher.respond_with_webauthn_url
|
438
|
+
@stub_fetcher.respond_with_webauthn_polling_failure
|
439
|
+
|
440
|
+
TCPServer.stub(:new, server) do
|
441
|
+
use_ui @stub_ui do
|
442
|
+
@cmd.add_owners("freewill", ["user-new1@example.com"])
|
443
|
+
end
|
444
|
+
end
|
445
|
+
|
446
|
+
assert_match @stub_fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
|
447
|
+
assert_match "You have enabled multi-factor authentication. Please visit #{@stub_fetcher.webauthn_url_with_port(server.port)} " \
|
448
|
+
"to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin " \
|
449
|
+
"command with the `--otp [your_code]` option.", @stub_ui.output
|
450
|
+
assert_match "ERROR: Security device verification failed: The token in the link you used has either expired " \
|
451
|
+
"or been used already.", @stub_ui.error
|
452
|
+
refute_match "You are verified with a security device. You may close the browser window.", @stub_ui.output
|
453
|
+
refute_match response_success, @stub_ui.output
|
454
|
+
end
|
455
|
+
|
360
456
|
def test_remove_owners_unathorized_api_key
|
361
457
|
response_forbidden = "The API key doesn't have access"
|
362
458
|
response_success = "Owner removed successfully."
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require_relative "helper"
|
3
4
|
require "rubygems/commands/pristine_command"
|
4
5
|
|
@@ -202,6 +203,54 @@ class TestGemCommandsPristineCommand < Gem::TestCase
|
|
202
203
|
assert_empty out, out.inspect
|
203
204
|
end
|
204
205
|
|
206
|
+
def test_execute_extensions_only_missing_extensions
|
207
|
+
a = util_spec "a" do |s|
|
208
|
+
s.extensions << "ext/a/extconf.rb"
|
209
|
+
end
|
210
|
+
|
211
|
+
ext_path = File.join @tempdir, "ext", "a", "extconf.rb"
|
212
|
+
write_file ext_path do |io|
|
213
|
+
io.write <<-'RUBY'
|
214
|
+
File.open "Makefile", "w" do |f|
|
215
|
+
f.puts "clean:\n\techo cleaned\n"
|
216
|
+
f.puts "all:\n\techo built\n"
|
217
|
+
f.puts "install:\n\techo installed\n"
|
218
|
+
end
|
219
|
+
RUBY
|
220
|
+
end
|
221
|
+
|
222
|
+
b = util_spec "b" do |s|
|
223
|
+
s.extensions << "ext/b/extconf.rb"
|
224
|
+
end
|
225
|
+
|
226
|
+
ext_path = File.join @tempdir, "ext", "b", "extconf.rb"
|
227
|
+
write_file ext_path do |io|
|
228
|
+
io.write <<-'RUBY'
|
229
|
+
File.open "Makefile", "w" do |f|
|
230
|
+
f.puts "clean:\n\techo cleaned\n"
|
231
|
+
f.puts "all:\n\techo built\n"
|
232
|
+
f.puts "install:\n\techo installed\n"
|
233
|
+
end
|
234
|
+
RUBY
|
235
|
+
end
|
236
|
+
|
237
|
+
install_gem a
|
238
|
+
install_gem b
|
239
|
+
|
240
|
+
# Remove the extension files for b
|
241
|
+
FileUtils.rm_rf b.gem_build_complete_path
|
242
|
+
|
243
|
+
@cmd.options[:only_missing_extensions] = true
|
244
|
+
@cmd.options[:args] = []
|
245
|
+
|
246
|
+
use_ui @ui do
|
247
|
+
@cmd.execute
|
248
|
+
end
|
249
|
+
|
250
|
+
refute_includes @ui.output, "Restored #{a.full_name}"
|
251
|
+
assert_includes @ui.output, "Restored #{b.full_name}"
|
252
|
+
end
|
253
|
+
|
205
254
|
def test_execute_no_extension
|
206
255
|
a = util_spec "a" do |s|
|
207
256
|
s.extensions << "ext/a/extconf.rb"
|
@@ -497,7 +546,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
|
|
497
546
|
fp.puts "puts __FILE__"
|
498
547
|
end
|
499
548
|
write_file File.join(@tempdir, "lib", "rubygems_plugin.rb") do |fp|
|
500
|
-
fp.puts "
|
549
|
+
fp.puts "# do nothing"
|
501
550
|
end
|
502
551
|
write_file File.join(@tempdir, "bin", "foo") do |fp|
|
503
552
|
fp.puts "#!/usr/bin/ruby"
|
@@ -1,5 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require_relative "helper"
|
4
|
+
require_relative "multifactor_auth_utilities"
|
3
5
|
require "rubygems/commands/push_command"
|
4
6
|
|
5
7
|
class TestGemCommandsPushCommand < Gem::TestCase
|
@@ -24,7 +26,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
|
|
24
26
|
@host = "https://rubygems.example"
|
25
27
|
@api_key = Gem.configuration.rubygems_api_key
|
26
28
|
|
27
|
-
@fetcher = Gem::
|
29
|
+
@fetcher = Gem::MultifactorAuthFetcher.new
|
28
30
|
Gem::RemoteFetcher.fetcher = @fetcher
|
29
31
|
|
30
32
|
@cmd = Gem::Commands::PushCommand.new
|
@@ -384,13 +386,9 @@ class TestGemCommandsPushCommand < Gem::TestCase
|
|
384
386
|
end
|
385
387
|
|
386
388
|
def test_otp_verified_success
|
387
|
-
response_fail = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
|
388
389
|
response_success = "Successfully registered gem: freewill (1.0.0)"
|
389
390
|
|
390
|
-
@fetcher.
|
391
|
-
HTTPResponseFactory.create(body: response_fail, code: 401, msg: "Unauthorized"),
|
392
|
-
HTTPResponseFactory.create(body: response_success, code: 200, msg: "OK"),
|
393
|
-
]
|
391
|
+
@fetcher.respond_with_require_otp("#{Gem.host}/api/v1/gems", response_success)
|
394
392
|
|
395
393
|
@otp_ui = Gem::MockGemUi.new "111111\n"
|
396
394
|
use_ui @otp_ui do
|
@@ -406,6 +404,8 @@ class TestGemCommandsPushCommand < Gem::TestCase
|
|
406
404
|
def test_otp_verified_failure
|
407
405
|
response = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
|
408
406
|
@fetcher.data["#{Gem.host}/api/v1/gems"] = HTTPResponseFactory.create(body: response, code: 401, msg: "Unauthorized")
|
407
|
+
@fetcher.data["#{Gem.host}/api/v1/webauthn_verification"] =
|
408
|
+
HTTPResponseFactory.create(body: "You don't have any security devices", code: 422, msg: "Unprocessable Entity")
|
409
409
|
|
410
410
|
@otp_ui = Gem::MockGemUi.new "111111\n"
|
411
411
|
assert_raise Gem::MockGemUi::TermError do
|
@@ -420,6 +420,106 @@ class TestGemCommandsPushCommand < Gem::TestCase
|
|
420
420
|
assert_equal "111111", @fetcher.last_request["OTP"]
|
421
421
|
end
|
422
422
|
|
423
|
+
def test_with_webauthn_enabled_success
|
424
|
+
response_success = "Successfully registered gem: freewill (1.0.0)"
|
425
|
+
server = Gem::MockTCPServer.new
|
426
|
+
|
427
|
+
@fetcher.respond_with_require_otp("#{Gem.host}/api/v1/gems", response_success)
|
428
|
+
@fetcher.respond_with_webauthn_url
|
429
|
+
|
430
|
+
TCPServer.stub(:new, server) do
|
431
|
+
Gem::GemcutterUtilities::WebauthnListener.stub(:listener_thread, Thread.new { Thread.current[:otp] = "Uvh6T57tkWuUnWYo" }) do
|
432
|
+
use_ui @ui do
|
433
|
+
@cmd.send_gem(@path)
|
434
|
+
end
|
435
|
+
end
|
436
|
+
end
|
437
|
+
|
438
|
+
assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
|
439
|
+
"to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
|
440
|
+
"you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
|
441
|
+
assert_match "You are verified with a security device. You may close the browser window.", @ui.output
|
442
|
+
assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
|
443
|
+
assert_match response_success, @ui.output
|
444
|
+
end
|
445
|
+
|
446
|
+
def test_with_webauthn_enabled_failure
|
447
|
+
response_success = "Successfully registered gem: freewill (1.0.0)"
|
448
|
+
server = Gem::MockTCPServer.new
|
449
|
+
error = Gem::WebauthnVerificationError.new("Something went wrong")
|
450
|
+
|
451
|
+
@fetcher.respond_with_require_otp("#{Gem.host}/api/v1/gems", response_success)
|
452
|
+
@fetcher.respond_with_webauthn_url
|
453
|
+
|
454
|
+
error = assert_raise Gem::MockGemUi::TermError do
|
455
|
+
TCPServer.stub(:new, server) do
|
456
|
+
Gem::GemcutterUtilities::WebauthnListener.stub(:listener_thread, Thread.new { Thread.current[:error] = error }) do
|
457
|
+
use_ui @ui do
|
458
|
+
@cmd.send_gem(@path)
|
459
|
+
end
|
460
|
+
end
|
461
|
+
end
|
462
|
+
end
|
463
|
+
assert_equal 1, error.exit_code
|
464
|
+
|
465
|
+
assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
|
466
|
+
assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
|
467
|
+
"to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
|
468
|
+
"you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
|
469
|
+
assert_match "ERROR: Security device verification failed: Something went wrong", @ui.error
|
470
|
+
refute_match "You are verified with a security device. You may close the browser window.", @ui.output
|
471
|
+
refute_match response_success, @ui.output
|
472
|
+
end
|
473
|
+
|
474
|
+
def test_with_webauthn_enabled_success_with_polling
|
475
|
+
response_success = "Successfully registered gem: freewill (1.0.0)"
|
476
|
+
server = Gem::MockTCPServer.new
|
477
|
+
|
478
|
+
@fetcher.respond_with_require_otp("#{Gem.host}/api/v1/gems", response_success)
|
479
|
+
@fetcher.respond_with_webauthn_url
|
480
|
+
@fetcher.respond_with_webauthn_polling("Uvh6T57tkWuUnWYo")
|
481
|
+
|
482
|
+
TCPServer.stub(:new, server) do
|
483
|
+
use_ui @ui do
|
484
|
+
@cmd.send_gem(@path)
|
485
|
+
end
|
486
|
+
end
|
487
|
+
|
488
|
+
assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
|
489
|
+
"to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
|
490
|
+
"you can re-run the gem signin command with the `--otp [your_code]` option.", @ui.output
|
491
|
+
assert_match "You are verified with a security device. You may close the browser window.", @ui.output
|
492
|
+
assert_equal "Uvh6T57tkWuUnWYo", @fetcher.last_request["OTP"]
|
493
|
+
assert_match response_success, @ui.output
|
494
|
+
end
|
495
|
+
|
496
|
+
def test_with_webauthn_enabled_failure_with_polling
|
497
|
+
response_success = "Successfully registered gem: freewill (1.0.0)"
|
498
|
+
server = Gem::MockTCPServer.new
|
499
|
+
|
500
|
+
@fetcher.respond_with_require_otp("#{Gem.host}/api/v1/gems", response_success)
|
501
|
+
@fetcher.respond_with_webauthn_url
|
502
|
+
@fetcher.respond_with_webauthn_polling_failure
|
503
|
+
|
504
|
+
error = assert_raise Gem::MockGemUi::TermError do
|
505
|
+
TCPServer.stub(:new, server) do
|
506
|
+
use_ui @ui do
|
507
|
+
@cmd.send_gem(@path)
|
508
|
+
end
|
509
|
+
end
|
510
|
+
end
|
511
|
+
assert_equal 1, error.exit_code
|
512
|
+
|
513
|
+
assert_match @fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
|
514
|
+
assert_match "You have enabled multi-factor authentication. Please visit #{@fetcher.webauthn_url_with_port(server.port)} " \
|
515
|
+
"to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, you can re-run the gem signin " \
|
516
|
+
"command with the `--otp [your_code]` option.", @ui.output
|
517
|
+
assert_match "ERROR: Security device verification failed: The token in the link you used has either expired " \
|
518
|
+
"or been used already.", @ui.error
|
519
|
+
refute_match "You are verified with a security device. You may close the browser window.", @ui.output
|
520
|
+
refute_match response_success, @ui.output
|
521
|
+
end
|
522
|
+
|
423
523
|
def test_sending_gem_unathorized_api_key_with_mfa_enabled
|
424
524
|
response_mfa_enabled = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
|
425
525
|
response_forbidden = "The API key doesn't have access"
|
@@ -430,6 +530,8 @@ class TestGemCommandsPushCommand < Gem::TestCase
|
|
430
530
|
HTTPResponseFactory.create(body: response_forbidden, code: 403, msg: "Forbidden"),
|
431
531
|
HTTPResponseFactory.create(body: response_success, code: 200, msg: "OK"),
|
432
532
|
]
|
533
|
+
@fetcher.data["#{@host}/api/v1/webauthn_verification"] =
|
534
|
+
HTTPResponseFactory.create(body: "You don't have any security devices", code: 422, msg: "Unprocessable Entity")
|
433
535
|
|
434
536
|
@fetcher.data["#{@host}/api/v1/api_key"] = HTTPResponseFactory.create(body: "", code: 200, msg: "OK")
|
435
537
|
@cmd.instance_variable_set :@host, @host
|
@@ -470,6 +572,8 @@ class TestGemCommandsPushCommand < Gem::TestCase
|
|
470
572
|
@fetcher.data["#{@host}/api/v1/profile/me.yaml"] = [
|
471
573
|
HTTPResponseFactory.create(body: response_profile, code: 200, msg: "OK"),
|
472
574
|
]
|
575
|
+
@fetcher.data["#{@host}/api/v1/webauthn_verification"] =
|
576
|
+
HTTPResponseFactory.create(body: "You don't have any security devices", code: 422, msg: "Unprocessable Entity")
|
473
577
|
|
474
578
|
@cmd.instance_variable_set :@scope, :push_rubygem
|
475
579
|
@cmd.options[:args] = [@path]
|
@@ -8,16 +8,17 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|
8
8
|
if File.exist?(bundler_gemspec)
|
9
9
|
BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1]
|
10
10
|
else
|
11
|
-
BUNDLER_VERS = "2.0.1"
|
11
|
+
BUNDLER_VERS = "2.0.1"
|
12
12
|
end
|
13
13
|
|
14
14
|
def setup
|
15
15
|
super
|
16
16
|
|
17
17
|
@cmd = Gem::Commands::SetupCommand.new
|
18
|
+
@cmd.options[:document] = []
|
18
19
|
|
19
20
|
filelist = %w[
|
20
|
-
|
21
|
+
exe/gem
|
21
22
|
lib/rubygems.rb
|
22
23
|
lib/rubygems/requirement.rb
|
23
24
|
lib/rubygems/ssl_certs/rubygems.org/foo.pem
|
@@ -66,7 +67,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|
66
67
|
io.puts "I changed it!"
|
67
68
|
end
|
68
69
|
|
69
|
-
@cmd.options[:document] = []
|
70
70
|
@cmd.execute
|
71
71
|
|
72
72
|
assert_match %r{\A#!}, File.read(gem_bin_path)
|
@@ -78,7 +78,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|
78
78
|
io.puts "I changed it!"
|
79
79
|
end
|
80
80
|
|
81
|
-
@cmd.options[:document] = []
|
82
81
|
@cmd.options[:regenerate_binstubs] = false
|
83
82
|
@cmd.execute
|
84
83
|
|
@@ -91,7 +90,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|
91
90
|
io.puts "I changed it!"
|
92
91
|
end
|
93
92
|
|
94
|
-
@cmd.options[:document] = []
|
95
93
|
@cmd.execute
|
96
94
|
|
97
95
|
assert_match %r{\Arequire}, File.read(gem_plugin_path)
|
@@ -103,7 +101,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|
103
101
|
io.puts "I changed it!"
|
104
102
|
end
|
105
103
|
|
106
|
-
@cmd.options[:document] = []
|
107
104
|
@cmd.options[:regenerate_plugins] = false
|
108
105
|
@cmd.execute
|
109
106
|
|
@@ -116,15 +113,12 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|
116
113
|
# Simulate gem installed with an older rubygems without a plugins layout
|
117
114
|
FileUtils.rm_rf Gem.plugindir
|
118
115
|
|
119
|
-
@cmd.options[:document] = []
|
120
116
|
@cmd.execute
|
121
117
|
|
122
118
|
assert_match %r{\Arequire}, File.read(gem_plugin_path)
|
123
119
|
end
|
124
120
|
|
125
121
|
def test_execute_informs_about_installed_executables
|
126
|
-
@cmd.options[:document] = []
|
127
|
-
|
128
122
|
use_ui @ui do
|
129
123
|
@cmd.execute
|
130
124
|
end
|
@@ -143,7 +137,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|
143
137
|
io.puts "I changed it!"
|
144
138
|
end
|
145
139
|
|
146
|
-
@cmd.options[:document] = []
|
147
140
|
@cmd.options[:env_shebang] = true
|
148
141
|
@cmd.execute
|
149
142
|
|
@@ -440,7 +433,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|
440
433
|
s.files = %W[lib/rubygems_plugin.rb]
|
441
434
|
end
|
442
435
|
write_file File.join @tempdir, "lib", "rubygems_plugin.rb" do |f|
|
443
|
-
f.puts "
|
436
|
+
f.puts "# do nothing"
|
444
437
|
end
|
445
438
|
install_gem gem
|
446
439
|
|