chef 16.2.73-universal-mingw32 → 16.4.41-universal-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (316) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -4
  3. data/Rakefile +1 -1
  4. data/chef-universal-mingw32.gemspec +2 -3
  5. data/chef.gemspec +2 -1
  6. data/lib/chef/action_collection.rb +4 -0
  7. data/lib/chef/api_client/registration.rb +2 -2
  8. data/lib/chef/application.rb +13 -1
  9. data/lib/chef/application/apply.rb +5 -5
  10. data/lib/chef/application/windows_service.rb +27 -27
  11. data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
  12. data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
  13. data/lib/chef/chef_class.rb +0 -1
  14. data/lib/chef/chef_fs/chef_fs_data_store.rb +54 -54
  15. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
  16. data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
  17. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
  18. data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
  19. data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
  20. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  21. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
  22. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  23. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
  24. data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
  25. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
  26. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  27. data/lib/chef/client.rb +14 -14
  28. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  29. data/lib/chef/cookbook/syntax_check.rb +1 -2
  30. data/lib/chef/cookbook_loader.rb +15 -29
  31. data/lib/chef/data_bag.rb +1 -2
  32. data/lib/chef/data_collector/run_end_message.rb +11 -1
  33. data/lib/chef/deprecated.rb +8 -0
  34. data/lib/chef/dsl/platform_introspection.rb +9 -7
  35. data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
  36. data/lib/chef/environment.rb +3 -4
  37. data/lib/chef/exceptions.rb +4 -1
  38. data/lib/chef/file_content_management/tempfile.rb +9 -9
  39. data/lib/chef/handler.rb +2 -0
  40. data/lib/chef/http.rb +11 -11
  41. data/lib/chef/http/authenticator.rb +3 -1
  42. data/lib/chef/json_compat.rb +1 -1
  43. data/lib/chef/knife.rb +4 -4
  44. data/lib/chef/knife/bootstrap.rb +6 -12
  45. data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
  46. data/lib/chef/knife/config_get.rb +1 -0
  47. data/lib/chef/knife/config_list_profiles.rb +4 -1
  48. data/lib/chef/knife/configure.rb +3 -1
  49. data/lib/chef/knife/cookbook_download.rb +1 -1
  50. data/lib/chef/knife/cookbook_metadata.rb +1 -1
  51. data/lib/chef/knife/cookbook_upload.rb +28 -33
  52. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  53. data/lib/chef/knife/core/generic_presenter.rb +1 -1
  54. data/lib/chef/knife/core/hashed_command_loader.rb +3 -2
  55. data/lib/chef/knife/core/subcommand_loader.rb +20 -1
  56. data/lib/chef/knife/core/ui.rb +8 -2
  57. data/lib/chef/knife/core/windows_bootstrap_context.rb +32 -25
  58. data/lib/chef/knife/delete.rb +15 -15
  59. data/lib/chef/knife/exec.rb +2 -2
  60. data/lib/chef/knife/rehash.rb +3 -21
  61. data/lib/chef/knife/ssh.rb +11 -7
  62. data/lib/chef/knife/xargs.rb +19 -19
  63. data/lib/chef/knife/yaml_convert.rb +1 -1
  64. data/lib/chef/log.rb +7 -2
  65. data/lib/chef/mixin/checksum.rb +0 -1
  66. data/lib/chef/mixin/chef_utils_wiring.rb +40 -0
  67. data/lib/chef/mixin/deep_merge.rb +35 -6
  68. data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
  69. data/lib/chef/mixin/openssl_helper.rb +30 -6
  70. data/lib/chef/mixin/path_sanity.rb +5 -4
  71. data/lib/chef/mixin/shell_out.rb +4 -188
  72. data/lib/chef/mixin/template.rb +1 -0
  73. data/lib/chef/mixin/which.rb +6 -3
  74. data/lib/chef/mixins.rb +1 -0
  75. data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
  76. data/lib/chef/node.rb +36 -12
  77. data/lib/chef/node/attribute.rb +2 -4
  78. data/lib/chef/node_map.rb +21 -18
  79. data/lib/chef/platform/service_helpers.rb +31 -28
  80. data/lib/chef/property.rb +1 -1
  81. data/lib/chef/provider/cron/unix.rb +0 -2
  82. data/lib/chef/provider/git.rb +17 -9
  83. data/lib/chef/provider/group.rb +0 -2
  84. data/lib/chef/provider/group/suse.rb +5 -5
  85. data/lib/chef/provider/ifconfig.rb +1 -4
  86. data/lib/chef/provider/mount.rb +0 -2
  87. data/lib/chef/provider/mount/solaris.rb +0 -1
  88. data/lib/chef/provider/package.rb +0 -2
  89. data/lib/chef/provider/package/rubygems.rb +1 -1
  90. data/lib/chef/provider/package/snap.rb +3 -4
  91. data/lib/chef/provider/package/windows.rb +9 -4
  92. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +9 -9
  93. data/lib/chef/provider/package/zypper.rb +0 -1
  94. data/lib/chef/provider/powershell_script.rb +21 -5
  95. data/lib/chef/provider/route.rb +1 -1
  96. data/lib/chef/provider/service.rb +2 -2
  97. data/lib/chef/provider/service/arch.rb +1 -1
  98. data/lib/chef/provider/service/debian.rb +1 -1
  99. data/lib/chef/provider/service/gentoo.rb +2 -2
  100. data/lib/chef/provider/service/macosx.rb +2 -2
  101. data/lib/chef/provider/service/openbsd.rb +1 -4
  102. data/lib/chef/provider/service/redhat.rb +2 -2
  103. data/lib/chef/provider/service/upstart.rb +1 -1
  104. data/lib/chef/provider/service/windows.rb +10 -10
  105. data/lib/chef/provider/systemd_unit.rb +0 -2
  106. data/lib/chef/provider/template/content.rb +1 -0
  107. data/lib/chef/provider/user/dscl.rb +2 -2
  108. data/lib/chef/provider/user/mac.rb +9 -9
  109. data/lib/chef/provider/windows_task.rb +0 -3
  110. data/lib/chef/provider/yum_repository.rb +1 -1
  111. data/lib/chef/provider/zypper_repository.rb +1 -2
  112. data/lib/chef/providers.rb +0 -1
  113. data/lib/chef/recipe.rb +1 -1
  114. data/lib/chef/resource.rb +8 -10
  115. data/lib/chef/resource/apt_repository.rb +1 -10
  116. data/lib/chef/resource/build_essential.rb +2 -2
  117. data/lib/chef/resource/chef_client_scheduled_task.rb +1 -1
  118. data/lib/chef/resource/chef_client_systemd_timer.rb +2 -2
  119. data/lib/chef/resource/chef_vault_secret.rb +13 -13
  120. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  121. data/lib/chef/resource/cron/cron_d.rb +1 -1
  122. data/lib/chef/resource/cron_access.rb +2 -2
  123. data/lib/chef/resource/execute.rb +4 -5
  124. data/lib/chef/resource/homebrew_update.rb +2 -2
  125. data/lib/chef/resource/hostname.rb +18 -18
  126. data/lib/chef/resource/lwrp_base.rb +1 -0
  127. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  128. data/lib/chef/resource/openssl_dhparam.rb +2 -0
  129. data/lib/chef/resource/openssl_ec_private_key.rb +2 -0
  130. data/lib/chef/resource/openssl_ec_public_key.rb +2 -0
  131. data/lib/chef/resource/openssl_rsa_private_key.rb +2 -0
  132. data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
  133. data/lib/chef/resource/openssl_x509_certificate.rb +35 -35
  134. data/lib/chef/resource/openssl_x509_crl.rb +3 -2
  135. data/lib/chef/resource/openssl_x509_request.rb +23 -20
  136. data/lib/chef/resource/osx_profile.rb +227 -5
  137. data/lib/chef/resource/powershell_package_source.rb +1 -1
  138. data/lib/chef/resource/powershell_script.rb +24 -30
  139. data/lib/chef/resource/service.rb +2 -2
  140. data/lib/chef/resource/ssh_known_hosts_entry.rb +1 -1
  141. data/lib/chef/resource/sudo.rb +2 -2
  142. data/lib/chef/resource/sysctl.rb +5 -5
  143. data/lib/chef/resource/timezone.rb +112 -73
  144. data/lib/chef/resource/user_ulimit.rb +1 -1
  145. data/lib/chef/resource/windows_ad_join.rb +2 -0
  146. data/lib/chef/resource/windows_audit_policy.rb +3 -0
  147. data/lib/chef/resource/windows_auto_run.rb +2 -0
  148. data/lib/chef/resource/windows_certificate.rb +2 -0
  149. data/lib/chef/resource/windows_dfs_folder.rb +2 -0
  150. data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
  151. data/lib/chef/resource/windows_dfs_server.rb +2 -0
  152. data/lib/chef/resource/windows_dns_record.rb +25 -5
  153. data/lib/chef/resource/windows_dns_zone.rb +12 -7
  154. data/lib/chef/resource/windows_feature.rb +2 -0
  155. data/lib/chef/resource/windows_feature_dism.rb +10 -0
  156. data/lib/chef/resource/windows_feature_powershell.rb +14 -2
  157. data/lib/chef/resource/windows_firewall_profile.rb +199 -0
  158. data/lib/chef/resource/windows_firewall_rule.rb +5 -3
  159. data/lib/chef/resource/windows_font.rb +3 -1
  160. data/lib/chef/resource/windows_pagefile.rb +4 -0
  161. data/lib/chef/resource/windows_printer.rb +17 -18
  162. data/lib/chef/resource/windows_printer_port.rb +14 -13
  163. data/lib/chef/resource/windows_security_policy.rb +51 -20
  164. data/lib/chef/resource/windows_share.rb +5 -3
  165. data/lib/chef/resource/windows_shortcut.rb +2 -0
  166. data/lib/chef/resource/windows_uac.rb +2 -0
  167. data/lib/chef/resource/windows_user_privilege.rb +2 -0
  168. data/lib/chef/resource/windows_workgroup.rb +2 -3
  169. data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
  170. data/lib/chef/resource_inspector.rb +7 -1
  171. data/lib/chef/resources.rb +1 -0
  172. data/lib/chef/role.rb +3 -4
  173. data/lib/chef/run_context/cookbook_compiler.rb +20 -20
  174. data/lib/chef/run_status.rb +2 -6
  175. data/lib/chef/server_api_versions.rb +4 -0
  176. data/lib/chef/shell.rb +1 -1
  177. data/lib/chef/shell/shell_session.rb +2 -0
  178. data/lib/chef/util/backup.rb +1 -1
  179. data/lib/chef/util/diff.rb +11 -12
  180. data/lib/chef/util/powershell/cmdlet.rb +1 -1
  181. data/lib/chef/version.rb +2 -2
  182. data/lib/chef/win32/file.rb +2 -2
  183. data/lib/chef/win32/file/version_info.rb +5 -5
  184. data/lib/chef/win32/registry.rb +1 -2
  185. data/spec/data/ssl/chef-rspec.cert +15 -15
  186. data/spec/functional/knife/ssh_spec.rb +5 -16
  187. data/spec/functional/resource/aix_service_spec.rb +0 -2
  188. data/spec/functional/resource/aixinit_service_spec.rb +7 -8
  189. data/spec/functional/resource/apt_package_spec.rb +0 -1
  190. data/spec/functional/resource/bff_spec.rb +2 -2
  191. data/spec/functional/resource/cookbook_file_spec.rb +1 -1
  192. data/spec/functional/resource/cron_spec.rb +0 -1
  193. data/spec/functional/resource/dsc_resource_spec.rb +1 -1
  194. data/spec/functional/resource/dsc_script_spec.rb +0 -1
  195. data/spec/functional/resource/git_spec.rb +23 -1
  196. data/spec/functional/resource/group_spec.rb +12 -8
  197. data/spec/functional/resource/insserv_spec.rb +4 -5
  198. data/spec/functional/resource/link_spec.rb +20 -20
  199. data/spec/functional/resource/powershell_script_spec.rb +4 -4
  200. data/spec/functional/resource/remote_file_spec.rb +1 -7
  201. data/spec/functional/resource/rpm_spec.rb +2 -2
  202. data/spec/functional/resource/windows_certificate_spec.rb +3 -3
  203. data/spec/functional/resource/windows_font_spec.rb +49 -0
  204. data/spec/functional/resource/windows_security_policy_spec.rb +0 -3
  205. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -1
  206. data/spec/functional/run_lock_spec.rb +26 -25
  207. data/spec/functional/shell_spec.rb +5 -5
  208. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  209. data/spec/functional/version_spec.rb +1 -1
  210. data/spec/functional/win32/registry_spec.rb +8 -8
  211. data/spec/functional/win32/service_manager_spec.rb +1 -1
  212. data/spec/integration/knife/common_options_spec.rb +12 -12
  213. data/spec/integration/knife/config_get_profile_spec.rb +69 -68
  214. data/spec/integration/knife/config_get_spec.rb +126 -125
  215. data/spec/integration/knife/config_list_profiles_spec.rb +181 -152
  216. data/spec/integration/knife/config_use_profile_spec.rb +110 -109
  217. data/spec/integration/knife/cookbook_upload_spec.rb +27 -0
  218. data/spec/integration/knife/diff_spec.rb +3 -1
  219. data/spec/integration/knife/download_spec.rb +3 -1
  220. data/spec/integration/knife/serve_spec.rb +5 -5
  221. data/spec/integration/knife/upload_spec.rb +3 -1
  222. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  223. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +2 -2
  224. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  225. data/spec/integration/recipes/notifies_spec.rb +1 -1
  226. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  227. data/spec/integration/recipes/recipe_dsl_spec.rb +1 -1
  228. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  229. data/spec/integration/recipes/resource_load_spec.rb +2 -0
  230. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  231. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  232. data/spec/scripts/ssl-serve.rb +1 -1
  233. data/spec/spec_helper.rb +16 -10
  234. data/spec/support/chef_helpers.rb +1 -20
  235. data/spec/support/platform_helpers.rb +9 -11
  236. data/spec/support/platforms/win32/spec_service.rb +1 -1
  237. data/spec/support/shared/functional/directory_resource.rb +1 -1
  238. data/spec/support/shared/functional/execute_resource.rb +1 -1
  239. data/spec/support/shared/functional/file_resource.rb +20 -21
  240. data/spec/support/shared/functional/win32_service.rb +1 -1
  241. data/spec/support/shared/functional/windows_script.rb +3 -3
  242. data/spec/support/shared/integration/integration_helper.rb +22 -52
  243. data/spec/support/shared/integration/knife_support.rb +2 -9
  244. data/spec/support/shared/unit/application_dot_d.rb +0 -1
  245. data/spec/support/shared/unit/script_resource.rb +6 -20
  246. data/spec/support/shared/unit/windows_script_resource.rb +15 -28
  247. data/spec/unit/application_spec.rb +4 -2
  248. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  249. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
  250. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  251. data/spec/unit/data_collector_spec.rb +29 -1
  252. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  253. data/spec/unit/environment_spec.rb +7 -7
  254. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  255. data/spec/unit/http/api_versions_spec.rb +19 -1
  256. data/spec/unit/json_compat_spec.rb +1 -1
  257. data/spec/unit/knife/bootstrap_spec.rb +16 -20
  258. data/spec/unit/knife/cookbook_download_spec.rb +4 -4
  259. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
  260. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  261. data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
  262. data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +21 -12
  263. data/spec/unit/knife/supermarket_share_spec.rb +1 -1
  264. data/spec/unit/log/syslog_spec.rb +6 -10
  265. data/spec/unit/log/winevt_spec.rb +21 -13
  266. data/spec/unit/lwrp_spec.rb +4 -4
  267. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  268. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  269. data/spec/unit/mixin/securable_spec.rb +0 -1
  270. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  271. data/spec/unit/mixin/template_spec.rb +30 -30
  272. data/spec/unit/mixin/which.rb +8 -0
  273. data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
  274. data/spec/unit/node/immutable_collections_spec.rb +6 -2
  275. data/spec/unit/node_spec.rb +103 -16
  276. data/spec/unit/property_spec.rb +5 -5
  277. data/spec/unit/provider/execute_spec.rb +0 -7
  278. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  279. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  280. data/spec/unit/provider/package/rubygems_spec.rb +5 -10
  281. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  282. data/spec/unit/provider/package/windows_spec.rb +30 -53
  283. data/spec/unit/provider/powershell_script_spec.rb +11 -4
  284. data/spec/unit/provider/remote_directory_spec.rb +9 -9
  285. data/spec/unit/provider/service/arch_service_spec.rb +3 -2
  286. data/spec/unit/provider/service/debian_service_spec.rb +1 -1
  287. data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
  288. data/spec/unit/provider/service/macosx_spec.rb +3 -3
  289. data/spec/unit/provider/service/redhat_spec.rb +3 -3
  290. data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
  291. data/spec/unit/provider/service/windows_spec.rb +2 -6
  292. data/spec/unit/provider/systemd_unit_spec.rb +28 -24
  293. data/spec/unit/provider_resolver_spec.rb +6 -6
  294. data/spec/unit/provider_spec.rb +1 -0
  295. data/spec/unit/resource/batch_spec.rb +6 -6
  296. data/spec/unit/resource/execute_spec.rb +123 -118
  297. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  298. data/spec/unit/resource/osx_profile_spec.rb +233 -0
  299. data/spec/unit/resource/powershell_script_spec.rb +11 -29
  300. data/spec/unit/resource/script_spec.rb +6 -1
  301. data/spec/unit/resource/timezone_spec.rb +63 -0
  302. data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
  303. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  304. data/spec/unit/resource/windows_package_spec.rb +1 -0
  305. data/spec/unit/resource_reporter_spec.rb +1 -1
  306. data/spec/unit/role_spec.rb +11 -11
  307. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  308. data/spec/unit/run_lock_spec.rb +1 -1
  309. data/spec/unit/scan_access_control_spec.rb +1 -1
  310. data/spec/unit/server_api_spec.rb +43 -16
  311. data/spec/unit/util/diff_spec.rb +1 -15
  312. data/spec/unit/win32/security_spec.rb +4 -3
  313. data/tasks/rspec.rb +1 -1
  314. metadata +39 -31
  315. data/lib/chef/provider/osx_profile.rb +0 -255
  316. data/spec/unit/provider/osx_profile_spec.rb +0 -255
@@ -1,255 +0,0 @@
1
- #
2
- # Author:: Nate Walck (<nate.walck@gmail.com>)
3
- # Copyright:: Copyright 2015-2016, Facebook, Inc.
4
- # License:: Apache License, Version 2.0
5
- #
6
- # Licensed under the Apache License, Version 2.0 (the "License");
7
- # you may not use this file except in compliance with the License.
8
- # You may obtain a copy of the License at
9
- #
10
- # http://www.apache.org/licenses/LICENSE-2.0
11
- #
12
- # Unless required by applicable law or agreed to in writing, software
13
- # distributed under the License is distributed on an "AS IS" BASIS,
14
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
- # See the License for the specific language governing permissions and
16
- # limitations under the License.
17
- #
18
-
19
- require_relative "../log"
20
- require_relative "../provider"
21
- require_relative "../resource"
22
- require_relative "../resource/file"
23
- require "uuidtools"
24
- require "plist"
25
-
26
- class Chef
27
- class Provider
28
- class OsxProfile < Chef::Provider
29
- provides :osx_profile
30
- provides :osx_config_profile
31
-
32
- def load_current_resource
33
- @current_resource = Chef::Resource::OsxProfile.new(new_resource.name)
34
- current_resource.profile_name(new_resource.profile_name)
35
-
36
- all_profiles = get_installed_profiles
37
- # FIXME: stop mutating the desired state
38
- new_resource.profile(
39
- new_resource.profile ||
40
- new_resource.profile_name
41
- )
42
-
43
- @new_profile_hash = get_profile_hash(new_resource.profile)
44
- if @new_profile_hash
45
- @new_profile_hash["PayloadUUID"] =
46
- config_uuid(@new_profile_hash)
47
- end
48
-
49
- if @new_profile_hash
50
- @new_profile_identifier = @new_profile_hash["PayloadIdentifier"]
51
- else
52
- @new_profile_identifier = new_resource.identifier ||
53
- new_resource.profile_name
54
- end
55
-
56
- current_profile = nil
57
- if all_profiles && all_profiles.key?("_computerlevel")
58
- current_profile = all_profiles["_computerlevel"].find do |item|
59
- item["ProfileIdentifier"] == @new_profile_identifier
60
- end
61
- end
62
- current_resource.profile(current_profile)
63
- end
64
-
65
- def define_resource_requirements
66
- requirements.assert(:remove) do |a|
67
- if @new_profile_identifier
68
- a.assertion do
69
- !@new_profile_identifier.nil? &&
70
- !@new_profile_identifier.end_with?(".mobileconfig") &&
71
- /^\w+(?:(\.| )\w+)+$/.match(@new_profile_identifier)
72
- end
73
- a.failure_message RuntimeError, "when removing using the identifier property, it must match the profile identifier"
74
- else
75
- new_profile_name = new_resource.profile_name
76
- a.assertion do
77
- !new_profile_name.end_with?(".mobileconfig") &&
78
- /^\w+(?:(\.| )\w+)+$/.match(new_profile_name)
79
- end
80
- a.failure_message RuntimeError, "When removing by resource name, it must match the profile identifier "
81
- end
82
- end
83
-
84
- requirements.assert(:install) do |a|
85
- if @new_profile_hash.is_a?(Hash)
86
- a.assertion do
87
- @new_profile_hash.include?("PayloadIdentifier")
88
- end
89
- a.failure_message RuntimeError, "The specified profile does not seem to be valid"
90
- end
91
- if @new_profile_hash.is_a?(String)
92
- a.assertion do
93
- @new_profile_hash.end_with?(".mobileconfig")
94
- end
95
- a.failure_message RuntimeError, "#{new_profile_hash}' is not a valid profile"
96
- end
97
- end
98
- end
99
-
100
- action :install do
101
- unless profile_installed?
102
- converge_by("install profile #{@new_profile_identifier}") do
103
- profile_path = write_profile_to_disk
104
- install_profile(profile_path)
105
- get_installed_profiles(true)
106
- end
107
- end
108
- end
109
-
110
- action :remove do
111
- # Clean up profile after removing it
112
- if profile_installed?
113
- converge_by("remove profile #{@new_profile_identifier}") do
114
- remove_profile
115
- get_installed_profiles(true)
116
- end
117
- end
118
- end
119
-
120
- def load_profile_hash(new_profile)
121
- # file must exist in cookbook
122
- if new_profile.end_with?(".mobileconfig")
123
- unless cookbook_file_available?(new_profile)
124
- error_string = "#{self}: '#{new_profile}' not found in cookbook"
125
- raise Chef::Exceptions::FileNotFound, error_string
126
- end
127
- cookbook_profile = cache_cookbook_profile(new_profile)
128
- read_plist(cookbook_profile)
129
- else
130
- nil
131
- end
132
- end
133
-
134
- def cookbook_file_available?(cookbook_file)
135
- run_context.has_cookbook_file_in_cookbook?(
136
- new_resource.cookbook_name, cookbook_file
137
- )
138
- end
139
-
140
- def get_cache_dir
141
- cache_dir = Chef::FileCache.create_cache_path(
142
- "profiles/#{new_resource.cookbook_name}"
143
- )
144
- end
145
-
146
- def cache_cookbook_profile(cookbook_file)
147
- Chef::FileCache.create_cache_path(
148
- ::File.join(
149
- "profiles",
150
- new_resource.cookbook_name,
151
- ::File.dirname(cookbook_file)
152
- )
153
- )
154
- # FIXME: should use a real cookbook file, or document what this craziness is
155
- remote_file = Chef::Resource::CookbookFile.new(
156
- ::File.join(
157
- get_cache_dir,
158
- "#{cookbook_file}.remote"
159
- ),
160
- run_context
161
- )
162
- remote_file.cookbook_name = new_resource.cookbook_name
163
- remote_file.source(cookbook_file)
164
- remote_file.backup(false)
165
- remote_file.run_action(:create)
166
- remote_file.path
167
- end
168
-
169
- def get_profile_hash(new_profile)
170
- if new_profile.is_a?(Hash)
171
- new_profile
172
- elsif new_profile.is_a?(String)
173
- load_profile_hash(new_profile)
174
- end
175
- end
176
-
177
- def config_uuid(profile)
178
- # Make a UUID of the profile contents and return as string
179
- UUIDTools::UUID.sha1_create(
180
- UUIDTools::UUID_DNS_NAMESPACE,
181
- profile.to_s
182
- ).to_s
183
- end
184
-
185
- def write_profile_to_disk
186
- # FIXME: use a real chef file resource and stop hacking up tempfiles directly
187
- new_resource.path(Chef::FileCache.create_cache_path("profiles"))
188
- tempfile = Chef::FileContentManagement::Tempfile.new(new_resource).tempfile
189
- tempfile.write(@new_profile_hash.to_plist)
190
- tempfile.close
191
- tempfile.path
192
- end
193
-
194
- def install_profile(profile_path)
195
- cmd = [ "/usr/bin/profiles", "-I", "-F", profile_path ]
196
- logger.trace("cmd: #{cmd.join(" ")}")
197
- shellout_results = shell_out(*cmd)
198
- shellout_results.exitstatus
199
- end
200
-
201
- def remove_profile
202
- cmd = [ "/usr/bin/profiles", "-R", "-p", @new_profile_identifier ]
203
- logger.trace("cmd: #{cmd.join(" ")}")
204
- shellout_results = shell_out(*cmd)
205
- shellout_results.exitstatus
206
- end
207
-
208
- def get_installed_profiles(update = nil)
209
- if update
210
- node.run_state[:config_profiles] = query_installed_profiles
211
- else
212
- node.run_state[:config_profiles] ||= query_installed_profiles
213
- end
214
- end
215
-
216
- def query_installed_profiles
217
- # Dump all profile metadata to a tempfile
218
- tempfile = generate_tempfile
219
- write_installed_profiles(tempfile)
220
- installed_profiles = read_plist(tempfile)
221
- logger.trace("Saved profiles to run_state")
222
- # Clean up the temp file as we do not need it anymore
223
- ::File.unlink(tempfile)
224
- installed_profiles
225
- end
226
-
227
- def generate_tempfile
228
- tempfile = ::Dir::Tmpname.create("allprofiles.plist") {}
229
- end
230
-
231
- def write_installed_profiles(tempfile)
232
- shell_out!( "/usr/bin/profiles", "-P", "-o", tempfile )
233
- end
234
-
235
- def read_plist(xml_file)
236
- ::Plist.parse_xml(xml_file)
237
- end
238
-
239
- def profile_installed?
240
- # Profile Identifier and UUID must match a currently installed profile
241
- if current_resource.profile.nil? || current_resource.profile.empty?
242
- false
243
- else
244
- if new_resource.action.include?(:remove)
245
- true
246
- else
247
- current_resource.profile["ProfileUUID"] ==
248
- @new_profile_hash["PayloadUUID"]
249
- end
250
- end
251
- end
252
-
253
- end
254
- end
255
- end
@@ -1,255 +0,0 @@
1
- #
2
- # Author:: Nate Walck (<nate.walck@gmail.com>)
3
- # Copyright:: Copyright 2015-2016, Chef, Inc.
4
- # License:: Apache License, Version 2.0
5
- #
6
- # Licensed under the Apache License, Version 2.0 (the "License");
7
- # you may not use this file except in compliance with the License.
8
- # You may obtain a copy of the License at
9
- #
10
- # http://www.apache.org/licenses/LICENSE-2.0
11
- #
12
- # Unless required by applicable law or agreed to in writing, software
13
- # distributed under the License is distributed on an "AS IS" BASIS,
14
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
- # See the License for the specific language governing permissions and
16
- # limitations under the License.
17
- #
18
-
19
- require "spec_helper"
20
-
21
- describe Chef::Provider::OsxProfile do
22
- let(:shell_out_success) do
23
- double("shell_out", exitstatus: 0, error?: false)
24
- end
25
- describe "action_create" do
26
- let(:node) { Chef::Node.new }
27
- let(:events) { Chef::EventDispatch::Dispatcher.new }
28
- let(:run_context) { Chef::RunContext.new(node, {}, events) }
29
- let(:new_resource) { Chef::Resource::OsxProfile.new("Profile Test", run_context) }
30
- let(:provider) { Chef::Provider::OsxProfile.new(new_resource, run_context) }
31
- let(:all_profiles) do
32
- { "_computerlevel" => [{ "ProfileDisplayName" => "Finder Settings",
33
- "ProfileIdentifier" => "com.apple.finder",
34
- "ProfileInstallDate" => "2015-11-08 23:15:21 +0000",
35
- "ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.finder" => { "Forced" => [{ "mcx_preference_settings" => { "ShowExternalHardDrivesOnDesktop" => false } }] } } },
36
- "PayloadDisplayName" => "Custom: (com.apple.finder)",
37
- "PayloadIdentifier" => "com.apple.finder",
38
- "PayloadType" => "com.apple.ManagedClient.preferences",
39
- "PayloadUUID" => "a017048f-684b-4e81-baa3-43afe316d739",
40
- "PayloadVersion" => 1 }],
41
- "ProfileOrganization" => "Chef",
42
- "ProfileRemovalDisallowed" => "false",
43
- "ProfileType" => "Configuration",
44
- "ProfileUUID" => "e2e09bef-e673-44a6-bcbe-ecb5f1c1b740",
45
- "ProfileVerificationState" => "unsigned",
46
- "ProfileVersion" => 1 },
47
- { "ProfileDisplayName" => "ScreenSaver Settings",
48
- "ProfileIdentifier" => "com.testprofile.screensaver",
49
- "ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
50
- "ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
51
- "PayloadDisplayName" => "Custom: (com.apple.screensaver)",
52
- "PayloadIdentifier" => "com.apple.screensaver",
53
- "PayloadType" => "com.apple.ManagedClient.preferences",
54
- "PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c110",
55
- "PayloadVersion" => 1 }],
56
- "ProfileOrganization" => "Chef",
57
- "ProfileRemovalDisallowed" => "false",
58
- "ProfileType" => "Configuration",
59
- "ProfileUUID" => "6e95927c-f200-54b4-85c7-52ab99b61c47",
60
- "ProfileVerificationState" => "unsigned",
61
- "ProfileVersion" => 1 }],
62
- }
63
- end
64
- # If anything is changed within this profile, be sure to update the
65
- # ProfileUUID in all_profiles to match the new config specific UUID
66
- let(:test_profile) do
67
- {
68
- "PayloadIdentifier" => "com.testprofile.screensaver",
69
- "PayloadRemovalDisallowed" => false,
70
- "PayloadScope" => "System",
71
- "PayloadType" => "Configuration",
72
- "PayloadUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
73
- "PayloadOrganization" => "Chef",
74
- "PayloadVersion" => 1,
75
- "PayloadDisplayName" => "Screensaver Settings",
76
- "PayloadContent" => [
77
- {
78
- "PayloadType" => "com.apple.ManagedClient.preferences",
79
- "PayloadVersion" => 1,
80
- "PayloadIdentifier" => "com.testprofile.screensaver",
81
- "PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c108",
82
- "PayloadEnabled" => true,
83
- "PayloadDisplayName" => "com.apple.screensaver",
84
- "PayloadContent" => {
85
- "com.apple.screensaver" => {
86
- "Forced" => [
87
- {
88
- "mcx_preference_settings" => {
89
- "idleTime" => 0,
90
- },
91
- },
92
- ],
93
- },
94
- },
95
- },
96
- ],
97
- }
98
- end
99
- let(:no_profiles) do
100
- {}
101
- end
102
-
103
- before(:each) do
104
- allow(provider).to receive(:cookbook_file_available?).and_return(true)
105
- allow(provider).to receive(:cache_cookbook_profile).and_return("/tmp/test.mobileconfig.remote")
106
- allow(provider).to receive(:get_new_profile_hash).and_return(test_profile)
107
- allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
108
- allow(provider).to receive(:read_plist).and_return(all_profiles)
109
- allow(::File).to receive(:unlink).and_return(true)
110
- end
111
-
112
- it "should build the get all profiles shellout command correctly" do
113
- profile_name = "com.testprofile.screensaver.mobileconfig"
114
- tempfile = "/tmp/allprofiles.plist"
115
- new_resource.profile_name profile_name
116
- allow(provider).to receive(:generate_tempfile).and_return(tempfile)
117
- allow(provider).to receive(:get_installed_profiles).and_call_original
118
- allow(provider).to receive(:read_plist).and_return(all_profiles)
119
- expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-P", "-o", "/tmp/allprofiles.plist")
120
- provider.load_current_resource
121
- end
122
-
123
- it "should use profile name as profile when no profile is set" do
124
- profile_name = "com.testprofile.screensaver.mobileconfig"
125
- new_resource.profile_name profile_name
126
- provider.load_current_resource
127
- expect(new_resource.profile_name).to eql(profile_name)
128
- end
129
-
130
- it "should use identifier from specified profile" do
131
- new_resource.profile test_profile
132
- provider.load_current_resource
133
- expect(
134
- provider.instance_variable_get(:@new_profile_identifier)
135
- ).to eql(test_profile["PayloadIdentifier"])
136
- end
137
-
138
- it "should install when not installed" do
139
- new_resource.profile test_profile
140
- allow(provider).to receive(:get_installed_profiles).and_return(no_profiles)
141
- provider.load_current_resource
142
- expect(provider).to receive(:install_profile)
143
- expect { provider.run_action(:install) }.to_not raise_error
144
- end
145
-
146
- it "does not install if the profile is already installed" do
147
- new_resource.profile test_profile
148
- allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
149
- provider.load_current_resource
150
- expect(provider).to_not receive(:install_profile)
151
- expect { provider.action_install }.to_not raise_error
152
- end
153
-
154
- it "should install when installed but uuid differs" do
155
- new_resource.profile test_profile
156
- all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
157
- provider.load_current_resource
158
- expect(provider).to receive(:install_profile)
159
- expect { provider.run_action(:install) }.to_not raise_error
160
- end
161
-
162
- it "should build the shellout install command correctly" do
163
- profile_path = "/tmp/test.mobileconfig"
164
- new_resource.profile test_profile
165
- # Change the profile so it triggers an install
166
- all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
167
- provider.load_current_resource
168
- allow(provider).to receive(:write_profile_to_disk).and_return(profile_path)
169
- expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-I", "-F", profile_path).and_return(shell_out_success)
170
- provider.action_install
171
- end
172
-
173
- it "should fail if there is no identifier inside the profile" do
174
- test_profile.delete("PayloadIdentifier")
175
- new_resource.profile test_profile
176
- error_message = "The specified profile does not seem to be valid"
177
- expect { provider.run_action(:install) }.to raise_error(RuntimeError, error_message)
178
- end
179
-
180
- end
181
-
182
- describe "action_remove" do
183
- let(:node) { Chef::Node.new }
184
- let(:events) { Chef::EventDispatch::Dispatcher.new }
185
- let(:run_context) { Chef::RunContext.new(node, {}, events) }
186
- let(:new_resource) { Chef::Resource::OsxProfile.new("Profile Test", run_context) }
187
- let(:provider) { Chef::Provider::OsxProfile.new(new_resource, run_context) }
188
- let(:current_resource) { Chef::Resource::OsxProfile.new("Profile Test") }
189
- let(:all_profiles) do
190
- { "_computerlevel" => [{ "ProfileDisplayName" => "ScreenSaver Settings",
191
- "ProfileIdentifier" => "com.apple.screensaver",
192
- "ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
193
- "ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
194
- "PayloadDisplayName" => "Custom: (com.apple.screensaver)",
195
- "PayloadIdentifier" => "com.apple.screensaver",
196
- "PayloadType" => "com.apple.ManagedClient.preferences",
197
- "PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c108",
198
- "PayloadVersion" => 1 }],
199
- "ProfileOrganization" => "Chef",
200
- "ProfileRemovalDisallowed" => "false",
201
- "ProfileType" => "Configuration",
202
- "ProfileUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
203
- "ProfileVerificationState" => "unsigned",
204
- "ProfileVersion" => 1 },
205
- { "ProfileDisplayName" => "ScreenSaver Settings",
206
- "ProfileIdentifier" => "com.testprofile.screensaver",
207
- "ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
208
- "ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
209
- "PayloadDisplayName" => "Custom: (com.apple.screensaver)",
210
- "PayloadIdentifier" => "com.apple.screensaver",
211
- "PayloadType" => "com.apple.ManagedClient.preferences",
212
- "PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c110",
213
- "PayloadVersion" => 1 }],
214
- "ProfileOrganization" => "Chef",
215
- "ProfileRemovalDisallowed" => "false",
216
- "ProfileType" => "Configuration",
217
- "ProfileUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
218
- "ProfileVerificationState" => "unsigned",
219
- "ProfileVersion" => 1 }],
220
- }
221
- end
222
- before(:each) do
223
- provider.current_resource = current_resource
224
- allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
225
- end
226
-
227
- it "should use resource name for identifier when not specified" do
228
- new_resource.profile_name "com.testprofile.screensaver"
229
- new_resource.action(:remove)
230
- provider.load_current_resource
231
- expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(new_resource.profile_name)
232
- end
233
-
234
- it "should use specified identifier" do
235
- new_resource.identifier "com.testprofile.screensaver"
236
- new_resource.action(:remove)
237
- provider.load_current_resource
238
- expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(new_resource.identifier)
239
- end
240
-
241
- it "should work with spaces in the identifier" do
242
- provider.action = :remove
243
- provider.define_resource_requirements
244
- expect { provider.process_resource_requirements }.not_to raise_error
245
- end
246
-
247
- it "should build the shellout remove command correctly" do
248
- new_resource.identifier "com.testprofile.screensaver"
249
- new_resource.action(:remove)
250
- provider.load_current_resource
251
- expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-R", "-p", new_resource.identifier).and_return(shell_out_success)
252
- provider.action_remove
253
- end
254
- end
255
- end