chef 16.1.16 → 16.18.30

Sign up to get free protection for your applications and to get access to all the features.
Files changed (822) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +32 -27
  3. data/README.md +5 -5
  4. data/Rakefile +35 -30
  5. data/bin/knife +1 -1
  6. data/chef-universal-mingw32.gemspec +5 -5
  7. data/chef.gemspec +32 -10
  8. data/lib/chef/action_collection.rb +5 -1
  9. data/lib/chef/api_client/registration.rb +2 -2
  10. data/lib/chef/application/apply.rb +19 -13
  11. data/lib/chef/application/base.rb +27 -24
  12. data/lib/chef/application/client.rb +17 -6
  13. data/lib/chef/application/exit_code.rb +13 -4
  14. data/lib/chef/application/knife.rb +22 -11
  15. data/lib/chef/application/solo.rb +2 -1
  16. data/lib/chef/application/windows_service.rb +39 -39
  17. data/lib/chef/application/windows_service_manager.rb +7 -7
  18. data/lib/chef/application.rb +33 -19
  19. data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
  20. data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
  21. data/lib/chef/chef_class.rb +0 -1
  22. data/lib/chef/chef_fs/chef_fs_data_store.rb +55 -55
  23. data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +1 -1
  24. data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
  25. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
  26. data/lib/chef/chef_fs/file_pattern.rb +1 -1
  27. data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
  28. data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +2 -2
  29. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
  30. data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
  31. data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
  32. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  33. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
  34. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +2 -2
  35. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
  36. data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
  37. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
  38. data/lib/chef/chef_fs/knife.rb +2 -2
  39. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  40. data/lib/chef/chef_fs/parallelizer.rb +0 -1
  41. data/lib/chef/chef_fs/path_utils.rb +1 -1
  42. data/lib/chef/client.rb +32 -59
  43. data/lib/chef/compliance/default_attributes.rb +97 -0
  44. data/lib/chef/compliance/fetcher/automate.rb +80 -0
  45. data/lib/chef/compliance/fetcher/chef_server.rb +134 -0
  46. data/lib/chef/compliance/reporter/automate.rb +201 -0
  47. data/lib/chef/compliance/reporter/chef_server_automate.rb +94 -0
  48. data/lib/chef/compliance/reporter/compliance_enforcer.rb +20 -0
  49. data/lib/chef/compliance/reporter/json_file.rb +19 -0
  50. data/lib/chef/compliance/runner.rb +269 -0
  51. data/lib/chef/cookbook/chefignore.rb +1 -1
  52. data/lib/chef/cookbook/cookbook_version_loader.rb +1 -1
  53. data/lib/chef/cookbook/gem_installer.rb +6 -2
  54. data/lib/chef/cookbook/metadata.rb +1 -1
  55. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  56. data/lib/chef/cookbook/synchronizer.rb +2 -2
  57. data/lib/chef/cookbook/syntax_check.rb +1 -2
  58. data/lib/chef/cookbook_loader.rb +15 -29
  59. data/lib/chef/cookbook_manifest.rb +2 -1
  60. data/lib/chef/cookbook_site_streaming_uploader.rb +13 -11
  61. data/lib/chef/cookbook_uploader.rb +1 -1
  62. data/lib/chef/cookbook_version.rb +30 -11
  63. data/lib/chef/data_bag.rb +5 -6
  64. data/lib/chef/data_collector/config_validation.rb +22 -13
  65. data/lib/chef/data_collector/run_end_message.rb +15 -5
  66. data/lib/chef/data_collector/run_start_message.rb +1 -1
  67. data/lib/chef/data_collector.rb +7 -6
  68. data/lib/chef/deprecated.rb +27 -5
  69. data/lib/chef/deprecation/warnings.rb +2 -2
  70. data/lib/chef/digester.rb +4 -3
  71. data/lib/chef/dsl/chef_vault.rb +1 -1
  72. data/lib/chef/dsl/data_query.rb +2 -2
  73. data/lib/chef/dsl/platform_introspection.rb +10 -8
  74. data/lib/chef/dsl/reboot_pending.rb +1 -1
  75. data/lib/chef/encrypted_data_bag_item/assertions.rb +1 -1
  76. data/lib/chef/encrypted_data_bag_item/decryptor.rb +3 -3
  77. data/lib/chef/encrypted_data_bag_item/encryptor.rb +3 -3
  78. data/lib/chef/encrypted_data_bag_item.rb +3 -4
  79. data/lib/chef/environment.rb +6 -7
  80. data/lib/chef/event_loggers/windows_eventlog.rb +2 -2
  81. data/lib/chef/exceptions.rb +16 -6
  82. data/lib/chef/file_access_control/windows.rb +12 -11
  83. data/lib/chef/file_access_control.rb +1 -1
  84. data/lib/chef/file_cache.rb +4 -4
  85. data/lib/chef/file_content_management/deploy/mv_unix.rb +1 -1
  86. data/lib/chef/file_content_management/tempfile.rb +10 -10
  87. data/lib/chef/formatters/doc.rb +7 -6
  88. data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +6 -5
  89. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +3 -3
  90. data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +3 -3
  91. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +9 -9
  92. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +8 -8
  93. data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +3 -3
  94. data/lib/chef/formatters/error_mapper.rb +2 -2
  95. data/lib/chef/formatters/indentable_output_stream.rb +2 -2
  96. data/lib/chef/formatters/minimal.rb +5 -4
  97. data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +28 -39
  98. data/lib/chef/handler/json_file.rb +1 -1
  99. data/lib/chef/handler.rb +2 -0
  100. data/lib/chef/http/auth_credentials.rb +5 -1
  101. data/lib/chef/http/authenticator.rb +4 -2
  102. data/lib/chef/http/basic_client.rb +4 -2
  103. data/lib/chef/http/decompressor.rb +1 -1
  104. data/lib/chef/http/http_request.rb +8 -6
  105. data/lib/chef/http/json_output.rb +1 -1
  106. data/lib/chef/http/socketless_chef_zero_client.rb +5 -2
  107. data/lib/chef/http/ssl_policies.rb +52 -15
  108. data/lib/chef/http.rb +38 -31
  109. data/lib/chef/json_compat.rb +4 -9
  110. data/lib/chef/key.rb +1 -1
  111. data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
  112. data/lib/chef/knife/bootstrap/templates/chef-full.erb +12 -12
  113. data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +9 -9
  114. data/lib/chef/knife/bootstrap/train_connector.rb +2 -1
  115. data/lib/chef/knife/bootstrap.rb +93 -40
  116. data/lib/chef/knife/client_bulk_delete.rb +1 -1
  117. data/lib/chef/knife/client_create.rb +3 -3
  118. data/lib/chef/knife/config_get.rb +8 -96
  119. data/lib/chef/knife/config_get_profile.rb +9 -9
  120. data/lib/chef/knife/config_list.rb +139 -0
  121. data/lib/chef/knife/config_list_profiles.rb +8 -95
  122. data/lib/chef/knife/config_show.rb +127 -0
  123. data/lib/chef/knife/config_use.rb +61 -0
  124. data/lib/chef/knife/config_use_profile.rb +12 -17
  125. data/lib/chef/knife/configure.rb +5 -3
  126. data/lib/chef/knife/cookbook_delete.rb +1 -1
  127. data/lib/chef/knife/cookbook_download.rb +1 -1
  128. data/lib/chef/knife/cookbook_metadata.rb +1 -1
  129. data/lib/chef/knife/cookbook_upload.rb +29 -37
  130. data/lib/chef/knife/core/bootstrap_context.rb +3 -3
  131. data/lib/chef/knife/core/cookbook_scm_repo.rb +2 -2
  132. data/lib/chef/knife/core/formatting_options.rb +49 -0
  133. data/lib/chef/knife/core/gem_glob_loader.rb +2 -2
  134. data/lib/chef/knife/core/generic_presenter.rb +1 -1
  135. data/lib/chef/knife/core/hashed_command_loader.rb +3 -2
  136. data/lib/chef/knife/core/node_presenter.rb +0 -25
  137. data/lib/chef/knife/core/object_loader.rb +1 -1
  138. data/lib/chef/knife/core/status_presenter.rb +1 -26
  139. data/lib/chef/knife/core/subcommand_loader.rb +20 -1
  140. data/lib/chef/knife/core/ui.rb +12 -3
  141. data/lib/chef/knife/core/windows_bootstrap_context.rb +51 -42
  142. data/lib/chef/knife/data_bag_create.rb +1 -1
  143. data/lib/chef/knife/delete.rb +15 -15
  144. data/lib/chef/knife/exec.rb +4 -4
  145. data/lib/chef/knife/node_bulk_delete.rb +1 -1
  146. data/lib/chef/knife/node_policy_set.rb +2 -2
  147. data/lib/chef/knife/node_run_list_add.rb +1 -1
  148. data/lib/chef/knife/node_run_list_remove.rb +2 -2
  149. data/lib/chef/knife/node_run_list_set.rb +1 -1
  150. data/lib/chef/knife/node_show.rb +4 -3
  151. data/lib/chef/knife/rehash.rb +3 -21
  152. data/lib/chef/knife/role_bulk_delete.rb +1 -1
  153. data/lib/chef/knife/role_env_run_list_add.rb +1 -1
  154. data/lib/chef/knife/role_env_run_list_set.rb +1 -1
  155. data/lib/chef/knife/role_run_list_add.rb +1 -1
  156. data/lib/chef/knife/role_run_list_set.rb +1 -1
  157. data/lib/chef/knife/search.rb +2 -2
  158. data/lib/chef/knife/serve.rb +3 -3
  159. data/lib/chef/knife/ssh.rb +33 -12
  160. data/lib/chef/knife/ssl_check.rb +3 -3
  161. data/lib/chef/knife/status.rb +10 -13
  162. data/lib/chef/knife/supermarket_share.rb +1 -1
  163. data/lib/chef/knife/supermarket_unshare.rb +1 -1
  164. data/lib/chef/knife/tag_create.rb +1 -1
  165. data/lib/chef/knife/tag_delete.rb +1 -1
  166. data/lib/chef/knife/user_create.rb +2 -2
  167. data/lib/chef/knife/xargs.rb +19 -19
  168. data/lib/chef/knife/yaml_convert.rb +1 -1
  169. data/lib/chef/knife.rb +9 -9
  170. data/lib/chef/local_mode.rb +2 -2
  171. data/lib/chef/log/syslog.rb +2 -2
  172. data/lib/chef/log/winevt.rb +2 -2
  173. data/lib/chef/log.rb +8 -3
  174. data/lib/chef/mixin/checksum.rb +5 -0
  175. data/{spec/functional/resource/base.rb → lib/chef/mixin/chef_utils_wiring.rb} +24 -12
  176. data/lib/chef/mixin/convert_to_class_name.rb +0 -56
  177. data/lib/chef/mixin/deep_merge.rb +35 -18
  178. data/{spec/unit/monkey_patches/uri_spec.rb → lib/chef/mixin/default_paths.rb} +11 -13
  179. data/lib/chef/mixin/openssl_helper.rb +32 -11
  180. data/lib/chef/mixin/path_sanity.rb +5 -4
  181. data/lib/chef/mixin/powershell_exec.rb +17 -22
  182. data/lib/chef/mixin/powershell_out.rb +12 -5
  183. data/lib/chef/mixin/properties.rb +2 -0
  184. data/lib/chef/mixin/securable.rb +2 -2
  185. data/lib/chef/mixin/shell_out.rb +4 -188
  186. data/lib/chef/mixin/template.rb +4 -3
  187. data/lib/chef/mixin/unformatter.rb +1 -1
  188. data/lib/chef/mixin/uris.rb +4 -2
  189. data/lib/chef/mixin/versioned_api.rb +1 -2
  190. data/lib/chef/mixin/which.rb +6 -3
  191. data/lib/chef/mixins.rb +1 -0
  192. data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
  193. data/lib/chef/node/attribute.rb +22 -7
  194. data/lib/chef/node/attribute_collections.rb +2 -6
  195. data/lib/chef/node/mixin/deep_merge_cache.rb +4 -4
  196. data/lib/chef/node/mixin/immutablize_hash.rb +2 -0
  197. data/lib/chef/node.rb +43 -18
  198. data/lib/chef/node_map.rb +21 -18
  199. data/lib/chef/platform/query_helpers.rb +4 -4
  200. data/lib/chef/platform/service_helpers.rb +31 -28
  201. data/lib/chef/policy_builder/dynamic.rb +2 -0
  202. data/lib/chef/policy_builder/policyfile.rb +8 -3
  203. data/lib/chef/powershell.rb +10 -4
  204. data/lib/chef/property.rb +2 -2
  205. data/lib/chef/provider/batch.rb +3 -10
  206. data/lib/chef/provider/cron/unix.rb +0 -2
  207. data/lib/chef/provider/cron.rb +9 -28
  208. data/lib/chef/provider/dsc_resource.rb +12 -24
  209. data/lib/chef/provider/dsc_script.rb +16 -20
  210. data/lib/chef/provider/execute.rb +2 -1
  211. data/lib/chef/provider/file.rb +5 -5
  212. data/lib/chef/provider/git.rb +22 -14
  213. data/lib/chef/provider/group/dscl.rb +3 -3
  214. data/lib/chef/provider/group/suse.rb +5 -5
  215. data/lib/chef/provider/group/windows.rb +13 -2
  216. data/lib/chef/provider/group.rb +14 -8
  217. data/lib/chef/provider/ifconfig/debian.rb +38 -22
  218. data/lib/chef/provider/ifconfig/redhat.rb +54 -18
  219. data/lib/chef/provider/ifconfig.rb +16 -19
  220. data/lib/chef/provider/launchd.rb +3 -13
  221. data/lib/chef/provider/link.rb +0 -9
  222. data/lib/chef/provider/mount/aix.rb +1 -1
  223. data/lib/chef/provider/mount/linux.rb +67 -0
  224. data/lib/chef/provider/mount/mount.rb +41 -43
  225. data/lib/chef/provider/mount/solaris.rb +0 -1
  226. data/lib/chef/provider/mount/windows.rb +2 -2
  227. data/lib/chef/provider/mount.rb +23 -3
  228. data/lib/chef/provider/noop.rb +1 -1
  229. data/lib/chef/provider/package/apt.rb +1 -1
  230. data/lib/chef/provider/package/chocolatey.rb +6 -6
  231. data/lib/chef/provider/package/dnf/dnf_helper.py +23 -6
  232. data/lib/chef/provider/package/dnf/python_helper.rb +6 -6
  233. data/lib/chef/provider/package/dnf.rb +39 -12
  234. data/lib/chef/provider/package/dpkg.rb +3 -12
  235. data/lib/chef/provider/package/freebsd/base.rb +3 -2
  236. data/lib/chef/provider/package/freebsd/pkgng.rb +4 -2
  237. data/lib/chef/provider/package/homebrew.rb +1 -1
  238. data/lib/chef/provider/package/ips.rb +1 -1
  239. data/lib/chef/provider/package/openbsd.rb +1 -1
  240. data/lib/chef/provider/package/portage.rb +2 -2
  241. data/lib/chef/provider/package/powershell.rb +10 -2
  242. data/lib/chef/provider/package/rubygems.rb +25 -22
  243. data/lib/chef/provider/package/snap.rb +99 -34
  244. data/lib/chef/provider/package/solaris.rb +0 -2
  245. data/lib/chef/provider/package/windows/msi.rb +3 -3
  246. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +12 -10
  247. data/lib/chef/provider/package/windows.rb +12 -7
  248. data/lib/chef/provider/package/yum/rpm_utils.rb +1 -1
  249. data/lib/chef/provider/package/yum/yum_helper.py +4 -10
  250. data/lib/chef/provider/package/zypper.rb +99 -73
  251. data/lib/chef/provider/package.rb +53 -18
  252. data/lib/chef/provider/powershell_script.rb +40 -17
  253. data/lib/chef/provider/registry_key.rb +4 -3
  254. data/lib/chef/provider/remote_file/content.rb +3 -0
  255. data/lib/chef/provider/remote_file/ftp.rb +6 -4
  256. data/lib/chef/provider/remote_file/http.rb +4 -1
  257. data/lib/chef/provider/remote_file/sftp.rb +6 -4
  258. data/lib/chef/provider/route.rb +4 -8
  259. data/lib/chef/provider/script.rb +4 -75
  260. data/lib/chef/provider/service/arch.rb +2 -2
  261. data/lib/chef/provider/service/debian.rb +5 -4
  262. data/lib/chef/provider/service/gentoo.rb +2 -2
  263. data/lib/chef/provider/service/macosx.rb +7 -7
  264. data/lib/chef/provider/service/openbsd.rb +5 -8
  265. data/lib/chef/provider/service/redhat.rb +4 -4
  266. data/lib/chef/provider/service/upstart.rb +1 -1
  267. data/lib/chef/provider/service/windows.rb +11 -11
  268. data/lib/chef/provider/service.rb +2 -2
  269. data/lib/chef/provider/subversion.rb +2 -2
  270. data/lib/chef/provider/systemd_unit.rb +0 -2
  271. data/lib/chef/provider/template/content.rb +2 -1
  272. data/lib/chef/provider/template_finder.rb +2 -10
  273. data/lib/chef/provider/user/aix.rb +1 -1
  274. data/lib/chef/provider/user/dscl.rb +10 -10
  275. data/lib/chef/provider/user/linux.rb +3 -3
  276. data/lib/chef/provider/user/mac.rb +29 -21
  277. data/lib/chef/provider/user/solaris.rb +1 -1
  278. data/lib/chef/provider/user/windows.rb +10 -3
  279. data/lib/chef/provider/user.rb +17 -9
  280. data/lib/chef/provider/windows_script.rb +87 -25
  281. data/lib/chef/provider/yum_repository.rb +3 -3
  282. data/lib/chef/provider/zypper_repository.rb +33 -14
  283. data/lib/chef/provider.rb +1 -5
  284. data/lib/chef/provider_resolver.rb +1 -1
  285. data/lib/chef/providers.rb +1 -4
  286. data/lib/chef/pwsh.rb +71 -0
  287. data/lib/chef/recipe.rb +2 -2
  288. data/lib/chef/resource/alternatives.rb +1 -1
  289. data/lib/chef/resource/apt_package.rb +1 -1
  290. data/lib/chef/resource/apt_repository.rb +7 -15
  291. data/lib/chef/resource/archive_file.rb +28 -8
  292. data/lib/chef/resource/bash.rb +119 -2
  293. data/lib/chef/resource/batch.rb +5 -3
  294. data/lib/chef/resource/bff_package.rb +22 -0
  295. data/lib/chef/resource/breakpoint.rb +59 -2
  296. data/lib/chef/resource/build_essential.rb +7 -10
  297. data/lib/chef/resource/cab_package.rb +29 -0
  298. data/lib/chef/resource/chef_client_config.rb +313 -0
  299. data/lib/chef/resource/chef_client_cron.rb +36 -29
  300. data/lib/chef/resource/chef_client_launchd.rb +194 -0
  301. data/lib/chef/resource/chef_client_scheduled_task.rb +36 -21
  302. data/lib/chef/resource/chef_client_systemd_timer.rb +29 -22
  303. data/lib/chef/resource/chef_client_trusted_certificate.rb +102 -0
  304. data/lib/chef/resource/chef_gem.rb +58 -22
  305. data/lib/chef/resource/chef_handler.rb +149 -4
  306. data/lib/chef/resource/chef_sleep.rb +3 -3
  307. data/lib/chef/resource/chef_vault_secret.rb +14 -14
  308. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  309. data/lib/chef/resource/cookbook_file.rb +2 -2
  310. data/lib/chef/resource/cron/_cron_shared.rb +99 -0
  311. data/lib/chef/resource/cron/cron.rb +46 -0
  312. data/lib/chef/resource/{cron_d.rb → cron/cron_d.rb} +9 -89
  313. data/lib/chef/resource/cron_access.rb +13 -5
  314. data/lib/chef/resource/csh.rb +2 -3
  315. data/lib/chef/resource/dmg_package.rb +2 -2
  316. data/lib/chef/resource/dnf_package.rb +2 -2
  317. data/lib/chef/resource/dsc_resource.rb +0 -1
  318. data/lib/chef/resource/dsc_script.rb +9 -2
  319. data/lib/chef/resource/execute.rb +486 -15
  320. data/lib/chef/resource/file.rb +5 -5
  321. data/lib/chef/resource/freebsd_package.rb +1 -1
  322. data/lib/chef/resource/gem_package.rb +36 -3
  323. data/lib/chef/resource/helpers/cron_validations.rb +6 -3
  324. data/lib/chef/resource/homebrew_cask.rb +16 -10
  325. data/lib/chef/resource/homebrew_package.rb +32 -3
  326. data/lib/chef/resource/homebrew_update.rb +110 -0
  327. data/lib/chef/resource/hostname.rb +27 -40
  328. data/lib/chef/resource/http_request.rb +1 -1
  329. data/lib/chef/resource/ifconfig.rb +52 -5
  330. data/lib/chef/resource/kernel_module.rb +15 -2
  331. data/lib/chef/resource/ksh.rb +3 -3
  332. data/lib/chef/resource/launchd.rb +18 -17
  333. data/lib/chef/resource/locale.rb +4 -4
  334. data/lib/chef/resource/lwrp_base.rb +4 -5
  335. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  336. data/lib/chef/resource/mdadm.rb +2 -2
  337. data/lib/chef/resource/mount.rb +9 -3
  338. data/lib/chef/resource/notify_group.rb +0 -1
  339. data/lib/chef/resource/ohai.rb +46 -3
  340. data/lib/chef/resource/ohai_hint.rb +33 -0
  341. data/lib/chef/resource/openssl_dhparam.rb +29 -5
  342. data/lib/chef/resource/openssl_ec_private_key.rb +8 -3
  343. data/lib/chef/resource/openssl_ec_public_key.rb +4 -2
  344. data/lib/chef/resource/openssl_rsa_private_key.rb +8 -3
  345. data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
  346. data/lib/chef/resource/openssl_x509_certificate.rb +49 -49
  347. data/lib/chef/resource/openssl_x509_crl.rb +22 -12
  348. data/lib/chef/resource/openssl_x509_request.rb +37 -36
  349. data/lib/chef/resource/osx_profile.rb +292 -6
  350. data/lib/chef/resource/perl.rb +2 -3
  351. data/lib/chef/resource/plist.rb +26 -11
  352. data/lib/chef/resource/powershell_package_source.rb +25 -24
  353. data/lib/chef/resource/powershell_script.rb +40 -41
  354. data/lib/chef/resource/python.rb +2 -3
  355. data/lib/chef/resource/reboot.rb +2 -2
  356. data/lib/chef/resource/registry_key.rb +93 -2
  357. data/lib/chef/resource/remote_directory.rb +1 -1
  358. data/lib/chef/resource/remote_file.rb +26 -10
  359. data/lib/chef/resource/rhsm_register.rb +39 -10
  360. data/lib/chef/resource/rhsm_subscription.rb +5 -5
  361. data/lib/chef/resource/route.rb +1 -1
  362. data/lib/chef/resource/ruby.rb +1 -6
  363. data/lib/chef/resource/ruby_block.rb +2 -2
  364. data/lib/chef/resource/scm/_scm.rb +2 -1
  365. data/lib/chef/resource/scm/git.rb +82 -1
  366. data/lib/chef/resource/scm/subversion.rb +14 -2
  367. data/lib/chef/resource/script.rb +2 -2
  368. data/lib/chef/resource/service.rb +5 -5
  369. data/lib/chef/resource/solaris_package.rb +0 -2
  370. data/lib/chef/resource/ssh_known_hosts_entry.rb +18 -3
  371. data/lib/chef/resource/sudo.rb +32 -5
  372. data/lib/chef/resource/support/client.erb +68 -0
  373. data/lib/chef/resource/support/cron.d.erb +1 -1
  374. data/lib/chef/resource/support/cron_access.erb +1 -1
  375. data/lib/chef/resource/support/sudoer.erb +1 -1
  376. data/lib/chef/resource/support/ulimit.erb +1 -1
  377. data/lib/chef/resource/swap_file.rb +17 -0
  378. data/lib/chef/resource/sysctl.rb +6 -10
  379. data/lib/chef/resource/systemd_unit.rb +45 -4
  380. data/lib/chef/resource/template.rb +4 -4
  381. data/lib/chef/resource/timezone.rb +122 -68
  382. data/lib/chef/resource/user/windows_user.rb +5 -0
  383. data/lib/chef/resource/user_ulimit.rb +2 -1
  384. data/lib/chef/resource/windows_ad_join.rb +51 -13
  385. data/lib/chef/resource/windows_audit_policy.rb +232 -0
  386. data/lib/chef/resource/windows_auto_run.rb +13 -0
  387. data/lib/chef/resource/windows_certificate.rb +95 -39
  388. data/lib/chef/resource/windows_dfs_folder.rb +2 -0
  389. data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
  390. data/lib/chef/resource/windows_dfs_server.rb +9 -4
  391. data/lib/chef/resource/windows_dns_record.rb +25 -5
  392. data/lib/chef/resource/windows_dns_zone.rb +12 -7
  393. data/lib/chef/resource/windows_env.rb +173 -0
  394. data/lib/chef/resource/windows_feature.rb +4 -0
  395. data/lib/chef/resource/windows_feature_dism.rb +10 -0
  396. data/lib/chef/resource/windows_feature_powershell.rb +14 -2
  397. data/lib/chef/resource/windows_firewall_profile.rb +196 -0
  398. data/lib/chef/resource/windows_firewall_rule.rb +14 -14
  399. data/lib/chef/resource/windows_font.rb +7 -5
  400. data/lib/chef/resource/windows_package.rb +30 -6
  401. data/lib/chef/resource/windows_pagefile.rb +5 -1
  402. data/lib/chef/resource/windows_path.rb +38 -0
  403. data/lib/chef/resource/windows_printer.rb +22 -21
  404. data/lib/chef/resource/windows_printer_port.rb +20 -17
  405. data/lib/chef/resource/windows_script.rb +2 -16
  406. data/lib/chef/resource/windows_security_policy.rb +98 -49
  407. data/lib/chef/resource/windows_service.rb +108 -0
  408. data/lib/chef/resource/windows_share.rb +23 -21
  409. data/lib/chef/resource/windows_shortcut.rb +3 -2
  410. data/lib/chef/resource/windows_task.rb +633 -32
  411. data/lib/chef/resource/windows_uac.rb +5 -1
  412. data/lib/chef/resource/windows_user_privilege.rb +111 -77
  413. data/lib/chef/resource/windows_workgroup.rb +11 -10
  414. data/lib/chef/resource/yum_package.rb +2 -2
  415. data/lib/chef/resource/yum_repository.rb +15 -10
  416. data/lib/chef/resource.rb +60 -27
  417. data/lib/chef/resource_collection/resource_set.rb +2 -6
  418. data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
  419. data/lib/chef/resource_inspector.rb +82 -70
  420. data/lib/chef/resource_reporter.rb +1 -3
  421. data/lib/chef/resources.rb +9 -3
  422. data/lib/chef/role.rb +3 -4
  423. data/lib/chef/run_context/cookbook_compiler.rb +21 -21
  424. data/lib/chef/run_context.rb +2 -2
  425. data/lib/chef/run_lock.rb +3 -3
  426. data/lib/chef/run_status.rb +2 -6
  427. data/lib/chef/search/query.rb +7 -6
  428. data/lib/chef/server_api.rb +0 -4
  429. data/lib/chef/server_api_versions.rb +4 -0
  430. data/lib/chef/shell/ext.rb +15 -15
  431. data/lib/chef/shell/shell_session.rb +4 -2
  432. data/lib/chef/shell.rb +63 -27
  433. data/lib/chef/train_transport.rb +5 -104
  434. data/lib/chef/util/backup.rb +2 -2
  435. data/lib/chef/util/diff.rb +16 -17
  436. data/lib/chef/util/dsc/configuration_generator.rb +53 -12
  437. data/lib/chef/util/dsc/lcm_output_parser.rb +4 -7
  438. data/lib/chef/util/dsc/local_configuration_manager.rb +18 -15
  439. data/lib/chef/util/dsc/resource_store.rb +5 -11
  440. data/lib/chef/util/powershell/ps_credential.rb +18 -14
  441. data/lib/chef/util/threaded_job_queue.rb +0 -2
  442. data/lib/chef/util/windows/net_user.rb +1 -1
  443. data/lib/chef/util/windows/volume.rb +1 -1
  444. data/lib/chef/version.rb +2 -2
  445. data/lib/chef/version_string.rb +1 -1
  446. data/lib/chef/win32/api/file.rb +4 -0
  447. data/lib/chef/win32/api.rb +9 -2
  448. data/lib/chef/win32/crypto.rb +1 -1
  449. data/lib/chef/win32/file/version_info.rb +5 -5
  450. data/lib/chef/win32/file.rb +4 -4
  451. data/lib/chef/win32/registry.rb +4 -6
  452. data/lib/chef/win32/security/sid.rb +1 -1
  453. data/lib/chef/win32/security.rb +1 -1
  454. data/lib/chef/win32/unicode.rb +1 -1
  455. data/lib/chef/win32/version.rb +4 -2
  456. data/spec/data/lwrp/providers/buck_passer.rb +1 -1
  457. data/spec/data/lwrp/providers/buck_passer_2.rb +1 -1
  458. data/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb +1 -1
  459. data/spec/data/rubygems.org/latest_specs.4.8.gz +0 -0
  460. data/spec/data/rubygems.org/nonexistent_gem +0 -0
  461. data/spec/data/rubygems.org/sexp_processor +0 -0
  462. data/spec/data/rubygems.org/sexp_processor-4.15.1.gemspec.rz +0 -0
  463. data/spec/data/shef-config.rb +1 -1
  464. data/spec/data/ssl/binary/chef-rspec-der.cert +0 -0
  465. data/spec/data/ssl/binary/chef-rspec-der.key +0 -0
  466. data/spec/data/ssl/chef-rspec.cert +15 -15
  467. data/spec/functional/assets/yumrepo-empty/repodata/01a3b-filelists.sqlite.bz2 +0 -0
  468. data/spec/functional/assets/yumrepo-empty/repodata/401dc-filelists.xml.gz +0 -0
  469. data/spec/functional/assets/yumrepo-empty/repodata/5dc1e-primary.sqlite.bz2 +0 -0
  470. data/spec/functional/assets/yumrepo-empty/repodata/6bf96-other.xml.gz +0 -0
  471. data/spec/functional/assets/yumrepo-empty/repodata/7c365-other.sqlite.bz2 +0 -0
  472. data/spec/functional/assets/yumrepo-empty/repodata/dabe2-primary.xml.gz +0 -0
  473. data/spec/functional/assets/yumrepo-empty/repodata/repomd.xml +55 -0
  474. data/spec/functional/event_loggers/windows_eventlog_spec.rb +6 -5
  475. data/spec/functional/knife/configure_spec.rb +1 -1
  476. data/spec/functional/knife/ssh_spec.rb +5 -16
  477. data/spec/functional/mixin/powershell_out_spec.rb +11 -3
  478. data/spec/functional/resource/aix_service_spec.rb +11 -4
  479. data/spec/functional/resource/aixinit_service_spec.rb +9 -10
  480. data/spec/functional/resource/apt_package_spec.rb +4 -7
  481. data/spec/functional/resource/bash_spec.rb +3 -2
  482. data/spec/functional/resource/bff_spec.rb +3 -3
  483. data/spec/functional/resource/chocolatey_package_spec.rb +11 -3
  484. data/spec/functional/resource/cookbook_file_spec.rb +1 -1
  485. data/spec/functional/resource/cron_spec.rb +24 -6
  486. data/spec/functional/resource/dnf_package_spec.rb +323 -17
  487. data/spec/functional/resource/dsc_resource_spec.rb +1 -1
  488. data/spec/functional/resource/dsc_script_spec.rb +6 -10
  489. data/spec/functional/resource/execute_spec.rb +1 -1
  490. data/spec/functional/resource/git_spec.rb +23 -1
  491. data/spec/functional/resource/group_spec.rb +26 -10
  492. data/spec/functional/resource/ifconfig_spec.rb +9 -1
  493. data/spec/functional/resource/insserv_spec.rb +8 -8
  494. data/spec/functional/resource/link_spec.rb +30 -25
  495. data/spec/functional/resource/mount_spec.rb +19 -3
  496. data/spec/functional/resource/msu_package_spec.rb +9 -3
  497. data/spec/functional/resource/ohai_spec.rb +2 -10
  498. data/spec/functional/resource/powershell_package_source_spec.rb +107 -0
  499. data/spec/functional/resource/powershell_script_spec.rb +65 -22
  500. data/spec/functional/resource/remote_file_spec.rb +9 -15
  501. data/spec/functional/resource/rpm_spec.rb +3 -3
  502. data/spec/functional/resource/timezone_spec.rb +2 -0
  503. data/spec/functional/resource/user/dscl_spec.rb +1 -1
  504. data/spec/functional/resource/user/mac_user_spec.rb +1 -1
  505. data/spec/functional/resource/windows_certificate_spec.rb +206 -382
  506. data/spec/functional/resource/windows_firewall_rule_spec.rb +93 -0
  507. data/spec/functional/resource/windows_font_spec.rb +50 -0
  508. data/spec/functional/resource/windows_package_spec.rb +36 -11
  509. data/spec/functional/resource/windows_path_spec.rb +4 -0
  510. data/spec/functional/resource/windows_security_policy_spec.rb +0 -4
  511. data/spec/functional/resource/windows_service_spec.rb +4 -0
  512. data/spec/functional/resource/windows_share_spec.rb +103 -0
  513. data/spec/functional/resource/windows_task_spec.rb +27 -27
  514. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -2
  515. data/spec/functional/resource/yum_package_spec.rb +16 -1
  516. data/spec/functional/resource/zypper_package_spec.rb +15 -1
  517. data/spec/functional/run_lock_spec.rb +26 -25
  518. data/spec/functional/shell_spec.rb +10 -6
  519. data/spec/functional/version_spec.rb +4 -4
  520. data/spec/functional/win32/crypto_spec.rb +1 -1
  521. data/spec/functional/win32/registry_spec.rb +8 -8
  522. data/spec/functional/win32/service_manager_spec.rb +1 -1
  523. data/spec/integration/client/client_spec.rb +6 -5
  524. data/spec/integration/client/exit_code_spec.rb +3 -2
  525. data/spec/integration/client/fips_spec.rb +21 -0
  526. data/spec/integration/client/ipv6_spec.rb +1 -1
  527. data/spec/integration/compliance/compliance_spec.rb +82 -0
  528. data/spec/integration/knife/client_key_create_spec.rb +1 -1
  529. data/spec/integration/knife/common_options_spec.rb +12 -12
  530. data/spec/integration/knife/config_list_spec.rb +220 -0
  531. data/spec/integration/knife/config_show_spec.rb +192 -0
  532. data/spec/integration/knife/config_use_spec.rb +198 -0
  533. data/spec/integration/knife/cookbook_api_ipv6_spec.rb +1 -1
  534. data/spec/integration/knife/cookbook_upload_spec.rb +28 -1
  535. data/spec/integration/knife/data_bag_from_file_spec.rb +1 -1
  536. data/spec/integration/knife/delete_spec.rb +1 -1
  537. data/spec/integration/knife/diff_spec.rb +3 -1
  538. data/spec/integration/knife/download_spec.rb +5 -3
  539. data/spec/integration/knife/environment_from_file_spec.rb +1 -1
  540. data/spec/integration/knife/node_create_spec.rb +1 -1
  541. data/spec/integration/knife/node_environment_set_spec.rb +1 -1
  542. data/spec/integration/knife/node_from_file_spec.rb +1 -1
  543. data/spec/integration/knife/node_run_list_add_spec.rb +4 -4
  544. data/spec/integration/knife/node_run_list_remove_spec.rb +1 -1
  545. data/spec/integration/knife/node_run_list_set_spec.rb +1 -1
  546. data/spec/integration/knife/node_show_spec.rb +1 -1
  547. data/spec/integration/knife/role_from_file_spec.rb +1 -1
  548. data/spec/integration/knife/serve_spec.rb +5 -5
  549. data/spec/integration/knife/upload_spec.rb +8 -7
  550. data/spec/integration/ohai/ohai_spec.rb +61 -0
  551. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  552. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +2 -2
  553. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  554. data/spec/integration/recipes/notifies_spec.rb +2 -2
  555. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  556. data/spec/integration/recipes/provider_choice.rb +2 -2
  557. data/spec/integration/recipes/recipe_dsl_spec.rb +6 -1
  558. data/spec/integration/recipes/remote_directory.rb +1 -1
  559. data/spec/integration/recipes/resource_action_spec.rb +14 -0
  560. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  561. data/spec/integration/recipes/resource_load_spec.rb +4 -2
  562. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  563. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  564. data/spec/integration/solo/solo_spec.rb +5 -5
  565. data/spec/spec_helper.rb +30 -17
  566. data/spec/stress/win32/file_spec.rb +1 -1
  567. data/spec/support/chef_helpers.rb +3 -22
  568. data/spec/support/lib/chef/resource/cat.rb +1 -1
  569. data/spec/support/lib/chef/resource/one_two_three_four.rb +1 -1
  570. data/spec/support/matchers/leak.rb +2 -2
  571. data/spec/support/mock/platform.rb +24 -16
  572. data/spec/support/platform_helpers.rb +36 -41
  573. data/spec/support/platforms/win32/spec_service.rb +2 -2
  574. data/spec/support/shared/functional/directory_resource.rb +1 -1
  575. data/spec/support/shared/functional/execute_resource.rb +2 -2
  576. data/spec/support/shared/functional/file_resource.rb +20 -21
  577. data/spec/support/shared/functional/securable_resource.rb +109 -29
  578. data/spec/support/shared/functional/securable_resource_with_reporting.rb +0 -1
  579. data/spec/support/shared/functional/win32_service.rb +2 -2
  580. data/spec/support/shared/functional/windows_script.rb +5 -5
  581. data/spec/support/shared/integration/integration_helper.rb +22 -52
  582. data/spec/support/shared/integration/knife_support.rb +2 -9
  583. data/spec/support/shared/unit/application_dot_d.rb +5 -4
  584. data/spec/support/shared/unit/execute_resource.rb +1 -1
  585. data/spec/support/shared/unit/knife_shared.rb +1 -1
  586. data/spec/support/shared/unit/provider/file.rb +26 -8
  587. data/spec/support/shared/unit/script_resource.rb +10 -24
  588. data/spec/support/shared/unit/windows_script_resource.rb +16 -29
  589. data/spec/tiny_server.rb +0 -1
  590. data/spec/unit/application/client_spec.rb +2 -2
  591. data/spec/unit/application/exit_code_spec.rb +10 -0
  592. data/spec/unit/application/solo_spec.rb +4 -2
  593. data/spec/unit/application_spec.rb +15 -8
  594. data/spec/unit/chef_fs/config_spec.rb +3 -3
  595. data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
  596. data/spec/unit/chef_fs/diff_spec.rb +8 -8
  597. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  598. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +6 -2
  599. data/spec/unit/chef_fs/path_util_spec.rb +1 -1
  600. data/spec/unit/client_spec.rb +25 -5
  601. data/spec/unit/compliance/fetcher/automate_spec.rb +142 -0
  602. data/spec/unit/compliance/fetcher/chef_server_spec.rb +93 -0
  603. data/spec/unit/compliance/reporter/automate_spec.rb +427 -0
  604. data/spec/unit/compliance/reporter/chef_server_automate_spec.rb +177 -0
  605. data/spec/unit/compliance/reporter/compliance_enforcer_spec.rb +48 -0
  606. data/spec/unit/compliance/runner_spec.rb +215 -0
  607. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  608. data/spec/unit/cookbook/synchronizer_spec.rb +28 -26
  609. data/spec/unit/cookbook_spec.rb +2 -2
  610. data/spec/unit/cookbook_version_spec.rb +52 -0
  611. data/spec/unit/daemon_spec.rb +1 -5
  612. data/spec/unit/data_bag_spec.rb +6 -3
  613. data/spec/unit/data_collector/config_validation_spec.rb +208 -0
  614. data/spec/unit/data_collector_spec.rb +100 -120
  615. data/spec/unit/decorator_spec.rb +23 -23
  616. data/spec/unit/dsl/declare_resource_spec.rb +1 -1
  617. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  618. data/spec/unit/dsl/reboot_pending_spec.rb +2 -2
  619. data/spec/unit/environment_spec.rb +12 -8
  620. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  621. data/spec/unit/file_access_control_spec.rb +1 -1
  622. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +2 -2
  623. data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +11 -11
  624. data/spec/unit/guard_interpreter_spec.rb +1 -1
  625. data/spec/unit/http/api_versions_spec.rb +20 -2
  626. data/spec/unit/http/ssl_policies_spec.rb +125 -66
  627. data/spec/unit/json_compat_spec.rb +1 -1
  628. data/spec/unit/knife/bootstrap_spec.rb +69 -45
  629. data/spec/unit/knife/client_create_spec.rb +2 -2
  630. data/spec/unit/knife/configure_client_spec.rb +5 -5
  631. data/spec/unit/knife/configure_spec.rb +3 -3
  632. data/spec/unit/knife/cookbook_delete_spec.rb +2 -2
  633. data/spec/unit/knife/cookbook_download_spec.rb +8 -8
  634. data/spec/unit/knife/cookbook_list_spec.rb +2 -2
  635. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
  636. data/spec/unit/knife/cookbook_metadata_spec.rb +3 -3
  637. data/spec/unit/knife/cookbook_show_spec.rb +6 -7
  638. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  639. data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
  640. data/spec/unit/knife/core/node_editor_spec.rb +1 -1
  641. data/spec/unit/knife/core/status_presenter_spec.rb +54 -0
  642. data/spec/unit/knife/core/ui_spec.rb +1 -0
  643. data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +24 -15
  644. data/spec/unit/knife/data_bag_edit_spec.rb +1 -1
  645. data/spec/unit/knife/environment_compare_spec.rb +3 -3
  646. data/spec/unit/knife/ssh_spec.rb +2 -2
  647. data/spec/unit/knife/supermarket_download_spec.rb +8 -8
  648. data/spec/unit/knife/supermarket_list_spec.rb +3 -3
  649. data/spec/unit/knife/supermarket_search_spec.rb +1 -1
  650. data/spec/unit/knife/supermarket_share_spec.rb +6 -7
  651. data/spec/unit/knife/tag_create_spec.rb +1 -1
  652. data/spec/unit/knife/tag_delete_spec.rb +1 -1
  653. data/spec/unit/knife/user_create_spec.rb +1 -1
  654. data/spec/unit/log/syslog_spec.rb +6 -10
  655. data/spec/unit/log/winevt_spec.rb +21 -13
  656. data/spec/unit/lwrp_spec.rb +12 -9
  657. data/spec/unit/mixin/checksum_spec.rb +28 -0
  658. data/spec/unit/mixin/deep_merge_spec.rb +15 -0
  659. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  660. data/spec/unit/mixin/openssl_helper_spec.rb +1 -8
  661. data/spec/unit/mixin/powershell_exec_spec.rb +43 -6
  662. data/spec/unit/mixin/powershell_out_spec.rb +16 -4
  663. data/spec/unit/mixin/powershell_type_coercions_spec.rb +1 -1
  664. data/spec/unit/mixin/securable_spec.rb +2 -3
  665. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  666. data/spec/unit/mixin/subclass_directive_spec.rb +2 -2
  667. data/spec/unit/mixin/template_spec.rb +30 -30
  668. data/spec/unit/mixin/unformatter_spec.rb +2 -2
  669. data/spec/unit/mixin/uris_spec.rb +1 -1
  670. data/spec/unit/mixin/user_context_spec.rb +1 -9
  671. data/spec/unit/mixin/which.rb +9 -1
  672. data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
  673. data/spec/unit/node/immutable_collections_spec.rb +8 -4
  674. data/spec/unit/node_spec.rb +103 -16
  675. data/spec/unit/platform/query_helpers_spec.rb +13 -14
  676. data/spec/unit/policy_builder/policyfile_spec.rb +11 -1
  677. data/spec/unit/property_spec.rb +6 -6
  678. data/spec/unit/provider/batch_spec.rb +130 -0
  679. data/spec/unit/provider/cron/unix_spec.rb +1 -1
  680. data/spec/unit/provider/cron_spec.rb +43 -49
  681. data/spec/unit/provider/dsc_resource_spec.rb +30 -63
  682. data/spec/unit/provider/dsc_script_spec.rb +11 -11
  683. data/spec/unit/provider/execute_spec.rb +1 -8
  684. data/spec/unit/provider/git_spec.rb +3 -3
  685. data/spec/unit/provider/group/windows_spec.rb +6 -0
  686. data/spec/unit/provider/group_spec.rb +1 -1
  687. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  688. data/spec/unit/provider/mdadm_spec.rb +1 -3
  689. data/spec/unit/provider/mount/linux_spec.rb +107 -0
  690. data/spec/unit/provider/mount/mount_spec.rb +73 -10
  691. data/spec/unit/provider/mount/solaris_spec.rb +1 -1
  692. data/spec/unit/provider/mount/windows_spec.rb +1 -0
  693. data/spec/unit/provider/mount_spec.rb +31 -0
  694. data/spec/unit/provider/package/chocolatey_spec.rb +2 -3
  695. data/spec/unit/provider/package/dnf/python_helper_spec.rb +8 -2
  696. data/spec/unit/provider/package/freebsd/pkgng_spec.rb +1 -1
  697. data/spec/unit/provider/package/openbsd_spec.rb +1 -1
  698. data/spec/unit/provider/package/pacman_spec.rb +17 -20
  699. data/spec/unit/provider/package/powershell_spec.rb +162 -99
  700. data/spec/unit/provider/package/rubygems_spec.rb +50 -20
  701. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  702. data/spec/unit/provider/package/snap_spec.rb +1 -1
  703. data/spec/unit/provider/package/windows/registry_uninstall_entry_spec.rb +3 -3
  704. data/spec/unit/provider/package/windows_spec.rb +30 -53
  705. data/spec/unit/provider/package/zypper_spec.rb +0 -25
  706. data/spec/unit/provider/package_spec.rb +2 -2
  707. data/spec/unit/provider/powershell_script_spec.rb +20 -44
  708. data/spec/unit/provider/remote_directory_spec.rb +9 -9
  709. data/spec/unit/provider/route_spec.rb +0 -2
  710. data/spec/unit/provider/script_spec.rb +20 -110
  711. data/spec/unit/provider/service/arch_service_spec.rb +3 -2
  712. data/spec/unit/provider/service/debian_service_spec.rb +1 -1
  713. data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
  714. data/spec/unit/provider/service/macosx_spec.rb +6 -6
  715. data/spec/unit/provider/service/redhat_spec.rb +3 -3
  716. data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
  717. data/spec/unit/provider/service/windows_spec.rb +2 -6
  718. data/spec/unit/provider/subversion_spec.rb +0 -3
  719. data/spec/unit/provider/systemd_unit_spec.rb +29 -25
  720. data/spec/unit/provider/user/dscl_spec.rb +2 -2
  721. data/spec/unit/provider/user_spec.rb +7 -1
  722. data/spec/unit/provider/windows_env_spec.rb +22 -37
  723. data/spec/unit/provider/windows_path_spec.rb +6 -11
  724. data/spec/unit/provider/windows_task_spec.rb +7 -6
  725. data/spec/unit/provider/zypper_repository_spec.rb +60 -10
  726. data/spec/unit/provider_spec.rb +1 -0
  727. data/spec/unit/recipe_spec.rb +1 -1
  728. data/spec/unit/resource/archive_file_spec.rb +23 -2
  729. data/spec/unit/resource/batch_spec.rb +6 -6
  730. data/spec/unit/resource/breakpoint_spec.rb +1 -1
  731. data/spec/unit/resource/build_essential_spec.rb +0 -12
  732. data/spec/unit/resource/chef_client_config_spec.rb +137 -0
  733. data/spec/unit/resource/chef_client_cron_spec.rb +51 -14
  734. data/spec/unit/resource/chef_client_launchd_spec.rb +127 -0
  735. data/spec/unit/resource/chef_client_scheduled_task_spec.rb +17 -7
  736. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +43 -5
  737. data/spec/unit/resource/chef_client_trusted_certificate_spec.rb +68 -0
  738. data/spec/unit/resource/cron_spec.rb +2 -2
  739. data/spec/unit/resource/execute_spec.rb +123 -118
  740. data/spec/unit/resource/file/verification_spec.rb +2 -1
  741. data/spec/unit/resource/helpers/cron_validations_spec.rb +5 -1
  742. data/spec/unit/resource/homebrew_cask_spec.rb +29 -11
  743. data/spec/unit/resource/homebrew_update_spec.rb +30 -0
  744. data/spec/unit/resource/ifconfig_spec.rb +2 -10
  745. data/spec/unit/resource/launchd_spec.rb +8 -0
  746. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  747. data/spec/unit/resource/mount_spec.rb +28 -5
  748. data/spec/unit/resource/osx_profile_spec.rb +299 -0
  749. data/spec/unit/resource/powershell_package_source_spec.rb +20 -20
  750. data/spec/unit/resource/powershell_script_spec.rb +15 -108
  751. data/spec/unit/resource/rhsm_register_spec.rb +56 -18
  752. data/spec/unit/resource/rhsm_subscription_spec.rb +50 -3
  753. data/spec/unit/resource/script_spec.rb +6 -1
  754. data/spec/unit/resource/service_spec.rb +2 -2
  755. data/spec/unit/resource/solaris_package_spec.rb +8 -10
  756. data/spec/unit/resource/systemd_unit_spec.rb +1 -1
  757. data/spec/unit/resource/timezone_spec.rb +64 -1
  758. data/spec/unit/{log_spec.rb → resource/user/windows_user_spec.rb} +16 -4
  759. data/spec/unit/resource/user_ulimit_spec.rb +14 -1
  760. data/spec/unit/resource/windows_audit_policy_spec.rb +64 -0
  761. data/spec/unit/resource/windows_certificate_spec.rb +12 -0
  762. data/spec/unit/resource/windows_dns_record_spec.rb +3 -3
  763. data/spec/unit/resource/windows_dns_zone_spec.rb +2 -2
  764. data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
  765. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  766. data/spec/unit/resource/windows_package_spec.rb +1 -0
  767. data/spec/unit/resource/windows_task_spec.rb +1 -1
  768. data/spec/unit/resource/windows_uac_spec.rb +3 -3
  769. data/spec/unit/resource/windows_user_privilege_spec.rb +55 -0
  770. data/spec/unit/resource/yum_repository_spec.rb +21 -21
  771. data/spec/unit/resource_inspector_spec.rb +10 -5
  772. data/spec/unit/resource_reporter_spec.rb +1 -1
  773. data/spec/unit/resource_spec.rb +137 -3
  774. data/spec/unit/role_spec.rb +30 -28
  775. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  776. data/spec/unit/run_lock_spec.rb +6 -2
  777. data/spec/unit/runner_spec.rb +1 -2
  778. data/spec/unit/scan_access_control_spec.rb +1 -1
  779. data/spec/unit/server_api_spec.rb +43 -16
  780. data/spec/unit/shell/shell_ext_spec.rb +46 -3
  781. data/spec/unit/shell/shell_session_spec.rb +35 -64
  782. data/spec/unit/shell_spec.rb +18 -21
  783. data/spec/unit/train_transport_spec.rb +14 -13
  784. data/spec/unit/util/backup_spec.rb +1 -1
  785. data/spec/unit/util/diff_spec.rb +1 -15
  786. data/spec/unit/util/dsc/configuration_generator_spec.rb +80 -1
  787. data/spec/unit/util/dsc/local_configuration_manager_spec.rb +27 -35
  788. data/spec/unit/util/powershell/ps_credential_spec.rb +2 -2
  789. data/spec/unit/util/selinux_spec.rb +4 -1
  790. data/spec/unit/util/threaded_job_queue_spec.rb +9 -0
  791. data/spec/unit/win32/security_spec.rb +4 -3
  792. data/tasks/rspec.rb +2 -4
  793. metadata +172 -104
  794. data/lib/chef/dist.rb +0 -68
  795. data/lib/chef/monkey_patches/net_http.rb +0 -22
  796. data/lib/chef/provider/osx_profile.rb +0 -255
  797. data/lib/chef/provider/windows_env.rb +0 -210
  798. data/lib/chef/provider/windows_path.rb +0 -61
  799. data/lib/chef/provider/windows_task.rb +0 -635
  800. data/lib/chef/resource/cron.rb +0 -157
  801. data/lib/chef/util/powershell/cmdlet.rb +0 -173
  802. data/lib/chef/util/powershell/cmdlet_result.rb +0 -61
  803. data/spec/data/trusted_certs_empty/.gitkeep +0 -0
  804. data/spec/data/trusted_certs_empty/README.md +0 -1
  805. data/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 +0 -0
  806. data/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz +0 -0
  807. data/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 +0 -0
  808. data/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 +0 -0
  809. data/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz +0 -0
  810. data/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz +0 -0
  811. data/spec/functional/util/powershell/cmdlet_spec.rb +0 -111
  812. data/spec/integration/knife/config_get_profile_spec.rb +0 -113
  813. data/spec/integration/knife/config_get_spec.rb +0 -191
  814. data/spec/integration/knife/config_list_profiles_spec.rb +0 -190
  815. data/spec/integration/knife/config_use_profile_spec.rb +0 -101
  816. data/spec/scripts/ssl-serve.rb +0 -47
  817. data/spec/support/mock/constant.rb +0 -52
  818. data/spec/unit/provider/osx_profile_spec.rb +0 -255
  819. data/spec/unit/provider_resolver_spec.rb +0 -885
  820. data/spec/unit/resource/data/InstallHistory_with_CLT.plist +0 -92
  821. data/spec/unit/resource/data/InstallHistory_without_CLT.plist +0 -38
  822. data/spec/unit/util/powershell/cmdlet_spec.rb +0 -106
@@ -19,11 +19,11 @@
19
19
  # limitations under the License.
20
20
  #
21
21
 
22
- require_relative "../json_compat"
23
-
24
22
  class Chef
25
23
  class Resource
26
24
  class WindowsFirewallRule < Chef::Resource
25
+ unified_mode true
26
+
27
27
  provides :windows_firewall_rule
28
28
 
29
29
  description "Use the **windows_firewall_rule** resource to create, change or remove Windows firewall rules."
@@ -157,11 +157,11 @@ class Chef
157
157
 
158
158
  load_current_value do
159
159
  load_state_cmd = load_firewall_state(rule_name)
160
- output = powershell_out(load_state_cmd)
161
- if output.stdout.empty?
160
+ output = powershell_exec(load_state_cmd)
161
+ if output.result.empty?
162
162
  current_value_does_not_exist!
163
163
  else
164
- state = Chef::JSONCompat.from_json(output.stdout)
164
+ state = output.result
165
165
  end
166
166
 
167
167
  # Need to reverse `$rule.Profile.ToString()` in powershell command
@@ -192,17 +192,17 @@ class Chef
192
192
  :remote_port, :direction, :protocol, :icmp_type, :firewall_action, :profile, :program, :service,
193
193
  :interface_type, :enabled do
194
194
  cmd = firewall_command("Set")
195
- powershell_out!(cmd)
195
+ powershell_exec!(cmd)
196
196
  end
197
197
  converge_if_changed :group do
198
- powershell_out!("Remove-NetFirewallRule -Name '#{new_resource.rule_name}'")
198
+ powershell_exec!("Remove-NetFirewallRule -Name '#{new_resource.rule_name}'")
199
199
  cmd = firewall_command("New")
200
- powershell_out!(cmd)
200
+ powershell_exec!(cmd)
201
201
  end
202
202
  else
203
203
  converge_by("create firewall rule #{new_resource.rule_name}") do
204
204
  cmd = firewall_command("New")
205
- powershell_out!(cmd)
205
+ powershell_exec!(cmd)
206
206
  end
207
207
  end
208
208
  end
@@ -212,7 +212,7 @@ class Chef
212
212
 
213
213
  if current_resource
214
214
  converge_by("delete firewall rule #{new_resource.rule_name}") do
215
- powershell_out!("Remove-NetFirewallRule -Name '#{new_resource.rule_name}'")
215
+ powershell_exec!("Remove-NetFirewallRule -Name '#{new_resource.rule_name}'")
216
216
  end
217
217
  else
218
218
  Chef::Log.info("Firewall rule \"#{new_resource.rule_name}\" doesn't exist. Skipping.")
@@ -273,11 +273,11 @@ class Chef
273
273
  requirements.assert(:create) do |a|
274
274
  a.assertion do
275
275
  if new_resource.icmp_type.is_a?(Integer)
276
- (0..255).include?(new_resource.icmp_type)
276
+ (0..255).cover?(new_resource.icmp_type)
277
277
  elsif new_resource.icmp_type.is_a?(String) && !new_resource.icmp_type.include?(":") && new_resource.protocol.start_with?("ICMP")
278
- (0..255).include?(new_resource.icmp_type.to_i)
278
+ (0..255).cover?(new_resource.icmp_type.to_i)
279
279
  elsif new_resource.icmp_type.is_a?(String) && new_resource.icmp_type.include?(":") && new_resource.protocol.start_with?("ICMP")
280
- new_resource.icmp_type.split(":").all? { |type| (0..255).include?(type.to_i) }
280
+ new_resource.icmp_type.split(":").all? { |type| (0..255).cover?(type.to_i) }
281
281
  else
282
282
  true
283
283
  end
@@ -318,7 +318,7 @@ class Chef
318
318
  service = $serviceFilter.Service
319
319
  interface_type = $interfaceTypeFilter.InterfaceType.ToString()
320
320
  enabled = [bool]::Parse($rule.Enabled.ToString())
321
- }) | ConvertTo-Json
321
+ })
322
322
  EOH
323
323
  end
324
324
  end
@@ -21,6 +21,7 @@ class Chef
21
21
  class Resource
22
22
  class WindowsFont < Chef::Resource
23
23
  require_relative "../util/path_helper"
24
+ unified_mode true
24
25
 
25
26
  provides(:windows_font) { true }
26
27
 
@@ -31,7 +32,7 @@ class Chef
31
32
 
32
33
  ```ruby
33
34
  windows_font 'Custom.otf' do
34
- source "https://example.com/Custom.otf"
35
+ source 'https://example.com/Custom.otf'
35
36
  end
36
37
  ```
37
38
  DOC
@@ -42,7 +43,7 @@ class Chef
42
43
 
43
44
  property :source, String,
44
45
  description: "A local filesystem path or URI that is used to source the font file.",
45
- coerce: proc { |x| x =~ /^.:.*/ ? x.tr('\\', "/").gsub("//", "/") : x }
46
+ coerce: proc { |x| /^.:.*/.match?(x) ? x.tr('\\', "/").gsub("//", "/") : x }
46
47
 
47
48
  action :install do
48
49
  description "Install a font to the system fonts directory."
@@ -84,7 +85,7 @@ class Chef
84
85
 
85
86
  # install the font into the appropriate fonts directory
86
87
  def install_font
87
- require "win32ole" if RUBY_PLATFORM =~ /mswin|mingw32|windows/
88
+ require "win32ole" if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
88
89
  fonts_dir = Chef::Util::PathHelper.join(ENV["windir"], "fonts")
89
90
  folder = WIN32OLE.new("Shell.Application").Namespace(fonts_dir)
90
91
  converge_by("install font #{new_resource.font_name} to #{fonts_dir}") do
@@ -96,10 +97,11 @@ class Chef
96
97
  #
97
98
  # @return [Boolean] Is the font is installed?
98
99
  def font_exists?
99
- require "win32ole" if RUBY_PLATFORM =~ /mswin|mingw32|windows/
100
+ require "win32ole" if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
100
101
  fonts_dir = WIN32OLE.new("WScript.Shell").SpecialFolders("Fonts")
102
+ fonts_dir_local = Chef::Util::PathHelper.join(ENV["home"], "AppData/Local/Microsoft/Windows/fonts")
101
103
  logger.trace("Seeing if the font at #{Chef::Util::PathHelper.join(fonts_dir, new_resource.font_name)} exists")
102
- ::File.exist?(Chef::Util::PathHelper.join(fonts_dir, new_resource.font_name))
104
+ ::File.exist?(Chef::Util::PathHelper.join(fonts_dir, new_resource.font_name)) || ::File.exist?(Chef::Util::PathHelper.join(fonts_dir_local, new_resource.font_name))
103
105
  end
104
106
 
105
107
  # Parse out the schema provided to us to see if it's one we support via remote_file.
@@ -19,18 +19,42 @@
19
19
  require_relative "../mixin/uris"
20
20
  require_relative "package"
21
21
  require_relative "../provider/package/windows"
22
- require_relative "../win32/error" if RUBY_PLATFORM =~ /mswin|mingw|windows/
23
- require_relative "../dist"
22
+ require_relative "../win32/error" if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
23
+ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
24
24
 
25
25
  class Chef
26
26
  class Resource
27
27
  class WindowsPackage < Chef::Resource::Package
28
28
  include Chef::Mixin::Uris
29
+ unified_mode true
29
30
 
30
31
  provides(:windows_package) { true }
31
32
  provides :package, os: "windows"
32
33
 
33
- description "Use the **windows_package** resource to manage packages on the Microsoft Windows platform. The windows_package resource supports these installer formats:\n\n Microsoft Installer Package (MSI)\n Nullsoft Scriptable Install System (NSIS)\n Inno Setup (inno)\n Wise\n InstallShield\n Custom installers such as installing a non-.msi file that embeds an .msi-based installer\n"
34
+ description <<~DESC
35
+ Use the **windows_package** resource to manage packages on the Microsoft Windows platform.
36
+ The **windows_package** resource supports these installer formats:
37
+ * Microsoft Installer Package (MSI)
38
+ * Nullsoft Scriptable Install System (NSIS)
39
+ * Inno Setup (inno)
40
+ * Wise
41
+ * InstallShield
42
+ * Custom installers such as installing a non-.msi file that embeds an .msi-based installer
43
+
44
+ To enable idempotence of the `:install` action or to enable the `:remove` action with no source property specified,
45
+ `package_name` MUST be an exact match of the name used by the package installer. The names of installed packages
46
+ Windows knows about can be found in **Add/Remove programs**, in the output of `ohai packages`, or in the
47
+ `DisplayName` property in one of the following in the Windows registry:
48
+
49
+ * `HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall`
50
+ * `HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall`
51
+ * `HKEY_LOCAL_MACHINE\\Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall`
52
+
53
+ Note: If there are multiple versions of a package installed with the same display name, all of those packages will
54
+ be removed unless a version is provided in the **version** property or unless it can be discovered in the installer
55
+ file specified by the **source** property.
56
+ DESC
57
+
34
58
  introduced "11.12"
35
59
  examples <<~DOC
36
60
  **Install a package**:
@@ -135,15 +159,15 @@ class Chef
135
159
  end
136
160
  end),
137
161
  default_description: "The resource block's name", # this property is basically a name_property but not really so we need to spell it out
138
- description: "The path to a package in the local file system. The location of the package may be at a URL."
162
+ description: "The path to a package in the local file system or the URL of a remote file that will be downloaded."
139
163
 
140
164
  property :checksum, String,
141
165
  desired_state: false, coerce: (proc { |c| c.downcase }),
142
- description: "The SHA-256 checksum of the file. Use to prevent a file from being re-downloaded. When the local file matches the checksum, #{Chef::Dist::PRODUCT} does not download it. Use when a URL is specified by the `source` property."
166
+ description: "The SHA-256 checksum of the file. Use to prevent a file from being re-downloaded. When the local file matches the checksum, #{ChefUtils::Dist::Infra::PRODUCT} does not download it. Use when a URL is specified by the `source` property."
143
167
 
144
168
  property :remote_file_attributes, Hash,
145
169
  desired_state: false,
146
- description: "If the source package to install is at a remote location this property allows you to define a hash of properties and their value which will be used by the underlying remote_file resource, which fetches the source."
170
+ description: "If the source package to install is at a remote location, this property allows you to define a hash of properties which will be used by the underlying **remote_file** resource used to fetch the source."
147
171
  end
148
172
  end
149
173
  end
@@ -20,6 +20,8 @@ require_relative "../resource"
20
20
  class Chef
21
21
  class Resource
22
22
  class WindowsPagefile < Chef::Resource
23
+ unified_mode true
24
+
23
25
  provides(:windows_pagefile) { true }
24
26
 
25
27
  description "Use the **windows_pagefile** resource to configure pagefile settings on Windows."
@@ -109,11 +111,13 @@ class Chef
109
111
  end
110
112
 
111
113
  action_class do
114
+ private
115
+
112
116
  # make sure the provided name property matches the appropriate format
113
117
  # we do this here and not in the property itself because if automatic_managed
114
118
  # is set then this validation is not necessary / doesn't make sense at all
115
119
  def validate_name
116
- return if /^.:.*.sys/ =~ new_resource.path
120
+ return if /^.:.*.sys/.match?(new_resource.path)
117
121
 
118
122
  raise "#{new_resource.path} does not match the format DRIVE:\\path\\file.sys for pagefiles. Example: C:\\pagefile.sys"
119
123
  end
@@ -16,11 +16,15 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
+ require_relative "../mixin/windows_env_helper" if ChefUtils.windows?
20
+ require_relative "../mixin/wide_string"
19
21
  require_relative "../resource"
20
22
 
21
23
  class Chef
22
24
  class Resource
23
25
  class WindowsPath < Chef::Resource
26
+ unified_mode true
27
+
24
28
  provides(:windows_path) { true }
25
29
 
26
30
  description "Use the **windows_path** resource to manage the path environment variable on Microsoft Windows."
@@ -49,6 +53,40 @@ class Chef
49
53
  property :path, String,
50
54
  description: "An optional property to set the path value if it differs from the resource block's name.",
51
55
  name_property: true
56
+
57
+ action_class do
58
+ include Chef::Mixin::WindowsEnvHelper if ChefUtils.windows?
59
+
60
+ def load_current_resource
61
+ @current_resource = Chef::Resource::WindowsPath.new(new_resource.name)
62
+ @current_resource.path(new_resource.path)
63
+ @current_resource
64
+ end
65
+ end
66
+
67
+ action :add do
68
+ # The windows Env provider does not correctly expand variables in
69
+ # the PATH environment variable. Ruby expects these to be expanded.
70
+ #
71
+ path = expand_path(new_resource.path)
72
+ env "path" do
73
+ action :modify
74
+ delim ::File::PATH_SEPARATOR
75
+ value path.tr("/", '\\')
76
+ end
77
+ end
78
+
79
+ action :remove do
80
+ # The windows Env provider does not correctly expand variables in
81
+ # the PATH environment variable. Ruby expects these to be expanded.
82
+ #
83
+ path = expand_path(new_resource.path)
84
+ env "path" do
85
+ action :delete
86
+ delim ::File::PATH_SEPARATOR
87
+ value path.tr("/", '\\')
88
+ end
89
+ end
52
90
  end
53
91
  end
54
92
  end
@@ -22,7 +22,9 @@ require_relative "../resource"
22
22
  class Chef
23
23
  class Resource
24
24
  class WindowsPrinter < Chef::Resource
25
- require "resolv"
25
+ unified_mode true
26
+
27
+ autoload :Resolv, "resolv"
26
28
 
27
29
  provides(:windows_printer) { true }
28
30
 
@@ -76,34 +78,22 @@ class Chef
76
78
 
77
79
  property :ipv4_address, String,
78
80
  description: "The IPv4 address of the printer, such as `10.4.64.23`",
79
- validation_message: "The ipv4_address property must be in the IPv4 format of `WWW.XXX.YYY.ZZZ`",
80
- regex: Resolv::IPv4::Regex
81
-
82
- property :exists, [TrueClass, FalseClass],
83
- skip_docs: true
81
+ callbacks: {
82
+ "The ipv4_address property must be in the IPv4 format of `WWW.XXX.YYY.ZZZ`" =>
83
+ proc { |v| v.match(Resolv::IPv4::Regex) },
84
+ }
84
85
 
85
86
  PRINTERS_REG_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers\\'.freeze unless defined?(PRINTERS_REG_KEY)
86
87
 
87
- # does the printer exist
88
- #
89
- # @param [String] name the name of the printer
90
- # @return [Boolean]
91
- def printer_exists?(name)
92
- printer_reg_key = PRINTERS_REG_KEY + name
93
- logger.trace "Checking to see if this reg key exists: '#{printer_reg_key}'"
94
- registry_key_exists?(printer_reg_key)
95
- end
96
-
97
88
  # @todo Set @current_resource printer properties from registry
98
89
  load_current_value do |desired|
99
90
  name desired.name
100
- exists printer_exists?(desired.name)
101
91
  end
102
92
 
103
93
  action :create do
104
94
  description "Create a new printer and a printer port if one doesn't already exist."
105
95
 
106
- if @current_resource.exists
96
+ if printer_exists?
107
97
  Chef::Log.info "#{@new_resource} already exists - nothing to do."
108
98
  else
109
99
  converge_by("Create #{@new_resource}") do
@@ -115,7 +105,7 @@ class Chef
115
105
  action :delete do
116
106
  description "Delete an existing printer. Note this does not delete the associated printer port."
117
107
 
118
- if @current_resource.exists
108
+ if printer_exists?
119
109
  converge_by("Delete #{@new_resource}") do
120
110
  delete_printer
121
111
  end
@@ -125,11 +115,22 @@ class Chef
125
115
  end
126
116
 
127
117
  action_class do
118
+ private
119
+
120
+ # does the printer exist
121
+ #
122
+ # @param [String] name the name of the printer
123
+ # @return [Boolean]
124
+ def printer_exists?
125
+ printer_reg_key = PRINTERS_REG_KEY + new_resource.name
126
+ logger.trace "Checking to see if this reg key exists: '#{printer_reg_key}'"
127
+ registry_key_exists?(printer_reg_key)
128
+ end
129
+
128
130
  # creates the printer port and then the printer
129
131
  def create_printer
130
132
  # Create the printer port first
131
- windows_printer_port new_resource.ipv4_address do
132
- end
133
+ windows_printer_port new_resource.ipv4_address
133
134
 
134
135
  port_name = "IP_#{new_resource.ipv4_address}"
135
136
 
@@ -22,7 +22,9 @@ require_relative "../resource"
22
22
  class Chef
23
23
  class Resource
24
24
  class WindowsPrinterPort < Chef::Resource
25
- require "resolv"
25
+ unified_mode true
26
+
27
+ autoload :Resolv, "resolv"
26
28
 
27
29
  provides(:windows_printer_port) { true }
28
30
 
@@ -59,9 +61,11 @@ class Chef
59
61
 
60
62
  property :ipv4_address, String,
61
63
  name_property: true,
62
- regex: Resolv::IPv4::Regex,
63
- validation_message: "The ipv4_address property must be in the format of WWW.XXX.YYY.ZZZ!",
64
- description: "An optional property for the IPv4 address of the printer if it differs from the resource block's name."
64
+ description: "An optional property for the IPv4 address of the printer if it differs from the resource block's name.",
65
+ callbacks: {
66
+ "The ipv4_address property must be in the format of WWW.XXX.YYY.ZZZ!" =>
67
+ proc { |v| v.match(Resolv::IPv4::Regex) },
68
+ }
65
69
 
66
70
  property :port_name, String,
67
71
  description: "The port name."
@@ -82,30 +86,19 @@ class Chef
82
86
  validation_message: "port_protocol must be either 1 for RAW or 2 for LPR!",
83
87
  default: 1, equal_to: [1, 2]
84
88
 
85
- property :exists, [TrueClass, FalseClass],
86
- skip_docs: true
87
-
88
89
  PORTS_REG_KEY = 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Print\Monitors\Standard TCP/IP Port\Ports\\'.freeze unless defined?(PORTS_REG_KEY)
89
90
 
90
- def port_exists?(name)
91
- port_reg_key = PORTS_REG_KEY + name
92
-
93
- logger.trace "Checking to see if this reg key exists: '#{port_reg_key}'"
94
- registry_key_exists?(port_reg_key)
95
- end
96
-
97
91
  # @todo Set @current_resource port properties from registry
98
92
  load_current_value do |desired|
99
93
  name desired.name
100
94
  ipv4_address desired.ipv4_address
101
95
  port_name desired.port_name || "IP_#{desired.ipv4_address}"
102
- exists port_exists?(desired.port_name || "IP_#{desired.ipv4_address}")
103
96
  end
104
97
 
105
98
  action :create do
106
99
  description "Create the new printer port if it does not already exist."
107
100
 
108
- if current_resource.exists
101
+ if port_exists?
109
102
  Chef::Log.info "#{@new_resource} already exists - nothing to do."
110
103
  else
111
104
  converge_by("Create #{@new_resource}") do
@@ -117,7 +110,7 @@ class Chef
117
110
  action :delete do
118
111
  description "Delete an existing printer port."
119
112
 
120
- if current_resource.exists
113
+ if port_exists?
121
114
  converge_by("Delete #{@new_resource}") do
122
115
  delete_printer_port
123
116
  end
@@ -127,6 +120,16 @@ class Chef
127
120
  end
128
121
 
129
122
  action_class do
123
+ private
124
+
125
+ def port_exists?
126
+ name = new_resource.port_name || "IP_#{new_resource.ipv4_address}"
127
+ port_reg_key = PORTS_REG_KEY + name
128
+
129
+ logger.trace "Checking to see if this reg key exists: '#{port_reg_key}'"
130
+ registry_key_exists?(port_reg_key)
131
+ end
132
+
130
133
  def create_printer_port
131
134
  port_name = new_resource.port_name || "IP_#{new_resource.ipv4_address}"
132
135
 
@@ -16,34 +16,20 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require_relative "../platform/query_helpers"
20
19
  require_relative "script"
21
20
  require_relative "../mixin/windows_architecture_helper"
22
21
 
23
22
  class Chef
24
23
  class Resource
25
24
  class WindowsScript < Chef::Resource::Script
26
- unified_mode true
25
+ include Chef::Mixin::WindowsArchitectureHelper
27
26
 
28
- provides :windows_script
27
+ unified_mode true
29
28
 
30
29
  # This is an abstract resource meant to be subclasses; thus no 'provides'
31
30
 
32
31
  set_guard_inherited_attributes(:architecture)
33
32
 
34
- protected
35
-
36
- def initialize(name, run_context, resource_name, interpreter_command)
37
- super(name, run_context)
38
- @interpreter = interpreter_command
39
- @resource_name = resource_name if resource_name
40
- @default_guard_interpreter = self.resource_name
41
- end
42
-
43
- include Chef::Mixin::WindowsArchitectureHelper
44
-
45
- public
46
-
47
33
  def architecture(arg = nil)
48
34
  assert_architecture_compatible!(arg) unless arg.nil?
49
35
  result = set_or_return(
@@ -17,29 +17,37 @@
17
17
  # limitations under the License.
18
18
 
19
19
  require_relative "../resource"
20
+ require "tempfile" unless defined?(Tempfile)
20
21
 
21
22
  class Chef
22
23
  class Resource
23
24
  class WindowsSecurityPolicy < Chef::Resource
24
- resource_name :windows_security_policy
25
+ unified_mode true
26
+
27
+ provides :windows_security_policy
25
28
 
26
29
  # The valid policy_names options found here
27
30
  # https://github.com/ChrisAWalker/cSecurityOptions under 'AccountSettings'
28
- policy_names = %w{MinimumPasswordAge
29
- MaximumPasswordAge
30
- MinimumPasswordLength
31
- PasswordComplexity
32
- PasswordHistorySize
33
- LockoutBadCount
34
- RequireLogonToChangePassword
35
- ForceLogoffWhenHourExpire
36
- NewAdministratorName
37
- NewGuestName
38
- ClearTextPassword
39
- LSAAnonymousNameLookup
40
- EnableAdminAccount
41
- EnableGuestAccount
42
- }
31
+ # This needs to be revisited - the list at the link above is non-exhaustive and is missing a couple of items
32
+ policy_names = %w{LockoutDuration
33
+ MaximumPasswordAge
34
+ MinimumPasswordAge
35
+ MinimumPasswordLength
36
+ PasswordComplexity
37
+ PasswordHistorySize
38
+ LockoutBadCount
39
+ ResetLockoutCount
40
+ AuditPolicyChange
41
+ LockoutDuration
42
+ RequireLogonToChangePassword
43
+ ForceLogoffWhenHourExpire
44
+ NewAdministratorName
45
+ NewGuestName
46
+ ClearTextPassword
47
+ LSAAnonymousNameLookup
48
+ EnableAdminAccount
49
+ EnableGuestAccount
50
+ }
43
51
  description "Use the **windows_security_policy** resource to set a security policy on the Microsoft Windows platform."
44
52
  introduced "16.0"
45
53
 
@@ -78,42 +86,83 @@ class Chef
78
86
  property :secvalue, String, required: true,
79
87
  description: "Policy value to be set for policy name."
80
88
 
89
+ load_current_value do |desired|
90
+ current_state = load_security_options
91
+
92
+ if desired.secoption == "ResetLockoutCount"
93
+ if desired.secvalue.to_i > 30
94
+ raise Chef::Exceptions::ValidationFailed, "The \"ResetLockoutCount\" value cannot be greater than 30 minutes"
95
+ end
96
+ end
97
+ if (desired.secoption == "ResetLockoutCount" || desired.secoption == "LockoutDuration") && current_state["LockoutBadCount"] == "0"
98
+ raise Chef::Exceptions::ValidationFailed, "#{desired.secoption} cannot be set unless the \"LockoutBadCount\" security policy has been set to a non-zero value"
99
+ end
100
+
101
+ secvalue current_state[desired.secoption.to_s]
102
+ end
103
+
81
104
  action :set do
82
- security_option = new_resource.secoption
83
- security_value = new_resource.secvalue
84
- powershell_script "#{security_option} set to #{security_value}" do
85
- convert_boolean_return true
86
- code <<-EOH
87
- $security_option = "#{security_option}"
88
- if ( ($security_option -match "NewGuestName") -Or ($security_option -match "NewAdministratorName") )
89
- {
90
- $#{security_option}_Remediation = (Get-Content $env:TEMP\\#{security_option}_Export.inf) | Foreach-Object { $_ -replace '#{security_option}\\s*=\\s*\\"\\w*\\"', '#{security_option} = "#{security_value}"' } | Set-Content $env:TEMP\\#{security_option}_Export.inf
91
- C:\\Windows\\System32\\secedit /configure /db $env:windir\\security\\new.sdb /cfg $env:TEMP\\#{security_option}_Export.inf /areas SECURITYPOLICY
92
- }
93
- else
94
- {
95
- $#{security_option}_Remediation = (Get-Content $env:TEMP\\#{security_option}_Export.inf) | Foreach-Object { $_ -replace "#{security_option}\\s*=\\s*\\d*", "#{security_option} = #{security_value}" } | Set-Content $env:TEMP\\#{security_option}_Export.inf
96
- C:\\Windows\\System32\\secedit /configure /db $env:windir\\security\\new.sdb /cfg $env:TEMP\\#{security_option}_Export.inf /areas SECURITYPOLICY
97
- }
98
- Remove-Item $env:TEMP\\#{security_option}_Export.inf -force
99
- EOH
100
- not_if <<-EOH
101
- $#{security_option}_Export = C:\\Windows\\System32\\secedit /export /cfg $env:TEMP\\#{security_option}_Export.inf
102
- $ExportAudit = (Get-Content $env:TEMP\\#{security_option}_Export.inf | Select-String -Pattern #{security_option})
103
- $check_digit = $ExportAudit -match '#{security_option} = #{security_value}'
104
- $check_string = $ExportAudit -match '#{security_option} = "#{security_value}"'
105
- if ( $check_string -Or $check_digit )
106
- {
107
- Remove-Item $env:TEMP\\#{security_option}_Export.inf -force
108
- $true
109
- }
110
- else
111
- {
112
- $false
113
- }
114
- EOH
105
+ converge_if_changed :secvalue do
106
+ security_option = new_resource.secoption
107
+ security_value = new_resource.secvalue
108
+
109
+ file = Tempfile.new(["#{security_option}", ".inf"])
110
+ case security_option
111
+ when "LockoutBadCount"
112
+ cmd = "net accounts /LockoutThreshold:#{security_value}"
113
+ when "ResetLockoutCount"
114
+ cmd = "net accounts /LockoutWindow:#{security_value}"
115
+ when "LockoutDuration"
116
+ cmd = "net accounts /LockoutDuration:#{security_value}"
117
+ when "NewAdministratorName", "NewGuestName"
118
+ policy_line = "#{security_option} = \"#{security_value}\""
119
+ file.write("[Unicode]\r\nUnicode=yes\r\n[System Access]\r\n#{policy_line}\r\n[Version]\r\nsignature=\"$CHICAGO$\"\r\nRevision=1\r\n")
120
+ file.close
121
+ file_path = file.path.gsub("/", '\\')
122
+ cmd = "C:\\Windows\\System32\\secedit /configure /db C:\\windows\\security\\new.sdb /cfg #{file_path} /areas SECURITYPOLICY"
123
+ else
124
+ policy_line = "#{security_option} = #{security_value}"
125
+ file.write("[Unicode]\r\nUnicode=yes\r\n[System Access]\r\n#{policy_line}\r\n[Version]\r\nsignature=\"$CHICAGO$\"\r\nRevision=1\r\n")
126
+ file.close
127
+ file_path = file.path.gsub("/", '\\')
128
+ cmd = "C:\\Windows\\System32\\secedit /configure /db C:\\windows\\security\\new.sdb /cfg #{file_path} /areas SECURITYPOLICY"
129
+ end
130
+ shell_out!(cmd)
131
+ file.unlink
115
132
  end
116
133
  end
134
+
135
+ private
136
+
137
+ # Loads powershell to get current state on security options
138
+ def load_security_options
139
+ powershell_code = <<-CODE
140
+ C:\\Windows\\System32\\secedit /export /cfg $env:TEMP\\secopts_export.inf | Out-Null
141
+ # cspell:disable-next-line
142
+ $security_options_data = (Get-Content $env:TEMP\\secopts_export.inf | Select-String -Pattern "^[CEFLMNPR].* =.*$" | Out-String)
143
+ Remove-Item $env:TEMP\\secopts_export.inf -force
144
+ $security_options_hash = ($security_options_data -Replace '"'| ConvertFrom-StringData)
145
+ ([PSCustomObject]@{
146
+ RequireLogonToChangePassword = $security_options_hash.RequireLogonToChangePassword
147
+ PasswordComplexity = $security_options_hash.PasswordComplexity
148
+ LSAAnonymousNameLookup = $security_options_hash.LSAAnonymousNameLookup
149
+ EnableAdminAccount = $security_options_hash.EnableAdminAccount
150
+ PasswordHistorySize = $security_options_hash.PasswordHistorySize
151
+ MinimumPasswordLength = $security_options_hash.MinimumPasswordLength
152
+ ResetLockoutCount = $security_options_hash.ResetLockoutCount
153
+ MaximumPasswordAge = $security_options_hash.MaximumPasswordAge
154
+ ClearTextPassword = $security_options_hash.ClearTextPassword
155
+ NewAdministratorName = $security_options_hash.NewAdministratorName
156
+ LockoutDuration = $security_options_hash.LockoutDuration
157
+ EnableGuestAccount = $security_options_hash.EnableGuestAccount
158
+ ForceLogoffWhenHourExpire = $security_options_hash.ForceLogoffWhenHourExpire
159
+ MinimumPasswordAge = $security_options_hash.MinimumPasswordAge
160
+ NewGuestName = $security_options_hash.NewGuestName
161
+ LockoutBadCount = $security_options_hash.LockoutBadCount
162
+ })
163
+ CODE
164
+ powershell_exec(powershell_code).result
165
+ end
117
166
  end
118
167
  end
119
168
  end