puppet 6.16.0-x86-mingw32 → 7.0.0-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Gemfile +5 -3
- data/Gemfile.lock +31 -33
- data/README.md +4 -5
- data/Rakefile +4 -12
- data/conf/fileserver.conf +5 -10
- data/ext/build_defaults.yaml +1 -1
- data/ext/osx/file_mapping.yaml +0 -5
- data/ext/project_data.yaml +1 -14
- data/ext/redhat/puppet.spec.erb +0 -1
- data/ext/windows/service/daemon.rb +6 -5
- data/install.rb +21 -17
- data/lib/puppet.rb +11 -20
- data/lib/puppet/agent.rb +2 -2
- data/lib/puppet/agent/locker.rb +0 -7
- data/lib/puppet/application.rb +172 -98
- data/lib/puppet/application/agent.rb +22 -6
- data/lib/puppet/application/apply.rb +18 -20
- data/lib/puppet/application/device.rb +100 -104
- data/lib/puppet/application/doc.rb +1 -1
- data/lib/puppet/application/filebucket.rb +15 -11
- data/lib/puppet/application/lookup.rb +16 -4
- data/lib/puppet/application/ssl.rb +1 -1
- data/lib/puppet/configurer.rb +66 -31
- data/lib/puppet/configurer/downloader.rb +31 -10
- data/lib/puppet/configurer/plugin_handler.rb +21 -19
- data/lib/puppet/confine.rb +2 -2
- data/lib/puppet/confine/any.rb +1 -1
- data/lib/puppet/defaults.rb +166 -169
- data/lib/puppet/environments.rb +41 -15
- data/lib/puppet/face/catalog.rb +1 -1
- data/lib/puppet/face/config.rb +56 -16
- data/lib/puppet/face/epp.rb +12 -2
- data/lib/puppet/face/facts.rb +66 -6
- data/lib/puppet/face/help.rb +1 -1
- data/lib/puppet/face/node.rb +3 -3
- data/lib/puppet/face/node/clean.rb +2 -2
- data/lib/puppet/face/plugin.rb +5 -8
- data/lib/puppet/feature/base.rb +1 -1
- data/lib/puppet/ffi/windows.rb +12 -0
- data/lib/puppet/ffi/windows/api_types.rb +311 -0
- data/lib/puppet/ffi/windows/constants.rb +404 -0
- data/lib/puppet/ffi/windows/functions.rb +628 -0
- data/lib/puppet/ffi/windows/structs.rb +338 -0
- data/lib/puppet/file_bucket/dipper.rb +1 -1
- data/lib/puppet/file_serving/configuration.rb +0 -5
- data/lib/puppet/file_serving/configuration/parser.rb +3 -32
- data/lib/puppet/file_serving/http_metadata.rb +13 -1
- data/lib/puppet/file_serving/metadata.rb +4 -1
- data/lib/puppet/file_serving/mount.rb +1 -2
- data/lib/puppet/file_serving/mount/locales.rb +1 -2
- data/lib/puppet/file_serving/mount/pluginfacts.rb +1 -2
- data/lib/puppet/file_serving/mount/plugins.rb +1 -2
- data/lib/puppet/file_serving/terminus_selector.rb +7 -8
- data/lib/puppet/file_system/file_impl.rb +4 -4
- data/lib/puppet/file_system/uniquefile.rb +8 -16
- data/lib/puppet/forge.rb +1 -1
- data/lib/puppet/forge/cache.rb +1 -1
- data/lib/puppet/forge/repository.rb +3 -8
- data/lib/puppet/functions/epp.rb +1 -0
- data/lib/puppet/functions/inline_epp.rb +1 -0
- data/lib/puppet/functions/lstrip.rb +4 -4
- data/lib/puppet/functions/new.rb +8 -3
- data/lib/puppet/functions/reverse_each.rb +1 -1
- data/lib/puppet/functions/rstrip.rb +4 -4
- data/lib/puppet/functions/step.rb +1 -1
- data/lib/puppet/functions/strip.rb +4 -4
- data/lib/puppet/generate/models/type/type.rb +4 -1
- data/lib/puppet/gettext/config.rb +5 -5
- data/lib/puppet/gettext/module_translations.rb +4 -4
- data/lib/puppet/http.rb +23 -13
- data/lib/puppet/http/client.rb +170 -115
- data/lib/puppet/{network/resolver.rb → http/dns.rb} +2 -2
- data/lib/puppet/http/errors.rb +16 -0
- data/lib/puppet/http/external_client.rb +5 -7
- data/lib/puppet/{network/http → http}/factory.rb +8 -11
- data/lib/puppet/{network/http → http}/pool.rb +61 -26
- data/lib/puppet/{network/http/session.rb → http/pool_entry.rb} +2 -3
- data/lib/puppet/http/proxy.rb +137 -0
- data/lib/puppet/http/redirector.rb +13 -19
- data/lib/puppet/http/resolver.rb +10 -23
- data/lib/puppet/http/resolver/server_list.rb +23 -45
- data/lib/puppet/http/resolver/settings.rb +7 -10
- data/lib/puppet/http/resolver/srv.rb +11 -15
- data/lib/puppet/http/response.rb +49 -48
- data/lib/puppet/http/response_converter.rb +24 -0
- data/lib/puppet/http/response_net_http.rb +42 -0
- data/lib/puppet/http/retry_after_handler.rb +4 -13
- data/lib/puppet/http/service.rb +15 -27
- data/lib/puppet/http/service/ca.rb +11 -22
- data/lib/puppet/http/service/compiler.rb +23 -70
- data/lib/puppet/http/service/file_server.rb +19 -28
- data/lib/puppet/http/service/puppetserver.rb +53 -0
- data/lib/puppet/http/service/report.rb +8 -10
- data/lib/puppet/http/session.rb +16 -24
- data/lib/puppet/{network/http → http}/site.rb +1 -2
- data/lib/puppet/indirector.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +1 -1
- data/lib/puppet/indirector/catalog/rest.rb +2 -4
- data/lib/puppet/indirector/exec.rb +1 -1
- data/lib/puppet/indirector/fact_search.rb +60 -0
- data/lib/puppet/indirector/facts/facter.rb +27 -6
- data/lib/puppet/indirector/facts/json.rb +27 -0
- data/lib/puppet/indirector/facts/rest.rb +3 -22
- data/lib/puppet/indirector/facts/yaml.rb +4 -59
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -9
- data/lib/puppet/indirector/file_content/rest.rb +3 -7
- data/lib/puppet/indirector/file_metadata/http.rb +25 -5
- data/lib/puppet/indirector/file_metadata/rest.rb +5 -11
- data/lib/puppet/indirector/file_server.rb +1 -8
- data/lib/puppet/indirector/generic_http.rb +0 -11
- data/lib/puppet/indirector/hiera.rb +4 -0
- data/lib/puppet/indirector/indirection.rb +1 -1
- data/lib/puppet/indirector/json.rb +5 -1
- data/lib/puppet/indirector/msgpack.rb +1 -1
- data/lib/puppet/indirector/node/json.rb +8 -0
- data/lib/puppet/indirector/node/rest.rb +2 -4
- data/lib/puppet/indirector/report/json.rb +34 -0
- data/lib/puppet/indirector/report/processor.rb +2 -2
- data/lib/puppet/indirector/report/rest.rb +3 -8
- data/lib/puppet/indirector/request.rb +2 -103
- data/lib/puppet/indirector/rest.rb +12 -263
- data/lib/puppet/indirector/yaml.rb +1 -1
- data/lib/puppet/module.rb +1 -2
- data/lib/puppet/module_tool/applications.rb +0 -1
- data/lib/puppet/network/authconfig.rb +2 -96
- data/lib/puppet/network/authorization.rb +13 -35
- data/lib/puppet/network/format_support.rb +2 -2
- data/lib/puppet/network/formats.rb +2 -1
- data/lib/puppet/network/http.rb +3 -3
- data/lib/puppet/network/http/api/indirected_routes.rb +3 -21
- data/lib/puppet/network/http/api/master/v3.rb +11 -13
- data/lib/puppet/network/http/api/master/v3/environments.rb +0 -1
- data/lib/puppet/network/http/connection.rb +247 -316
- data/lib/puppet/network/http/handler.rb +0 -1
- data/lib/puppet/network/http/route.rb +2 -2
- data/lib/puppet/network/http_pool.rb +16 -34
- data/lib/puppet/node.rb +1 -30
- data/lib/puppet/node/environment.rb +12 -5
- data/lib/puppet/node/facts.rb +17 -0
- data/lib/puppet/pal/json_catalog_encoder.rb +4 -0
- data/lib/puppet/pal/pal_impl.rb +93 -14
- data/lib/puppet/parameter.rb +1 -1
- data/lib/puppet/parser/ast/leaf.rb +5 -5
- data/lib/puppet/parser/ast/pops_bridge.rb +0 -42
- data/lib/puppet/parser/compiler.rb +1 -199
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +14 -39
- data/lib/puppet/parser/functions.rb +21 -17
- data/lib/puppet/parser/functions/create_resources.rb +11 -7
- data/lib/puppet/parser/resource.rb +3 -71
- data/lib/puppet/parser/resource/param.rb +6 -0
- data/lib/puppet/parser/type_loader.rb +2 -2
- data/lib/puppet/pops/adaptable.rb +7 -13
- data/lib/puppet/pops/adapters.rb +8 -4
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +1 -3
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +27 -13
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +2 -2
- data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +3 -3
- data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +6 -8
- data/lib/puppet/pops/loader/runtime3_type_loader.rb +4 -2
- data/lib/puppet/pops/loaders.rb +18 -11
- data/lib/puppet/pops/lookup/context.rb +1 -1
- data/lib/puppet/pops/lookup/hiera_config.rb +14 -1
- data/lib/puppet/pops/model/ast.pp +0 -42
- data/lib/puppet/pops/model/ast.rb +0 -290
- data/lib/puppet/pops/model/factory.rb +0 -45
- data/lib/puppet/pops/model/model_label_provider.rb +0 -5
- data/lib/puppet/pops/model/model_tree_dumper.rb +0 -22
- data/lib/puppet/pops/model/pn_transformer.rb +0 -16
- data/lib/puppet/pops/parser/egrammar.ra +0 -56
- data/lib/puppet/pops/parser/eparser.rb +1520 -1712
- data/lib/puppet/pops/parser/lexer2.rb +4 -4
- data/lib/puppet/pops/parser/parser_support.rb +0 -5
- data/lib/puppet/pops/resource/resource_type_impl.rb +2 -22
- data/lib/puppet/pops/types/iterable.rb +34 -8
- data/lib/puppet/pops/types/p_meta_type.rb +1 -1
- data/lib/puppet/pops/types/p_type_set_type.rb +4 -0
- data/lib/puppet/pops/types/type_calculator.rb +0 -7
- data/lib/puppet/pops/types/type_parser.rb +0 -4
- data/lib/puppet/pops/types/types.rb +0 -1
- data/lib/puppet/pops/validation/checker4_0.rb +28 -42
- data/lib/puppet/pops/validation/tasks_checker.rb +0 -12
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -1
- data/lib/puppet/provider.rb +0 -13
- data/lib/puppet/provider/file/windows.rb +1 -1
- data/lib/puppet/provider/nameservice.rb +0 -18
- data/lib/puppet/provider/package/apt.rb +34 -0
- data/lib/puppet/provider/package/aptitude.rb +1 -1
- data/lib/puppet/provider/package/dpkg.rb +1 -11
- data/lib/puppet/provider/package/gem.rb +27 -5
- data/lib/puppet/provider/package/pip.rb +0 -1
- data/lib/puppet/provider/package/pip2.rb +17 -0
- data/lib/puppet/provider/package/pkg.rb +0 -4
- data/lib/puppet/provider/package/portage.rb +1 -1
- data/lib/puppet/provider/package/puppet_gem.rb +6 -4
- data/lib/puppet/provider/package/puppetserver_gem.rb +180 -0
- data/lib/puppet/provider/package/yum.rb +2 -1
- data/lib/puppet/provider/package/zypper.rb +3 -0
- data/lib/puppet/provider/service/smf.rb +191 -73
- data/lib/puppet/provider/service/windows.rb +23 -7
- data/lib/puppet/provider/user/aix.rb +1 -1
- data/lib/puppet/provider/user/directoryservice.rb +0 -10
- data/lib/puppet/provider/user/user_role_add.rb +1 -1
- data/lib/puppet/provider/user/useradd.rb +11 -4
- data/lib/puppet/provider/user/windows_adsi.rb +18 -1
- data/lib/puppet/reference/configuration.rb +2 -0
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/reports/http.rb +2 -0
- data/lib/puppet/resource.rb +3 -90
- data/lib/puppet/resource/catalog.rb +1 -14
- data/lib/puppet/resource/type.rb +5 -112
- data/lib/puppet/resource/type_collection.rb +3 -48
- data/lib/puppet/runtime.rb +1 -2
- data/lib/puppet/settings.rb +84 -35
- data/lib/puppet/settings/base_setting.rb +26 -2
- data/lib/puppet/settings/integer_setting.rb +17 -0
- data/lib/puppet/settings/port_setting.rb +15 -0
- data/lib/puppet/settings/priority_setting.rb +5 -4
- data/lib/puppet/ssl.rb +10 -6
- data/lib/puppet/ssl/base.rb +3 -5
- data/lib/puppet/ssl/certificate.rb +0 -6
- data/lib/puppet/ssl/certificate_request.rb +1 -12
- data/lib/puppet/ssl/certificate_signer.rb +6 -0
- data/lib/puppet/ssl/oids.rb +3 -1
- data/lib/puppet/ssl/ssl_context.rb +2 -2
- data/lib/puppet/ssl/ssl_provider.rb +37 -1
- data/lib/puppet/ssl/state_machine.rb +3 -1
- data/lib/puppet/ssl/verifier.rb +2 -0
- data/lib/puppet/test/test_helper.rb +19 -16
- data/lib/puppet/transaction.rb +3 -9
- data/lib/puppet/transaction/persistence.rb +1 -1
- data/lib/puppet/transaction/report.rb +10 -8
- data/lib/puppet/trusted_external.rb +29 -1
- data/lib/puppet/type.rb +9 -77
- data/lib/puppet/type/file.rb +45 -22
- data/lib/puppet/type/file/checksum.rb +5 -5
- data/lib/puppet/type/file/source.rb +33 -13
- data/lib/puppet/type/filebucket.rb +4 -4
- data/lib/puppet/type/notify.rb +2 -2
- data/lib/puppet/type/package.rb +5 -13
- data/lib/puppet/type/service.rb +53 -0
- data/lib/puppet/type/user.rb +18 -3
- data/lib/puppet/util.rb +41 -3
- data/lib/puppet/util/autoload.rb +9 -7
- data/lib/puppet/util/character_encoding.rb +9 -5
- data/lib/puppet/util/checksums.rb +19 -4
- data/lib/puppet/util/execution.rb +2 -13
- data/lib/puppet/util/fileparsing.rb +2 -2
- data/lib/puppet/util/http_proxy.rb +2 -215
- data/lib/puppet/util/monkey_patches.rb +0 -46
- data/lib/puppet/util/provider_features.rb +1 -1
- data/lib/puppet/util/rdoc.rb +0 -7
- data/lib/puppet/util/reference.rb +1 -1
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/rubygems.rb +5 -1
- data/lib/puppet/util/run_mode.rb +14 -2
- data/lib/puppet/util/windows.rb +3 -7
- data/lib/puppet/util/windows/daemon.rb +360 -0
- data/lib/puppet/util/windows/error.rb +1 -0
- data/lib/puppet/util/windows/eventlog.rb +5 -15
- data/lib/puppet/util/windows/file.rb +8 -242
- data/lib/puppet/util/windows/monkey_patches/process.rb +414 -0
- data/lib/puppet/util/windows/principal.rb +8 -6
- data/lib/puppet/util/windows/process.rb +4 -226
- data/lib/puppet/util/windows/registry.rb +11 -11
- data/lib/puppet/util/windows/security.rb +4 -4
- data/lib/puppet/util/windows/service.rb +52 -486
- data/lib/puppet/util/windows/string.rb +12 -13
- data/lib/puppet/util/windows/user.rb +242 -8
- data/lib/puppet/util/yaml.rb +0 -22
- data/lib/puppet/vendor/require_vendored.rb +0 -1
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet/x509.rb +5 -1
- data/lib/puppet/x509/cert_provider.rb +29 -1
- data/locales/puppet.pot +713 -1380
- data/man/man5/puppet.conf.5 +84 -98
- data/man/man8/puppet-agent.8 +7 -4
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +6 -6
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +55 -9
- data/man/man8/puppet-filebucket.8 +6 -6
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +2 -2
- data/man/man8/puppet-module.8 +1 -58
- data/man/man8/puppet-node.8 +7 -4
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +4 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +1 -1
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb +2 -0
- data/spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb +25 -0
- data/spec/fixtures/unit/forge/bacula-releases.json +128 -0
- data/spec/fixtures/unit/forge/bacula.tar.gz +0 -0
- data/spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages +30 -0
- data/spec/fixtures/unit/provider/service/smf/{svcs.out → svcs_instances.out} +0 -0
- data/spec/integration/application/agent_spec.rb +157 -59
- data/spec/integration/application/apply_spec.rb +150 -150
- data/spec/integration/application/doc_spec.rb +16 -6
- data/spec/integration/application/filebucket_spec.rb +78 -29
- data/spec/integration/application/help_spec.rb +44 -0
- data/spec/integration/application/lookup_spec.rb +13 -0
- data/spec/integration/application/module_spec.rb +68 -0
- data/spec/integration/application/plugin_spec.rb +76 -4
- data/spec/integration/configurer_spec.rb +14 -0
- data/spec/integration/data_binding_spec.rb +82 -0
- data/spec/integration/defaults_spec.rb +33 -5
- data/spec/integration/directory_environments_spec.rb +17 -17
- data/spec/integration/environments/setting_hooks_spec.rb +1 -1
- data/spec/integration/indirector/facts/facter_spec.rb +8 -6
- data/spec/integration/network/http_pool_spec.rb +29 -30
- data/spec/integration/node/environment_spec.rb +1 -1
- data/spec/integration/parser/catalog_spec.rb +0 -38
- data/spec/integration/parser/compiler_spec.rb +11 -0
- data/spec/integration/parser/node_spec.rb +0 -9
- data/spec/integration/parser/pcore_resource_spec.rb +0 -37
- data/spec/integration/type/file_spec.rb +6 -5
- data/spec/integration/util/execution_spec.rb +22 -0
- data/spec/integration/util/windows/adsi_spec.rb +2 -2
- data/spec/integration/util/windows/monkey_patches/process_spec.rb +231 -0
- data/spec/integration/util/windows/process_spec.rb +26 -32
- data/spec/integration/util/windows/registry_spec.rb +7 -7
- data/spec/integration/util/windows/security_spec.rb +1 -1
- data/spec/integration/util/windows/user_spec.rb +47 -5
- data/spec/integration/util_spec.rb +7 -33
- data/spec/lib/puppet_spec/matchers.rb +0 -80
- data/spec/lib/puppet_spec/puppetserver.rb +9 -1
- data/spec/lib/puppet_spec/settings.rb +7 -1
- data/spec/shared_contexts/types_setup.rb +2 -0
- data/spec/spec_helper.rb +2 -0
- data/spec/unit/agent_spec.rb +0 -2
- data/spec/unit/application/agent_spec.rb +3 -4
- data/spec/unit/application/config_spec.rb +224 -4
- data/spec/unit/application/doc_spec.rb +2 -2
- data/spec/unit/application/face_base_spec.rb +6 -4
- data/spec/unit/application/facts_spec.rb +74 -8
- data/spec/unit/application/filebucket_spec.rb +41 -39
- data/spec/unit/application/resource_spec.rb +3 -1
- data/spec/unit/application/ssl_spec.rb +17 -4
- data/spec/unit/application_spec.rb +9 -4
- data/spec/unit/certificate_factory_spec.rb +1 -1
- data/spec/unit/configurer/downloader_spec.rb +14 -0
- data/spec/unit/configurer/fact_handler_spec.rb +4 -4
- data/spec/unit/configurer/plugin_handler_spec.rb +56 -18
- data/spec/unit/configurer_spec.rb +96 -44
- data/spec/unit/confine_spec.rb +2 -1
- data/spec/unit/context/trusted_information_spec.rb +12 -10
- data/spec/unit/defaults_spec.rb +77 -28
- data/spec/unit/environments_spec.rb +96 -32
- data/spec/unit/face/config_spec.rb +65 -12
- data/spec/unit/face/facts_spec.rb +4 -0
- data/spec/unit/face/node_spec.rb +2 -2
- data/spec/unit/face/plugin_spec.rb +73 -33
- data/spec/unit/file_bucket/file_spec.rb +1 -1
- data/spec/unit/file_serving/configuration/parser_spec.rb +14 -18
- data/spec/unit/file_serving/configuration_spec.rb +6 -12
- data/spec/unit/file_serving/http_metadata_spec.rb +37 -14
- data/spec/unit/file_serving/mount/locales_spec.rb +2 -2
- data/spec/unit/file_serving/mount/pluginfacts_spec.rb +2 -2
- data/spec/unit/file_serving/mount/plugins_spec.rb +2 -2
- data/spec/unit/file_serving/terminus_selector_spec.rb +45 -26
- data/spec/unit/file_system/uniquefile_spec.rb +18 -0
- data/spec/unit/file_system_spec.rb +1 -2
- data/spec/unit/functions/camelcase_spec.rb +1 -1
- data/spec/unit/functions/capitalize_spec.rb +1 -1
- data/spec/unit/functions/downcase_spec.rb +1 -1
- data/spec/unit/functions/inline_epp_spec.rb +26 -1
- data/spec/unit/functions/upcase_spec.rb +1 -1
- data/spec/unit/http/client_spec.rb +71 -17
- data/spec/unit/{network/resolver_spec.rb → http/dns_spec.rb} +3 -3
- data/spec/unit/http/external_client_spec.rb +4 -4
- data/spec/unit/{network/http → http}/factory_spec.rb +5 -11
- data/spec/unit/{network/http/session_spec.rb → http/pool_entry_spec.rb} +3 -3
- data/spec/unit/{network/http → http}/pool_spec.rb +12 -17
- data/spec/unit/{util/http_proxy_spec.rb → http/proxy_spec.rb} +2 -69
- data/spec/unit/http/resolver_spec.rb +34 -15
- data/spec/unit/http/response_spec.rb +6 -0
- data/spec/unit/http/service/ca_spec.rb +2 -3
- data/spec/unit/http/service/compiler_spec.rb +51 -65
- data/spec/unit/http/service/file_server_spec.rb +5 -6
- data/spec/unit/http/service/puppetserver_spec.rb +112 -0
- data/spec/unit/http/service/report_spec.rb +2 -3
- data/spec/unit/http/service_spec.rb +1 -3
- data/spec/unit/http/session_spec.rb +24 -35
- data/spec/unit/{network/http → http}/site_spec.rb +3 -3
- data/spec/unit/indirector/catalog/json_spec.rb +1 -1
- data/spec/unit/indirector/catalog/rest_spec.rb +1 -1
- data/spec/unit/indirector/facts/facter_spec.rb +97 -0
- data/spec/unit/indirector/facts/json_spec.rb +255 -0
- data/spec/unit/indirector/facts/rest_spec.rb +1 -1
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +5 -3
- data/spec/unit/indirector/file_content/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_metadata/http_spec.rb +27 -0
- data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_server_spec.rb +1 -15
- data/spec/unit/indirector/json_spec.rb +8 -8
- data/spec/unit/indirector/msgpack_spec.rb +8 -8
- data/spec/unit/indirector/node/json_spec.rb +33 -0
- data/spec/unit/indirector/node/rest_spec.rb +1 -1
- data/spec/{integration/indirector/report/yaml.rb → unit/indirector/report/json_spec.rb} +13 -24
- data/spec/unit/indirector/report/rest_spec.rb +2 -17
- data/spec/unit/indirector/report/yaml_spec.rb +72 -8
- data/spec/unit/indirector/request_spec.rb +3 -267
- data/spec/unit/indirector/rest_spec.rb +98 -752
- data/spec/unit/indirector/yaml_spec.rb +7 -7
- data/spec/unit/interface_spec.rb +3 -3
- data/spec/unit/module_tool/tar/mini_spec.rb +20 -0
- data/spec/unit/network/authconfig_spec.rb +2 -132
- data/spec/unit/network/authorization_spec.rb +2 -55
- data/spec/unit/network/format_support_spec.rb +3 -2
- data/spec/unit/network/formats_spec.rb +4 -4
- data/spec/unit/network/http/api/indirected_routes_spec.rb +3 -98
- data/spec/unit/network/http/api/master/v3/environments_spec.rb +12 -23
- data/spec/unit/network/http/api/master/v3_spec.rb +28 -7
- data/spec/unit/network/http/api_spec.rb +10 -0
- data/spec/unit/network/http/connection_spec.rb +61 -73
- data/spec/unit/network/http/handler_spec.rb +0 -6
- data/spec/unit/network/http_pool_spec.rb +0 -4
- data/spec/unit/node/environment_spec.rb +51 -22
- data/spec/unit/node_spec.rb +2 -54
- data/spec/unit/parser/ast/block_expression_spec.rb +1 -1
- data/spec/unit/parser/functions/create_resources_spec.rb +2 -20
- data/spec/unit/parser/scope_spec.rb +1 -1
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +19 -8
- data/spec/unit/pops/loaders/loaders_spec.rb +77 -22
- data/spec/unit/pops/lookup/lookup_spec.rb +25 -0
- data/spec/unit/pops/parser/parse_application_spec.rb +4 -22
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_capabilities_spec.rb +8 -21
- data/spec/unit/pops/parser/parse_site_spec.rb +20 -24
- data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -71
- data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
- data/spec/unit/pops/types/type_calculator_spec.rb +7 -17
- data/spec/unit/pops/types/type_factory_spec.rb +1 -1
- data/spec/unit/pops/validator/validator_spec.rb +61 -46
- data/spec/unit/pops/visitor_spec.rb +1 -1
- data/spec/unit/provider/exec_spec.rb +4 -3
- data/spec/unit/provider/nameservice_spec.rb +0 -57
- data/spec/unit/provider/package/apt_spec.rb +77 -0
- data/spec/unit/provider/package/aptitude_spec.rb +1 -0
- data/spec/unit/provider/package/dpkg_spec.rb +22 -55
- data/spec/unit/provider/package/gem_spec.rb +32 -0
- data/spec/unit/provider/package/openbsd_spec.rb +2 -0
- data/spec/unit/provider/package/pip2_spec.rb +36 -0
- data/spec/unit/provider/package/puppet_gem_spec.rb +6 -2
- data/spec/unit/provider/package/puppetserver_gem_spec.rb +137 -0
- data/spec/unit/provider/package/yum_spec.rb +31 -0
- data/spec/unit/provider/package/zypper_spec.rb +14 -0
- data/spec/unit/provider/service/base_spec.rb +2 -4
- data/spec/unit/provider/service/bsd_spec.rb +5 -1
- data/spec/unit/provider/service/daemontools_spec.rb +1 -1
- data/spec/unit/provider/service/debian_spec.rb +3 -5
- data/spec/unit/provider/service/freebsd_spec.rb +1 -1
- data/spec/unit/provider/service/gentoo_spec.rb +4 -5
- data/spec/unit/provider/service/init_spec.rb +45 -5
- data/spec/unit/provider/service/launchd_spec.rb +5 -6
- data/spec/unit/provider/service/openrc_spec.rb +4 -5
- data/spec/unit/provider/service/openwrt_spec.rb +1 -1
- data/spec/unit/provider/service/redhat_spec.rb +1 -1
- data/spec/unit/provider/service/runit_spec.rb +2 -1
- data/spec/unit/provider/service/smf_spec.rb +402 -166
- data/spec/unit/provider/service/src_spec.rb +3 -5
- data/spec/unit/provider/service/systemd_spec.rb +3 -6
- data/spec/unit/provider/service/upstart_spec.rb +4 -5
- data/spec/unit/provider/service/windows_spec.rb +50 -15
- data/spec/unit/provider/user/openbsd_spec.rb +1 -0
- data/spec/unit/provider/user/useradd_spec.rb +22 -16
- data/spec/unit/provider/user/windows_adsi_spec.rb +82 -0
- data/spec/unit/provider_spec.rb +0 -12
- data/spec/unit/puppet_pal_2pec.rb +40 -0
- data/spec/unit/puppet_pal_catalog_spec.rb +45 -0
- data/spec/unit/reports/store_spec.rb +17 -13
- data/spec/unit/resource/type_collection_spec.rb +2 -22
- data/spec/unit/resource_spec.rb +3 -59
- data/spec/unit/settings/http_extra_headers_spec.rb +2 -4
- data/spec/unit/settings/integer_setting_spec.rb +42 -0
- data/spec/unit/settings/port_setting_spec.rb +31 -0
- data/spec/unit/settings/priority_setting_spec.rb +4 -4
- data/spec/unit/settings_spec.rb +586 -239
- data/spec/unit/ssl/base_spec.rb +36 -3
- data/spec/unit/ssl/certificate_request_spec.rb +15 -45
- data/spec/unit/ssl/certificate_spec.rb +2 -11
- data/spec/unit/ssl/ssl_provider_spec.rb +78 -49
- data/spec/unit/ssl/state_machine_spec.rb +0 -1
- data/spec/unit/ssl/verifier_spec.rb +0 -21
- data/spec/unit/test/test_helper_spec.rb +17 -0
- data/spec/unit/transaction/persistence_spec.rb +15 -0
- data/spec/unit/transaction/report_spec.rb +3 -3
- data/spec/unit/transaction/resource_harness_spec.rb +2 -2
- data/spec/unit/transaction_spec.rb +45 -79
- data/spec/unit/type/file/checksum_spec.rb +6 -6
- data/spec/unit/type/file/content_spec.rb +1 -1
- data/spec/unit/type/file/ensure_spec.rb +1 -1
- data/spec/unit/type/file/mode_spec.rb +1 -1
- data/spec/unit/type/file/source_spec.rb +4 -5
- data/spec/unit/type/file_spec.rb +134 -102
- data/spec/unit/type/filebucket_spec.rb +1 -1
- data/spec/unit/type/package_spec.rb +1 -1
- data/spec/unit/type/service_spec.rb +209 -0
- data/spec/unit/type/user_spec.rb +31 -2
- data/spec/unit/type_spec.rb +70 -0
- data/spec/unit/util/backups_spec.rb +0 -2
- data/spec/unit/util/character_encoding_spec.rb +4 -4
- data/spec/unit/util/checksums_spec.rb +16 -0
- data/spec/unit/util/command_line_spec.rb +11 -6
- data/spec/unit/util/execution_spec.rb +0 -29
- data/spec/unit/util/monkey_patches_spec.rb +0 -6
- data/spec/unit/util/rubygems_spec.rb +2 -2
- data/spec/unit/util/run_mode_spec.rb +27 -127
- data/spec/unit/util/windows/api_types_spec.rb +104 -40
- data/spec/unit/util/windows/service_spec.rb +4 -4
- data/spec/unit/util/windows/string_spec.rb +1 -3
- data/spec/unit/util/yaml_spec.rb +0 -54
- data/spec/unit/util_spec.rb +3 -21
- data/spec/unit/x509/cert_provider_spec.rb +1 -1
- metadata +76 -270
- data/conf/auth.conf +0 -150
- data/lib/puppet/application/cert.rb +0 -76
- data/lib/puppet/application/key.rb +0 -4
- data/lib/puppet/application/man.rb +0 -4
- data/lib/puppet/application/status.rb +0 -4
- data/lib/puppet/face/key.rb +0 -16
- data/lib/puppet/face/man.rb +0 -145
- data/lib/puppet/face/module/build.rb +0 -14
- data/lib/puppet/face/module/generate.rb +0 -14
- data/lib/puppet/face/module/search.rb +0 -103
- data/lib/puppet/face/status.rb +0 -51
- data/lib/puppet/indirector/certificate/file.rb +0 -9
- data/lib/puppet/indirector/certificate/rest.rb +0 -18
- data/lib/puppet/indirector/certificate_request/file.rb +0 -9
- data/lib/puppet/indirector/certificate_request/memory.rb +0 -7
- data/lib/puppet/indirector/certificate_request/rest.rb +0 -11
- data/lib/puppet/indirector/file_content/http.rb +0 -22
- data/lib/puppet/indirector/key/file.rb +0 -46
- data/lib/puppet/indirector/key/memory.rb +0 -7
- data/lib/puppet/indirector/ssl_file.rb +0 -162
- data/lib/puppet/indirector/status.rb +0 -3
- data/lib/puppet/indirector/status/local.rb +0 -12
- data/lib/puppet/indirector/status/rest.rb +0 -27
- data/lib/puppet/module_tool/applications/searcher.rb +0 -29
- data/lib/puppet/network/auth_config_parser.rb +0 -90
- data/lib/puppet/network/authstore.rb +0 -283
- data/lib/puppet/network/http/api/master/v3/authorization.rb +0 -18
- data/lib/puppet/network/http/api/master/v3/environment.rb +0 -85
- data/lib/puppet/network/http/base_pool.rb +0 -36
- data/lib/puppet/network/http/compression.rb +0 -127
- data/lib/puppet/network/http/connection_adapter.rb +0 -182
- data/lib/puppet/network/http/nocache_pool.rb +0 -28
- data/lib/puppet/network/rest_controller.rb +0 -2
- data/lib/puppet/network/rights.rb +0 -210
- data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +0 -64
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +0 -20
- data/lib/puppet/parser/environment_compiler.rb +0 -199
- data/lib/puppet/pops/types/enumeration.rb +0 -16
- data/lib/puppet/resource/capability_finder.rb +0 -154
- data/lib/puppet/rest/errors.rb +0 -15
- data/lib/puppet/rest/response.rb +0 -35
- data/lib/puppet/rest/route.rb +0 -85
- data/lib/puppet/rest/routes.rb +0 -135
- data/lib/puppet/ssl/host.rb +0 -505
- data/lib/puppet/ssl/key.rb +0 -61
- data/lib/puppet/ssl/validator.rb +0 -61
- data/lib/puppet/ssl/validator/default_validator.rb +0 -209
- data/lib/puppet/ssl/validator/no_validator.rb +0 -22
- data/lib/puppet/ssl/verifier_adapter.rb +0 -58
- data/lib/puppet/status.rb +0 -40
- data/lib/puppet/util/connection.rb +0 -88
- data/lib/puppet/util/ssl.rb +0 -83
- data/lib/puppet/util/windows/api_types.rb +0 -282
- data/lib/puppet/vendor/load_pathspec.rb +0 -1
- data/lib/puppet/vendor/pathspec/CHANGELOG.md +0 -2
- data/lib/puppet/vendor/pathspec/LICENSE +0 -201
- data/lib/puppet/vendor/pathspec/PUPPET_README.md +0 -6
- data/lib/puppet/vendor/pathspec/README.md +0 -53
- data/lib/puppet/vendor/pathspec/lib/pathspec.rb +0 -122
- data/lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb +0 -275
- data/lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb +0 -17
- data/lib/puppet/vendor/pathspec/lib/pathspec/spec.rb +0 -14
- data/man/man8/puppet-key.8 +0 -126
- data/man/man8/puppet-man.8 +0 -76
- data/man/man8/puppet-status.8 +0 -108
- data/spec/integration/faces/config_spec.rb +0 -91
- data/spec/integration/faces/documentation_spec.rb +0 -57
- data/spec/integration/file_bucket/file_spec.rb +0 -50
- data/spec/integration/file_serving/content_spec.rb +0 -7
- data/spec/integration/file_serving/fileset_spec.rb +0 -12
- data/spec/integration/file_serving/metadata_spec.rb +0 -8
- data/spec/integration/file_serving/terminus_helper_spec.rb +0 -20
- data/spec/integration/file_system/uniquefile_spec.rb +0 -26
- data/spec/integration/module_tool/forge_spec.rb +0 -51
- data/spec/integration/module_tool/tar/mini_spec.rb +0 -28
- data/spec/integration/network/authconfig_spec.rb +0 -256
- data/spec/integration/provider/service/init_spec.rb +0 -48
- data/spec/integration/provider/service/systemd_spec.rb +0 -25
- data/spec/integration/provider/service/windows_spec.rb +0 -50
- data/spec/integration/reference/providers_spec.rb +0 -21
- data/spec/integration/reports_spec.rb +0 -13
- data/spec/integration/ssl/certificate_request_spec.rb +0 -44
- data/spec/integration/ssl/host_spec.rb +0 -72
- data/spec/integration/ssl/key_spec.rb +0 -99
- data/spec/integration/test/test_helper_spec.rb +0 -31
- data/spec/shared_behaviours/file_serving_model.rb +0 -51
- data/spec/unit/capability_spec.rb +0 -414
- data/spec/unit/face/catalog_spec.rb +0 -6
- data/spec/unit/face/key_spec.rb +0 -9
- data/spec/unit/face/man_spec.rb +0 -25
- data/spec/unit/face/module/search_spec.rb +0 -231
- data/spec/unit/face/module_spec.rb +0 -3
- data/spec/unit/face/status_spec.rb +0 -9
- data/spec/unit/indirector/certificate/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate/rest_spec.rb +0 -61
- data/spec/unit/indirector/certificate_request/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -25
- data/spec/unit/indirector/key/file_spec.rb +0 -79
- data/spec/unit/indirector/ssl_file_spec.rb +0 -305
- data/spec/unit/indirector/status/local_spec.rb +0 -10
- data/spec/unit/indirector/status/rest_spec.rb +0 -50
- data/spec/unit/man_spec.rb +0 -31
- data/spec/unit/module_tool/applications/searcher_spec.rb +0 -38
- data/spec/unit/network/auth_config_parser_spec.rb +0 -115
- data/spec/unit/network/authstore_spec.rb +0 -422
- data/spec/unit/network/http/api/master/v3/authorization_spec.rb +0 -57
- data/spec/unit/network/http/api/master/v3/environment_spec.rb +0 -185
- data/spec/unit/network/http/compression_spec.rb +0 -240
- data/spec/unit/network/http/nocache_pool_spec.rb +0 -64
- data/spec/unit/network/http_spec.rb +0 -9
- data/spec/unit/network/rights_spec.rb +0 -439
- data/spec/unit/parser/environment_compiler_spec.rb +0 -723
- data/spec/unit/pops/types/enumeration_spec.rb +0 -51
- data/spec/unit/resource/capability_finder_spec.rb +0 -143
- data/spec/unit/rest/route_spec.rb +0 -132
- data/spec/unit/ssl/host_spec.rb +0 -650
- data/spec/unit/ssl/key_spec.rb +0 -173
- data/spec/unit/ssl/validator_spec.rb +0 -278
- data/spec/unit/status_spec.rb +0 -45
- data/spec/unit/util/ssl_spec.rb +0 -91
@@ -84,6 +84,24 @@ describe Puppet::FileSystem::Uniquefile do
|
|
84
84
|
}.to raise_error(Errno::ENOENT, %r{No such file or directory - A directory component in .* does not exist or is a dangling symbolic link})
|
85
85
|
end
|
86
86
|
|
87
|
+
it "should use UTF8 characters in TMP,TEMP,TMPDIR environment variable", :if => Puppet::Util::Platform.windows? do
|
88
|
+
rune_utf8 = "\u16A0\u16C7\u16BB\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2\u16B1\u16EB\u16A0\u16C1\u16B1\u16AA\u16EB\u16B7\u16D6\u16BB\u16B9\u16E6\u16DA\u16B3\u16A2\u16D7"
|
89
|
+
temp_rune_utf8 = File.join(Dir.tmpdir, rune_utf8)
|
90
|
+
Puppet::FileSystem.mkpath(temp_rune_utf8)
|
91
|
+
|
92
|
+
# Set the temporary environment variables to the UTF8 temp path
|
93
|
+
Puppet::Util::Windows::Process.set_environment_variable('TMPDIR', temp_rune_utf8)
|
94
|
+
Puppet::Util::Windows::Process.set_environment_variable('TMP', temp_rune_utf8)
|
95
|
+
Puppet::Util::Windows::Process.set_environment_variable('TEMP', temp_rune_utf8)
|
96
|
+
|
97
|
+
# Create a unique file
|
98
|
+
filename = Puppet::FileSystem::Uniquefile.open_tmp('foo') do |file|
|
99
|
+
File.dirname(file.path)
|
100
|
+
end
|
101
|
+
|
102
|
+
expect(filename).to eq(temp_rune_utf8)
|
103
|
+
end
|
104
|
+
|
87
105
|
context "Ruby 1.9.3 Tempfile tests" do
|
88
106
|
# the remaining tests in this file are ported directly from the ruby 1.9.3 source,
|
89
107
|
# since most of this file was ported from there
|
@@ -872,8 +872,7 @@ describe "Puppet::FileSystem" do
|
|
872
872
|
|
873
873
|
# regardless of slash direction, return value is drive letter
|
874
874
|
expanded = Puppet::FileSystem.expand_path(slash)
|
875
|
-
expect(expanded).to
|
876
|
-
expect(expanded).to eq(File.expand_path(slash))
|
875
|
+
expect(expanded).to match(/^[a-z]:/i)
|
877
876
|
end
|
878
877
|
end
|
879
878
|
|
@@ -15,7 +15,7 @@ describe 'the camelcase function' do
|
|
15
15
|
expect(compile_to_catalog("notify { String(42.camelcase == 42): }")).to have_resource('Notify[true]')
|
16
16
|
end
|
17
17
|
|
18
|
-
it 'performs
|
18
|
+
it 'performs camelcase of international UTF-8 characters' do
|
19
19
|
expect(compile_to_catalog("notify { 'åäö_äö'.camelcase: }")).to have_resource('Notify[ÅäöÄö]')
|
20
20
|
end
|
21
21
|
|
@@ -15,7 +15,7 @@ describe 'the capitalize function' do
|
|
15
15
|
expect(compile_to_catalog("notify { String(42.capitalize == 42): }")).to have_resource('Notify[true]')
|
16
16
|
end
|
17
17
|
|
18
|
-
it 'performs capitalize of international UTF-8 characters'
|
18
|
+
it 'performs capitalize of international UTF-8 characters' do
|
19
19
|
expect(compile_to_catalog("notify { 'åäö'.capitalize: }")).to have_resource('Notify[Åäö]')
|
20
20
|
end
|
21
21
|
|
@@ -15,7 +15,7 @@ describe 'the downcase function' do
|
|
15
15
|
expect(compile_to_catalog("notify { String(42.downcase == 42): }")).to have_resource('Notify[true]')
|
16
16
|
end
|
17
17
|
|
18
|
-
it 'performs
|
18
|
+
it 'performs downcase of international UTF-8 characters' do
|
19
19
|
expect(compile_to_catalog("notify { 'ÅÄÖ'.downcase: }")).to have_resource('Notify[åäö]')
|
20
20
|
end
|
21
21
|
|
@@ -1,8 +1,10 @@
|
|
1
|
-
|
2
1
|
require 'spec_helper'
|
3
2
|
|
3
|
+
require 'puppet_spec/compiler'
|
4
|
+
|
4
5
|
describe "the inline_epp function" do
|
5
6
|
include PuppetSpec::Files
|
7
|
+
include PuppetSpec::Compiler
|
6
8
|
|
7
9
|
let :node do Puppet::Node.new('localhost') end
|
8
10
|
let :compiler do Puppet::Parser::Compiler.new(node) end
|
@@ -73,6 +75,29 @@ describe "the inline_epp function" do
|
|
73
75
|
expect(eval_template("string was: <%= $string %>")).to eq("string was: the string value")
|
74
76
|
end
|
75
77
|
|
78
|
+
context "when using Sensitive" do
|
79
|
+
it "returns an unwrapped sensitive value as a String" do
|
80
|
+
expect(eval_and_collect_notices(<<~END)).to eq(["opensesame"])
|
81
|
+
notice(inline_epp("<%= Sensitive('opensesame').unwrap %>"))
|
82
|
+
END
|
83
|
+
end
|
84
|
+
|
85
|
+
it "rewraps a sensitive value" do
|
86
|
+
# note entire result is redacted, not just sensitive part
|
87
|
+
expect(eval_and_collect_notices(<<~END)).to eq(["Sensitive [value redacted]"])
|
88
|
+
notice(inline_epp("This is sensitive <%= Sensitive('opensesame') %>"))
|
89
|
+
END
|
90
|
+
end
|
91
|
+
|
92
|
+
it "can be double wrapped" do
|
93
|
+
catalog = compile_to_catalog(<<~END)
|
94
|
+
notify { 'title':
|
95
|
+
message => Sensitive(inline_epp("<%= Sensitive('opensesame') %>"))
|
96
|
+
}
|
97
|
+
END
|
98
|
+
expect(catalog.resource(:notify, 'title')['message']).to eq('opensesame')
|
99
|
+
end
|
100
|
+
end
|
76
101
|
|
77
102
|
def eval_template_with_args(content, args_hash)
|
78
103
|
epp_function.call(scope, content, args_hash)
|
@@ -15,7 +15,7 @@ describe 'the upcase function' do
|
|
15
15
|
expect(compile_to_catalog("notify { String(42.upcase == 42): }")).to have_resource('Notify[true]')
|
16
16
|
end
|
17
17
|
|
18
|
-
it 'performs
|
18
|
+
it 'performs upcase of international UTF-8 characters' do
|
19
19
|
expect(compile_to_catalog("notify { 'åäö'.upcase: }")).to have_resource('Notify[ÅÄÖ]')
|
20
20
|
end
|
21
21
|
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require 'spec_helper'
|
2
|
-
require 'webmock/rspec'
|
3
2
|
require 'puppet/http'
|
4
3
|
|
5
4
|
describe Puppet::HTTP::Client do
|
@@ -155,7 +154,7 @@ describe Puppet::HTTP::Client do
|
|
155
154
|
stub_request(:get, uri)
|
156
155
|
|
157
156
|
response = client.get(uri)
|
158
|
-
expect(response).to
|
157
|
+
expect(response).to be_a(Puppet::HTTP::Response)
|
159
158
|
expect(response).to be_success
|
160
159
|
expect(response.code).to eq(200)
|
161
160
|
end
|
@@ -225,7 +224,7 @@ describe Puppet::HTTP::Client do
|
|
225
224
|
stub_request(:head, uri)
|
226
225
|
|
227
226
|
response = client.head(uri)
|
228
|
-
expect(response).to
|
227
|
+
expect(response).to be_a(Puppet::HTTP::Response)
|
229
228
|
expect(response).to be_success
|
230
229
|
expect(response.code).to eq(200)
|
231
230
|
end
|
@@ -285,7 +284,7 @@ describe Puppet::HTTP::Client do
|
|
285
284
|
stub_request(:put, uri)
|
286
285
|
|
287
286
|
response = client.put(uri, "", headers: {'Content-Type' => 'text/plain'})
|
288
|
-
expect(response).to
|
287
|
+
expect(response).to be_a(Puppet::HTTP::Response)
|
289
288
|
expect(response).to be_success
|
290
289
|
expect(response.code).to eq(200)
|
291
290
|
end
|
@@ -354,7 +353,7 @@ describe Puppet::HTTP::Client do
|
|
354
353
|
stub_request(:post, uri)
|
355
354
|
|
356
355
|
response = client.post(uri, "", headers: {'Content-Type' => 'text/plain'})
|
357
|
-
expect(response).to
|
356
|
+
expect(response).to be_a(Puppet::HTTP::Response)
|
358
357
|
expect(response).to be_success
|
359
358
|
expect(response.code).to eq(200)
|
360
359
|
end
|
@@ -436,7 +435,7 @@ describe Puppet::HTTP::Client do
|
|
436
435
|
stub_request(:delete, uri)
|
437
436
|
|
438
437
|
response = client.delete(uri)
|
439
|
-
expect(response).to
|
438
|
+
expect(response).to be_a(Puppet::HTTP::Response)
|
440
439
|
expect(response).to be_success
|
441
440
|
expect(response.code).to eq(200)
|
442
441
|
end
|
@@ -507,6 +506,20 @@ describe Puppet::HTTP::Client do
|
|
507
506
|
|
508
507
|
client.get(uri, options: {basic_auth: {user: 'user', password: nil}})
|
509
508
|
end
|
509
|
+
|
510
|
+
it 'observes userinfo in the URL' do
|
511
|
+
stub_request(:get, uri).with(basic_auth: credentials)
|
512
|
+
|
513
|
+
client.get(URI("https://user:pass@www.example.com"))
|
514
|
+
end
|
515
|
+
|
516
|
+
it 'prefers explicit basic_auth credentials' do
|
517
|
+
uri = URI("https://ignored_user:ignored_pass@www.example.com")
|
518
|
+
|
519
|
+
stub_request(:get, "https://www.example.com").with(basic_auth: credentials)
|
520
|
+
|
521
|
+
client.get(uri, options: {basic_auth: {user: 'user', password: 'pass'}})
|
522
|
+
end
|
510
523
|
end
|
511
524
|
|
512
525
|
context "when redirecting" do
|
@@ -535,10 +548,41 @@ describe Puppet::HTTP::Client do
|
|
535
548
|
expect(response).to be_success
|
536
549
|
end
|
537
550
|
|
538
|
-
it "
|
539
|
-
|
540
|
-
|
541
|
-
stub_request(:get,
|
551
|
+
it "updates the Host header from the Location host and port" do
|
552
|
+
stub_request(:get, start_url).with(headers: { 'Host' => 'www.example.com:8140' })
|
553
|
+
.to_return(redirect_to(url: other_host))
|
554
|
+
stub_request(:get, other_host).with(headers: { 'Host' => 'other.example.com:8140' })
|
555
|
+
.to_return(status: 200)
|
556
|
+
|
557
|
+
response = client.get(start_url)
|
558
|
+
expect(response).to be_success
|
559
|
+
end
|
560
|
+
|
561
|
+
it "omits the default HTTPS port from the Host header" do
|
562
|
+
stub_request(:get, start_url).with(headers: { 'Host' => 'www.example.com:8140' })
|
563
|
+
.to_return(redirect_to(url: "https://other.example.com/qux"))
|
564
|
+
stub_request(:get, "https://other.example.com/qux").with(headers: { 'Host' => 'other.example.com' })
|
565
|
+
.to_return(status: 200)
|
566
|
+
|
567
|
+
response = client.get(start_url)
|
568
|
+
expect(response).to be_success
|
569
|
+
end
|
570
|
+
|
571
|
+
it "omits the default HTTP port from the Host header" do
|
572
|
+
stub_request(:get, start_url).with(headers: { 'Host' => 'www.example.com:8140' })
|
573
|
+
.to_return(redirect_to(url: "http://other.example.com/qux"))
|
574
|
+
stub_request(:get, "http://other.example.com/qux").with(headers: { 'Host' => 'other.example.com' })
|
575
|
+
.to_return(status: 200)
|
576
|
+
|
577
|
+
response = client.get(start_url)
|
578
|
+
expect(response).to be_success
|
579
|
+
end
|
580
|
+
|
581
|
+
it "applies query parameters from the location header" do
|
582
|
+
query = { 'redirected' => false }
|
583
|
+
|
584
|
+
stub_request(:get, start_url).with(query: query).to_return(redirect_to(url: "#{bar_url}?redirected=true"))
|
585
|
+
stub_request(:get, bar_url).with(query: {'redirected' => 'true'}).to_return(status: 200)
|
542
586
|
|
543
587
|
response = client.get(start_url, params: query)
|
544
588
|
expect(response).to be_success
|
@@ -569,16 +613,27 @@ describe Puppet::HTTP::Client do
|
|
569
613
|
expect(response).to be_success
|
570
614
|
end
|
571
615
|
|
572
|
-
it "
|
616
|
+
it "applies query parameters from the location header" do
|
573
617
|
relative_url = "/people.html"
|
574
|
-
query = { '
|
575
|
-
stub_request(:get, start_url).with(query: query).to_return(redirect_to(url: relative_url))
|
576
|
-
stub_request(:get, "https://www.example.com:8140/people.html").with(query:
|
618
|
+
query = { 'redirected' => false }
|
619
|
+
stub_request(:get, start_url).with(query: query).to_return(redirect_to(url: "#{relative_url}?redirected=true"))
|
620
|
+
stub_request(:get, "https://www.example.com:8140/people.html").with(query: {'redirected' => 'true'}).to_return(status: 200)
|
577
621
|
|
578
622
|
response = client.get(start_url, params: query)
|
579
623
|
expect(response).to be_success
|
580
624
|
end
|
581
625
|
|
626
|
+
it "removes dot segments from a relative location" do
|
627
|
+
# from https://tools.ietf.org/html/rfc3986#section-5.4.2
|
628
|
+
base_url = URI("http://a/b/c/d;p?q")
|
629
|
+
relative_url = "../../../../g"
|
630
|
+
stub_request(:get, base_url).to_return(redirect_to(url: relative_url))
|
631
|
+
stub_request(:get, "http://a/g").to_return(status: 200)
|
632
|
+
|
633
|
+
response = client.get(base_url)
|
634
|
+
expect(response).to be_success
|
635
|
+
end
|
636
|
+
|
582
637
|
it "preserves request body for each request" do
|
583
638
|
data = 'some data'
|
584
639
|
stub_request(:put, start_url).with(body: data).to_return(redirect_to(url: bar_url))
|
@@ -716,7 +771,7 @@ describe Puppet::HTTP::Client do
|
|
716
771
|
it "should close the connection before sleeping" do
|
717
772
|
retry_after('42')
|
718
773
|
|
719
|
-
site = Puppet::
|
774
|
+
site = Puppet::HTTP::Site.from_uri(uri)
|
720
775
|
|
721
776
|
http1 = Net::HTTP.new(site.host, site.port)
|
722
777
|
http1.use_ssl = true
|
@@ -726,8 +781,7 @@ describe Puppet::HTTP::Client do
|
|
726
781
|
http2.use_ssl = true
|
727
782
|
allow(http2).to receive(:started?).and_return(true)
|
728
783
|
|
729
|
-
|
730
|
-
pool = Puppet::Network::HTTP::Pool.new(15)
|
784
|
+
pool = Puppet::HTTP::Pool.new(15)
|
731
785
|
client = Puppet::HTTP::Client.new(pool: pool)
|
732
786
|
|
733
787
|
# The "with_connection" method is required to yield started connections
|
@@ -1,7 +1,7 @@
|
|
1
1
|
require 'spec_helper'
|
2
|
-
require 'puppet/
|
2
|
+
require 'puppet/http'
|
3
3
|
|
4
|
-
describe Puppet::
|
4
|
+
describe Puppet::HTTP::DNS do
|
5
5
|
before do
|
6
6
|
@dns_mock_object = double('dns')
|
7
7
|
allow(Resolv::DNS).to receive(:new).and_return(@dns_mock_object)
|
@@ -26,7 +26,7 @@ describe Puppet::Network::Resolver do
|
|
26
26
|
end
|
27
27
|
end
|
28
28
|
|
29
|
-
let(:resolver) {
|
29
|
+
let(:resolver) { described_class.new }
|
30
30
|
|
31
31
|
describe 'when the domain is not known' do
|
32
32
|
before :each do
|
@@ -9,7 +9,7 @@ class Puppet::HTTP::TestExternal
|
|
9
9
|
@host = host
|
10
10
|
@port = port
|
11
11
|
@options = options
|
12
|
-
@factory = Puppet::
|
12
|
+
@factory = Puppet::HTTP::Factory.new
|
13
13
|
end
|
14
14
|
|
15
15
|
def get(path, headers = {}, options = {})
|
@@ -27,7 +27,7 @@ class Puppet::HTTP::TestExternal
|
|
27
27
|
request.basic_auth(options[:basic_auth][:user], options[:basic_auth][:password])
|
28
28
|
end
|
29
29
|
|
30
|
-
site = Puppet::
|
30
|
+
site = Puppet::HTTP::Site.new(@options[:use_ssl] ? 'https' : 'http', @host, @port)
|
31
31
|
http = @factory.create_connection(site)
|
32
32
|
http.start
|
33
33
|
begin
|
@@ -61,7 +61,7 @@ describe Puppet::HTTP::ExternalClient do
|
|
61
61
|
stub_request(:get, uri)
|
62
62
|
|
63
63
|
response = client.get(uri)
|
64
|
-
expect(response).to
|
64
|
+
expect(response).to be_a(Puppet::HTTP::Response)
|
65
65
|
expect(response).to be_success
|
66
66
|
expect(response.code).to eq(200)
|
67
67
|
end
|
@@ -113,7 +113,7 @@ describe Puppet::HTTP::ExternalClient do
|
|
113
113
|
stub_request(:post, uri)
|
114
114
|
|
115
115
|
response = client.post(uri, "", headers: {'Content-Type' => 'text/plain'})
|
116
|
-
expect(response).to
|
116
|
+
expect(response).to be_a(Puppet::HTTP::Response)
|
117
117
|
expect(response).to be_success
|
118
118
|
expect(response.code).to eq(200)
|
119
119
|
end
|
@@ -1,22 +1,16 @@
|
|
1
1
|
require 'spec_helper'
|
2
|
-
require 'puppet/
|
3
|
-
require 'puppet/util/http_proxy'
|
2
|
+
require 'puppet/http'
|
4
3
|
|
5
|
-
describe Puppet::
|
4
|
+
describe Puppet::HTTP::Factory do
|
6
5
|
before(:all) do
|
7
6
|
ENV['http_proxy'] = nil
|
8
7
|
ENV['HTTP_PROXY'] = nil
|
9
8
|
end
|
10
|
-
before :each do
|
11
|
-
Puppet::SSL::Key.indirection.terminus_class = :memory
|
12
|
-
Puppet::SSL::CertificateRequest.indirection.terminus_class = :memory
|
13
|
-
end
|
14
9
|
|
15
|
-
let(:site) { Puppet::
|
10
|
+
let(:site) { Puppet::HTTP::Site.new('https', 'www.example.com', 443) }
|
16
11
|
|
17
12
|
def create_connection(site)
|
18
|
-
factory =
|
19
|
-
|
13
|
+
factory = described_class.new
|
20
14
|
factory.create_connection(site)
|
21
15
|
end
|
22
16
|
|
@@ -124,7 +118,7 @@ describe Puppet::Network::HTTP::Factory do
|
|
124
118
|
expect(conn.keep_alive_timeout).to eq(2147483647)
|
125
119
|
end
|
126
120
|
|
127
|
-
it "disables ruby's max retry
|
121
|
+
it "disables ruby's max retry" do
|
128
122
|
conn = create_connection(site)
|
129
123
|
|
130
124
|
expect(conn.max_retries).to eq(0)
|
@@ -1,15 +1,15 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
require 'puppet/
|
3
|
+
require 'puppet/http'
|
4
4
|
|
5
|
-
describe Puppet::
|
5
|
+
describe Puppet::HTTP::PoolEntry do
|
6
6
|
let(:connection) { double('connection') }
|
7
7
|
let(:verifier) { double('verifier') }
|
8
8
|
|
9
9
|
def create_session(connection, expiration_time = nil)
|
10
10
|
expiration_time ||= Time.now + 60 * 60
|
11
11
|
|
12
|
-
|
12
|
+
described_class.new(connection, verifier, expiration_time)
|
13
13
|
end
|
14
14
|
|
15
15
|
it 'provides access to its connection' do
|
@@ -4,18 +4,13 @@ require 'openssl'
|
|
4
4
|
require 'puppet/network/http'
|
5
5
|
require 'puppet/network/http_pool'
|
6
6
|
|
7
|
-
describe Puppet::
|
8
|
-
before :each do
|
9
|
-
Puppet::SSL::Key.indirection.terminus_class = :memory
|
10
|
-
Puppet::SSL::CertificateRequest.indirection.terminus_class = :memory
|
11
|
-
end
|
12
|
-
|
7
|
+
describe Puppet::HTTP::Pool do
|
13
8
|
let(:site) do
|
14
|
-
Puppet::
|
9
|
+
Puppet::HTTP::Site.new('https', 'rubygems.org', 443)
|
15
10
|
end
|
16
11
|
|
17
12
|
let(:different_site) do
|
18
|
-
Puppet::
|
13
|
+
Puppet::HTTP::Site.new('https', 'github.com', 443)
|
19
14
|
end
|
20
15
|
|
21
16
|
let(:ssl_context) { Puppet::SSL::SSLContext.new }
|
@@ -26,11 +21,11 @@ describe Puppet::Network::HTTP::Pool do
|
|
26
21
|
end
|
27
22
|
|
28
23
|
def create_pool
|
29
|
-
Puppet::
|
24
|
+
Puppet::HTTP::Pool.new(15)
|
30
25
|
end
|
31
26
|
|
32
27
|
def create_pool_with_connections(site, *connections)
|
33
|
-
pool = Puppet::
|
28
|
+
pool = Puppet::HTTP::Pool.new(15)
|
34
29
|
connections.each do |conn|
|
35
30
|
pool.release(site, verifier, conn)
|
36
31
|
end
|
@@ -38,7 +33,7 @@ describe Puppet::Network::HTTP::Pool do
|
|
38
33
|
end
|
39
34
|
|
40
35
|
def create_pool_with_http_connections(site, *connections)
|
41
|
-
pool = Puppet::
|
36
|
+
pool = Puppet::HTTP::Pool.new(15)
|
42
37
|
connections.each do |conn|
|
43
38
|
pool.release(site, nil, conn)
|
44
39
|
end
|
@@ -48,7 +43,7 @@ describe Puppet::Network::HTTP::Pool do
|
|
48
43
|
def create_pool_with_expired_connections(site, *connections)
|
49
44
|
# setting keepalive timeout to -1 ensures any newly added
|
50
45
|
# connections have already expired
|
51
|
-
pool = Puppet::
|
46
|
+
pool = Puppet::HTTP::Pool.new(-1)
|
52
47
|
connections.each do |conn|
|
53
48
|
pool.release(site, verifier, conn)
|
54
49
|
end
|
@@ -230,11 +225,11 @@ describe Puppet::Network::HTTP::Pool do
|
|
230
225
|
end
|
231
226
|
|
232
227
|
it 'returns a new HTTP connection if the cached connection is HTTPS' do
|
233
|
-
https_site = Puppet::
|
228
|
+
https_site = Puppet::HTTP::Site.new('https', 'www.example.com', 443)
|
234
229
|
old_conn = create_connection(https_site)
|
235
230
|
pool = create_pool_with_connections(https_site, old_conn)
|
236
231
|
|
237
|
-
http_site = Puppet::
|
232
|
+
http_site = Puppet::HTTP::Site.new('http', 'www.example.com', 443)
|
238
233
|
new_conn = create_http_connection(http_site)
|
239
234
|
allow(pool.factory).to receive(:create_connection).with(http_site).and_return(new_conn)
|
240
235
|
|
@@ -242,11 +237,11 @@ describe Puppet::Network::HTTP::Pool do
|
|
242
237
|
end
|
243
238
|
|
244
239
|
it 'returns a new HTTPS connection if the cached connection is HTTP' do
|
245
|
-
http_site = Puppet::
|
240
|
+
http_site = Puppet::HTTP::Site.new('http', 'www.example.com', 443)
|
246
241
|
old_conn = create_http_connection(http_site)
|
247
242
|
pool = create_pool_with_http_connections(http_site, old_conn)
|
248
243
|
|
249
|
-
https_site = Puppet::
|
244
|
+
https_site = Puppet::HTTP::Site.new('https', 'www.example.com', 443)
|
250
245
|
new_conn = create_connection(https_site)
|
251
246
|
allow(pool.factory).to receive(:create_connection).with(https_site).and_return(new_conn)
|
252
247
|
|
@@ -279,7 +274,7 @@ describe Puppet::Network::HTTP::Pool do
|
|
279
274
|
end
|
280
275
|
|
281
276
|
it 'returns a cached connection if both connections are http' do
|
282
|
-
http_site = Puppet::
|
277
|
+
http_site = Puppet::HTTP::Site.new('http', 'www.example.com', 80)
|
283
278
|
old_conn = create_http_connection(http_site)
|
284
279
|
pool = create_pool_with_http_connections(http_site, old_conn)
|
285
280
|
|