puppet 6.19.0-x86-mingw32 → 7.3.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/CODEOWNERS +2 -16
- data/Gemfile +3 -4
- data/Gemfile.lock +33 -28
- data/README.md +1 -1
- 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 +2 -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/application.rb +182 -104
- data/lib/puppet/application/agent.rb +1 -0
- data/lib/puppet/application/apply.rb +3 -2
- data/lib/puppet/application/device.rb +101 -104
- data/lib/puppet/application/filebucket.rb +15 -11
- data/lib/puppet/application/script.rb +1 -0
- data/lib/puppet/application/ssl.rb +1 -1
- data/lib/puppet/application_support.rb +7 -0
- data/lib/puppet/configurer.rb +44 -36
- data/lib/puppet/configurer/plugin_handler.rb +21 -19
- data/lib/puppet/defaults.rb +71 -170
- data/lib/puppet/environments.rb +44 -75
- data/lib/puppet/face/config.rb +10 -0
- data/lib/puppet/face/epp.rb +12 -2
- data/lib/puppet/face/facts.rb +80 -6
- data/lib/puppet/face/help.rb +1 -1
- data/lib/puppet/face/node/clean.rb +8 -0
- data/lib/puppet/face/plugin.rb +5 -8
- data/lib/puppet/ffi/posix.rb +10 -0
- data/lib/puppet/ffi/posix/constants.rb +14 -0
- data/lib/puppet/ffi/posix/functions.rb +24 -0
- 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_serving/configuration.rb +0 -5
- data/lib/puppet/file_serving/configuration/parser.rb +6 -32
- data/lib/puppet/file_serving/http_metadata.rb +1 -1
- data/lib/puppet/file_serving/mount.rb +1 -2
- data/lib/puppet/forge/repository.rb +0 -1
- data/lib/puppet/functions/epp.rb +1 -0
- data/lib/puppet/functions/inline_epp.rb +1 -0
- data/lib/puppet/generate/models/type/type.rb +4 -1
- data/lib/puppet/http.rb +22 -13
- data/lib/puppet/http/client.rb +164 -114
- 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 +4 -12
- data/lib/puppet/http/resolver.rb +5 -15
- data/lib/puppet/http/resolver/server_list.rb +6 -10
- data/lib/puppet/http/resolver/settings.rb +4 -7
- data/lib/puppet/http/resolver/srv.rb +7 -11
- data/lib/puppet/http/response.rb +36 -54
- 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 +12 -26
- data/lib/puppet/http/service/ca.rb +11 -22
- data/lib/puppet/http/service/compiler.rb +22 -69
- data/lib/puppet/http/service/file_server.rb +18 -27
- data/lib/puppet/http/service/puppetserver.rb +26 -12
- data/lib/puppet/http/service/report.rb +8 -10
- data/lib/puppet/http/session.rb +11 -20
- data/lib/puppet/{network/http → http}/site.rb +1 -2
- data/lib/puppet/indirector/catalog/rest.rb +2 -4
- data/lib/puppet/indirector/fact_search.rb +60 -0
- data/lib/puppet/indirector/facts/facter.rb +24 -3
- 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 +3 -58
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -9
- data/lib/puppet/indirector/file_content/rest.rb +2 -6
- data/lib/puppet/indirector/file_metadata/rest.rb +3 -9
- data/lib/puppet/indirector/file_server.rb +1 -8
- data/lib/puppet/indirector/generic_http.rb +0 -11
- data/lib/puppet/indirector/json.rb +5 -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/rest.rb +3 -8
- data/lib/puppet/indirector/request.rb +0 -101
- data/lib/puppet/indirector/rest.rb +12 -263
- data/lib/puppet/module_tool/applications.rb +0 -1
- data/lib/puppet/module_tool/applications/installer.rb +48 -2
- data/lib/puppet/module_tool/errors/shared.rb +17 -2
- data/lib/puppet/network/authconfig.rb +2 -96
- data/lib/puppet/network/authorization.rb +13 -35
- data/lib/puppet/network/formats.rb +69 -1
- data/lib/puppet/network/http.rb +3 -3
- data/lib/puppet/network/http/api/indirected_routes.rb +2 -20
- data/lib/puppet/network/http/api/master/v3.rb +11 -13
- data/lib/puppet/network/http/connection.rb +247 -316
- data/lib/puppet/network/http/handler.rb +0 -1
- data/lib/puppet/network/http_pool.rb +16 -34
- data/lib/puppet/node.rb +1 -30
- data/lib/puppet/pal/json_catalog_encoder.rb +4 -0
- data/lib/puppet/pal/pal_impl.rb +73 -18
- data/lib/puppet/parser/ast/leaf.rb +3 -2
- data/lib/puppet/parser/ast/pops_bridge.rb +0 -38
- data/lib/puppet/parser/compiler.rb +0 -198
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +14 -39
- data/lib/puppet/parser/resource.rb +0 -69
- data/lib/puppet/parser/templatewrapper.rb +1 -1
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +5 -3
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +22 -8
- 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/issues.rb +0 -5
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +6 -8
- data/lib/puppet/pops/model/ast.pp +0 -42
- data/lib/puppet/pops/model/ast.rb +0 -290
- data/lib/puppet/pops/model/ast_transformer.rb +1 -1
- 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 -24
- 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 +9 -37
- data/lib/puppet/pops/validation/tasks_checker.rb +0 -12
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -2
- data/lib/puppet/provider.rb +0 -13
- data/lib/puppet/provider/nameservice.rb +0 -18
- data/lib/puppet/provider/package/apt.rb +4 -0
- data/lib/puppet/provider/package/dpkg.rb +0 -10
- data/lib/puppet/provider/package/gem.rb +23 -3
- data/lib/puppet/provider/package/pip.rb +0 -1
- 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 +1 -4
- data/lib/puppet/provider/service/smf.rb +191 -73
- data/lib/puppet/provider/user/aix.rb +2 -2
- data/lib/puppet/provider/user/directoryservice.rb +0 -10
- data/lib/puppet/reference/configuration.rb +8 -5
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/resource.rb +1 -89
- data/lib/puppet/resource/catalog.rb +1 -14
- data/lib/puppet/resource/type.rb +3 -119
- data/lib/puppet/resource/type_collection.rb +3 -48
- data/lib/puppet/runtime.rb +1 -2
- data/lib/puppet/settings.rb +88 -48
- data/lib/puppet/settings/alias_setting.rb +37 -0
- 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_provider.rb +17 -0
- data/lib/puppet/ssl/state_machine.rb +3 -1
- data/lib/puppet/ssl/verifier.rb +2 -0
- data/lib/puppet/test/test_helper.rb +1 -3
- data/lib/puppet/transaction.rb +1 -7
- data/lib/puppet/transaction/report.rb +2 -4
- data/lib/puppet/type.rb +0 -76
- data/lib/puppet/type/file.rb +5 -7
- data/lib/puppet/type/file/checksum.rb +1 -1
- data/lib/puppet/type/file/source.rb +1 -1
- data/lib/puppet/type/filebucket.rb +3 -3
- data/lib/puppet/type/package.rb +5 -13
- data/lib/puppet/type/user.rb +1 -1
- data/lib/puppet/util/autoload.rb +1 -8
- data/lib/puppet/util/execution.rb +0 -11
- data/lib/puppet/util/http_proxy.rb +2 -215
- data/lib/puppet/util/monkey_patches.rb +0 -46
- data/lib/puppet/util/posix.rb +54 -5
- data/lib/puppet/util/rdoc.rb +0 -7
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/rubygems.rb +5 -1
- data/lib/puppet/util/run_mode.rb +9 -1
- data/lib/puppet/util/windows.rb +3 -8
- 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 +4 -9
- 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/process.rb +4 -226
- data/lib/puppet/util/windows/service.rb +9 -460
- data/lib/puppet/util/windows/string.rb +12 -13
- 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 +629 -1314
- data/man/man5/puppet.conf.5 +39 -99
- data/man/man8/puppet-agent.8 +2 -2
- data/man/man8/puppet-apply.8 +2 -2
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +2 -2
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +58 -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 +1 -1
- data/man/man8/puppet-module.8 +1 -58
- data/man/man8/puppet-node.8 +4 -1
- 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 +2 -2
- data/man/man8/puppet-ssl.8 +1 -1
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +91 -0
- data/spec/fixtures/unit/provider/service/smf/{svcs.out → svcs_instances.out} +0 -0
- data/spec/fixtures/unit/provider/user/aix/aix_passwd_file.out +4 -0
- data/spec/integration/application/agent_spec.rb +151 -14
- data/spec/integration/application/apply_spec.rb +20 -1
- data/spec/integration/application/filebucket_spec.rb +16 -16
- data/spec/integration/application/help_spec.rb +2 -0
- data/spec/integration/application/plugin_spec.rb +23 -1
- data/spec/integration/defaults_spec.rb +7 -10
- data/spec/integration/environments/setting_hooks_spec.rb +1 -1
- data/spec/integration/indirector/file_content/file_server_spec.rb +0 -2
- data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -2
- data/spec/integration/network/http_pool_spec.rb +3 -21
- data/spec/integration/parser/catalog_spec.rb +0 -38
- data/spec/integration/parser/node_spec.rb +0 -9
- data/spec/integration/parser/pcore_resource_spec.rb +0 -37
- data/spec/integration/resource/type_collection_spec.rb +2 -6
- data/spec/integration/transaction_spec.rb +4 -9
- data/spec/integration/type/file_spec.rb +5 -4
- data/spec/integration/util/windows/adsi_spec.rb +3 -1
- data/spec/integration/util/windows/monkey_patches/process_spec.rb +231 -0
- data/spec/integration/util/windows/registry_spec.rb +0 -10
- data/spec/integration/util/windows/security_spec.rb +1 -1
- data/spec/lib/puppet_spec/puppetserver.rb +1 -1
- data/spec/lib/puppet_spec/settings.rb +7 -1
- data/spec/spec_helper.rb +3 -4
- data/spec/unit/agent_spec.rb +8 -8
- data/spec/unit/application/agent_spec.rb +0 -1
- data/spec/unit/application/config_spec.rb +224 -4
- data/spec/unit/application/facts_spec.rb +35 -0
- data/spec/unit/application/filebucket_spec.rb +41 -41
- data/spec/unit/application/ssl_spec.rb +2 -2
- data/spec/unit/application_spec.rb +51 -9
- data/spec/unit/certificate_factory_spec.rb +1 -1
- data/spec/unit/configurer/downloader_spec.rb +6 -2
- data/spec/unit/configurer/plugin_handler_spec.rb +56 -18
- data/spec/unit/configurer_spec.rb +12 -9
- data/spec/unit/confine/feature_spec.rb +1 -1
- data/spec/unit/confine_spec.rb +8 -2
- data/spec/unit/context/trusted_information_spec.rb +2 -6
- data/spec/unit/defaults_spec.rb +26 -32
- data/spec/unit/environments_spec.rb +96 -22
- data/spec/unit/face/config_spec.rb +27 -32
- data/spec/unit/face/facts_spec.rb +4 -0
- data/spec/unit/face/node_spec.rb +14 -13
- 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 +22 -19
- data/spec/unit/file_serving/configuration_spec.rb +6 -12
- data/spec/unit/file_serving/metadata_spec.rb +3 -3
- data/spec/unit/file_serving/terminus_helper_spec.rb +11 -4
- data/spec/unit/forge/module_release_spec.rb +2 -7
- 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 +7 -8
- 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 +13 -13
- data/spec/unit/http/service/compiler_spec.rb +49 -62
- data/spec/unit/http/service/file_server_spec.rb +3 -3
- data/spec/unit/http/service/puppetserver_spec.rb +34 -4
- data/spec/unit/http/service_spec.rb +1 -2
- data/spec/unit/http/session_spec.rb +16 -14
- data/spec/unit/{network/http → http}/site_spec.rb +3 -3
- data/spec/unit/indirector/face_spec.rb +0 -1
- data/spec/unit/indirector/facts/facter_spec.rb +104 -1
- data/spec/unit/indirector/facts/json_spec.rb +255 -0
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +5 -3
- data/spec/unit/indirector/file_bucket_file/selector_spec.rb +26 -8
- data/spec/unit/indirector/file_content/rest_spec.rb +0 -4
- 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/indirection_spec.rb +8 -12
- data/spec/unit/indirector/node/json_spec.rb +33 -0
- 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 +0 -264
- data/spec/unit/indirector/rest_spec.rb +98 -752
- data/spec/unit/indirector_spec.rb +2 -2
- data/spec/unit/module_tool/applications/installer_spec.rb +66 -0
- data/spec/unit/network/authconfig_spec.rb +2 -132
- data/spec/unit/network/authorization_spec.rb +2 -55
- data/spec/unit/network/formats_spec.rb +45 -4
- data/spec/unit/network/http/api/indirected_routes_spec.rb +1 -101
- 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 +19 -41
- 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 +33 -21
- data/spec/unit/node_spec.rb +2 -54
- data/spec/unit/parser/compiler_spec.rb +3 -19
- data/spec/unit/parser/functions/create_resources_spec.rb +2 -20
- data/spec/unit/parser/resource_spec.rb +14 -8
- data/spec/unit/parser/templatewrapper_spec.rb +4 -3
- data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +20 -0
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +4 -7
- data/spec/unit/pops/loaders/loaders_spec.rb +6 -21
- 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 +6 -6
- 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/property_spec.rb +1 -0
- data/spec/unit/provider/nameservice_spec.rb +66 -122
- data/spec/unit/provider/package/apt_spec.rb +4 -8
- data/spec/unit/provider/package/base_spec.rb +6 -5
- data/spec/unit/provider/package/dpkg_spec.rb +0 -48
- data/spec/unit/provider/package/gem_spec.rb +32 -0
- data/spec/unit/provider/package/pacman_spec.rb +18 -12
- data/spec/unit/provider/package/pip_spec.rb +6 -11
- data/spec/unit/provider/package/pkgdmg_spec.rb +0 -4
- data/spec/unit/provider/package/puppet_gem_spec.rb +3 -2
- data/spec/unit/provider/service/smf_spec.rb +401 -165
- data/spec/unit/provider/service/windows_spec.rb +0 -1
- data/spec/unit/provider/user/aix_spec.rb +5 -0
- data/spec/unit/provider/user/hpux_spec.rb +1 -1
- data/spec/unit/provider/user/pw_spec.rb +2 -0
- data/spec/unit/provider/user/useradd_spec.rb +1 -0
- data/spec/unit/provider_spec.rb +6 -20
- data/spec/unit/puppet_pal_catalog_spec.rb +45 -0
- data/spec/unit/resource/type_collection_spec.rb +2 -22
- data/spec/unit/resource/type_spec.rb +1 -1
- data/spec/unit/resource_spec.rb +11 -66
- 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 +560 -228
- data/spec/unit/ssl/base_spec.rb +36 -4
- 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 +14 -8
- data/spec/unit/ssl/state_machine_spec.rb +0 -1
- data/spec/unit/ssl/verifier_spec.rb +0 -21
- data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -7
- data/spec/unit/transaction/event_manager_spec.rb +14 -11
- data/spec/unit/transaction/report_spec.rb +0 -2
- data/spec/unit/transaction/resource_harness_spec.rb +2 -2
- data/spec/unit/transaction_spec.rb +57 -82
- data/spec/unit/type/file/checksum_spec.rb +6 -6
- data/spec/unit/type/file/content_spec.rb +1 -2
- 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/selinux_spec.rb +0 -2
- data/spec/unit/type/file/source_spec.rb +0 -1
- data/spec/unit/type/file_spec.rb +12 -12
- data/spec/unit/type/group_spec.rb +13 -6
- data/spec/unit/type/package_spec.rb +1 -1
- data/spec/unit/type/resources_spec.rb +7 -7
- data/spec/unit/type/service_spec.rb +1 -1
- data/spec/unit/type/tidy_spec.rb +0 -1
- data/spec/unit/type_spec.rb +22 -2
- data/spec/unit/util/at_fork_spec.rb +2 -2
- data/spec/unit/util/autoload_spec.rb +5 -1
- data/spec/unit/util/backups_spec.rb +1 -4
- data/spec/unit/util/execution_spec.rb +15 -40
- data/spec/unit/util/inifile_spec.rb +6 -14
- data/spec/unit/util/log_spec.rb +8 -7
- data/spec/unit/util/logging_spec.rb +3 -3
- data/spec/unit/util/monkey_patches_spec.rb +0 -6
- data/spec/unit/util/posix_spec.rb +363 -15
- data/spec/unit/util/rubygems_spec.rb +2 -2
- data/spec/unit/util/run_mode_spec.rb +21 -121
- data/spec/unit/util/selinux_spec.rb +76 -52
- data/spec/unit/util/storage_spec.rb +3 -1
- data/spec/unit/util/suidmanager_spec.rb +44 -41
- 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 +13 -24
- metadata +66 -226
- 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 -88
- 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 -184
- 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 -66
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +0 -22
- data/lib/puppet/parser/environment_compiler.rb +0 -202
- 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 -309
- data/lib/puppet/util/windows/monkey_patches/dir.rb +0 -40
- 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/application/config_spec.rb +0 -74
- data/spec/integration/network/authconfig_spec.rb +0 -256
- data/spec/integration/util/windows/monkey_patches/dir_spec.rb +0 -11
- data/spec/unit/application/man_spec.rb +0 -52
- 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/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/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 -730
- 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
@@ -0,0 +1,360 @@
|
|
1
|
+
require 'puppet/ffi/windows'
|
2
|
+
|
3
|
+
module Puppet::Util::Windows
|
4
|
+
|
5
|
+
# The Daemon class, based on the chef/win32-service implementation
|
6
|
+
class Daemon
|
7
|
+
include Puppet::FFI::Windows::Constants
|
8
|
+
extend Puppet::FFI::Windows::Constants
|
9
|
+
|
10
|
+
include Puppet::FFI::Windows::Structs
|
11
|
+
extend Puppet::FFI::Windows::Structs
|
12
|
+
|
13
|
+
include Puppet::FFI::Windows::Functions
|
14
|
+
extend Puppet::FFI::Windows::Functions
|
15
|
+
|
16
|
+
# Service is not running
|
17
|
+
STOPPED = SERVICE_STOPPED
|
18
|
+
|
19
|
+
# Service has received a start signal but is not yet running
|
20
|
+
START_PENDING = SERVICE_START_PENDING
|
21
|
+
|
22
|
+
# Service has received a stop signal but is not yet stopped
|
23
|
+
STOP_PENDING = SERVICE_STOP_PENDING
|
24
|
+
|
25
|
+
# Service is running
|
26
|
+
RUNNING = SERVICE_RUNNING
|
27
|
+
|
28
|
+
# Service has received a signal to resume but is not yet running
|
29
|
+
CONTINUE_PENDING = SERVICE_CONTINUE_PENDING
|
30
|
+
|
31
|
+
# Service has received a signal to pause but is not yet paused
|
32
|
+
PAUSE_PENDING = SERVICE_PAUSE_PENDING
|
33
|
+
|
34
|
+
# Service is paused
|
35
|
+
PAUSED = SERVICE_PAUSED
|
36
|
+
|
37
|
+
# Service controls
|
38
|
+
|
39
|
+
# Notifies service that it should stop
|
40
|
+
CONTROL_STOP = SERVICE_CONTROL_STOP
|
41
|
+
|
42
|
+
# Notifies service that it should pause
|
43
|
+
CONTROL_PAUSE = SERVICE_CONTROL_PAUSE
|
44
|
+
|
45
|
+
# Notifies service that it should resume
|
46
|
+
CONTROL_CONTINUE = SERVICE_CONTROL_CONTINUE
|
47
|
+
|
48
|
+
# Notifies service that it should return its current status information
|
49
|
+
CONTROL_INTERROGATE = SERVICE_CONTROL_INTERROGATE
|
50
|
+
|
51
|
+
# Notifies a service that its parameters have changed
|
52
|
+
CONTROL_PARAMCHANGE = SERVICE_CONTROL_PARAMCHANGE
|
53
|
+
|
54
|
+
# Notifies a service that there is a new component for binding
|
55
|
+
CONTROL_NETBINDADD = SERVICE_CONTROL_NETBINDADD
|
56
|
+
|
57
|
+
# Notifies a service that a component for binding has been removed
|
58
|
+
CONTROL_NETBINDREMOVE = SERVICE_CONTROL_NETBINDREMOVE
|
59
|
+
|
60
|
+
# Notifies a service that a component for binding has been enabled
|
61
|
+
CONTROL_NETBINDENABLE = SERVICE_CONTROL_NETBINDENABLE
|
62
|
+
|
63
|
+
# Notifies a service that a component for binding has been disabled
|
64
|
+
CONTROL_NETBINDDISABLE = SERVICE_CONTROL_NETBINDDISABLE
|
65
|
+
|
66
|
+
IDLE = 0
|
67
|
+
|
68
|
+
# Misc
|
69
|
+
IDLE_CONTROL_CODE = 0
|
70
|
+
WAIT_OBJECT_0 = 0
|
71
|
+
WAIT_TIMEOUT = 0x00000102
|
72
|
+
WAIT_FAILED = 0xFFFFFFFF
|
73
|
+
NO_ERROR = 0
|
74
|
+
|
75
|
+
# Wraps SetServiceStatus.
|
76
|
+
SetTheServiceStatus = Proc.new do |dwCurrentState, dwWin32ExitCode, dwCheckPoint, dwWaitHint|
|
77
|
+
ss = SERVICE_STATUS.new # Current status of the service.
|
78
|
+
|
79
|
+
# Disable control requests until the service is started.
|
80
|
+
if dwCurrentState == SERVICE_START_PENDING
|
81
|
+
ss[:dwControlsAccepted] = 0
|
82
|
+
else
|
83
|
+
ss[:dwControlsAccepted] =
|
84
|
+
SERVICE_ACCEPT_STOP|SERVICE_ACCEPT_SHUTDOWN|
|
85
|
+
SERVICE_ACCEPT_PAUSE_CONTINUE|SERVICE_ACCEPT_PARAMCHANGE
|
86
|
+
end
|
87
|
+
|
88
|
+
# Initialize ss structure.
|
89
|
+
ss[:dwServiceType] = SERVICE_WIN32_OWN_PROCESS
|
90
|
+
ss[:dwServiceSpecificExitCode] = 0
|
91
|
+
ss[:dwCurrentState] = dwCurrentState
|
92
|
+
ss[:dwWin32ExitCode] = dwWin32ExitCode
|
93
|
+
ss[:dwCheckPoint] = dwCheckPoint
|
94
|
+
ss[:dwWaitHint] = dwWaitHint
|
95
|
+
|
96
|
+
@@dwServiceState = dwCurrentState
|
97
|
+
|
98
|
+
# Send status of the service to the Service Controller.
|
99
|
+
if !SetServiceStatus(@@ssh, ss)
|
100
|
+
SetEvent(@@hStopEvent)
|
101
|
+
end
|
102
|
+
end
|
103
|
+
|
104
|
+
ERROR_CALL_NOT_IMPLEMENTED = 0x78
|
105
|
+
|
106
|
+
# Handles control signals from the service control manager.
|
107
|
+
Service_Ctrl_ex = Proc.new do |dwCtrlCode, dwEventType, lpEventData, lpContext|
|
108
|
+
@@waiting_control_code = dwCtrlCode;
|
109
|
+
return_value = NO_ERROR
|
110
|
+
|
111
|
+
begin
|
112
|
+
dwState = SERVICE_RUNNING
|
113
|
+
|
114
|
+
case dwCtrlCode
|
115
|
+
when SERVICE_CONTROL_STOP
|
116
|
+
dwState = SERVICE_STOP_PENDING
|
117
|
+
when SERVICE_CONTROL_SHUTDOWN
|
118
|
+
dwState = SERVICE_STOP_PENDING
|
119
|
+
when SERVICE_CONTROL_PAUSE
|
120
|
+
dwState = SERVICE_PAUSED
|
121
|
+
when SERVICE_CONTROL_CONTINUE
|
122
|
+
dwState = SERVICE_RUNNING
|
123
|
+
#else
|
124
|
+
# TODO: Handle other control codes? Retain the current state?
|
125
|
+
end
|
126
|
+
|
127
|
+
# Set the status of the service except on interrogation.
|
128
|
+
unless dwCtrlCode == SERVICE_CONTROL_INTERROGATE
|
129
|
+
SetTheServiceStatus.call(dwState, NO_ERROR, 0, 0)
|
130
|
+
end
|
131
|
+
|
132
|
+
# Tell service_main thread to stop.
|
133
|
+
if dwCtrlCode == SERVICE_CONTROL_STOP || dwCtrlCode == SERVICE_CONTROL_SHUTDOWN
|
134
|
+
if SetEvent(@@hStopEvent) == 0
|
135
|
+
SetTheServiceStatus.call(SERVICE_STOPPED, FFI.errno, 0, 0)
|
136
|
+
end
|
137
|
+
end
|
138
|
+
rescue
|
139
|
+
return_value = ERROR_CALL_NOT_IMPLEMENTED
|
140
|
+
end
|
141
|
+
|
142
|
+
return_value
|
143
|
+
end
|
144
|
+
|
145
|
+
# Called by the service control manager after the call to StartServiceCtrlDispatcher.
|
146
|
+
Service_Main = FFI::Function.new(:void, [:ulong, :pointer], :blocking => false) do |dwArgc, lpszArgv|
|
147
|
+
begin
|
148
|
+
# Obtain the name of the service.
|
149
|
+
if lpszArgv.address != 0
|
150
|
+
argv = lpszArgv.get_array_of_string(0, dwArgc)
|
151
|
+
lpszServiceName = argv[0]
|
152
|
+
else
|
153
|
+
lpszServiceName = ''
|
154
|
+
end
|
155
|
+
|
156
|
+
# Args passed to Service.start
|
157
|
+
if(dwArgc > 1)
|
158
|
+
@@Argv = argv[1..-1]
|
159
|
+
else
|
160
|
+
@@Argv = nil
|
161
|
+
end
|
162
|
+
|
163
|
+
# Register the service ctrl handler.
|
164
|
+
@@ssh = RegisterServiceCtrlHandlerExW(
|
165
|
+
lpszServiceName,
|
166
|
+
Service_Ctrl_ex,
|
167
|
+
nil
|
168
|
+
)
|
169
|
+
|
170
|
+
# No service to stop, no service handle to notify, nothing to do but exit.
|
171
|
+
break if @@ssh == 0
|
172
|
+
|
173
|
+
# The service has started.
|
174
|
+
SetTheServiceStatus.call(SERVICE_RUNNING, NO_ERROR, 0, 0)
|
175
|
+
|
176
|
+
SetEvent(@@hStartEvent)
|
177
|
+
|
178
|
+
# Main loop for the service.
|
179
|
+
while(WaitForSingleObject(@@hStopEvent, 1000) != WAIT_OBJECT_0) do
|
180
|
+
end
|
181
|
+
|
182
|
+
# Main loop for the service.
|
183
|
+
while(WaitForSingleObject(@@hStopCompletedEvent, 1000) != WAIT_OBJECT_0) do
|
184
|
+
end
|
185
|
+
ensure
|
186
|
+
# Stop the service.
|
187
|
+
SetTheServiceStatus.call(SERVICE_STOPPED, NO_ERROR, 0, 0)
|
188
|
+
end
|
189
|
+
end
|
190
|
+
|
191
|
+
ThreadProc = FFI::Function.new(:ulong,[:pointer]) do |lpParameter|
|
192
|
+
ste = FFI::MemoryPointer.new(SERVICE_TABLE_ENTRYW, 2)
|
193
|
+
|
194
|
+
s = SERVICE_TABLE_ENTRYW.new(ste[0])
|
195
|
+
s[:lpServiceName] = FFI::MemoryPointer.from_string('')
|
196
|
+
s[:lpServiceProc] = lpParameter
|
197
|
+
|
198
|
+
s = SERVICE_TABLE_ENTRYW.new(ste[1])
|
199
|
+
s[:lpServiceName] = nil
|
200
|
+
s[:lpServiceProc] = nil
|
201
|
+
|
202
|
+
# No service to step, no service handle, no ruby exceptions, just terminate the thread..
|
203
|
+
if !StartServiceCtrlDispatcherW(ste)
|
204
|
+
return 1
|
205
|
+
end
|
206
|
+
|
207
|
+
return 0
|
208
|
+
end
|
209
|
+
|
210
|
+
# This is a shortcut for Daemon.new + Daemon#mainloop.
|
211
|
+
#
|
212
|
+
def self.mainloop
|
213
|
+
self.new.mainloop
|
214
|
+
end
|
215
|
+
|
216
|
+
# This is the method that actually puts your code into a loop and allows it
|
217
|
+
# to run as a service. The code that is actually run while in the mainloop
|
218
|
+
# is what you defined in your own Daemon#service_main method.
|
219
|
+
#
|
220
|
+
def mainloop
|
221
|
+
@@waiting_control_code = IDLE_CONTROL_CODE
|
222
|
+
@@dwServiceState = 0
|
223
|
+
|
224
|
+
# Redirect STDIN, STDOUT and STDERR to the NUL device if they're still
|
225
|
+
# associated with a tty. This helps newbs avoid Errno::EBADF errors.
|
226
|
+
STDIN.reopen('NUL') if STDIN.isatty
|
227
|
+
STDOUT.reopen('NUL') if STDOUT.isatty
|
228
|
+
STDERR.reopen('NUL') if STDERR.isatty
|
229
|
+
|
230
|
+
# Calling init here so that init failures never even tries to start the
|
231
|
+
# service. Of course that means that init methods must be very quick
|
232
|
+
# because the SCM will be receiving no START_PENDING messages while
|
233
|
+
# init's running.
|
234
|
+
#
|
235
|
+
# TODO: Fix?
|
236
|
+
service_init() if respond_to?('service_init')
|
237
|
+
|
238
|
+
# Create the event to signal the service to start.
|
239
|
+
@@hStartEvent = CreateEventW(nil, 1, 0, nil)
|
240
|
+
|
241
|
+
if @@hStartEvent == 0
|
242
|
+
raise SystemCallError.new('CreateEvent', FFI.errno)
|
243
|
+
end
|
244
|
+
|
245
|
+
# Create the event to signal the service to stop.
|
246
|
+
@@hStopEvent = CreateEventW(nil, 1, 0, nil)
|
247
|
+
|
248
|
+
if @@hStopEvent == 0
|
249
|
+
raise SystemCallError.new('CreateEvent', FFI.errno)
|
250
|
+
end
|
251
|
+
|
252
|
+
# Create the event to signal the service that stop has completed
|
253
|
+
@@hStopCompletedEvent = CreateEventW(nil, 1, 0, nil)
|
254
|
+
|
255
|
+
if @@hStopCompletedEvent == 0
|
256
|
+
raise SystemCallError.new('CreateEvent', FFI.errno)
|
257
|
+
end
|
258
|
+
|
259
|
+
hThread = CreateThread(nil, 0, ThreadProc, Service_Main, 0, nil)
|
260
|
+
|
261
|
+
if hThread == 0
|
262
|
+
raise SystemCallError.new('CreateThread', FFI.errno)
|
263
|
+
end
|
264
|
+
|
265
|
+
events = FFI::MemoryPointer.new(:pointer, 2)
|
266
|
+
events.put_pointer(0, FFI::Pointer.new(hThread))
|
267
|
+
events.put_pointer(FFI::Pointer.size, FFI::Pointer.new(@@hStartEvent))
|
268
|
+
|
269
|
+
while ((index = WaitForMultipleObjects(2, events, 0, 1000)) == WAIT_TIMEOUT) do
|
270
|
+
end
|
271
|
+
|
272
|
+
if index == WAIT_FAILED
|
273
|
+
raise SystemCallError.new('WaitForMultipleObjects', FFI.errno)
|
274
|
+
end
|
275
|
+
|
276
|
+
# The thread exited, so the show is off.
|
277
|
+
if index == WAIT_OBJECT_0
|
278
|
+
raise "Service_Main thread exited abnormally"
|
279
|
+
end
|
280
|
+
|
281
|
+
thr = Thread.new do
|
282
|
+
begin
|
283
|
+
while(WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT)
|
284
|
+
# Check to see if anything interesting has been signaled
|
285
|
+
case @@waiting_control_code
|
286
|
+
when SERVICE_CONTROL_PAUSE
|
287
|
+
service_pause() if respond_to?('service_pause')
|
288
|
+
when SERVICE_CONTROL_CONTINUE
|
289
|
+
service_resume() if respond_to?('service_resume')
|
290
|
+
when SERVICE_CONTROL_INTERROGATE
|
291
|
+
service_interrogate() if respond_to?('service_interrogate')
|
292
|
+
when SERVICE_CONTROL_SHUTDOWN
|
293
|
+
service_shutdown() if respond_to?('service_shutdown')
|
294
|
+
when SERVICE_CONTROL_PARAMCHANGE
|
295
|
+
service_paramchange() if respond_to?('service_paramchange')
|
296
|
+
when SERVICE_CONTROL_NETBINDADD
|
297
|
+
service_netbindadd() if respond_to?('service_netbindadd')
|
298
|
+
when SERVICE_CONTROL_NETBINDREMOVE
|
299
|
+
service_netbindremove() if respond_to?('service_netbindremove')
|
300
|
+
when SERVICE_CONTROL_NETBINDENABLE
|
301
|
+
service_netbindenable() if respond_to?('service_netbindenable')
|
302
|
+
when SERVICE_CONTROL_NETBINDDISABLE
|
303
|
+
service_netbinddisable() if respond_to?('service_netbinddisable')
|
304
|
+
end
|
305
|
+
@@waiting_control_code = IDLE_CONTROL_CODE
|
306
|
+
end
|
307
|
+
|
308
|
+
service_stop() if respond_to?('service_stop')
|
309
|
+
ensure
|
310
|
+
SetEvent(@@hStopCompletedEvent)
|
311
|
+
end
|
312
|
+
end
|
313
|
+
|
314
|
+
if respond_to?('service_main')
|
315
|
+
service_main(*@@Argv)
|
316
|
+
end
|
317
|
+
|
318
|
+
thr.join
|
319
|
+
end
|
320
|
+
|
321
|
+
# Returns the state of the service (as an constant integer) which can be any
|
322
|
+
# of the service status constants, e.g. RUNNING, PAUSED, etc.
|
323
|
+
#
|
324
|
+
# This method is typically used within your service_main method to setup the
|
325
|
+
# loop. For example:
|
326
|
+
#
|
327
|
+
# class MyDaemon < Daemon
|
328
|
+
# def service_main
|
329
|
+
# while state == RUNNING || state == PAUSED || state == IDLE
|
330
|
+
# # Your main loop here
|
331
|
+
# end
|
332
|
+
# end
|
333
|
+
# end
|
334
|
+
#
|
335
|
+
# See the Daemon#running? method for an abstraction of the above code.
|
336
|
+
#
|
337
|
+
def state
|
338
|
+
@@dwServiceState
|
339
|
+
end
|
340
|
+
|
341
|
+
#
|
342
|
+
# Returns whether or not the service is in a running state, i.e. the service
|
343
|
+
# status is either RUNNING, PAUSED or IDLE.
|
344
|
+
#
|
345
|
+
# This is typically used within your service_main method to setup the main
|
346
|
+
# loop. For example:
|
347
|
+
#
|
348
|
+
# class MyDaemon < Daemon
|
349
|
+
# def service_main
|
350
|
+
# while running?
|
351
|
+
# # Your main loop here
|
352
|
+
# end
|
353
|
+
# end
|
354
|
+
# end
|
355
|
+
#
|
356
|
+
def running?
|
357
|
+
[SERVICE_RUNNING, SERVICE_PAUSED, 0].include?(@@dwServiceState)
|
358
|
+
end
|
359
|
+
end
|
360
|
+
end
|
@@ -46,8 +46,8 @@ class Puppet::Util::Windows::EventLog
|
|
46
46
|
end
|
47
47
|
|
48
48
|
# Report an event to this instance's event log handle. Accepts a string to
|
49
|
-
# report (:data => <string>) and event type (:event_type =>
|
50
|
-
# (:event_id =>
|
49
|
+
# report (:data => <string>) and event type (:event_type => Integer) and id
|
50
|
+
# (:event_id => Integer) as returned by #to_native. The additional arguments to
|
51
51
|
# ReportEventW seen in this method aren't exposed - though ReportEventW
|
52
52
|
# technically can accept multiple strings as well as raw binary data to log,
|
53
53
|
# we accept a single string from Puppet::Util::Log
|
@@ -126,13 +126,8 @@ class Puppet::Util::Windows::EventLog
|
|
126
126
|
def wide_string(str)
|
127
127
|
# if given a nil string, assume caller wants to pass a nil pointer to win32
|
128
128
|
return nil if str.nil?
|
129
|
-
|
130
|
-
|
131
|
-
# causing buffer overruns.
|
132
|
-
#
|
133
|
-
# See http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?revision=41920&view=revision
|
134
|
-
newstr = str + "\0".encode(str.encoding)
|
135
|
-
newstr.encode!('UTF-16LE')
|
129
|
+
|
130
|
+
str.encode('UTF-16LE')
|
136
131
|
end
|
137
132
|
|
138
133
|
# Private duplicate of Puppet::Util::Windows::ApiTypes::from_string_to_wide_string
|
@@ -1,74 +1,15 @@
|
|
1
|
-
require 'puppet/
|
1
|
+
require 'puppet/ffi/windows'
|
2
2
|
|
3
3
|
module Puppet::Util::Windows::File
|
4
|
-
require 'ffi'
|
5
|
-
extend FFI::Library
|
6
4
|
extend Puppet::Util::Windows::String
|
7
5
|
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
# The right to delete the object.
|
16
|
-
DELETE = 0x00010000
|
17
|
-
# The right to read the information in the object's security descriptor, not including the information in the system access control list (SACL).
|
18
|
-
# READ_CONTROL = 0x00020000
|
19
|
-
# The right to modify the discretionary access control list (DACL) in the object's security descriptor.
|
20
|
-
WRITE_DAC = 0x00040000
|
21
|
-
# The right to change the owner in the object's security descriptor.
|
22
|
-
WRITE_OWNER = 0x00080000
|
23
|
-
|
24
|
-
# Combines DELETE, READ_CONTROL, WRITE_DAC, and WRITE_OWNER access.
|
25
|
-
STANDARD_RIGHTS_REQUIRED = 0xf0000
|
26
|
-
# Currently defined to equal READ_CONTROL.
|
27
|
-
STANDARD_RIGHTS_READ = 0x20000
|
28
|
-
# Currently defined to equal READ_CONTROL.
|
29
|
-
STANDARD_RIGHTS_WRITE = 0x20000
|
30
|
-
# Currently defined to equal READ_CONTROL.
|
31
|
-
STANDARD_RIGHTS_EXECUTE = 0x20000
|
32
|
-
# Combines DELETE, READ_CONTROL, WRITE_DAC, WRITE_OWNER, and SYNCHRONIZE access.
|
33
|
-
STANDARD_RIGHTS_ALL = 0x1F0000
|
34
|
-
SPECIFIC_RIGHTS_ALL = 0xFFFF
|
35
|
-
|
36
|
-
FILE_READ_DATA = 1
|
37
|
-
FILE_WRITE_DATA = 2
|
38
|
-
FILE_APPEND_DATA = 4
|
39
|
-
FILE_READ_EA = 8
|
40
|
-
FILE_WRITE_EA = 16
|
41
|
-
FILE_EXECUTE = 32
|
42
|
-
FILE_DELETE_CHILD = 64
|
43
|
-
FILE_READ_ATTRIBUTES = 128
|
44
|
-
FILE_WRITE_ATTRIBUTES = 256
|
45
|
-
|
46
|
-
FILE_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1FF
|
47
|
-
|
48
|
-
FILE_GENERIC_READ =
|
49
|
-
STANDARD_RIGHTS_READ |
|
50
|
-
FILE_READ_DATA |
|
51
|
-
FILE_READ_ATTRIBUTES |
|
52
|
-
FILE_READ_EA |
|
53
|
-
SYNCHRONIZE
|
54
|
-
|
55
|
-
FILE_GENERIC_WRITE =
|
56
|
-
STANDARD_RIGHTS_WRITE |
|
57
|
-
FILE_WRITE_DATA |
|
58
|
-
FILE_WRITE_ATTRIBUTES |
|
59
|
-
FILE_WRITE_EA |
|
60
|
-
FILE_APPEND_DATA |
|
61
|
-
SYNCHRONIZE
|
62
|
-
|
63
|
-
FILE_GENERIC_EXECUTE =
|
64
|
-
STANDARD_RIGHTS_EXECUTE |
|
65
|
-
FILE_READ_ATTRIBUTES |
|
66
|
-
FILE_EXECUTE |
|
67
|
-
SYNCHRONIZE
|
68
|
-
|
69
|
-
REPLACEFILE_WRITE_THROUGH = 0x1
|
70
|
-
REPLACEFILE_IGNORE_MERGE_ERRORS = 0x2
|
71
|
-
REPLACEFILE_IGNORE_ACL_ERRORS = 0x3
|
6
|
+
include Puppet::FFI::Windows::Constants
|
7
|
+
|
8
|
+
extend Puppet::FFI::Windows::Structs
|
9
|
+
include Puppet::FFI::Windows::Structs
|
10
|
+
|
11
|
+
include Puppet::FFI::Windows::Functions
|
12
|
+
extend Puppet::FFI::Windows::Functions
|
72
13
|
|
73
14
|
def replace_file(target, source)
|
74
15
|
target_encoded = wide_string(target.to_s)
|
@@ -111,7 +52,6 @@ module Puppet::Util::Windows::File
|
|
111
52
|
end
|
112
53
|
module_function :symlink
|
113
54
|
|
114
|
-
|
115
55
|
def exist?(path)
|
116
56
|
path = path.to_str if path.respond_to?(:to_str) # support WatchedFile
|
117
57
|
path = path.to_s # support String and Pathname
|
@@ -144,9 +84,6 @@ module Puppet::Util::Windows::File
|
|
144
84
|
end
|
145
85
|
module_function :exist?
|
146
86
|
|
147
|
-
|
148
|
-
INVALID_FILE_ATTRIBUTES = 0xFFFFFFFF #define INVALID_FILE_ATTRIBUTES (DWORD (-1))
|
149
|
-
|
150
87
|
def get_attributes(file_name, raise_on_invalid = true)
|
151
88
|
result = GetFileAttributesW(wide_string(file_name.to_s))
|
152
89
|
if raise_on_invalid && result == INVALID_FILE_ATTRIBUTES
|
@@ -199,18 +136,6 @@ module Puppet::Util::Windows::File
|
|
199
136
|
"#{flags_and_attributes.to_s(8)}, #{template_file_handle})")
|
200
137
|
end
|
201
138
|
|
202
|
-
IO_REPARSE_TAG_MOUNT_POINT = 0xA0000003
|
203
|
-
IO_REPARSE_TAG_HSM = 0xC0000004
|
204
|
-
IO_REPARSE_TAG_HSM2 = 0x80000006
|
205
|
-
IO_REPARSE_TAG_SIS = 0x80000007
|
206
|
-
IO_REPARSE_TAG_WIM = 0x80000008
|
207
|
-
IO_REPARSE_TAG_CSV = 0x80000009
|
208
|
-
IO_REPARSE_TAG_DFS = 0x8000000A
|
209
|
-
IO_REPARSE_TAG_SYMLINK = 0xA000000C
|
210
|
-
IO_REPARSE_TAG_DFSR = 0x80000012
|
211
|
-
IO_REPARSE_TAG_DEDUP = 0x80000013
|
212
|
-
IO_REPARSE_TAG_NFS = 0x80000014
|
213
|
-
|
214
139
|
def self.get_reparse_point_data(handle, &block)
|
215
140
|
# must be multiple of 1024, min 10240
|
216
141
|
FFI::MemoryPointer.new(MAXIMUM_REPARSE_DATA_BUFFER_SIZE) do |reparse_data_buffer_ptr|
|
@@ -276,7 +201,6 @@ module Puppet::Util::Windows::File
|
|
276
201
|
out_buffer
|
277
202
|
end
|
278
203
|
|
279
|
-
FILE_ATTRIBUTE_REPARSE_POINT = 0x400
|
280
204
|
def reparse_point?(file_name)
|
281
205
|
attributes = get_attributes(file_name, false)
|
282
206
|
|
@@ -291,16 +215,6 @@ module Puppet::Util::Windows::File
|
|
291
215
|
end
|
292
216
|
module_function :symlink?
|
293
217
|
|
294
|
-
GENERIC_READ = 0x80000000
|
295
|
-
GENERIC_WRITE = 0x40000000
|
296
|
-
GENERIC_EXECUTE = 0x20000000
|
297
|
-
GENERIC_ALL = 0x10000000
|
298
|
-
FILE_SHARE_READ = 1
|
299
|
-
FILE_SHARE_WRITE = 2
|
300
|
-
OPEN_EXISTING = 3
|
301
|
-
FILE_FLAG_OPEN_REPARSE_POINT = 0x00200000
|
302
|
-
FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
|
303
|
-
|
304
218
|
def self.open_symlink(link_name)
|
305
219
|
begin
|
306
220
|
yield handle = create_file(
|
@@ -329,9 +243,6 @@ module Puppet::Util::Windows::File
|
|
329
243
|
end
|
330
244
|
module_function :readlink
|
331
245
|
|
332
|
-
ERROR_FILE_NOT_FOUND = 2
|
333
|
-
ERROR_PATH_NOT_FOUND = 3
|
334
|
-
|
335
246
|
def get_long_pathname(path)
|
336
247
|
converted = ''
|
337
248
|
FFI::Pointer.from_string_to_wide_string(path) do |path_ptr|
|
@@ -411,9 +322,6 @@ module Puppet::Util::Windows::File
|
|
411
322
|
end
|
412
323
|
module_function :lstat
|
413
324
|
|
414
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa364571(v=vs.85).aspx
|
415
|
-
FSCTL_GET_REPARSE_POINT = 0x900a8
|
416
|
-
|
417
325
|
def self.resolve_symlink(handle)
|
418
326
|
path = nil
|
419
327
|
get_reparse_point_data(handle) do |reparse_data|
|
@@ -444,146 +352,4 @@ module Puppet::Util::Windows::File
|
|
444
352
|
symlink
|
445
353
|
end
|
446
354
|
private_class_method :symlink_reparse_point?
|
447
|
-
|
448
|
-
ffi_convention :stdcall
|
449
|
-
|
450
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa365512(v=vs.85).aspx
|
451
|
-
# BOOL WINAPI ReplaceFile(
|
452
|
-
# _In_ LPCTSTR lpReplacedFileName,
|
453
|
-
# _In_ LPCTSTR lpReplacementFileName,
|
454
|
-
# _In_opt_ LPCTSTR lpBackupFileName,
|
455
|
-
# _In_ DWORD dwReplaceFlags - 0x1 REPLACEFILE_WRITE_THROUGH,
|
456
|
-
# 0x2 REPLACEFILE_IGNORE_MERGE_ERRORS,
|
457
|
-
# 0x4 REPLACEFILE_IGNORE_ACL_ERRORS
|
458
|
-
# _Reserved_ LPVOID lpExclude,
|
459
|
-
# _Reserved_ LPVOID lpReserved
|
460
|
-
# );
|
461
|
-
ffi_lib :kernel32
|
462
|
-
attach_function_private :ReplaceFileW,
|
463
|
-
[:lpcwstr, :lpcwstr, :lpcwstr, :dword, :lpvoid, :lpvoid], :win32_bool
|
464
|
-
|
465
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa365240(v=vs.85).aspx
|
466
|
-
# BOOL WINAPI MoveFileEx(
|
467
|
-
# _In_ LPCTSTR lpExistingFileName,
|
468
|
-
# _In_opt_ LPCTSTR lpNewFileName,
|
469
|
-
# _In_ DWORD dwFlags
|
470
|
-
# );
|
471
|
-
ffi_lib :kernel32
|
472
|
-
attach_function_private :MoveFileExW,
|
473
|
-
[:lpcwstr, :lpcwstr, :dword], :win32_bool
|
474
|
-
|
475
|
-
# BOOLEAN WINAPI CreateSymbolicLink(
|
476
|
-
# _In_ LPTSTR lpSymlinkFileName, - symbolic link to be created
|
477
|
-
# _In_ LPTSTR lpTargetFileName, - name of target for symbolic link
|
478
|
-
# _In_ DWORD dwFlags - 0x0 target is a file, 0x1 target is a directory
|
479
|
-
# );
|
480
|
-
# rescue on Windows < 6.0 so that code doesn't explode
|
481
|
-
begin
|
482
|
-
ffi_lib :kernel32
|
483
|
-
attach_function_private :CreateSymbolicLinkW,
|
484
|
-
[:lpwstr, :lpwstr, :dword], :boolean
|
485
|
-
rescue LoadError
|
486
|
-
end
|
487
|
-
|
488
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa364944(v=vs.85).aspx
|
489
|
-
# DWORD WINAPI GetFileAttributes(
|
490
|
-
# _In_ LPCTSTR lpFileName
|
491
|
-
# );
|
492
|
-
ffi_lib :kernel32
|
493
|
-
attach_function_private :GetFileAttributesW,
|
494
|
-
[:lpcwstr], :dword
|
495
|
-
|
496
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa365535(v=vs.85).aspx
|
497
|
-
# BOOL WINAPI SetFileAttributes(
|
498
|
-
# _In_ LPCTSTR lpFileName,
|
499
|
-
# _In_ DWORD dwFileAttributes
|
500
|
-
# );
|
501
|
-
ffi_lib :kernel32
|
502
|
-
attach_function_private :SetFileAttributesW,
|
503
|
-
[:lpcwstr, :dword], :win32_bool
|
504
|
-
|
505
|
-
# HANDLE WINAPI CreateFile(
|
506
|
-
# _In_ LPCTSTR lpFileName,
|
507
|
-
# _In_ DWORD dwDesiredAccess,
|
508
|
-
# _In_ DWORD dwShareMode,
|
509
|
-
# _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes,
|
510
|
-
# _In_ DWORD dwCreationDisposition,
|
511
|
-
# _In_ DWORD dwFlagsAndAttributes,
|
512
|
-
# _In_opt_ HANDLE hTemplateFile
|
513
|
-
# );
|
514
|
-
ffi_lib :kernel32
|
515
|
-
attach_function_private :CreateFileW,
|
516
|
-
[:lpcwstr, :dword, :dword, :pointer, :dword, :dword, :handle], :handle
|
517
|
-
|
518
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa363216(v=vs.85).aspx
|
519
|
-
# BOOL WINAPI DeviceIoControl(
|
520
|
-
# _In_ HANDLE hDevice,
|
521
|
-
# _In_ DWORD dwIoControlCode,
|
522
|
-
# _In_opt_ LPVOID lpInBuffer,
|
523
|
-
# _In_ DWORD nInBufferSize,
|
524
|
-
# _Out_opt_ LPVOID lpOutBuffer,
|
525
|
-
# _In_ DWORD nOutBufferSize,
|
526
|
-
# _Out_opt_ LPDWORD lpBytesReturned,
|
527
|
-
# _Inout_opt_ LPOVERLAPPED lpOverlapped
|
528
|
-
# );
|
529
|
-
ffi_lib :kernel32
|
530
|
-
attach_function_private :DeviceIoControl,
|
531
|
-
[:handle, :dword, :lpvoid, :dword, :lpvoid, :dword, :lpdword, :pointer], :win32_bool
|
532
|
-
|
533
|
-
MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
|
534
|
-
|
535
|
-
# SYMLINK_REPARSE_DATA_BUFFER
|
536
|
-
# https://msdn.microsoft.com/en-us/library/cc232006.aspx
|
537
|
-
# https://msdn.microsoft.com/en-us/library/windows/hardware/ff552012(v=vs.85).aspx
|
538
|
-
# struct is always MAXIMUM_REPARSE_DATA_BUFFER_SIZE bytes
|
539
|
-
class SYMLINK_REPARSE_DATA_BUFFER < FFI::Struct
|
540
|
-
layout :ReparseTag, :win32_ulong,
|
541
|
-
:ReparseDataLength, :ushort,
|
542
|
-
:Reserved, :ushort,
|
543
|
-
:SubstituteNameOffset, :ushort,
|
544
|
-
:SubstituteNameLength, :ushort,
|
545
|
-
:PrintNameOffset, :ushort,
|
546
|
-
:PrintNameLength, :ushort,
|
547
|
-
:Flags, :win32_ulong,
|
548
|
-
# max less above fields dword / uint 4 bytes, ushort 2 bytes
|
549
|
-
# technically a WCHAR buffer, but we care about size in bytes here
|
550
|
-
:PathBuffer, [:byte, MAXIMUM_REPARSE_DATA_BUFFER_SIZE - 20]
|
551
|
-
end
|
552
|
-
|
553
|
-
# MOUNT_POINT_REPARSE_DATA_BUFFER
|
554
|
-
# https://msdn.microsoft.com/en-us/library/cc232007.aspx
|
555
|
-
# https://msdn.microsoft.com/en-us/library/windows/hardware/ff552012(v=vs.85).aspx
|
556
|
-
# struct is always MAXIMUM_REPARSE_DATA_BUFFER_SIZE bytes
|
557
|
-
class MOUNT_POINT_REPARSE_DATA_BUFFER < FFI::Struct
|
558
|
-
layout :ReparseTag, :win32_ulong,
|
559
|
-
:ReparseDataLength, :ushort,
|
560
|
-
:Reserved, :ushort,
|
561
|
-
:SubstituteNameOffset, :ushort,
|
562
|
-
:SubstituteNameLength, :ushort,
|
563
|
-
:PrintNameOffset, :ushort,
|
564
|
-
:PrintNameLength, :ushort,
|
565
|
-
# max less above fields dword / uint 4 bytes, ushort 2 bytes
|
566
|
-
# technically a WCHAR buffer, but we care about size in bytes here
|
567
|
-
:PathBuffer, [:byte, MAXIMUM_REPARSE_DATA_BUFFER_SIZE - 16]
|
568
|
-
end
|
569
|
-
|
570
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa364980(v=vs.85).aspx
|
571
|
-
# DWORD WINAPI GetLongPathName(
|
572
|
-
# _In_ LPCTSTR lpszShortPath,
|
573
|
-
# _Out_ LPTSTR lpszLongPath,
|
574
|
-
# _In_ DWORD cchBuffer
|
575
|
-
# );
|
576
|
-
ffi_lib :kernel32
|
577
|
-
attach_function_private :GetLongPathNameW,
|
578
|
-
[:lpcwstr, :lpwstr, :dword], :dword
|
579
|
-
|
580
|
-
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa364989(v=vs.85).aspx
|
581
|
-
# DWORD WINAPI GetShortPathName(
|
582
|
-
# _In_ LPCTSTR lpszLongPath,
|
583
|
-
# _Out_ LPTSTR lpszShortPath,
|
584
|
-
# _In_ DWORD cchBuffer
|
585
|
-
# );
|
586
|
-
ffi_lib :kernel32
|
587
|
-
attach_function_private :GetShortPathNameW,
|
588
|
-
[:lpcwstr, :lpwstr, :dword], :dword
|
589
355
|
end
|