puppet 6.16.0-x64-mingw32 → 7.0.0-x64-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
@@ -1,88 +0,0 @@
|
|
1
|
-
require 'puppet'
|
2
|
-
require 'puppet/util/warnings'
|
3
|
-
|
4
|
-
module Puppet::Util
|
5
|
-
module Connection
|
6
|
-
extend Puppet::Util::Warnings
|
7
|
-
|
8
|
-
# The logic for server and port is kind of gross. In summary:
|
9
|
-
# IF an endpoint-specific setting is requested AND that setting has been set by the user
|
10
|
-
# Use that setting.
|
11
|
-
# The defaults for these settings are the "normal" server/masterport settings, so
|
12
|
-
# when they are unset we instead want to "fall back" to the failover-selected
|
13
|
-
# host/port pair.
|
14
|
-
# ELSE IF we have a failover-selected host/port
|
15
|
-
# Use what the failover logic came up with
|
16
|
-
# ELSE IF the server_list setting is in use
|
17
|
-
# Use the first entry - failover hasn't happened yet, but that
|
18
|
-
# setting is still authoritative
|
19
|
-
# ELSE
|
20
|
-
# Go for the legacy server/masterport settings, and hope for the best
|
21
|
-
|
22
|
-
# Determines which server to use based on the specified setting, taking into
|
23
|
-
# account HA fallback from server_list.
|
24
|
-
# @param [Symbol] setting The preferred server setting to use
|
25
|
-
# @return [String] the name of the server for use in the request
|
26
|
-
def self.determine_server(setting)
|
27
|
-
if setting && setting != :server && Puppet.settings.set_by_config?(setting)
|
28
|
-
debug_once _("Selected server from the %{setting} setting: %{server}") % {setting: setting, server: Puppet.settings[setting]}
|
29
|
-
Puppet[setting]
|
30
|
-
else
|
31
|
-
server = Puppet.lookup(:server) do
|
32
|
-
primary_server = Puppet.settings[:server_list][0]
|
33
|
-
if primary_server
|
34
|
-
#TRANSLATORS 'server_list' is the name of a setting and should not be translated
|
35
|
-
debug_once _("Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}") % {server: primary_server[0]}
|
36
|
-
primary_server[0]
|
37
|
-
else
|
38
|
-
setting ||= :server
|
39
|
-
debug_once _("Dynamically-bound server lookup failed, falling back to %{setting} setting: %{server}") % {setting: setting, server: Puppet.settings[setting]}
|
40
|
-
Puppet.settings[setting]
|
41
|
-
end
|
42
|
-
end
|
43
|
-
server
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
|
-
# Determines which port to use based on the specified setting, taking into
|
48
|
-
# account HA fallback from server_list.
|
49
|
-
# For port there's a little bit of an extra snag: setting a specific
|
50
|
-
# server setting and relying on the default port for that server is
|
51
|
-
# common, so we also want to check if the assocaited SERVER setting
|
52
|
-
# has been set by the user. If either of those are set we ignore the
|
53
|
-
# failover-selected port.
|
54
|
-
# @param [Symbol] port_setting The preferred port setting to use
|
55
|
-
# @param [Symbol] server_setting The server setting assoicated with this route.
|
56
|
-
# @return [Integer] the port to use for use in the request
|
57
|
-
def self.determine_port(port_setting, server_setting)
|
58
|
-
if (port_setting && port_setting != :masterport && Puppet.settings.set_by_config?(port_setting)) ||
|
59
|
-
(server_setting && server_setting != :server && Puppet.settings.set_by_config?(server_setting))
|
60
|
-
debug_once _("Selected port from the %{setting} setting: %{port}") % {setting: port_setting, port: Puppet.settings[port_setting].to_i}
|
61
|
-
Puppet.settings[port_setting].to_i
|
62
|
-
else
|
63
|
-
port = Puppet.lookup(:serverport) do
|
64
|
-
primary_server = Puppet.settings[:server_list][0]
|
65
|
-
if primary_server
|
66
|
-
# Port might not be set, so we want to fallback in that
|
67
|
-
# case. We know we don't need to use `setting` here, since
|
68
|
-
# the default value of every port setting is `masterport`
|
69
|
-
if primary_server[1]
|
70
|
-
#TRANSLATORS 'server_list' is the name of a setting and should not be translated
|
71
|
-
debug_once _("Dynamically-bound port lookup failed; using first entry from the `server_list` setting: %{port}") % {port: primary_server[1]}
|
72
|
-
primary_server[1]
|
73
|
-
else
|
74
|
-
#TRANSLATORS 'masterport' is the name of a setting and should not be translated
|
75
|
-
debug_once _("Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}") % {port: Puppet.settings[:masterport]}
|
76
|
-
Puppet.settings[:masterport]
|
77
|
-
end
|
78
|
-
else
|
79
|
-
port_setting ||= :masterport
|
80
|
-
debug_once _("Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}") % {setting: port_setting, port: Puppet.settings[port_setting]}
|
81
|
-
Puppet.settings[port_setting]
|
82
|
-
end
|
83
|
-
end
|
84
|
-
port.to_i
|
85
|
-
end
|
86
|
-
end
|
87
|
-
end
|
88
|
-
end
|
data/lib/puppet/util/ssl.rb
DELETED
@@ -1,83 +0,0 @@
|
|
1
|
-
require 'puppet/ssl/openssl_loader'
|
2
|
-
|
3
|
-
##
|
4
|
-
# SSL is a private module with class methods that help work with x.509
|
5
|
-
# subjects and errors.
|
6
|
-
#
|
7
|
-
# @api private
|
8
|
-
module Puppet::Util::SSL
|
9
|
-
|
10
|
-
@@dn_parsers = nil
|
11
|
-
@@no_name = nil
|
12
|
-
|
13
|
-
# Given a DN string, parse it into an OpenSSL certificate subject. This
|
14
|
-
# method will flexibly handle both OpenSSL and RFC2253 formats, as given by
|
15
|
-
# nginx and Apache, respectively.
|
16
|
-
#
|
17
|
-
# @param [String] dn the x.509 Distinguished Name (DN) string.
|
18
|
-
#
|
19
|
-
# @return [OpenSSL::X509::Name] the certificate subject
|
20
|
-
def self.subject_from_dn(dn)
|
21
|
-
if is_possibly_valid_dn?(dn)
|
22
|
-
parsers = @@dn_parsers ||= [
|
23
|
-
OpenSSL::X509::Name.method(:parse_rfc2253),
|
24
|
-
OpenSSL::X509::Name.method(:parse_openssl)
|
25
|
-
]
|
26
|
-
parsers.each do |parser|
|
27
|
-
begin
|
28
|
-
return parser.call(dn)
|
29
|
-
rescue OpenSSL::X509::NameError
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
@@no_name ||= OpenSSL::X509::Name.new
|
35
|
-
end
|
36
|
-
|
37
|
-
##
|
38
|
-
# cn_from_subject extracts the CN from the given OpenSSL certificate
|
39
|
-
# subject.
|
40
|
-
#
|
41
|
-
# @api private
|
42
|
-
#
|
43
|
-
# @param [OpenSSL::X509::Name] subject the subject to extract the CN field from
|
44
|
-
#
|
45
|
-
# @return [String, nil] the CN, or nil if not found
|
46
|
-
def self.cn_from_subject(subject)
|
47
|
-
if subject.respond_to? :to_a
|
48
|
-
(subject.to_a.assoc('CN') || [])[1]
|
49
|
-
end
|
50
|
-
end
|
51
|
-
|
52
|
-
def self.is_possibly_valid_dn?(dn)
|
53
|
-
dn =~ /=/
|
54
|
-
end
|
55
|
-
|
56
|
-
##
|
57
|
-
# Extract and format meaningful error messages from OpenSSL::OpenSSLErrors
|
58
|
-
# and a Validator. Re-raises the error if unknown.
|
59
|
-
#
|
60
|
-
# @api private
|
61
|
-
#
|
62
|
-
# @param [OpenSSL::OpenSSLError] error An error thrown during creating a
|
63
|
-
# connection
|
64
|
-
# @param [Puppet::SSL::DefaultValidator] verifier A Validator who may have
|
65
|
-
# invalidated the connection
|
66
|
-
# @param [String] host The DNS name of the other end of the SSL connection
|
67
|
-
#
|
68
|
-
# @raises [Puppet::Error, OpenSSL::OpenSSLError]
|
69
|
-
def self.handle_connection_error(error, verifier, host)
|
70
|
-
# can be nil
|
71
|
-
peer_cert = verifier.peer_certs.last
|
72
|
-
|
73
|
-
if error.message.include? "certificate verify failed"
|
74
|
-
msg = error.message
|
75
|
-
msg << ": [" + verifier.verify_errors.join('; ') + "]"
|
76
|
-
raise Puppet::Error, msg, error.backtrace
|
77
|
-
elsif peer_cert && !OpenSSL::SSL.verify_certificate_identity(peer_cert, host)
|
78
|
-
raise Puppet::SSL::CertMismatchError.new(peer_cert, host)
|
79
|
-
else
|
80
|
-
raise error
|
81
|
-
end
|
82
|
-
end
|
83
|
-
end
|
@@ -1,282 +0,0 @@
|
|
1
|
-
require 'ffi'
|
2
|
-
require 'puppet/util/windows/string'
|
3
|
-
|
4
|
-
module Puppet::Util::Windows::APITypes
|
5
|
-
module ::FFI
|
6
|
-
WIN32_FALSE = 0
|
7
|
-
|
8
|
-
# standard Win32 error codes
|
9
|
-
ERROR_SUCCESS = 0
|
10
|
-
end
|
11
|
-
|
12
|
-
module ::FFI::Library
|
13
|
-
# Wrapper method for attach_function + private
|
14
|
-
def attach_function_private(*args)
|
15
|
-
attach_function(*args)
|
16
|
-
private args[0]
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
class ::FFI::Pointer
|
21
|
-
NULL_HANDLE = 0
|
22
|
-
|
23
|
-
def self.from_string_to_wide_string(str, &block)
|
24
|
-
str = Puppet::Util::Windows::String.wide_string(str)
|
25
|
-
FFI::MemoryPointer.new(:byte, str.bytesize) do |ptr|
|
26
|
-
# uchar here is synonymous with byte
|
27
|
-
ptr.put_array_of_uchar(0, str.bytes.to_a)
|
28
|
-
|
29
|
-
yield ptr
|
30
|
-
end
|
31
|
-
|
32
|
-
# ptr has already had free called, so nothing to return
|
33
|
-
nil
|
34
|
-
end
|
35
|
-
|
36
|
-
def read_win32_bool
|
37
|
-
# BOOL is always a 32-bit integer in Win32
|
38
|
-
# some Win32 APIs return 1 for true, while others are non-0
|
39
|
-
read_int32 != FFI::WIN32_FALSE
|
40
|
-
end
|
41
|
-
|
42
|
-
alias_method :read_dword, :read_uint32
|
43
|
-
alias_method :read_win32_ulong, :read_uint32
|
44
|
-
alias_method :read_qword, :read_uint64
|
45
|
-
|
46
|
-
alias_method :read_hresult, :read_int32
|
47
|
-
|
48
|
-
def read_handle
|
49
|
-
type_size == 4 ? read_uint32 : read_uint64
|
50
|
-
end
|
51
|
-
|
52
|
-
alias_method :read_wchar, :read_uint16
|
53
|
-
alias_method :read_word, :read_uint16
|
54
|
-
alias_method :read_array_of_wchar, :read_array_of_uint16
|
55
|
-
|
56
|
-
def read_wide_string(char_length, dst_encoding = Encoding::UTF_8, encode_options = {})
|
57
|
-
# char_length is number of wide chars (typically excluding NULLs), *not* bytes
|
58
|
-
str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
|
59
|
-
str.encode(dst_encoding, str.encoding, encode_options)
|
60
|
-
rescue Exception => e
|
61
|
-
Puppet.debug "Unable to convert value #{str.nil? ? 'nil' : str.dump} to encoding #{dst_encoding} due to #{e.inspect}"
|
62
|
-
raise
|
63
|
-
end
|
64
|
-
|
65
|
-
# @param max_char_length [Integer] Maximum number of wide chars to return (typically excluding NULLs), *not* bytes
|
66
|
-
# @param null_terminator [Symbol] Number of number of null wchar characters, *not* bytes, that determine the end of the string
|
67
|
-
# null_terminator = :single_null, then the terminating sequence is two bytes of zero. This is UNIT16 = 0
|
68
|
-
# null_terminator = :double_null, then the terminating sequence is four bytes of zero. This is UNIT32 = 0
|
69
|
-
# @param encode_options [Hash] Accepts the same option hash that may be passed to String#encode in Ruby
|
70
|
-
def read_arbitrary_wide_string_up_to(max_char_length = 512, null_terminator = :single_null, encode_options = {})
|
71
|
-
if null_terminator != :single_null && null_terminator != :double_null
|
72
|
-
raise _("Unable to read wide strings with %{null_terminator} terminal nulls") % { null_terminator: null_terminator }
|
73
|
-
end
|
74
|
-
|
75
|
-
terminator_width = null_terminator == :single_null ? 1 : 2
|
76
|
-
reader_method = null_terminator == :single_null ? :get_uint16 : :get_uint32
|
77
|
-
|
78
|
-
# Look for a null terminating characters; if found, read up to that null (exclusive)
|
79
|
-
(0...max_char_length - terminator_width).each do |i|
|
80
|
-
return read_wide_string(i, Encoding::UTF_8, encode_options) if send(reader_method, (i * 2)) == 0
|
81
|
-
end
|
82
|
-
|
83
|
-
# String is longer than the max; read just to the max
|
84
|
-
read_wide_string(max_char_length, Encoding::UTF_8, encode_options)
|
85
|
-
end
|
86
|
-
|
87
|
-
def read_win32_local_pointer(&block)
|
88
|
-
ptr = nil
|
89
|
-
begin
|
90
|
-
ptr = read_pointer
|
91
|
-
yield ptr
|
92
|
-
ensure
|
93
|
-
if ptr && ! ptr.null?
|
94
|
-
if FFI::WIN32::LocalFree(ptr.address) != FFI::Pointer::NULL_HANDLE
|
95
|
-
Puppet.debug "LocalFree memory leak"
|
96
|
-
end
|
97
|
-
end
|
98
|
-
end
|
99
|
-
|
100
|
-
# ptr has already had LocalFree called, so nothing to return
|
101
|
-
nil
|
102
|
-
end
|
103
|
-
|
104
|
-
def read_com_memory_pointer(&block)
|
105
|
-
ptr = nil
|
106
|
-
begin
|
107
|
-
ptr = read_pointer
|
108
|
-
yield ptr
|
109
|
-
ensure
|
110
|
-
FFI::WIN32::CoTaskMemFree(ptr) if ptr && ! ptr.null?
|
111
|
-
end
|
112
|
-
|
113
|
-
# ptr has already had CoTaskMemFree called, so nothing to return
|
114
|
-
nil
|
115
|
-
end
|
116
|
-
|
117
|
-
|
118
|
-
alias_method :write_dword, :write_uint32
|
119
|
-
alias_method :write_word, :write_uint16
|
120
|
-
end
|
121
|
-
|
122
|
-
# FFI Types
|
123
|
-
# https://github.com/ffi/ffi/wiki/Types
|
124
|
-
|
125
|
-
# Windows - Common Data Types
|
126
|
-
# https://msdn.microsoft.com/en-us/library/cc230309.aspx
|
127
|
-
|
128
|
-
# Windows Data Types
|
129
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx
|
130
|
-
|
131
|
-
FFI.typedef :uint16, :word
|
132
|
-
FFI.typedef :uint32, :dword
|
133
|
-
# uintptr_t is defined in an FFI conf as platform specific, either
|
134
|
-
# ulong_long on x64 or just ulong on x86
|
135
|
-
FFI.typedef :uintptr_t, :handle
|
136
|
-
FFI.typedef :uintptr_t, :hwnd
|
137
|
-
|
138
|
-
# buffer_inout is similar to pointer (platform specific), but optimized for buffers
|
139
|
-
FFI.typedef :buffer_inout, :lpwstr
|
140
|
-
# buffer_in is similar to pointer (platform specific), but optimized for CONST read only buffers
|
141
|
-
FFI.typedef :buffer_in, :lpcwstr
|
142
|
-
FFI.typedef :buffer_in, :lpcolestr
|
143
|
-
|
144
|
-
# string is also similar to pointer, but should be used for const char *
|
145
|
-
# NOTE that this is not wide, useful only for A suffixed functions
|
146
|
-
FFI.typedef :string, :lpcstr
|
147
|
-
|
148
|
-
# pointer in FFI is platform specific
|
149
|
-
# NOTE: for API calls with reserved lpvoid parameters, pass a FFI::Pointer::NULL
|
150
|
-
FFI.typedef :pointer, :lpcvoid
|
151
|
-
FFI.typedef :pointer, :lpvoid
|
152
|
-
FFI.typedef :pointer, :lpword
|
153
|
-
FFI.typedef :pointer, :lpbyte
|
154
|
-
FFI.typedef :pointer, :lpdword
|
155
|
-
FFI.typedef :pointer, :pdword
|
156
|
-
FFI.typedef :pointer, :phandle
|
157
|
-
FFI.typedef :pointer, :ulong_ptr
|
158
|
-
FFI.typedef :pointer, :pbool
|
159
|
-
FFI.typedef :pointer, :lpunknown
|
160
|
-
|
161
|
-
# any time LONG / ULONG is in a win32 API definition DO NOT USE platform specific width
|
162
|
-
# which is what FFI uses by default
|
163
|
-
# instead create new aliases for these very special cases
|
164
|
-
# NOTE: not a good idea to redefine FFI :ulong since other typedefs may rely on it
|
165
|
-
FFI.typedef :uint32, :win32_ulong
|
166
|
-
FFI.typedef :int32, :win32_long
|
167
|
-
# FFI bool can be only 1 byte at times,
|
168
|
-
# Win32 BOOL is a signed int, and is always 4 bytes, even on x64
|
169
|
-
# https://blogs.msdn.com/b/oldnewthing/archive/2011/03/28/10146459.aspx
|
170
|
-
FFI.typedef :int32, :win32_bool
|
171
|
-
|
172
|
-
# BOOLEAN (unlike BOOL) is a BYTE - typedef unsigned char BYTE;
|
173
|
-
FFI.typedef :uchar, :boolean
|
174
|
-
|
175
|
-
# Same as a LONG, a 32-bit signed integer
|
176
|
-
FFI.typedef :int32, :hresult
|
177
|
-
|
178
|
-
# NOTE: FFI already defines (u)short as a 16-bit (un)signed like this:
|
179
|
-
# FFI.typedef :uint16, :ushort
|
180
|
-
# FFI.typedef :int16, :short
|
181
|
-
|
182
|
-
# 8 bits per byte
|
183
|
-
FFI.typedef :uchar, :byte
|
184
|
-
FFI.typedef :uint16, :wchar
|
185
|
-
|
186
|
-
module ::FFI::WIN32
|
187
|
-
extend ::FFI::Library
|
188
|
-
|
189
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa373931(v=vs.85).aspx
|
190
|
-
# typedef struct _GUID {
|
191
|
-
# DWORD Data1;
|
192
|
-
# WORD Data2;
|
193
|
-
# WORD Data3;
|
194
|
-
# BYTE Data4[8];
|
195
|
-
# } GUID;
|
196
|
-
class GUID < FFI::Struct
|
197
|
-
layout :Data1, :dword,
|
198
|
-
:Data2, :word,
|
199
|
-
:Data3, :word,
|
200
|
-
:Data4, [:byte, 8]
|
201
|
-
|
202
|
-
def self.[](s)
|
203
|
-
raise _('Bad GUID format.') unless s =~ /^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/i
|
204
|
-
|
205
|
-
new.tap do |guid|
|
206
|
-
guid[:Data1] = s[0, 8].to_i(16)
|
207
|
-
guid[:Data2] = s[9, 4].to_i(16)
|
208
|
-
guid[:Data3] = s[14, 4].to_i(16)
|
209
|
-
guid[:Data4][0] = s[19, 2].to_i(16)
|
210
|
-
guid[:Data4][1] = s[21, 2].to_i(16)
|
211
|
-
s[24, 12].split('').each_slice(2).with_index do |a, i|
|
212
|
-
guid[:Data4][i + 2] = a.join('').to_i(16)
|
213
|
-
end
|
214
|
-
end
|
215
|
-
end
|
216
|
-
|
217
|
-
def ==(other) Windows.memcmp(other, self, size) == 0 end
|
218
|
-
end
|
219
|
-
|
220
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms724950(v=vs.85).aspx
|
221
|
-
# typedef struct _SYSTEMTIME {
|
222
|
-
# WORD wYear;
|
223
|
-
# WORD wMonth;
|
224
|
-
# WORD wDayOfWeek;
|
225
|
-
# WORD wDay;
|
226
|
-
# WORD wHour;
|
227
|
-
# WORD wMinute;
|
228
|
-
# WORD wSecond;
|
229
|
-
# WORD wMilliseconds;
|
230
|
-
# } SYSTEMTIME, *PSYSTEMTIME;
|
231
|
-
class SYSTEMTIME < FFI::Struct
|
232
|
-
layout :wYear, :word,
|
233
|
-
:wMonth, :word,
|
234
|
-
:wDayOfWeek, :word,
|
235
|
-
:wDay, :word,
|
236
|
-
:wHour, :word,
|
237
|
-
:wMinute, :word,
|
238
|
-
:wSecond, :word,
|
239
|
-
:wMilliseconds, :word
|
240
|
-
|
241
|
-
def to_local_time
|
242
|
-
Time.local(self[:wYear], self[:wMonth], self[:wDay],
|
243
|
-
self[:wHour], self[:wMinute], self[:wSecond], self[:wMilliseconds] * 1000)
|
244
|
-
end
|
245
|
-
end
|
246
|
-
|
247
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms724284(v=vs.85).aspx
|
248
|
-
# Contains a 64-bit value representing the number of 100-nanosecond
|
249
|
-
# intervals since January 1, 1601 (UTC).
|
250
|
-
# typedef struct _FILETIME {
|
251
|
-
# DWORD dwLowDateTime;
|
252
|
-
# DWORD dwHighDateTime;
|
253
|
-
# } FILETIME, *PFILETIME;
|
254
|
-
class FILETIME < FFI::Struct
|
255
|
-
layout :dwLowDateTime, :dword,
|
256
|
-
:dwHighDateTime, :dword
|
257
|
-
end
|
258
|
-
|
259
|
-
ffi_convention :stdcall
|
260
|
-
|
261
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa366730(v=vs.85).aspx
|
262
|
-
# HLOCAL WINAPI LocalFree(
|
263
|
-
# _In_ HLOCAL hMem
|
264
|
-
# );
|
265
|
-
ffi_lib :kernel32
|
266
|
-
attach_function :LocalFree, [:handle], :handle
|
267
|
-
|
268
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms724211(v=vs.85).aspx
|
269
|
-
# BOOL WINAPI CloseHandle(
|
270
|
-
# _In_ HANDLE hObject
|
271
|
-
# );
|
272
|
-
ffi_lib :kernel32
|
273
|
-
attach_function_private :CloseHandle, [:handle], :win32_bool
|
274
|
-
|
275
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms680722(v=vs.85).aspx
|
276
|
-
# void CoTaskMemFree(
|
277
|
-
# _In_opt_ LPVOID pv
|
278
|
-
# );
|
279
|
-
ffi_lib :ole32
|
280
|
-
attach_function :CoTaskMemFree, [:lpvoid], :void
|
281
|
-
end
|
282
|
-
end
|