puppet 6.20.0-x86-mingw32 → 7.4.0-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Gemfile +1 -4
- data/Gemfile.lock +13 -13
- data/README.md +1 -1
- data/conf/fileserver.conf +5 -10
- data/ext/build_defaults.yaml +1 -2
- 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 +172 -98
- data/lib/puppet/application/device.rb +100 -104
- data/lib/puppet/application/filebucket.rb +13 -9
- data/lib/puppet/application/ssl.rb +1 -1
- data/lib/puppet/configurer.rb +27 -29
- data/lib/puppet/configurer/plugin_handler.rb +21 -19
- data/lib/puppet/defaults.rb +57 -162
- data/lib/puppet/environments.rb +8 -23
- data/lib/puppet/face/facts.rb +73 -49
- 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/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/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/facts/facter.rb +25 -3
- data/lib/puppet/indirector/facts/rest.rb +3 -22
- 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/node/rest.rb +2 -4
- 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/network/authconfig.rb +2 -96
- data/lib/puppet/network/authorization.rb +13 -35
- data/lib/puppet/network/formats.rb +67 -0
- 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 +3 -1
- 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/pops/evaluator/evaluator_impl.rb +0 -5
- 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/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/property/list.rb +1 -1
- data/lib/puppet/provider.rb +0 -13
- data/lib/puppet/provider/group/groupadd.rb +13 -8
- data/lib/puppet/provider/nameservice.rb +0 -18
- data/lib/puppet/provider/package/apt.rb +30 -2
- data/lib/puppet/provider/package/aptitude.rb +6 -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/debian.rb +2 -0
- data/lib/puppet/provider/service/smf.rb +191 -73
- data/lib/puppet/provider/user/directoryservice.rb +0 -10
- data/lib/puppet/provider/user/useradd.rb +55 -8
- data/lib/puppet/reference/configuration.rb +7 -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 +45 -33
- 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 +8 -16
- data/lib/puppet/type/user.rb +1 -1
- 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/rdoc.rb +0 -7
- data/lib/puppet/util/retry_action.rb +1 -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 +521 -1226
- data/man/man5/puppet.conf.5 +35 -95
- data/man/man8/puppet-agent.8 +1 -1
- data/man/man8/puppet-apply.8 +1 -1
- 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 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +57 -36
- data/man/man8/puppet-filebucket.8 +4 -4
- 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 +1 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -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/unit/provider/service/smf/{svcs.out → svcs_instances.out} +0 -0
- data/spec/integration/application/agent_spec.rb +57 -11
- data/spec/integration/application/apply_spec.rb +1 -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 -3
- 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/type/file_spec.rb +5 -4
- data/spec/integration/util/windows/monkey_patches/process_spec.rb +231 -0
- 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 +1 -0
- data/spec/spec_helper.rb +2 -0
- data/spec/unit/agent_spec.rb +0 -2
- data/spec/unit/application/facts_spec.rb +86 -0
- data/spec/unit/application/filebucket_spec.rb +41 -39
- data/spec/unit/application/ssl_spec.rb +2 -2
- 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/context/trusted_information_spec.rb +2 -6
- data/spec/unit/defaults_spec.rb +22 -47
- data/spec/unit/environments_spec.rb +0 -3
- data/spec/unit/face/facts_spec.rb +4 -0
- data/spec/unit/face/node_spec.rb +14 -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 +22 -18
- data/spec/unit/file_serving/configuration_spec.rb +6 -12
- 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/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 +0 -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 +0 -1
- data/spec/unit/http/session_spec.rb +16 -14
- data/spec/unit/{network/http → http}/site_spec.rb +3 -3
- data/spec/unit/indirector/facts/facter_spec.rb +113 -0
- 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/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_server_spec.rb +1 -15
- data/spec/unit/indirector/report/rest_spec.rb +2 -17
- data/spec/unit/indirector/request_spec.rb +0 -264
- data/spec/unit/indirector/rest_spec.rb +98 -752
- data/spec/unit/network/authconfig_spec.rb +2 -129
- 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 -92
- 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 -1
- 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/functions/create_resources_spec.rb +2 -20
- 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/provider/group/groupadd_spec.rb +5 -2
- data/spec/unit/provider/nameservice_spec.rb +0 -57
- data/spec/unit/provider/package/apt_spec.rb +24 -15
- data/spec/unit/provider/package/aptitude_spec.rb +1 -1
- 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/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/useradd_spec.rb +55 -3
- data/spec/unit/provider_spec.rb +0 -12
- data/spec/unit/resource/type_collection_spec.rb +2 -22
- data/spec/unit/resource_spec.rb +0 -56
- 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 +17 -0
- data/spec/unit/ssl/base_spec.rb +36 -3
- data/spec/unit/ssl/certificate_request_spec.rb +19 -55
- data/spec/unit/ssl/certificate_spec.rb +2 -11
- data/spec/unit/ssl/state_machine_spec.rb +0 -1
- data/spec/unit/ssl/verifier_spec.rb +0 -21
- 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 +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 +0 -1
- data/spec/unit/type/file_spec.rb +12 -6
- data/spec/unit/type/package_spec.rb +1 -1
- data/spec/unit/type_spec.rb +20 -0
- data/spec/unit/util/backups_spec.rb +0 -2
- data/spec/unit/util/execution_spec.rb +0 -29
- data/spec/unit/util/monkey_patches_spec.rb +0 -6
- data/spec/unit/util/run_mode_spec.rb +21 -121
- 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 +0 -18
- metadata +48 -219
- 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/fact_dif.rb +0 -62
- 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/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/key_spec.rb +0 -9
- data/spec/unit/face/module/search_spec.rb +0 -231
- 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 -78
- 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 -148
- data/spec/unit/rest/route_spec.rb +0 -132
- data/spec/unit/ssl/host_spec.rb +0 -645
- 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
@@ -102,49 +102,3 @@ unless Puppet::Util::Platform.jruby_fips?
|
|
102
102
|
end
|
103
103
|
end
|
104
104
|
end
|
105
|
-
|
106
|
-
unless Puppet::Util::Platform.jruby_fips?
|
107
|
-
unless OpenSSL::PKey::EC.instance_methods.include?(:private?)
|
108
|
-
class OpenSSL::PKey::EC
|
109
|
-
# Added in ruby 2.4.0 in https://github.com/ruby/ruby/commit/7c971e61f04
|
110
|
-
alias :private? :private_key?
|
111
|
-
end
|
112
|
-
end
|
113
|
-
|
114
|
-
unless OpenSSL::PKey::EC.singleton_methods.include?(:generate)
|
115
|
-
class OpenSSL::PKey::EC
|
116
|
-
# Added in ruby 2.4.0 in https://github.com/ruby/ruby/commit/85500b66342
|
117
|
-
def self.generate(string)
|
118
|
-
ec = OpenSSL::PKey::EC.new(string)
|
119
|
-
ec.generate_key
|
120
|
-
end
|
121
|
-
end
|
122
|
-
end
|
123
|
-
end
|
124
|
-
|
125
|
-
# The Enumerable#uniq method was added in Ruby 2.4.0 (https://bugs.ruby-lang.org/issues/11090)
|
126
|
-
# This is a backport to earlier Ruby versions.
|
127
|
-
#
|
128
|
-
unless Enumerable.instance_methods.include?(:uniq)
|
129
|
-
module Enumerable
|
130
|
-
def uniq
|
131
|
-
result = []
|
132
|
-
uniq_map = {}
|
133
|
-
if block_given?
|
134
|
-
each do |value|
|
135
|
-
key = yield value
|
136
|
-
next if uniq_map.has_key?(key)
|
137
|
-
uniq_map[key] = true
|
138
|
-
result << value
|
139
|
-
end
|
140
|
-
else
|
141
|
-
each do |value|
|
142
|
-
next if uniq_map.has_key?(value)
|
143
|
-
uniq_map[value] = true
|
144
|
-
result << value
|
145
|
-
end
|
146
|
-
end
|
147
|
-
result
|
148
|
-
end
|
149
|
-
end
|
150
|
-
end
|
data/lib/puppet/util/rdoc.rb
CHANGED
@@ -26,13 +26,6 @@ module Puppet::Util::RDoc
|
|
26
26
|
|
27
27
|
options << "--force-update"
|
28
28
|
options += [ "--charset", charset] if charset
|
29
|
-
# Rdoc root default is Dir.pwd, but the win32-dir gem monkey patches Dir.pwd
|
30
|
-
# replacing Ruby's normal / with \. When RDoc generates relative paths it
|
31
|
-
# uses relative_path_from that will generate errors when the slashes don't
|
32
|
-
# properly match. This is a workaround for that issue.
|
33
|
-
if Puppet::Util::Platform.windows? && RDoc::VERSION !~ /^[0-3]\./
|
34
|
-
options += [ "--root", Dir.pwd.tr('\\', '/')]
|
35
|
-
end
|
36
29
|
options += files
|
37
30
|
|
38
31
|
# launch the documentation process
|
@@ -7,7 +7,7 @@ module Puppet::Util::RetryAction
|
|
7
7
|
# Execute the supplied block retrying with exponential backoff.
|
8
8
|
#
|
9
9
|
# @param [Hash] options the retry options
|
10
|
-
# @option options [
|
10
|
+
# @option options [Integer] :retries Maximum number of times to retry.
|
11
11
|
# @option options [Array<Exception>] :retry_exceptions ([StandardError]) Optional array of exceptions that are allowed to be retried.
|
12
12
|
# @yield The block to be executed.
|
13
13
|
def self.retry_action(options = {})
|
data/lib/puppet/util/run_mode.rb
CHANGED
@@ -74,6 +74,10 @@ module Puppet
|
|
74
74
|
which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
|
75
75
|
end
|
76
76
|
|
77
|
+
def public_dir
|
78
|
+
which_dir("/opt/puppetlabs/puppet/public", "~/.puppetlabs/opt/puppet/public")
|
79
|
+
end
|
80
|
+
|
77
81
|
def run_dir
|
78
82
|
which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run")
|
79
83
|
end
|
@@ -96,6 +100,10 @@ module Puppet
|
|
96
100
|
which_dir(File.join(windows_common_base("puppet/cache")), "~/.puppetlabs/opt/puppet/cache")
|
97
101
|
end
|
98
102
|
|
103
|
+
def public_dir
|
104
|
+
which_dir(File.join(windows_common_base("puppet/public")), "~/.puppetlabs/opt/puppet/public")
|
105
|
+
end
|
106
|
+
|
99
107
|
def run_dir
|
100
108
|
which_dir(File.join(windows_common_base("puppet/var/run")), "~/.puppetlabs/var/run")
|
101
109
|
end
|
@@ -107,7 +115,7 @@ module Puppet
|
|
107
115
|
private
|
108
116
|
|
109
117
|
def windows_common_base(*extra)
|
110
|
-
[
|
118
|
+
[ENV['ALLUSERSPROFILE'], "PuppetLabs"] + extra
|
111
119
|
end
|
112
120
|
end
|
113
121
|
end
|
data/lib/puppet/util/windows.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
require 'puppet/util/platform'
|
2
|
+
|
2
3
|
module Puppet::Util::Windows
|
3
4
|
module ADSI
|
4
5
|
class ADSIObject; end
|
@@ -15,8 +16,6 @@ module Puppet::Util::Windows
|
|
15
16
|
class EventLog; end
|
16
17
|
|
17
18
|
if Puppet::Util::Platform.windows?
|
18
|
-
require 'Win32API' # case matters in this require!
|
19
|
-
|
20
19
|
# Note: Setting codepage here globally ensures all strings returned via
|
21
20
|
# WIN32OLE (Ruby's late-bound COM support) are encoded in Encoding::UTF_8
|
22
21
|
#
|
@@ -24,14 +23,9 @@ module Puppet::Util::Windows
|
|
24
23
|
# to 2048 (at least on US English Windows) and is not listed in the MS
|
25
24
|
# locales table, here: https://msdn.microsoft.com/en-us/library/ms912047(v=winembedded.10).aspx
|
26
25
|
require 'win32ole' ; WIN32OLE.codepage = WIN32OLE::CP_UTF8
|
27
|
-
# gems
|
28
|
-
require 'win32/process'
|
29
|
-
require 'puppet/util/windows/monkey_patches/dir'
|
30
|
-
require 'win32/dir'
|
31
|
-
require 'win32/service'
|
32
26
|
|
33
27
|
# these reference platform specific gems
|
34
|
-
require 'puppet/
|
28
|
+
require 'puppet/ffi/windows'
|
35
29
|
require 'puppet/util/windows/string'
|
36
30
|
require 'puppet/util/windows/error'
|
37
31
|
require 'puppet/util/windows/com'
|
@@ -49,5 +43,6 @@ module Puppet::Util::Windows
|
|
49
43
|
require 'puppet/util/windows/registry'
|
50
44
|
require 'puppet/util/windows/eventlog'
|
51
45
|
require 'puppet/util/windows/service'
|
46
|
+
require 'puppet/util/windows/monkey_patches/process'
|
52
47
|
end
|
53
48
|
end
|
@@ -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
|