puppet 6.16.0-x64-mingw32 → 7.0.0-x64-mingw32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Gemfile +5 -3
- data/Gemfile.lock +31 -33
- data/README.md +4 -5
- data/Rakefile +4 -12
- data/conf/fileserver.conf +5 -10
- data/ext/build_defaults.yaml +1 -1
- data/ext/osx/file_mapping.yaml +0 -5
- data/ext/project_data.yaml +1 -14
- data/ext/redhat/puppet.spec.erb +0 -1
- data/ext/windows/service/daemon.rb +6 -5
- data/install.rb +21 -17
- data/lib/puppet.rb +11 -20
- data/lib/puppet/agent.rb +2 -2
- data/lib/puppet/agent/locker.rb +0 -7
- data/lib/puppet/application.rb +172 -98
- data/lib/puppet/application/agent.rb +22 -6
- data/lib/puppet/application/apply.rb +18 -20
- data/lib/puppet/application/device.rb +100 -104
- data/lib/puppet/application/doc.rb +1 -1
- data/lib/puppet/application/filebucket.rb +15 -11
- data/lib/puppet/application/lookup.rb +16 -4
- data/lib/puppet/application/ssl.rb +1 -1
- data/lib/puppet/configurer.rb +66 -31
- data/lib/puppet/configurer/downloader.rb +31 -10
- data/lib/puppet/configurer/plugin_handler.rb +21 -19
- data/lib/puppet/confine.rb +2 -2
- data/lib/puppet/confine/any.rb +1 -1
- data/lib/puppet/defaults.rb +166 -169
- data/lib/puppet/environments.rb +41 -15
- data/lib/puppet/face/catalog.rb +1 -1
- data/lib/puppet/face/config.rb +56 -16
- data/lib/puppet/face/epp.rb +12 -2
- data/lib/puppet/face/facts.rb +66 -6
- data/lib/puppet/face/help.rb +1 -1
- data/lib/puppet/face/node.rb +3 -3
- data/lib/puppet/face/node/clean.rb +2 -2
- data/lib/puppet/face/plugin.rb +5 -8
- data/lib/puppet/feature/base.rb +1 -1
- data/lib/puppet/ffi/windows.rb +12 -0
- data/lib/puppet/ffi/windows/api_types.rb +311 -0
- data/lib/puppet/ffi/windows/constants.rb +404 -0
- data/lib/puppet/ffi/windows/functions.rb +628 -0
- data/lib/puppet/ffi/windows/structs.rb +338 -0
- data/lib/puppet/file_bucket/dipper.rb +1 -1
- data/lib/puppet/file_serving/configuration.rb +0 -5
- data/lib/puppet/file_serving/configuration/parser.rb +3 -32
- data/lib/puppet/file_serving/http_metadata.rb +13 -1
- data/lib/puppet/file_serving/metadata.rb +4 -1
- data/lib/puppet/file_serving/mount.rb +1 -2
- data/lib/puppet/file_serving/mount/locales.rb +1 -2
- data/lib/puppet/file_serving/mount/pluginfacts.rb +1 -2
- data/lib/puppet/file_serving/mount/plugins.rb +1 -2
- data/lib/puppet/file_serving/terminus_selector.rb +7 -8
- data/lib/puppet/file_system/file_impl.rb +4 -4
- data/lib/puppet/file_system/uniquefile.rb +8 -16
- data/lib/puppet/forge.rb +1 -1
- data/lib/puppet/forge/cache.rb +1 -1
- data/lib/puppet/forge/repository.rb +3 -8
- data/lib/puppet/functions/epp.rb +1 -0
- data/lib/puppet/functions/inline_epp.rb +1 -0
- data/lib/puppet/functions/lstrip.rb +4 -4
- data/lib/puppet/functions/new.rb +8 -3
- data/lib/puppet/functions/reverse_each.rb +1 -1
- data/lib/puppet/functions/rstrip.rb +4 -4
- data/lib/puppet/functions/step.rb +1 -1
- data/lib/puppet/functions/strip.rb +4 -4
- data/lib/puppet/generate/models/type/type.rb +4 -1
- data/lib/puppet/gettext/config.rb +5 -5
- data/lib/puppet/gettext/module_translations.rb +4 -4
- data/lib/puppet/http.rb +23 -13
- data/lib/puppet/http/client.rb +170 -115
- data/lib/puppet/{network/resolver.rb → http/dns.rb} +2 -2
- data/lib/puppet/http/errors.rb +16 -0
- data/lib/puppet/http/external_client.rb +5 -7
- data/lib/puppet/{network/http → http}/factory.rb +8 -11
- data/lib/puppet/{network/http → http}/pool.rb +61 -26
- data/lib/puppet/{network/http/session.rb → http/pool_entry.rb} +2 -3
- data/lib/puppet/http/proxy.rb +137 -0
- data/lib/puppet/http/redirector.rb +13 -19
- data/lib/puppet/http/resolver.rb +10 -23
- data/lib/puppet/http/resolver/server_list.rb +23 -45
- data/lib/puppet/http/resolver/settings.rb +7 -10
- data/lib/puppet/http/resolver/srv.rb +11 -15
- data/lib/puppet/http/response.rb +49 -48
- data/lib/puppet/http/response_converter.rb +24 -0
- data/lib/puppet/http/response_net_http.rb +42 -0
- data/lib/puppet/http/retry_after_handler.rb +4 -13
- data/lib/puppet/http/service.rb +15 -27
- data/lib/puppet/http/service/ca.rb +11 -22
- data/lib/puppet/http/service/compiler.rb +23 -70
- data/lib/puppet/http/service/file_server.rb +19 -28
- data/lib/puppet/http/service/puppetserver.rb +53 -0
- data/lib/puppet/http/service/report.rb +8 -10
- data/lib/puppet/http/session.rb +16 -24
- data/lib/puppet/{network/http → http}/site.rb +1 -2
- data/lib/puppet/indirector.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +1 -1
- data/lib/puppet/indirector/catalog/rest.rb +2 -4
- data/lib/puppet/indirector/exec.rb +1 -1
- data/lib/puppet/indirector/fact_search.rb +60 -0
- data/lib/puppet/indirector/facts/facter.rb +27 -6
- data/lib/puppet/indirector/facts/json.rb +27 -0
- data/lib/puppet/indirector/facts/rest.rb +3 -22
- data/lib/puppet/indirector/facts/yaml.rb +4 -59
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -9
- data/lib/puppet/indirector/file_content/rest.rb +3 -7
- data/lib/puppet/indirector/file_metadata/http.rb +25 -5
- data/lib/puppet/indirector/file_metadata/rest.rb +5 -11
- data/lib/puppet/indirector/file_server.rb +1 -8
- data/lib/puppet/indirector/generic_http.rb +0 -11
- data/lib/puppet/indirector/hiera.rb +4 -0
- data/lib/puppet/indirector/indirection.rb +1 -1
- data/lib/puppet/indirector/json.rb +5 -1
- data/lib/puppet/indirector/msgpack.rb +1 -1
- data/lib/puppet/indirector/node/json.rb +8 -0
- data/lib/puppet/indirector/node/rest.rb +2 -4
- data/lib/puppet/indirector/report/json.rb +34 -0
- data/lib/puppet/indirector/report/processor.rb +2 -2
- data/lib/puppet/indirector/report/rest.rb +3 -8
- data/lib/puppet/indirector/request.rb +2 -103
- data/lib/puppet/indirector/rest.rb +12 -263
- data/lib/puppet/indirector/yaml.rb +1 -1
- data/lib/puppet/module.rb +1 -2
- data/lib/puppet/module_tool/applications.rb +0 -1
- data/lib/puppet/network/authconfig.rb +2 -96
- data/lib/puppet/network/authorization.rb +13 -35
- data/lib/puppet/network/format_support.rb +2 -2
- data/lib/puppet/network/formats.rb +2 -1
- data/lib/puppet/network/http.rb +3 -3
- data/lib/puppet/network/http/api/indirected_routes.rb +3 -21
- data/lib/puppet/network/http/api/master/v3.rb +11 -13
- data/lib/puppet/network/http/api/master/v3/environments.rb +0 -1
- data/lib/puppet/network/http/connection.rb +247 -316
- data/lib/puppet/network/http/handler.rb +0 -1
- data/lib/puppet/network/http/route.rb +2 -2
- data/lib/puppet/network/http_pool.rb +16 -34
- data/lib/puppet/node.rb +1 -30
- data/lib/puppet/node/environment.rb +12 -5
- data/lib/puppet/node/facts.rb +17 -0
- data/lib/puppet/pal/json_catalog_encoder.rb +4 -0
- data/lib/puppet/pal/pal_impl.rb +93 -14
- data/lib/puppet/parameter.rb +1 -1
- data/lib/puppet/parser/ast/leaf.rb +5 -5
- data/lib/puppet/parser/ast/pops_bridge.rb +0 -42
- data/lib/puppet/parser/compiler.rb +1 -199
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +14 -39
- data/lib/puppet/parser/functions.rb +21 -17
- data/lib/puppet/parser/functions/create_resources.rb +11 -7
- data/lib/puppet/parser/resource.rb +3 -71
- data/lib/puppet/parser/resource/param.rb +6 -0
- data/lib/puppet/parser/type_loader.rb +2 -2
- data/lib/puppet/pops/adaptable.rb +7 -13
- data/lib/puppet/pops/adapters.rb +8 -4
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +1 -3
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +27 -13
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +2 -2
- data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +3 -3
- data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +6 -8
- data/lib/puppet/pops/loader/runtime3_type_loader.rb +4 -2
- data/lib/puppet/pops/loaders.rb +18 -11
- data/lib/puppet/pops/lookup/context.rb +1 -1
- data/lib/puppet/pops/lookup/hiera_config.rb +14 -1
- data/lib/puppet/pops/model/ast.pp +0 -42
- data/lib/puppet/pops/model/ast.rb +0 -290
- data/lib/puppet/pops/model/factory.rb +0 -45
- data/lib/puppet/pops/model/model_label_provider.rb +0 -5
- data/lib/puppet/pops/model/model_tree_dumper.rb +0 -22
- data/lib/puppet/pops/model/pn_transformer.rb +0 -16
- data/lib/puppet/pops/parser/egrammar.ra +0 -56
- data/lib/puppet/pops/parser/eparser.rb +1520 -1712
- data/lib/puppet/pops/parser/lexer2.rb +4 -4
- data/lib/puppet/pops/parser/parser_support.rb +0 -5
- data/lib/puppet/pops/resource/resource_type_impl.rb +2 -22
- data/lib/puppet/pops/types/iterable.rb +34 -8
- data/lib/puppet/pops/types/p_meta_type.rb +1 -1
- data/lib/puppet/pops/types/p_type_set_type.rb +4 -0
- data/lib/puppet/pops/types/type_calculator.rb +0 -7
- data/lib/puppet/pops/types/type_parser.rb +0 -4
- data/lib/puppet/pops/types/types.rb +0 -1
- data/lib/puppet/pops/validation/checker4_0.rb +28 -42
- data/lib/puppet/pops/validation/tasks_checker.rb +0 -12
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -1
- data/lib/puppet/provider.rb +0 -13
- data/lib/puppet/provider/file/windows.rb +1 -1
- data/lib/puppet/provider/nameservice.rb +0 -18
- data/lib/puppet/provider/package/apt.rb +34 -0
- data/lib/puppet/provider/package/aptitude.rb +1 -1
- data/lib/puppet/provider/package/dpkg.rb +1 -11
- data/lib/puppet/provider/package/gem.rb +27 -5
- data/lib/puppet/provider/package/pip.rb +0 -1
- data/lib/puppet/provider/package/pip2.rb +17 -0
- data/lib/puppet/provider/package/pkg.rb +0 -4
- data/lib/puppet/provider/package/portage.rb +1 -1
- data/lib/puppet/provider/package/puppet_gem.rb +6 -4
- data/lib/puppet/provider/package/puppetserver_gem.rb +180 -0
- data/lib/puppet/provider/package/yum.rb +2 -1
- data/lib/puppet/provider/package/zypper.rb +3 -0
- data/lib/puppet/provider/service/smf.rb +191 -73
- data/lib/puppet/provider/service/windows.rb +23 -7
- data/lib/puppet/provider/user/aix.rb +1 -1
- data/lib/puppet/provider/user/directoryservice.rb +0 -10
- data/lib/puppet/provider/user/user_role_add.rb +1 -1
- data/lib/puppet/provider/user/useradd.rb +11 -4
- data/lib/puppet/provider/user/windows_adsi.rb +18 -1
- data/lib/puppet/reference/configuration.rb +2 -0
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/reports/http.rb +2 -0
- data/lib/puppet/resource.rb +3 -90
- data/lib/puppet/resource/catalog.rb +1 -14
- data/lib/puppet/resource/type.rb +5 -112
- data/lib/puppet/resource/type_collection.rb +3 -48
- data/lib/puppet/runtime.rb +1 -2
- data/lib/puppet/settings.rb +84 -35
- data/lib/puppet/settings/base_setting.rb +26 -2
- data/lib/puppet/settings/integer_setting.rb +17 -0
- data/lib/puppet/settings/port_setting.rb +15 -0
- data/lib/puppet/settings/priority_setting.rb +5 -4
- data/lib/puppet/ssl.rb +10 -6
- data/lib/puppet/ssl/base.rb +3 -5
- data/lib/puppet/ssl/certificate.rb +0 -6
- data/lib/puppet/ssl/certificate_request.rb +1 -12
- data/lib/puppet/ssl/certificate_signer.rb +6 -0
- data/lib/puppet/ssl/oids.rb +3 -1
- data/lib/puppet/ssl/ssl_context.rb +2 -2
- data/lib/puppet/ssl/ssl_provider.rb +37 -1
- data/lib/puppet/ssl/state_machine.rb +3 -1
- data/lib/puppet/ssl/verifier.rb +2 -0
- data/lib/puppet/test/test_helper.rb +19 -16
- data/lib/puppet/transaction.rb +3 -9
- data/lib/puppet/transaction/persistence.rb +1 -1
- data/lib/puppet/transaction/report.rb +10 -8
- data/lib/puppet/trusted_external.rb +29 -1
- data/lib/puppet/type.rb +9 -77
- data/lib/puppet/type/file.rb +45 -22
- data/lib/puppet/type/file/checksum.rb +5 -5
- data/lib/puppet/type/file/source.rb +33 -13
- data/lib/puppet/type/filebucket.rb +4 -4
- data/lib/puppet/type/notify.rb +2 -2
- data/lib/puppet/type/package.rb +5 -13
- data/lib/puppet/type/service.rb +53 -0
- data/lib/puppet/type/user.rb +18 -3
- data/lib/puppet/util.rb +41 -3
- data/lib/puppet/util/autoload.rb +9 -7
- data/lib/puppet/util/character_encoding.rb +9 -5
- data/lib/puppet/util/checksums.rb +19 -4
- data/lib/puppet/util/execution.rb +2 -13
- data/lib/puppet/util/fileparsing.rb +2 -2
- data/lib/puppet/util/http_proxy.rb +2 -215
- data/lib/puppet/util/monkey_patches.rb +0 -46
- data/lib/puppet/util/provider_features.rb +1 -1
- data/lib/puppet/util/rdoc.rb +0 -7
- data/lib/puppet/util/reference.rb +1 -1
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/rubygems.rb +5 -1
- data/lib/puppet/util/run_mode.rb +14 -2
- data/lib/puppet/util/windows.rb +3 -7
- data/lib/puppet/util/windows/daemon.rb +360 -0
- data/lib/puppet/util/windows/error.rb +1 -0
- data/lib/puppet/util/windows/eventlog.rb +5 -15
- data/lib/puppet/util/windows/file.rb +8 -242
- data/lib/puppet/util/windows/monkey_patches/process.rb +414 -0
- data/lib/puppet/util/windows/principal.rb +8 -6
- data/lib/puppet/util/windows/process.rb +4 -226
- data/lib/puppet/util/windows/registry.rb +11 -11
- data/lib/puppet/util/windows/security.rb +4 -4
- data/lib/puppet/util/windows/service.rb +52 -486
- data/lib/puppet/util/windows/string.rb +12 -13
- data/lib/puppet/util/windows/user.rb +242 -8
- data/lib/puppet/util/yaml.rb +0 -22
- data/lib/puppet/vendor/require_vendored.rb +0 -1
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet/x509.rb +5 -1
- data/lib/puppet/x509/cert_provider.rb +29 -1
- data/locales/puppet.pot +713 -1380
- data/man/man5/puppet.conf.5 +84 -98
- data/man/man8/puppet-agent.8 +7 -4
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +6 -6
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +55 -9
- data/man/man8/puppet-filebucket.8 +6 -6
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +2 -2
- data/man/man8/puppet-module.8 +1 -58
- data/man/man8/puppet-node.8 +7 -4
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +4 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +1 -1
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb +2 -0
- data/spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb +25 -0
- data/spec/fixtures/unit/forge/bacula-releases.json +128 -0
- data/spec/fixtures/unit/forge/bacula.tar.gz +0 -0
- data/spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages +30 -0
- data/spec/fixtures/unit/provider/service/smf/{svcs.out → svcs_instances.out} +0 -0
- data/spec/integration/application/agent_spec.rb +157 -59
- data/spec/integration/application/apply_spec.rb +150 -150
- data/spec/integration/application/doc_spec.rb +16 -6
- data/spec/integration/application/filebucket_spec.rb +78 -29
- data/spec/integration/application/help_spec.rb +44 -0
- data/spec/integration/application/lookup_spec.rb +13 -0
- data/spec/integration/application/module_spec.rb +68 -0
- data/spec/integration/application/plugin_spec.rb +76 -4
- data/spec/integration/configurer_spec.rb +14 -0
- data/spec/integration/data_binding_spec.rb +82 -0
- data/spec/integration/defaults_spec.rb +33 -5
- data/spec/integration/directory_environments_spec.rb +17 -17
- data/spec/integration/environments/setting_hooks_spec.rb +1 -1
- data/spec/integration/indirector/facts/facter_spec.rb +8 -6
- data/spec/integration/network/http_pool_spec.rb +29 -30
- data/spec/integration/node/environment_spec.rb +1 -1
- data/spec/integration/parser/catalog_spec.rb +0 -38
- data/spec/integration/parser/compiler_spec.rb +11 -0
- data/spec/integration/parser/node_spec.rb +0 -9
- data/spec/integration/parser/pcore_resource_spec.rb +0 -37
- data/spec/integration/type/file_spec.rb +6 -5
- data/spec/integration/util/execution_spec.rb +22 -0
- data/spec/integration/util/windows/adsi_spec.rb +2 -2
- data/spec/integration/util/windows/monkey_patches/process_spec.rb +231 -0
- data/spec/integration/util/windows/process_spec.rb +26 -32
- data/spec/integration/util/windows/registry_spec.rb +7 -7
- data/spec/integration/util/windows/security_spec.rb +1 -1
- data/spec/integration/util/windows/user_spec.rb +47 -5
- data/spec/integration/util_spec.rb +7 -33
- data/spec/lib/puppet_spec/matchers.rb +0 -80
- data/spec/lib/puppet_spec/puppetserver.rb +9 -1
- data/spec/lib/puppet_spec/settings.rb +7 -1
- data/spec/shared_contexts/types_setup.rb +2 -0
- data/spec/spec_helper.rb +2 -0
- data/spec/unit/agent_spec.rb +0 -2
- data/spec/unit/application/agent_spec.rb +3 -4
- data/spec/unit/application/config_spec.rb +224 -4
- data/spec/unit/application/doc_spec.rb +2 -2
- data/spec/unit/application/face_base_spec.rb +6 -4
- data/spec/unit/application/facts_spec.rb +74 -8
- data/spec/unit/application/filebucket_spec.rb +41 -39
- data/spec/unit/application/resource_spec.rb +3 -1
- data/spec/unit/application/ssl_spec.rb +17 -4
- data/spec/unit/application_spec.rb +9 -4
- data/spec/unit/certificate_factory_spec.rb +1 -1
- data/spec/unit/configurer/downloader_spec.rb +14 -0
- data/spec/unit/configurer/fact_handler_spec.rb +4 -4
- data/spec/unit/configurer/plugin_handler_spec.rb +56 -18
- data/spec/unit/configurer_spec.rb +96 -44
- data/spec/unit/confine_spec.rb +2 -1
- data/spec/unit/context/trusted_information_spec.rb +12 -10
- data/spec/unit/defaults_spec.rb +77 -28
- data/spec/unit/environments_spec.rb +96 -32
- data/spec/unit/face/config_spec.rb +65 -12
- data/spec/unit/face/facts_spec.rb +4 -0
- data/spec/unit/face/node_spec.rb +2 -2
- data/spec/unit/face/plugin_spec.rb +73 -33
- data/spec/unit/file_bucket/file_spec.rb +1 -1
- data/spec/unit/file_serving/configuration/parser_spec.rb +14 -18
- data/spec/unit/file_serving/configuration_spec.rb +6 -12
- data/spec/unit/file_serving/http_metadata_spec.rb +37 -14
- data/spec/unit/file_serving/mount/locales_spec.rb +2 -2
- data/spec/unit/file_serving/mount/pluginfacts_spec.rb +2 -2
- data/spec/unit/file_serving/mount/plugins_spec.rb +2 -2
- data/spec/unit/file_serving/terminus_selector_spec.rb +45 -26
- data/spec/unit/file_system/uniquefile_spec.rb +18 -0
- data/spec/unit/file_system_spec.rb +1 -2
- data/spec/unit/functions/camelcase_spec.rb +1 -1
- data/spec/unit/functions/capitalize_spec.rb +1 -1
- data/spec/unit/functions/downcase_spec.rb +1 -1
- data/spec/unit/functions/inline_epp_spec.rb +26 -1
- data/spec/unit/functions/upcase_spec.rb +1 -1
- data/spec/unit/http/client_spec.rb +71 -17
- data/spec/unit/{network/resolver_spec.rb → http/dns_spec.rb} +3 -3
- data/spec/unit/http/external_client_spec.rb +4 -4
- data/spec/unit/{network/http → http}/factory_spec.rb +5 -11
- data/spec/unit/{network/http/session_spec.rb → http/pool_entry_spec.rb} +3 -3
- data/spec/unit/{network/http → http}/pool_spec.rb +12 -17
- data/spec/unit/{util/http_proxy_spec.rb → http/proxy_spec.rb} +2 -69
- data/spec/unit/http/resolver_spec.rb +34 -15
- data/spec/unit/http/response_spec.rb +6 -0
- data/spec/unit/http/service/ca_spec.rb +2 -3
- data/spec/unit/http/service/compiler_spec.rb +51 -65
- data/spec/unit/http/service/file_server_spec.rb +5 -6
- data/spec/unit/http/service/puppetserver_spec.rb +112 -0
- data/spec/unit/http/service/report_spec.rb +2 -3
- data/spec/unit/http/service_spec.rb +1 -3
- data/spec/unit/http/session_spec.rb +24 -35
- data/spec/unit/{network/http → http}/site_spec.rb +3 -3
- data/spec/unit/indirector/catalog/json_spec.rb +1 -1
- data/spec/unit/indirector/catalog/rest_spec.rb +1 -1
- data/spec/unit/indirector/facts/facter_spec.rb +97 -0
- data/spec/unit/indirector/facts/json_spec.rb +255 -0
- data/spec/unit/indirector/facts/rest_spec.rb +1 -1
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +5 -3
- data/spec/unit/indirector/file_content/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_metadata/http_spec.rb +27 -0
- data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_server_spec.rb +1 -15
- data/spec/unit/indirector/json_spec.rb +8 -8
- data/spec/unit/indirector/msgpack_spec.rb +8 -8
- data/spec/unit/indirector/node/json_spec.rb +33 -0
- data/spec/unit/indirector/node/rest_spec.rb +1 -1
- data/spec/{integration/indirector/report/yaml.rb → unit/indirector/report/json_spec.rb} +13 -24
- data/spec/unit/indirector/report/rest_spec.rb +2 -17
- data/spec/unit/indirector/report/yaml_spec.rb +72 -8
- data/spec/unit/indirector/request_spec.rb +3 -267
- data/spec/unit/indirector/rest_spec.rb +98 -752
- data/spec/unit/indirector/yaml_spec.rb +7 -7
- data/spec/unit/interface_spec.rb +3 -3
- data/spec/unit/module_tool/tar/mini_spec.rb +20 -0
- data/spec/unit/network/authconfig_spec.rb +2 -132
- data/spec/unit/network/authorization_spec.rb +2 -55
- data/spec/unit/network/format_support_spec.rb +3 -2
- data/spec/unit/network/formats_spec.rb +4 -4
- data/spec/unit/network/http/api/indirected_routes_spec.rb +3 -98
- data/spec/unit/network/http/api/master/v3/environments_spec.rb +12 -23
- data/spec/unit/network/http/api/master/v3_spec.rb +28 -7
- data/spec/unit/network/http/api_spec.rb +10 -0
- data/spec/unit/network/http/connection_spec.rb +61 -73
- data/spec/unit/network/http/handler_spec.rb +0 -6
- data/spec/unit/network/http_pool_spec.rb +0 -4
- data/spec/unit/node/environment_spec.rb +51 -22
- data/spec/unit/node_spec.rb +2 -54
- data/spec/unit/parser/ast/block_expression_spec.rb +1 -1
- data/spec/unit/parser/functions/create_resources_spec.rb +2 -20
- data/spec/unit/parser/scope_spec.rb +1 -1
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +19 -8
- data/spec/unit/pops/loaders/loaders_spec.rb +77 -22
- data/spec/unit/pops/lookup/lookup_spec.rb +25 -0
- data/spec/unit/pops/parser/parse_application_spec.rb +4 -22
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_capabilities_spec.rb +8 -21
- data/spec/unit/pops/parser/parse_site_spec.rb +20 -24
- data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -71
- data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
- data/spec/unit/pops/types/type_calculator_spec.rb +7 -17
- data/spec/unit/pops/types/type_factory_spec.rb +1 -1
- data/spec/unit/pops/validator/validator_spec.rb +61 -46
- data/spec/unit/pops/visitor_spec.rb +1 -1
- data/spec/unit/provider/exec_spec.rb +4 -3
- data/spec/unit/provider/nameservice_spec.rb +0 -57
- data/spec/unit/provider/package/apt_spec.rb +77 -0
- data/spec/unit/provider/package/aptitude_spec.rb +1 -0
- data/spec/unit/provider/package/dpkg_spec.rb +22 -55
- data/spec/unit/provider/package/gem_spec.rb +32 -0
- data/spec/unit/provider/package/openbsd_spec.rb +2 -0
- data/spec/unit/provider/package/pip2_spec.rb +36 -0
- data/spec/unit/provider/package/puppet_gem_spec.rb +6 -2
- data/spec/unit/provider/package/puppetserver_gem_spec.rb +137 -0
- data/spec/unit/provider/package/yum_spec.rb +31 -0
- data/spec/unit/provider/package/zypper_spec.rb +14 -0
- data/spec/unit/provider/service/base_spec.rb +2 -4
- data/spec/unit/provider/service/bsd_spec.rb +5 -1
- data/spec/unit/provider/service/daemontools_spec.rb +1 -1
- data/spec/unit/provider/service/debian_spec.rb +3 -5
- data/spec/unit/provider/service/freebsd_spec.rb +1 -1
- data/spec/unit/provider/service/gentoo_spec.rb +4 -5
- data/spec/unit/provider/service/init_spec.rb +45 -5
- data/spec/unit/provider/service/launchd_spec.rb +5 -6
- data/spec/unit/provider/service/openrc_spec.rb +4 -5
- data/spec/unit/provider/service/openwrt_spec.rb +1 -1
- data/spec/unit/provider/service/redhat_spec.rb +1 -1
- data/spec/unit/provider/service/runit_spec.rb +2 -1
- data/spec/unit/provider/service/smf_spec.rb +402 -166
- data/spec/unit/provider/service/src_spec.rb +3 -5
- data/spec/unit/provider/service/systemd_spec.rb +3 -6
- data/spec/unit/provider/service/upstart_spec.rb +4 -5
- data/spec/unit/provider/service/windows_spec.rb +50 -15
- data/spec/unit/provider/user/openbsd_spec.rb +1 -0
- data/spec/unit/provider/user/useradd_spec.rb +22 -16
- data/spec/unit/provider/user/windows_adsi_spec.rb +82 -0
- data/spec/unit/provider_spec.rb +0 -12
- data/spec/unit/puppet_pal_2pec.rb +40 -0
- data/spec/unit/puppet_pal_catalog_spec.rb +45 -0
- data/spec/unit/reports/store_spec.rb +17 -13
- data/spec/unit/resource/type_collection_spec.rb +2 -22
- data/spec/unit/resource_spec.rb +3 -59
- data/spec/unit/settings/http_extra_headers_spec.rb +2 -4
- data/spec/unit/settings/integer_setting_spec.rb +42 -0
- data/spec/unit/settings/port_setting_spec.rb +31 -0
- data/spec/unit/settings/priority_setting_spec.rb +4 -4
- data/spec/unit/settings_spec.rb +586 -239
- data/spec/unit/ssl/base_spec.rb +36 -3
- data/spec/unit/ssl/certificate_request_spec.rb +15 -45
- data/spec/unit/ssl/certificate_spec.rb +2 -11
- data/spec/unit/ssl/ssl_provider_spec.rb +78 -49
- data/spec/unit/ssl/state_machine_spec.rb +0 -1
- data/spec/unit/ssl/verifier_spec.rb +0 -21
- data/spec/unit/test/test_helper_spec.rb +17 -0
- data/spec/unit/transaction/persistence_spec.rb +15 -0
- data/spec/unit/transaction/report_spec.rb +3 -3
- data/spec/unit/transaction/resource_harness_spec.rb +2 -2
- data/spec/unit/transaction_spec.rb +45 -79
- data/spec/unit/type/file/checksum_spec.rb +6 -6
- data/spec/unit/type/file/content_spec.rb +1 -1
- data/spec/unit/type/file/ensure_spec.rb +1 -1
- data/spec/unit/type/file/mode_spec.rb +1 -1
- data/spec/unit/type/file/source_spec.rb +4 -5
- data/spec/unit/type/file_spec.rb +134 -102
- data/spec/unit/type/filebucket_spec.rb +1 -1
- data/spec/unit/type/package_spec.rb +1 -1
- data/spec/unit/type/service_spec.rb +209 -0
- data/spec/unit/type/user_spec.rb +31 -2
- data/spec/unit/type_spec.rb +70 -0
- data/spec/unit/util/backups_spec.rb +0 -2
- data/spec/unit/util/character_encoding_spec.rb +4 -4
- data/spec/unit/util/checksums_spec.rb +16 -0
- data/spec/unit/util/command_line_spec.rb +11 -6
- data/spec/unit/util/execution_spec.rb +0 -29
- data/spec/unit/util/monkey_patches_spec.rb +0 -6
- data/spec/unit/util/rubygems_spec.rb +2 -2
- data/spec/unit/util/run_mode_spec.rb +27 -127
- data/spec/unit/util/windows/api_types_spec.rb +104 -40
- data/spec/unit/util/windows/service_spec.rb +4 -4
- data/spec/unit/util/windows/string_spec.rb +1 -3
- data/spec/unit/util/yaml_spec.rb +0 -54
- data/spec/unit/util_spec.rb +3 -21
- data/spec/unit/x509/cert_provider_spec.rb +1 -1
- metadata +76 -270
- data/conf/auth.conf +0 -150
- data/lib/puppet/application/cert.rb +0 -76
- data/lib/puppet/application/key.rb +0 -4
- data/lib/puppet/application/man.rb +0 -4
- data/lib/puppet/application/status.rb +0 -4
- data/lib/puppet/face/key.rb +0 -16
- data/lib/puppet/face/man.rb +0 -145
- data/lib/puppet/face/module/build.rb +0 -14
- data/lib/puppet/face/module/generate.rb +0 -14
- data/lib/puppet/face/module/search.rb +0 -103
- data/lib/puppet/face/status.rb +0 -51
- data/lib/puppet/indirector/certificate/file.rb +0 -9
- data/lib/puppet/indirector/certificate/rest.rb +0 -18
- data/lib/puppet/indirector/certificate_request/file.rb +0 -9
- data/lib/puppet/indirector/certificate_request/memory.rb +0 -7
- data/lib/puppet/indirector/certificate_request/rest.rb +0 -11
- data/lib/puppet/indirector/file_content/http.rb +0 -22
- data/lib/puppet/indirector/key/file.rb +0 -46
- data/lib/puppet/indirector/key/memory.rb +0 -7
- data/lib/puppet/indirector/ssl_file.rb +0 -162
- data/lib/puppet/indirector/status.rb +0 -3
- data/lib/puppet/indirector/status/local.rb +0 -12
- data/lib/puppet/indirector/status/rest.rb +0 -27
- data/lib/puppet/module_tool/applications/searcher.rb +0 -29
- data/lib/puppet/network/auth_config_parser.rb +0 -90
- data/lib/puppet/network/authstore.rb +0 -283
- data/lib/puppet/network/http/api/master/v3/authorization.rb +0 -18
- data/lib/puppet/network/http/api/master/v3/environment.rb +0 -85
- data/lib/puppet/network/http/base_pool.rb +0 -36
- data/lib/puppet/network/http/compression.rb +0 -127
- data/lib/puppet/network/http/connection_adapter.rb +0 -182
- data/lib/puppet/network/http/nocache_pool.rb +0 -28
- data/lib/puppet/network/rest_controller.rb +0 -2
- data/lib/puppet/network/rights.rb +0 -210
- data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +0 -64
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +0 -20
- data/lib/puppet/parser/environment_compiler.rb +0 -199
- data/lib/puppet/pops/types/enumeration.rb +0 -16
- data/lib/puppet/resource/capability_finder.rb +0 -154
- data/lib/puppet/rest/errors.rb +0 -15
- data/lib/puppet/rest/response.rb +0 -35
- data/lib/puppet/rest/route.rb +0 -85
- data/lib/puppet/rest/routes.rb +0 -135
- data/lib/puppet/ssl/host.rb +0 -505
- data/lib/puppet/ssl/key.rb +0 -61
- data/lib/puppet/ssl/validator.rb +0 -61
- data/lib/puppet/ssl/validator/default_validator.rb +0 -209
- data/lib/puppet/ssl/validator/no_validator.rb +0 -22
- data/lib/puppet/ssl/verifier_adapter.rb +0 -58
- data/lib/puppet/status.rb +0 -40
- data/lib/puppet/util/connection.rb +0 -88
- data/lib/puppet/util/ssl.rb +0 -83
- data/lib/puppet/util/windows/api_types.rb +0 -282
- data/lib/puppet/vendor/load_pathspec.rb +0 -1
- data/lib/puppet/vendor/pathspec/CHANGELOG.md +0 -2
- data/lib/puppet/vendor/pathspec/LICENSE +0 -201
- data/lib/puppet/vendor/pathspec/PUPPET_README.md +0 -6
- data/lib/puppet/vendor/pathspec/README.md +0 -53
- data/lib/puppet/vendor/pathspec/lib/pathspec.rb +0 -122
- data/lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb +0 -275
- data/lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb +0 -17
- data/lib/puppet/vendor/pathspec/lib/pathspec/spec.rb +0 -14
- data/man/man8/puppet-key.8 +0 -126
- data/man/man8/puppet-man.8 +0 -76
- data/man/man8/puppet-status.8 +0 -108
- data/spec/integration/faces/config_spec.rb +0 -91
- data/spec/integration/faces/documentation_spec.rb +0 -57
- data/spec/integration/file_bucket/file_spec.rb +0 -50
- data/spec/integration/file_serving/content_spec.rb +0 -7
- data/spec/integration/file_serving/fileset_spec.rb +0 -12
- data/spec/integration/file_serving/metadata_spec.rb +0 -8
- data/spec/integration/file_serving/terminus_helper_spec.rb +0 -20
- data/spec/integration/file_system/uniquefile_spec.rb +0 -26
- data/spec/integration/module_tool/forge_spec.rb +0 -51
- data/spec/integration/module_tool/tar/mini_spec.rb +0 -28
- data/spec/integration/network/authconfig_spec.rb +0 -256
- data/spec/integration/provider/service/init_spec.rb +0 -48
- data/spec/integration/provider/service/systemd_spec.rb +0 -25
- data/spec/integration/provider/service/windows_spec.rb +0 -50
- data/spec/integration/reference/providers_spec.rb +0 -21
- data/spec/integration/reports_spec.rb +0 -13
- data/spec/integration/ssl/certificate_request_spec.rb +0 -44
- data/spec/integration/ssl/host_spec.rb +0 -72
- data/spec/integration/ssl/key_spec.rb +0 -99
- data/spec/integration/test/test_helper_spec.rb +0 -31
- data/spec/shared_behaviours/file_serving_model.rb +0 -51
- data/spec/unit/capability_spec.rb +0 -414
- data/spec/unit/face/catalog_spec.rb +0 -6
- data/spec/unit/face/key_spec.rb +0 -9
- data/spec/unit/face/man_spec.rb +0 -25
- data/spec/unit/face/module/search_spec.rb +0 -231
- data/spec/unit/face/module_spec.rb +0 -3
- data/spec/unit/face/status_spec.rb +0 -9
- data/spec/unit/indirector/certificate/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate/rest_spec.rb +0 -61
- data/spec/unit/indirector/certificate_request/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -25
- data/spec/unit/indirector/key/file_spec.rb +0 -79
- data/spec/unit/indirector/ssl_file_spec.rb +0 -305
- data/spec/unit/indirector/status/local_spec.rb +0 -10
- data/spec/unit/indirector/status/rest_spec.rb +0 -50
- data/spec/unit/man_spec.rb +0 -31
- data/spec/unit/module_tool/applications/searcher_spec.rb +0 -38
- data/spec/unit/network/auth_config_parser_spec.rb +0 -115
- data/spec/unit/network/authstore_spec.rb +0 -422
- data/spec/unit/network/http/api/master/v3/authorization_spec.rb +0 -57
- data/spec/unit/network/http/api/master/v3/environment_spec.rb +0 -185
- data/spec/unit/network/http/compression_spec.rb +0 -240
- data/spec/unit/network/http/nocache_pool_spec.rb +0 -64
- data/spec/unit/network/http_spec.rb +0 -9
- data/spec/unit/network/rights_spec.rb +0 -439
- data/spec/unit/parser/environment_compiler_spec.rb +0 -723
- data/spec/unit/pops/types/enumeration_spec.rb +0 -51
- data/spec/unit/resource/capability_finder_spec.rb +0 -143
- data/spec/unit/rest/route_spec.rb +0 -132
- data/spec/unit/ssl/host_spec.rb +0 -650
- data/spec/unit/ssl/key_spec.rb +0 -173
- data/spec/unit/ssl/validator_spec.rb +0 -278
- data/spec/unit/status_spec.rb +0 -45
- data/spec/unit/util/ssl_spec.rb +0 -91
@@ -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
|
@@ -140,12 +135,7 @@ class Puppet::Util::Windows::EventLog
|
|
140
135
|
# @api private
|
141
136
|
def from_string_to_wide_string(str, &block)
|
142
137
|
str = wide_string(str)
|
143
|
-
FFI::MemoryPointer.
|
144
|
-
# uchar here is synonymous with byte
|
145
|
-
ptr.put_array_of_uchar(0, str.bytes.to_a)
|
146
|
-
|
147
|
-
yield ptr
|
148
|
-
end
|
138
|
+
FFI::MemoryPointer.from_wide_string(str) { |ptr| yield ptr }
|
149
139
|
|
150
140
|
# ptr has already had free called, so nothing to return
|
151
141
|
nil
|
@@ -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
|
@@ -0,0 +1,414 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'ffi'
|
4
|
+
require 'puppet/ffi/windows'
|
5
|
+
require 'puppet/util/windows/string'
|
6
|
+
|
7
|
+
module Process
|
8
|
+
extend FFI::Library
|
9
|
+
extend Puppet::Util::Windows::String
|
10
|
+
|
11
|
+
extend Puppet::FFI::Windows::APITypes
|
12
|
+
extend Puppet::FFI::Windows::Functions
|
13
|
+
extend Puppet::FFI::Windows::Structs
|
14
|
+
|
15
|
+
include Puppet::FFI::Windows::Constants
|
16
|
+
include Puppet::FFI::Windows::Structs
|
17
|
+
|
18
|
+
ProcessInfo = Struct.new(
|
19
|
+
'ProcessInfo',
|
20
|
+
:process_handle,
|
21
|
+
:thread_handle,
|
22
|
+
:process_id,
|
23
|
+
:thread_id
|
24
|
+
)
|
25
|
+
|
26
|
+
private_constant :ProcessInfo
|
27
|
+
|
28
|
+
# Disable popups. This mostly affects the Process.kill method.
|
29
|
+
SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX)
|
30
|
+
|
31
|
+
class << self
|
32
|
+
|
33
|
+
private :SetHandleInformation, :SetErrorMode, :CreateProcessW, :OpenProcess,
|
34
|
+
:SetPriorityClass, :CreateProcessWithLogonW, :get_osfhandle, :get_errno
|
35
|
+
|
36
|
+
# Process.create(key => value, ...) => ProcessInfo
|
37
|
+
#
|
38
|
+
# This is a wrapper for the CreateProcess() function. It executes a process,
|
39
|
+
# returning a ProcessInfo struct. It accepts a hash as an argument.
|
40
|
+
# There are several primary keys:
|
41
|
+
#
|
42
|
+
# * command_line (this or app_name must be present)
|
43
|
+
# * app_name (default: nil)
|
44
|
+
# * inherit (default: false)
|
45
|
+
# * process_inherit (default: false)
|
46
|
+
# * thread_inherit (default: false)
|
47
|
+
# * creation_flags (default: 0)
|
48
|
+
# * cwd (default: Dir.pwd)
|
49
|
+
# * startup_info (default: nil)
|
50
|
+
# * environment (default: nil)
|
51
|
+
# * close_handles (default: true)
|
52
|
+
# * with_logon (default: nil)
|
53
|
+
# * domain (default: nil)
|
54
|
+
# * password (default: nil, mandatory if with_logon)
|
55
|
+
#
|
56
|
+
# Of these, the 'command_line' or 'app_name' must be specified or an
|
57
|
+
# error is raised. Both may be set individually, but 'command_line' should
|
58
|
+
# be preferred if only one of them is set because it does not (necessarily)
|
59
|
+
# require an explicit path or extension to work.
|
60
|
+
#
|
61
|
+
# The 'domain' and 'password' options are only relevent in the context
|
62
|
+
# of 'with_logon'. If 'with_logon' is set, then the 'password' option is
|
63
|
+
# mandatory.
|
64
|
+
#
|
65
|
+
# The startup_info key takes a hash. Its keys are attributes that are
|
66
|
+
# part of the StartupInfo struct, and are generally only meaningful for
|
67
|
+
# GUI or console processes. See the documentation on CreateProcess()
|
68
|
+
# and the StartupInfo struct on MSDN for more information.
|
69
|
+
#
|
70
|
+
# * desktop
|
71
|
+
# * title
|
72
|
+
# * x
|
73
|
+
# * y
|
74
|
+
# * x_size
|
75
|
+
# * y_size
|
76
|
+
# * x_count_chars
|
77
|
+
# * y_count_chars
|
78
|
+
# * fill_attribute
|
79
|
+
# * sw_flags
|
80
|
+
# * startf_flags
|
81
|
+
# * stdin
|
82
|
+
# * stdout
|
83
|
+
# * stderr
|
84
|
+
#
|
85
|
+
# Note that the 'stdin', 'stdout' and 'stderr' options can be either Ruby
|
86
|
+
# IO objects or file descriptors (i.e. a fileno). However, StringIO objects
|
87
|
+
# are not currently supported. Unfortunately, setting these is not currently
|
88
|
+
# an option for JRuby.
|
89
|
+
#
|
90
|
+
# If 'stdin', 'stdout' or 'stderr' are specified, then the +inherit+ value
|
91
|
+
# is automatically set to true and the Process::STARTF_USESTDHANDLES flag is
|
92
|
+
# automatically OR'd to the +startf_flags+ value.
|
93
|
+
#
|
94
|
+
# The ProcessInfo struct contains the following members:
|
95
|
+
#
|
96
|
+
# * process_handle - The handle to the newly created process.
|
97
|
+
# * thread_handle - The handle to the primary thread of the process.
|
98
|
+
# * process_id - Process ID.
|
99
|
+
# * thread_id - Thread ID.
|
100
|
+
#
|
101
|
+
# If the 'close_handles' option is set to true (the default) then the
|
102
|
+
# process_handle and the thread_handle are automatically closed for you
|
103
|
+
# before the ProcessInfo struct is returned.
|
104
|
+
#
|
105
|
+
# If the 'with_logon' option is set, then the process runs the specified
|
106
|
+
# executable file in the security context of the specified credentials.
|
107
|
+
|
108
|
+
VALID_KEYS = %i[
|
109
|
+
app_name command_line inherit creation_flags cwd environment
|
110
|
+
startup_info thread_inherit process_inherit close_handles with_logon
|
111
|
+
domain password
|
112
|
+
].freeze
|
113
|
+
|
114
|
+
VALID_SI_KEYS = %i[
|
115
|
+
startf_flags desktop title x y x_size y_size x_count_chars
|
116
|
+
y_count_chars fill_attribute sw_flags stdin stdout stderr
|
117
|
+
].freeze
|
118
|
+
|
119
|
+
private_constant :VALID_KEYS, :VALID_SI_KEYS
|
120
|
+
|
121
|
+
def create(args)
|
122
|
+
# Validate that args is a Hash
|
123
|
+
validate_args(args)
|
124
|
+
|
125
|
+
initialize_defaults
|
126
|
+
|
127
|
+
# Validate the keys, and convert symbols and case to lowercase strings.
|
128
|
+
validate_keys(args)
|
129
|
+
|
130
|
+
# If the startup_info key is present, validate its subkeys
|
131
|
+
validate_startup_info if hash[:startup_info]
|
132
|
+
|
133
|
+
# validates that 'app_name' or 'command_line' is set
|
134
|
+
validate_command_line
|
135
|
+
|
136
|
+
if hash[:app_name] && !hash[:command_line]
|
137
|
+
hash[:command_line] = hash[:app_name]
|
138
|
+
hash[:app_name] = nil
|
139
|
+
end
|
140
|
+
|
141
|
+
# Setup stdin, stdout and stderr handlers
|
142
|
+
setup_std_handlers
|
143
|
+
|
144
|
+
if logon
|
145
|
+
create_process_with_logon
|
146
|
+
else
|
147
|
+
create_process
|
148
|
+
end
|
149
|
+
|
150
|
+
# Automatically close the process and thread handles in the
|
151
|
+
# PROCESS_INFORMATION struct unless explicitly told not to.
|
152
|
+
if hash[:close_handles]
|
153
|
+
FFI::WIN32.CloseHandle(procinfo[:hProcess])
|
154
|
+
FFI::WIN32.CloseHandle(procinfo[:hThread])
|
155
|
+
end
|
156
|
+
|
157
|
+
ProcessInfo.new(
|
158
|
+
procinfo[:hProcess],
|
159
|
+
procinfo[:hThread],
|
160
|
+
procinfo[:dwProcessId],
|
161
|
+
procinfo[:dwThreadId]
|
162
|
+
)
|
163
|
+
end
|
164
|
+
|
165
|
+
remove_method :setpriority
|
166
|
+
|
167
|
+
# Sets the priority class for the specified process id +int+.
|
168
|
+
#
|
169
|
+
# The +kind+ parameter is ignored but present for API compatibility.
|
170
|
+
# You can only retrieve process information, not process group or user
|
171
|
+
# information, so it is effectively always Process::PRIO_PROCESS.
|
172
|
+
#
|
173
|
+
# Possible +int_priority+ values are:
|
174
|
+
#
|
175
|
+
# * Process::NORMAL_PRIORITY_CLASS
|
176
|
+
# * Process::IDLE_PRIORITY_CLASS
|
177
|
+
# * Process::HIGH_PRIORITY_CLASS
|
178
|
+
# * Process::REALTIME_PRIORITY_CLASS
|
179
|
+
# * Process::BELOW_NORMAL_PRIORITY_CLASS
|
180
|
+
# * Process::ABOVE_NORMAL_PRIORITY_CLASS
|
181
|
+
|
182
|
+
def setpriority(kind, int, int_priority)
|
183
|
+
raise TypeError unless kind.is_a?(Integer)
|
184
|
+
raise TypeError unless int.is_a?(Integer)
|
185
|
+
raise TypeError unless int_priority.is_a?(Integer)
|
186
|
+
|
187
|
+
int = Process.pid if int == 0
|
188
|
+
handle = OpenProcess(PROCESS_SET_INFORMATION, 0 , int)
|
189
|
+
|
190
|
+
if handle == 0
|
191
|
+
raise SystemCallError, FFI.errno, "OpenProcess"
|
192
|
+
end
|
193
|
+
|
194
|
+
begin
|
195
|
+
result = SetPriorityClass(handle, int_priority)
|
196
|
+
raise SystemCallError, FFI.errno, "SetPriorityClass" unless result
|
197
|
+
ensure
|
198
|
+
FFI::WIN32.CloseHandle(handle)
|
199
|
+
end
|
200
|
+
|
201
|
+
return 0
|
202
|
+
end
|
203
|
+
|
204
|
+
private
|
205
|
+
|
206
|
+
def initialize_defaults
|
207
|
+
@hash = {
|
208
|
+
app_name: nil,
|
209
|
+
creation_flags: 0,
|
210
|
+
close_handles: true
|
211
|
+
}
|
212
|
+
@si_hash = nil
|
213
|
+
@procinfo = nil
|
214
|
+
end
|
215
|
+
|
216
|
+
def validate_args(args)
|
217
|
+
raise TypeError, 'hash keyword arguments expected' unless args.is_a?(Hash)
|
218
|
+
end
|
219
|
+
|
220
|
+
def validate_keys(args)
|
221
|
+
args.each do |key, val|
|
222
|
+
key = key.to_s.to_sym
|
223
|
+
raise ArgumentError, "invalid key '#{key}'" unless VALID_KEYS.include?(key)
|
224
|
+
|
225
|
+
hash[key] = val
|
226
|
+
end
|
227
|
+
end
|
228
|
+
|
229
|
+
def validate_startup_info
|
230
|
+
hash[:startup_info].each do |key, val|
|
231
|
+
key = key.to_s.to_sym
|
232
|
+
raise ArgumentError, "invalid startup_info key '#{key}'" unless VALID_SI_KEYS.include?(key)
|
233
|
+
|
234
|
+
si_hash[key] = val
|
235
|
+
end
|
236
|
+
end
|
237
|
+
|
238
|
+
def validate_command_line
|
239
|
+
raise ArgumentError, 'command_line or app_name must be specified' unless hash[:app_name] || hash[:command_line]
|
240
|
+
end
|
241
|
+
|
242
|
+
def procinfo
|
243
|
+
@procinfo ||= PROCESS_INFORMATION.new
|
244
|
+
end
|
245
|
+
|
246
|
+
def hash
|
247
|
+
@hash ||= {}
|
248
|
+
end
|
249
|
+
|
250
|
+
def si_hash
|
251
|
+
@si_hash ||= {}
|
252
|
+
end
|
253
|
+
|
254
|
+
def app
|
255
|
+
wide_string(hash[:app_name])
|
256
|
+
end
|
257
|
+
|
258
|
+
def cmd
|
259
|
+
wide_string(hash[:command_line])
|
260
|
+
end
|
261
|
+
|
262
|
+
def cwd
|
263
|
+
wide_string(hash[:cwd])
|
264
|
+
end
|
265
|
+
|
266
|
+
def password
|
267
|
+
wide_string(hash[:password])
|
268
|
+
end
|
269
|
+
|
270
|
+
def logon
|
271
|
+
wide_string(hash[:with_logon])
|
272
|
+
end
|
273
|
+
|
274
|
+
def domain
|
275
|
+
wide_string(hash[:domain])
|
276
|
+
end
|
277
|
+
|
278
|
+
def env
|
279
|
+
env = hash[:environment]
|
280
|
+
return unless env
|
281
|
+
|
282
|
+
env = env.split(File::PATH_SEPARATOR) unless env.respond_to?(:join)
|
283
|
+
env = env.map { |e| e + 0.chr }.join('') + 0.chr
|
284
|
+
env = wide_string(env) if hash[:with_logon]
|
285
|
+
env
|
286
|
+
end
|
287
|
+
|
288
|
+
def process_security
|
289
|
+
return unless hash[:process_inherit]
|
290
|
+
|
291
|
+
process_security = SECURITY_ATTRIBUTES.new
|
292
|
+
process_security[:nLength] = SECURITY_ATTRIBUTES.size
|
293
|
+
process_security[:bInheritHandle] = 1
|
294
|
+
process_security
|
295
|
+
end
|
296
|
+
|
297
|
+
def thread_security
|
298
|
+
return unless hash[:thread_inherit]
|
299
|
+
|
300
|
+
thread_security = SECURITY_ATTRIBUTES.new
|
301
|
+
thread_security[:nLength] = SECURITY_ATTRIBUTES.size
|
302
|
+
thread_security[:bInheritHandle] = 1
|
303
|
+
thread_security
|
304
|
+
end
|
305
|
+
|
306
|
+
# Automatically handle stdin, stdout and stderr as either IO objects
|
307
|
+
# or file descriptors. This won't work for StringIO, however. It also
|
308
|
+
# will not work on JRuby because of the way it handles internal file
|
309
|
+
# descriptors.
|
310
|
+
def setup_std_handlers
|
311
|
+
%i[stdin stdout stderr].each do |io|
|
312
|
+
next unless si_hash[io]
|
313
|
+
|
314
|
+
handle = if si_hash[io].respond_to?(:fileno)
|
315
|
+
get_osfhandle(si_hash[io].fileno)
|
316
|
+
else
|
317
|
+
get_osfhandle(si_hash[io])
|
318
|
+
end
|
319
|
+
|
320
|
+
if handle == INVALID_HANDLE_VALUE
|
321
|
+
ptr = FFI::MemoryPointer.new(:int)
|
322
|
+
|
323
|
+
errno = if get_errno(ptr).zero?
|
324
|
+
ptr.read_int
|
325
|
+
else
|
326
|
+
FFI.errno
|
327
|
+
end
|
328
|
+
|
329
|
+
raise SystemCallError.new('get_osfhandle', errno)
|
330
|
+
end
|
331
|
+
|
332
|
+
# Most implementations of Ruby on Windows create inheritable
|
333
|
+
# handles by default, but some do not. RF bug #26988.
|
334
|
+
bool = SetHandleInformation(
|
335
|
+
handle,
|
336
|
+
HANDLE_FLAG_INHERIT,
|
337
|
+
HANDLE_FLAG_INHERIT
|
338
|
+
)
|
339
|
+
|
340
|
+
raise SystemCallError.new('SetHandleInformation', FFI.errno) unless bool
|
341
|
+
|
342
|
+
si_hash[io] = handle
|
343
|
+
si_hash[:startf_flags] ||= 0
|
344
|
+
si_hash[:startf_flags] |= STARTF_USESTDHANDLES
|
345
|
+
hash[:inherit] = true
|
346
|
+
end
|
347
|
+
end
|
348
|
+
|
349
|
+
def startinfo
|
350
|
+
startinfo = STARTUPINFO.new
|
351
|
+
|
352
|
+
return startinfo if si_hash.empty?
|
353
|
+
|
354
|
+
startinfo[:cb] = startinfo.size
|
355
|
+
startinfo[:lpDesktop] = si_hash[:desktop] if si_hash[:desktop]
|
356
|
+
startinfo[:lpTitle] = si_hash[:title] if si_hash[:title]
|
357
|
+
startinfo[:dwX] = si_hash[:x] if si_hash[:x]
|
358
|
+
startinfo[:dwY] = si_hash[:y] if si_hash[:y]
|
359
|
+
startinfo[:dwXSize] = si_hash[:x_size] if si_hash[:x_size]
|
360
|
+
startinfo[:dwYSize] = si_hash[:y_size] if si_hash[:y_size]
|
361
|
+
startinfo[:dwXCountChars] = si_hash[:x_count_chars] if si_hash[:x_count_chars]
|
362
|
+
startinfo[:dwYCountChars] = si_hash[:y_count_chars] if si_hash[:y_count_chars]
|
363
|
+
startinfo[:dwFillAttribute] = si_hash[:fill_attribute] if si_hash[:fill_attribute]
|
364
|
+
startinfo[:dwFlags] = si_hash[:startf_flags] if si_hash[:startf_flags]
|
365
|
+
startinfo[:wShowWindow] = si_hash[:sw_flags] if si_hash[:sw_flags]
|
366
|
+
startinfo[:cbReserved2] = 0
|
367
|
+
startinfo[:hStdInput] = si_hash[:stdin] if si_hash[:stdin]
|
368
|
+
startinfo[:hStdOutput] = si_hash[:stdout] if si_hash[:stdout]
|
369
|
+
startinfo[:hStdError] = si_hash[:stderr] if si_hash[:stderr]
|
370
|
+
startinfo
|
371
|
+
end
|
372
|
+
|
373
|
+
def create_process_with_logon
|
374
|
+
raise ArgumentError, 'password must be specified if with_logon is used' unless password
|
375
|
+
|
376
|
+
hash[:creation_flags] |= CREATE_UNICODE_ENVIRONMENT
|
377
|
+
|
378
|
+
bool = CreateProcessWithLogonW(
|
379
|
+
logon, # User
|
380
|
+
domain, # Domain
|
381
|
+
password, # Password
|
382
|
+
LOGON_WITH_PROFILE, # Logon flags
|
383
|
+
app, # App name
|
384
|
+
cmd, # Command line
|
385
|
+
hash[:creation_flags], # Creation flags
|
386
|
+
env, # Environment
|
387
|
+
cwd, # Working directory
|
388
|
+
startinfo, # Startup Info
|
389
|
+
procinfo # Process Info
|
390
|
+
)
|
391
|
+
|
392
|
+
raise SystemCallError.new('CreateProcessWithLogonW', FFI.errno) unless bool
|
393
|
+
end
|
394
|
+
|
395
|
+
def create_process
|
396
|
+
inherit = hash[:inherit] ? 1 : 0
|
397
|
+
|
398
|
+
bool = CreateProcessW(
|
399
|
+
app, # App name
|
400
|
+
cmd, # Command line
|
401
|
+
process_security, # Process attributes
|
402
|
+
thread_security, # Thread attributes
|
403
|
+
inherit, # Inherit handles?
|
404
|
+
hash[:creation_flags], # Creation flags
|
405
|
+
env, # Environment
|
406
|
+
cwd, # Working directory
|
407
|
+
startinfo, # Startup Info
|
408
|
+
procinfo # Process Info
|
409
|
+
)
|
410
|
+
|
411
|
+
raise SystemCallError.new('CreateProcess', FFI.errno) unless bool
|
412
|
+
end
|
413
|
+
end
|
414
|
+
end
|