puppet 7.5.0-universal-darwin → 7.9.0-universal-darwin

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (712) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +7 -7
  3. data/Gemfile +2 -1
  4. data/Gemfile.lock +20 -20
  5. data/README.md +4 -4
  6. data/ext/osx/puppet.plist +2 -0
  7. data/ext/project_data.yaml +1 -0
  8. data/install.rb +11 -15
  9. data/lib/hiera_puppet.rb +1 -1
  10. data/lib/puppet.rb +40 -40
  11. data/lib/puppet/agent.rb +6 -6
  12. data/lib/puppet/agent/disabler.rb +1 -1
  13. data/lib/puppet/agent/locker.rb +2 -2
  14. data/lib/puppet/application.rb +6 -6
  15. data/lib/puppet/application/agent.rb +18 -11
  16. data/lib/puppet/application/apply.rb +6 -5
  17. data/lib/puppet/application/catalog.rb +1 -1
  18. data/lib/puppet/application/config.rb +1 -1
  19. data/lib/puppet/application/describe.rb +1 -1
  20. data/lib/puppet/application/device.rb +8 -7
  21. data/lib/puppet/application/doc.rb +7 -7
  22. data/lib/puppet/application/epp.rb +2 -2
  23. data/lib/puppet/application/face_base.rb +2 -2
  24. data/lib/puppet/application/facts.rb +1 -1
  25. data/lib/puppet/application/filebucket.rb +3 -2
  26. data/lib/puppet/application/generate.rb +1 -1
  27. data/lib/puppet/application/help.rb +1 -1
  28. data/lib/puppet/application/indirection_base.rb +1 -1
  29. data/lib/puppet/application/lookup.rb +6 -6
  30. data/lib/puppet/application/module.rb +1 -1
  31. data/lib/puppet/application/node.rb +1 -1
  32. data/lib/puppet/application/parser.rb +2 -2
  33. data/lib/puppet/application/plugin.rb +1 -1
  34. data/lib/puppet/application/report.rb +1 -1
  35. data/lib/puppet/application/resource.rb +18 -4
  36. data/lib/puppet/application/script.rb +6 -5
  37. data/lib/puppet/application/ssl.rb +3 -2
  38. data/lib/puppet/application_support.rb +4 -4
  39. data/lib/puppet/compilable_resource_type.rb +1 -1
  40. data/lib/puppet/concurrent/lock.rb +1 -1
  41. data/lib/puppet/configurer.rb +4 -4
  42. data/lib/puppet/configurer/downloader.rb +4 -3
  43. data/lib/puppet/configurer/fact_handler.rb +3 -3
  44. data/lib/puppet/configurer/plugin_handler.rb +1 -1
  45. data/lib/puppet/confine.rb +1 -1
  46. data/lib/puppet/confine/boolean.rb +1 -1
  47. data/lib/puppet/confine/exists.rb +1 -1
  48. data/lib/puppet/confine/false.rb +1 -1
  49. data/lib/puppet/confine/feature.rb +1 -1
  50. data/lib/puppet/confine/true.rb +1 -1
  51. data/lib/puppet/confine/variable.rb +1 -1
  52. data/lib/puppet/confine_collection.rb +1 -1
  53. data/lib/puppet/confiner.rb +1 -1
  54. data/lib/puppet/context.rb +2 -2
  55. data/lib/puppet/context/trusted_information.rb +1 -1
  56. data/lib/puppet/daemon.rb +2 -2
  57. data/lib/puppet/data_binding.rb +1 -1
  58. data/lib/puppet/datatypes/error.rb +1 -1
  59. data/lib/puppet/defaults.rb +17 -12
  60. data/lib/puppet/environments.rb +11 -1
  61. data/lib/puppet/etc.rb +1 -1
  62. data/lib/puppet/external/pson/common.rb +1 -1
  63. data/lib/puppet/external/pson/pure.rb +3 -3
  64. data/lib/puppet/face.rb +1 -1
  65. data/lib/puppet/face/catalog.rb +1 -1
  66. data/lib/puppet/face/config.rb +2 -2
  67. data/lib/puppet/face/epp.rb +6 -6
  68. data/lib/puppet/face/facts.rb +2 -2
  69. data/lib/puppet/face/generate.rb +2 -2
  70. data/lib/puppet/face/help.rb +3 -3
  71. data/lib/puppet/face/help/action.erb +1 -0
  72. data/lib/puppet/face/help/face.erb +1 -0
  73. data/lib/puppet/face/module.rb +3 -3
  74. data/lib/puppet/face/module/install.rb +2 -2
  75. data/lib/puppet/face/node.rb +1 -1
  76. data/lib/puppet/face/node/clean.rb +1 -1
  77. data/lib/puppet/face/parser.rb +4 -4
  78. data/lib/puppet/face/plugin.rb +2 -2
  79. data/lib/puppet/face/report.rb +1 -1
  80. data/lib/puppet/face/resource.rb +1 -1
  81. data/lib/puppet/feature/base.rb +2 -2
  82. data/lib/puppet/feature/bolt.rb +1 -1
  83. data/lib/puppet/feature/cfpropertylist.rb +1 -1
  84. data/lib/puppet/feature/eventlog.rb +1 -1
  85. data/lib/puppet/feature/hiera_eyaml.rb +1 -1
  86. data/lib/puppet/feature/hocon.rb +1 -1
  87. data/lib/puppet/feature/libuser.rb +2 -2
  88. data/lib/puppet/feature/msgpack.rb +1 -1
  89. data/lib/puppet/feature/pe_license.rb +1 -1
  90. data/lib/puppet/feature/selinux.rb +1 -1
  91. data/lib/puppet/feature/ssh.rb +1 -1
  92. data/lib/puppet/feature/telnet.rb +1 -1
  93. data/lib/puppet/feature/zlib.rb +1 -1
  94. data/lib/puppet/ffi/posix.rb +2 -2
  95. data/lib/puppet/ffi/posix/constants.rb +1 -1
  96. data/lib/puppet/ffi/posix/functions.rb +1 -1
  97. data/lib/puppet/ffi/windows.rb +4 -4
  98. data/lib/puppet/ffi/windows/api_types.rb +2 -2
  99. data/lib/puppet/ffi/windows/constants.rb +1 -1
  100. data/lib/puppet/ffi/windows/functions.rb +1 -1
  101. data/lib/puppet/ffi/windows/structs.rb +1 -1
  102. data/lib/puppet/file_bucket/dipper.rb +4 -4
  103. data/lib/puppet/file_bucket/file.rb +3 -3
  104. data/lib/puppet/file_serving/base.rb +2 -2
  105. data/lib/puppet/file_serving/configuration.rb +10 -10
  106. data/lib/puppet/file_serving/configuration/parser.rb +2 -2
  107. data/lib/puppet/file_serving/content.rb +3 -3
  108. data/lib/puppet/file_serving/fileset.rb +16 -4
  109. data/lib/puppet/file_serving/http_metadata.rb +1 -1
  110. data/lib/puppet/file_serving/metadata.rb +6 -6
  111. data/lib/puppet/file_serving/mount.rb +4 -4
  112. data/lib/puppet/file_serving/mount/file.rb +1 -1
  113. data/lib/puppet/file_serving/mount/locales.rb +1 -1
  114. data/lib/puppet/file_serving/mount/modules.rb +1 -1
  115. data/lib/puppet/file_serving/mount/pluginfacts.rb +1 -1
  116. data/lib/puppet/file_serving/mount/plugins.rb +1 -1
  117. data/lib/puppet/file_serving/mount/tasks.rb +1 -1
  118. data/lib/puppet/file_serving/terminus_helper.rb +2 -2
  119. data/lib/puppet/file_serving/terminus_selector.rb +1 -1
  120. data/lib/puppet/file_system.rb +9 -9
  121. data/lib/puppet/file_system/file_impl.rb +1 -1
  122. data/lib/puppet/file_system/jruby.rb +1 -1
  123. data/lib/puppet/file_system/path_pattern.rb +1 -1
  124. data/lib/puppet/file_system/uniquefile.rb +1 -1
  125. data/lib/puppet/file_system/windows.rb +4 -4
  126. data/lib/puppet/forge.rb +8 -8
  127. data/lib/puppet/forge/cache.rb +2 -2
  128. data/lib/puppet/forge/errors.rb +3 -3
  129. data/lib/puppet/forge/repository.rb +4 -4
  130. data/lib/puppet/functions.rb +1 -1
  131. data/lib/puppet/functions/all.rb +1 -1
  132. data/lib/puppet/functions/camelcase.rb +1 -1
  133. data/lib/puppet/functions/capitalize.rb +2 -2
  134. data/lib/puppet/functions/downcase.rb +2 -2
  135. data/lib/puppet/functions/empty.rb +8 -0
  136. data/lib/puppet/functions/get.rb +5 -5
  137. data/lib/puppet/functions/group_by.rb +13 -5
  138. data/lib/puppet/functions/lest.rb +1 -1
  139. data/lib/puppet/functions/new.rb +100 -100
  140. data/lib/puppet/functions/partition.rb +12 -4
  141. data/lib/puppet/functions/require.rb +5 -5
  142. data/lib/puppet/functions/sort.rb +3 -3
  143. data/lib/puppet/functions/strftime.rb +1 -0
  144. data/lib/puppet/functions/tree_each.rb +7 -9
  145. data/lib/puppet/functions/type.rb +4 -4
  146. data/lib/puppet/functions/unwrap.rb +17 -2
  147. data/lib/puppet/functions/upcase.rb +2 -2
  148. data/lib/puppet/functions/versioncmp.rb +1 -1
  149. data/lib/puppet/generate/models/type/type.rb +1 -1
  150. data/lib/puppet/generate/type.rb +2 -2
  151. data/lib/puppet/gettext/config.rb +3 -3
  152. data/lib/puppet/gettext/module_translations.rb +1 -1
  153. data/lib/puppet/graph.rb +6 -6
  154. data/lib/puppet/graph/simple_graph.rb +2 -2
  155. data/lib/puppet/http.rb +26 -26
  156. data/lib/puppet/http/factory.rb +2 -2
  157. data/lib/puppet/http/proxy.rb +1 -1
  158. data/lib/puppet/http/resolver/server_list.rb +15 -4
  159. data/lib/puppet/http/service/compiler.rb +73 -1
  160. data/lib/puppet/http/service/file_server.rb +3 -2
  161. data/lib/puppet/indirector.rb +5 -5
  162. data/lib/puppet/indirector/catalog/compiler.rb +7 -6
  163. data/lib/puppet/indirector/catalog/json.rb +2 -2
  164. data/lib/puppet/indirector/catalog/msgpack.rb +2 -2
  165. data/lib/puppet/indirector/catalog/rest.rb +2 -2
  166. data/lib/puppet/indirector/catalog/store_configs.rb +2 -2
  167. data/lib/puppet/indirector/catalog/yaml.rb +2 -2
  168. data/lib/puppet/indirector/code.rb +1 -1
  169. data/lib/puppet/indirector/data_binding/hiera.rb +1 -1
  170. data/lib/puppet/indirector/data_binding/none.rb +1 -1
  171. data/lib/puppet/indirector/direct_file_server.rb +2 -2
  172. data/lib/puppet/indirector/envelope.rb +1 -1
  173. data/lib/puppet/indirector/errors.rb +1 -1
  174. data/lib/puppet/indirector/exec.rb +2 -2
  175. data/lib/puppet/indirector/face.rb +1 -1
  176. data/lib/puppet/indirector/facts/facter.rb +2 -2
  177. data/lib/puppet/indirector/facts/json.rb +3 -3
  178. data/lib/puppet/indirector/facts/memory.rb +2 -2
  179. data/lib/puppet/indirector/facts/network_device.rb +2 -2
  180. data/lib/puppet/indirector/facts/rest.rb +2 -2
  181. data/lib/puppet/indirector/facts/store_configs.rb +2 -2
  182. data/lib/puppet/indirector/facts/yaml.rb +3 -3
  183. data/lib/puppet/indirector/file_bucket_file/file.rb +4 -4
  184. data/lib/puppet/indirector/file_bucket_file/rest.rb +2 -2
  185. data/lib/puppet/indirector/file_bucket_file/selector.rb +1 -1
  186. data/lib/puppet/indirector/file_content.rb +1 -1
  187. data/lib/puppet/indirector/file_content/file.rb +3 -3
  188. data/lib/puppet/indirector/file_content/file_server.rb +3 -3
  189. data/lib/puppet/indirector/file_content/rest.rb +3 -3
  190. data/lib/puppet/indirector/file_content/selector.rb +4 -4
  191. data/lib/puppet/indirector/file_metadata.rb +1 -1
  192. data/lib/puppet/indirector/file_metadata/file.rb +3 -3
  193. data/lib/puppet/indirector/file_metadata/file_server.rb +3 -3
  194. data/lib/puppet/indirector/file_metadata/http.rb +3 -3
  195. data/lib/puppet/indirector/file_metadata/rest.rb +4 -3
  196. data/lib/puppet/indirector/file_metadata/selector.rb +4 -4
  197. data/lib/puppet/indirector/file_server.rb +4 -4
  198. data/lib/puppet/indirector/generic_http.rb +1 -1
  199. data/lib/puppet/indirector/hiera.rb +1 -1
  200. data/lib/puppet/indirector/indirection.rb +5 -5
  201. data/lib/puppet/indirector/json.rb +2 -2
  202. data/lib/puppet/indirector/memory.rb +1 -1
  203. data/lib/puppet/indirector/msgpack.rb +2 -2
  204. data/lib/puppet/indirector/node/exec.rb +2 -2
  205. data/lib/puppet/indirector/node/json.rb +2 -2
  206. data/lib/puppet/indirector/node/memory.rb +2 -2
  207. data/lib/puppet/indirector/node/msgpack.rb +2 -2
  208. data/lib/puppet/indirector/node/plain.rb +2 -2
  209. data/lib/puppet/indirector/node/rest.rb +2 -2
  210. data/lib/puppet/indirector/node/store_configs.rb +2 -2
  211. data/lib/puppet/indirector/node/yaml.rb +2 -2
  212. data/lib/puppet/indirector/none.rb +1 -1
  213. data/lib/puppet/indirector/plain.rb +1 -1
  214. data/lib/puppet/indirector/report/json.rb +2 -2
  215. data/lib/puppet/indirector/report/msgpack.rb +2 -2
  216. data/lib/puppet/indirector/report/processor.rb +3 -3
  217. data/lib/puppet/indirector/report/rest.rb +1 -1
  218. data/lib/puppet/indirector/report/yaml.rb +2 -2
  219. data/lib/puppet/indirector/request.rb +3 -3
  220. data/lib/puppet/indirector/resource/ral.rb +7 -2
  221. data/lib/puppet/indirector/resource/store_configs.rb +2 -2
  222. data/lib/puppet/indirector/terminus.rb +5 -5
  223. data/lib/puppet/indirector/yaml.rb +2 -2
  224. data/lib/puppet/info_service.rb +3 -3
  225. data/lib/puppet/info_service/class_information_service.rb +3 -3
  226. data/lib/puppet/info_service/plan_information_service.rb +1 -1
  227. data/lib/puppet/info_service/task_information_service.rb +1 -1
  228. data/lib/puppet/interface.rb +10 -10
  229. data/lib/puppet/interface/documentation.rb +2 -1
  230. data/lib/puppet/loaders.rb +21 -25
  231. data/lib/puppet/metatype/manager.rb +3 -3
  232. data/lib/puppet/module.rb +5 -4
  233. data/lib/puppet/module/plan.rb +1 -1
  234. data/lib/puppet/module/task.rb +1 -1
  235. data/lib/puppet/module_tool.rb +10 -10
  236. data/lib/puppet/module_tool/applications.rb +7 -7
  237. data/lib/puppet/module_tool/applications/application.rb +2 -2
  238. data/lib/puppet/module_tool/applications/checksummer.rb +2 -2
  239. data/lib/puppet/module_tool/applications/installer.rb +11 -7
  240. data/lib/puppet/module_tool/applications/unpacker.rb +2 -2
  241. data/lib/puppet/module_tool/applications/upgrader.rb +5 -5
  242. data/lib/puppet/module_tool/checksums.rb +1 -1
  243. data/lib/puppet/module_tool/contents_description.rb +1 -1
  244. data/lib/puppet/module_tool/dependency.rb +2 -2
  245. data/lib/puppet/module_tool/errors.rb +6 -6
  246. data/lib/puppet/module_tool/errors/shared.rb +17 -0
  247. data/lib/puppet/module_tool/install_directory.rb +2 -2
  248. data/lib/puppet/module_tool/installed_modules.rb +2 -2
  249. data/lib/puppet/module_tool/local_tarball.rb +2 -2
  250. data/lib/puppet/module_tool/metadata.rb +3 -3
  251. data/lib/puppet/module_tool/tar.rb +4 -4
  252. data/lib/puppet/module_tool/tar/mini.rb +1 -1
  253. data/lib/puppet/network/format.rb +1 -1
  254. data/lib/puppet/network/format_handler.rb +3 -3
  255. data/lib/puppet/network/format_support.rb +1 -1
  256. data/lib/puppet/network/formats.rb +2 -2
  257. data/lib/puppet/network/http.rb +12 -12
  258. data/lib/puppet/network/http/api.rb +1 -1
  259. data/lib/puppet/network/http/api/indirected_routes.rb +1 -1
  260. data/lib/puppet/network/http/api/master.rb +1 -1
  261. data/lib/puppet/network/http/api/master/v3.rb +2 -2
  262. data/lib/puppet/network/http/api/master/v3/environments.rb +2 -2
  263. data/lib/puppet/network/http/api/server/v3.rb +2 -2
  264. data/lib/puppet/network/http/api/server/v3/environments.rb +1 -1
  265. data/lib/puppet/network/http/connection.rb +1 -1
  266. data/lib/puppet/network/http/error.rb +1 -1
  267. data/lib/puppet/network/http/handler.rb +3 -3
  268. data/lib/puppet/network/http_pool.rb +1 -1
  269. data/lib/puppet/node.rb +3 -3
  270. data/lib/puppet/node/environment.rb +15 -8
  271. data/lib/puppet/node/facts.rb +3 -3
  272. data/lib/puppet/pal/pal_api.rb +10 -10
  273. data/lib/puppet/pal/pal_impl.rb +3 -3
  274. data/lib/puppet/parameter.rb +4 -4
  275. data/lib/puppet/parameter/boolean.rb +1 -1
  276. data/lib/puppet/parameter/package_options.rb +1 -1
  277. data/lib/puppet/parameter/path.rb +1 -1
  278. data/lib/puppet/parameter/value.rb +1 -1
  279. data/lib/puppet/parameter/value_collection.rb +1 -1
  280. data/lib/puppet/parser.rb +10 -10
  281. data/lib/puppet/parser/ast.rb +8 -8
  282. data/lib/puppet/parser/ast/hostclass.rb +1 -1
  283. data/lib/puppet/parser/ast/pops_bridge.rb +2 -2
  284. data/lib/puppet/parser/catalog_compiler.rb +2 -2
  285. data/lib/puppet/parser/compiler.rb +5 -5
  286. data/lib/puppet/parser/e4_parser_adapter.rb +1 -1
  287. data/lib/puppet/parser/functions.rb +4 -4
  288. data/lib/puppet/parser/functions/digest.rb +1 -1
  289. data/lib/puppet/parser/functions/file.rb +1 -1
  290. data/lib/puppet/parser/functions/fqdn_rand.rb +14 -6
  291. data/lib/puppet/parser/functions/versioncmp.rb +1 -1
  292. data/lib/puppet/parser/parser_factory.rb +2 -2
  293. data/lib/puppet/parser/resource.rb +3 -3
  294. data/lib/puppet/parser/scope.rb +3 -3
  295. data/lib/puppet/parser/script_compiler.rb +2 -2
  296. data/lib/puppet/parser/templatewrapper.rb +2 -2
  297. data/lib/puppet/parser/type_loader.rb +1 -1
  298. data/lib/puppet/plugins/configuration.rb +5 -5
  299. data/lib/puppet/pops.rb +57 -57
  300. data/lib/puppet/pops/evaluator/deferred_resolver.rb +1 -1
  301. data/lib/puppet/pops/evaluator/evaluator_impl.rb +7 -7
  302. data/lib/puppet/pops/evaluator/external_syntax_support.rb +1 -1
  303. data/lib/puppet/pops/loader/base_loader.rb +42 -32
  304. data/lib/puppet/pops/loader/dependency_loader.rb +2 -2
  305. data/lib/puppet/pops/loader/loader.rb +15 -5
  306. data/lib/puppet/pops/loader/module_loaders.rb +8 -8
  307. data/lib/puppet/pops/loader/predefined_loader.rb +4 -0
  308. data/lib/puppet/pops/loader/runtime3_type_loader.rb +1 -1
  309. data/lib/puppet/pops/loader/static_loader.rb +4 -0
  310. data/lib/puppet/pops/loader/task_instantiator.rb +1 -1
  311. data/lib/puppet/pops/loaders.rb +4 -4
  312. data/lib/puppet/pops/lookup/invocation.rb +1 -1
  313. data/lib/puppet/pops/model/ast_transformer.rb +1 -1
  314. data/lib/puppet/pops/model/pn_transformer.rb +1 -1
  315. data/lib/puppet/pops/parser/eparser.rb +2 -2
  316. data/lib/puppet/pops/parser/evaluating_parser.rb +1 -1
  317. data/lib/puppet/pops/parser/lexer2.rb +5 -5
  318. data/lib/puppet/pops/parser/lexer_support.rb +1 -1
  319. data/lib/puppet/pops/parser/parser_support.rb +4 -4
  320. data/lib/puppet/pops/puppet_stack.rb +1 -1
  321. data/lib/puppet/pops/serialization/json.rb +1 -1
  322. data/lib/puppet/pops/serialization/json_path.rb +1 -1
  323. data/lib/puppet/pops/time/timespan.rb +1 -1
  324. data/lib/puppet/pops/types/p_sem_ver_type.rb +8 -2
  325. data/lib/puppet/pops/types/p_sensitive_type.rb +10 -0
  326. data/lib/puppet/pops/types/p_type_set_type.rb +1 -1
  327. data/lib/puppet/pops/types/string_converter.rb +1 -1
  328. data/lib/puppet/pops/types/type_calculator.rb +1 -1
  329. data/lib/puppet/pops/types/type_formatter.rb +1 -1
  330. data/lib/puppet/pops/types/type_mismatch_describer.rb +1 -1
  331. data/lib/puppet/pops/types/type_parser.rb +1 -1
  332. data/lib/puppet/pops/types/types.rb +1 -1
  333. data/lib/puppet/pops/validation/checker4_0.rb +1 -1
  334. data/lib/puppet/property.rb +3 -3
  335. data/lib/puppet/property/boolean.rb +1 -1
  336. data/lib/puppet/property/ensure.rb +1 -1
  337. data/lib/puppet/property/keyvalue.rb +1 -1
  338. data/lib/puppet/property/list.rb +1 -1
  339. data/lib/puppet/property/ordered_list.rb +1 -1
  340. data/lib/puppet/provider.rb +2 -2
  341. data/lib/puppet/provider/confine.rb +2 -2
  342. data/lib/puppet/provider/exec.rb +2 -2
  343. data/lib/puppet/provider/exec/posix.rb +17 -5
  344. data/lib/puppet/provider/exec/windows.rb +1 -1
  345. data/lib/puppet/provider/file/posix.rb +1 -1
  346. data/lib/puppet/provider/file/windows.rb +1 -1
  347. data/lib/puppet/provider/group/aix.rb +1 -1
  348. data/lib/puppet/provider/group/directoryservice.rb +1 -1
  349. data/lib/puppet/provider/group/groupadd.rb +2 -2
  350. data/lib/puppet/provider/group/ldap.rb +1 -1
  351. data/lib/puppet/provider/group/pw.rb +1 -1
  352. data/lib/puppet/provider/group/windows_adsi.rb +1 -1
  353. data/lib/puppet/provider/ldap.rb +2 -2
  354. data/lib/puppet/provider/nameservice.rb +1 -1
  355. data/lib/puppet/provider/nameservice/directoryservice.rb +3 -3
  356. data/lib/puppet/provider/nameservice/objectadd.rb +1 -1
  357. data/lib/puppet/provider/nameservice/pw.rb +1 -1
  358. data/lib/puppet/provider/package.rb +1 -1
  359. data/lib/puppet/provider/package/aix.rb +2 -2
  360. data/lib/puppet/provider/package/appdmg.rb +2 -2
  361. data/lib/puppet/provider/package/apple.rb +1 -1
  362. data/lib/puppet/provider/package/apt.rb +5 -5
  363. data/lib/puppet/provider/package/dnfmodule.rb +2 -2
  364. data/lib/puppet/provider/package/dpkg.rb +1 -1
  365. data/lib/puppet/provider/package/gem.rb +3 -3
  366. data/lib/puppet/provider/package/hpux.rb +1 -1
  367. data/lib/puppet/provider/package/macports.rb +2 -2
  368. data/lib/puppet/provider/package/nim.rb +13 -8
  369. data/lib/puppet/provider/package/openbsd.rb +1 -1
  370. data/lib/puppet/provider/package/opkg.rb +1 -1
  371. data/lib/puppet/provider/package/pacman.rb +1 -1
  372. data/lib/puppet/provider/package/pip.rb +18 -6
  373. data/lib/puppet/provider/package/pkg.rb +2 -2
  374. data/lib/puppet/provider/package/pkgdmg.rb +3 -3
  375. data/lib/puppet/provider/package/pkgin.rb +1 -1
  376. data/lib/puppet/provider/package/pkgng.rb +1 -1
  377. data/lib/puppet/provider/package/portage.rb +1 -1
  378. data/lib/puppet/provider/package/portupgrade.rb +1 -1
  379. data/lib/puppet/provider/package/puppet_gem.rb +12 -1
  380. data/lib/puppet/provider/package/puppetserver_gem.rb +0 -0
  381. data/lib/puppet/provider/package/rpm.rb +2 -2
  382. data/lib/puppet/provider/package/sun.rb +1 -1
  383. data/lib/puppet/provider/package/windows.rb +17 -4
  384. data/lib/puppet/provider/package/windows/exe_package.rb +31 -2
  385. data/lib/puppet/provider/package/windows/msi_package.rb +1 -1
  386. data/lib/puppet/provider/package/windows/package.rb +6 -5
  387. data/lib/puppet/provider/package/yum.rb +6 -6
  388. data/lib/puppet/provider/package/zypper.rb +3 -3
  389. data/lib/puppet/provider/package_targetable.rb +1 -1
  390. data/lib/puppet/provider/parsedfile.rb +6 -3
  391. data/lib/puppet/provider/service/base.rb +6 -4
  392. data/lib/puppet/provider/service/daemontools.rb +0 -1
  393. data/lib/puppet/provider/service/debian.rb +3 -5
  394. data/lib/puppet/provider/service/freebsd.rb +1 -1
  395. data/lib/puppet/provider/service/init.rb +1 -1
  396. data/lib/puppet/provider/service/launchd.rb +9 -3
  397. data/lib/puppet/provider/service/service.rb +28 -3
  398. data/lib/puppet/provider/service/smf.rb +0 -24
  399. data/lib/puppet/provider/service/src.rb +2 -2
  400. data/lib/puppet/provider/service/systemd.rb +18 -8
  401. data/lib/puppet/provider/service/windows.rb +38 -0
  402. data/lib/puppet/provider/user/aix.rb +2 -2
  403. data/lib/puppet/provider/user/directoryservice.rb +26 -13
  404. data/lib/puppet/provider/user/ldap.rb +1 -1
  405. data/lib/puppet/provider/user/openbsd.rb +1 -1
  406. data/lib/puppet/provider/user/pw.rb +1 -1
  407. data/lib/puppet/provider/user/user_role_add.rb +2 -2
  408. data/lib/puppet/provider/user/useradd.rb +4 -4
  409. data/lib/puppet/provider/user/windows_adsi.rb +1 -1
  410. data/lib/puppet/reference/configuration.rb +1 -1
  411. data/lib/puppet/reference/indirection.rb +4 -4
  412. data/lib/puppet/reference/report.rb +1 -1
  413. data/lib/puppet/reports.rb +1 -1
  414. data/lib/puppet/reports/http.rb +2 -2
  415. data/lib/puppet/reports/log.rb +1 -1
  416. data/lib/puppet/reports/store.rb +2 -2
  417. data/lib/puppet/resource.rb +4 -4
  418. data/lib/puppet/resource/catalog.rb +5 -5
  419. data/lib/puppet/resource/status.rb +2 -2
  420. data/lib/puppet/resource/type.rb +4 -4
  421. data/lib/puppet/resource/type_collection.rb +6 -4
  422. data/lib/puppet/runtime.rb +1 -1
  423. data/lib/puppet/scheduler.rb +4 -4
  424. data/lib/puppet/settings.rb +61 -37
  425. data/lib/puppet/settings/autosign_setting.rb +1 -1
  426. data/lib/puppet/settings/base_setting.rb +2 -2
  427. data/lib/puppet/settings/certificate_revocation_setting.rb +1 -1
  428. data/lib/puppet/settings/config_file.rb +2 -9
  429. data/lib/puppet/settings/errors.rb +1 -1
  430. data/lib/puppet/settings/priority_setting.rb +3 -3
  431. data/lib/puppet/settings/value_translator.rb +0 -1
  432. data/lib/puppet/ssl.rb +11 -11
  433. data/lib/puppet/ssl/base.rb +3 -3
  434. data/lib/puppet/ssl/certificate.rb +1 -1
  435. data/lib/puppet/ssl/certificate_request.rb +2 -2
  436. data/lib/puppet/ssl/certificate_request_attributes.rb +2 -2
  437. data/lib/puppet/ssl/oids.rb +1 -1
  438. data/lib/puppet/ssl/openssl_loader.rb +1 -1
  439. data/lib/puppet/ssl/ssl_context.rb +1 -1
  440. data/lib/puppet/ssl/ssl_provider.rb +1 -1
  441. data/lib/puppet/ssl/state_machine.rb +2 -2
  442. data/lib/puppet/ssl/verifier.rb +5 -1
  443. data/lib/puppet/syntax_checkers/base64.rb +1 -1
  444. data/lib/puppet/syntax_checkers/epp.rb +1 -1
  445. data/lib/puppet/syntax_checkers/json.rb +1 -1
  446. data/lib/puppet/syntax_checkers/pp.rb +1 -1
  447. data/lib/puppet/transaction.rb +11 -11
  448. data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
  449. data/lib/puppet/transaction/event.rb +4 -4
  450. data/lib/puppet/transaction/event_manager.rb +1 -1
  451. data/lib/puppet/transaction/persistence.rb +1 -1
  452. data/lib/puppet/transaction/report.rb +2 -2
  453. data/lib/puppet/transaction/resource_harness.rb +1 -1
  454. data/lib/puppet/type.rb +14 -14
  455. data/lib/puppet/type/component.rb +3 -3
  456. data/lib/puppet/type/exec.rb +16 -3
  457. data/lib/puppet/type/file.rb +37 -19
  458. data/lib/puppet/type/file/checksum.rb +1 -1
  459. data/lib/puppet/type/file/checksum_value.rb +2 -2
  460. data/lib/puppet/type/file/content.rb +2 -2
  461. data/lib/puppet/type/file/data_sync.rb +2 -2
  462. data/lib/puppet/type/file/ensure.rb +1 -1
  463. data/lib/puppet/type/file/group.rb +1 -1
  464. data/lib/puppet/type/file/mode.rb +7 -1
  465. data/lib/puppet/type/file/selcontext.rb +2 -2
  466. data/lib/puppet/type/file/source.rb +4 -4
  467. data/lib/puppet/type/filebucket.rb +1 -1
  468. data/lib/puppet/type/group.rb +2 -2
  469. data/lib/puppet/type/package.rb +2 -2
  470. data/lib/puppet/type/resources.rb +2 -2
  471. data/lib/puppet/type/service.rb +18 -38
  472. data/lib/puppet/type/tidy.rb +25 -6
  473. data/lib/puppet/type/user.rb +43 -25
  474. data/lib/puppet/util.rb +43 -34
  475. data/lib/puppet/util/at_fork.rb +3 -3
  476. data/lib/puppet/util/at_fork/solaris.rb +1 -1
  477. data/lib/puppet/util/autoload.rb +4 -4
  478. data/lib/puppet/util/checksums.rb +3 -3
  479. data/lib/puppet/util/colors.rb +1 -1
  480. data/lib/puppet/util/command_line.rb +6 -6
  481. data/lib/puppet/util/command_line/puppet_option_parser.rb +2 -2
  482. data/lib/puppet/util/execution.rb +2 -2
  483. data/lib/puppet/util/feature.rb +2 -2
  484. data/lib/puppet/util/filetype.rb +1 -1
  485. data/lib/puppet/util/http_proxy.rb +1 -1
  486. data/lib/puppet/util/inifile.rb +2 -2
  487. data/lib/puppet/util/instance_loader.rb +3 -3
  488. data/lib/puppet/util/json_lockfile.rb +1 -1
  489. data/lib/puppet/util/ldap/connection.rb +1 -1
  490. data/lib/puppet/util/ldap/generator.rb +1 -1
  491. data/lib/puppet/util/ldap/manager.rb +3 -3
  492. data/lib/puppet/util/limits.rb +1 -1
  493. data/lib/puppet/util/log.rb +6 -6
  494. data/lib/puppet/util/log/destinations.rb +1 -1
  495. data/lib/puppet/util/logging.rb +2 -2
  496. data/lib/puppet/util/metric.rb +2 -2
  497. data/lib/puppet/util/monkey_patches.rb +9 -20
  498. data/lib/puppet/util/network_device/base.rb +3 -3
  499. data/lib/puppet/util/network_device/config.rb +2 -2
  500. data/lib/puppet/util/network_device/transport.rb +1 -1
  501. data/lib/puppet/util/network_device/transport/base.rb +2 -2
  502. data/lib/puppet/util/package/version/range.rb +6 -6
  503. data/lib/puppet/util/package/version/range/eq.rb +1 -1
  504. data/lib/puppet/util/package/version/range/gt.rb +1 -1
  505. data/lib/puppet/util/package/version/range/gt_eq.rb +1 -1
  506. data/lib/puppet/util/package/version/range/lt.rb +1 -1
  507. data/lib/puppet/util/package/version/range/lt_eq.rb +1 -1
  508. data/lib/puppet/util/package/version/range/min_max.rb +1 -1
  509. data/lib/puppet/util/package/version/range/simple.rb +1 -1
  510. data/lib/puppet/util/package/version/rpm.rb +1 -1
  511. data/lib/puppet/util/pidlock.rb +1 -1
  512. data/lib/puppet/util/plist.rb +1 -1
  513. data/lib/puppet/util/posix.rb +1 -1
  514. data/lib/puppet/util/profiler.rb +3 -3
  515. data/lib/puppet/util/profiler/aggregate.rb +2 -2
  516. data/lib/puppet/util/profiler/object_counts.rb +1 -1
  517. data/lib/puppet/util/profiler/wall_clock.rb +1 -1
  518. data/lib/puppet/util/provider_features.rb +2 -2
  519. data/lib/puppet/util/rdoc.rb +2 -2
  520. data/lib/puppet/util/rdoc/generators/puppet_generator.rb +2 -2
  521. data/lib/puppet/util/rdoc/parser.rb +6 -6
  522. data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +1 -1
  523. data/lib/puppet/util/reference.rb +1 -1
  524. data/lib/puppet/util/resource_template.rb +2 -2
  525. data/lib/puppet/util/rubygems.rb +1 -1
  526. data/lib/puppet/util/selinux.rb +30 -4
  527. data/lib/puppet/util/skip_tags.rb +1 -1
  528. data/lib/puppet/util/storage.rb +1 -1
  529. data/lib/puppet/util/suidmanager.rb +2 -2
  530. data/lib/puppet/util/symbolic_file_mode.rb +30 -18
  531. data/lib/puppet/util/tag_set.rb +1 -1
  532. data/lib/puppet/util/tagging.rb +1 -1
  533. data/lib/puppet/util/watched_file.rb +1 -1
  534. data/lib/puppet/util/watcher.rb +3 -3
  535. data/lib/puppet/util/windows.rb +20 -20
  536. data/lib/puppet/util/windows/access_control_entry.rb +1 -1
  537. data/lib/puppet/util/windows/adsi.rb +1 -1
  538. data/lib/puppet/util/windows/daemon.rb +1 -1
  539. data/lib/puppet/util/windows/error.rb +2 -2
  540. data/lib/puppet/util/windows/file.rb +1 -1
  541. data/lib/puppet/util/windows/monkey_patches/process.rb +2 -2
  542. data/lib/puppet/util/windows/principal.rb +1 -1
  543. data/lib/puppet/util/windows/process.rb +2 -2
  544. data/lib/puppet/util/windows/registry.rb +1 -1
  545. data/lib/puppet/util/windows/root_certs.rb +2 -2
  546. data/lib/puppet/util/windows/security.rb +1 -1
  547. data/lib/puppet/util/windows/security_descriptor.rb +1 -1
  548. data/lib/puppet/util/windows/service.rb +1 -1
  549. data/lib/puppet/util/windows/sid.rb +4 -2
  550. data/lib/puppet/util/windows/user.rb +1 -1
  551. data/lib/puppet/vendor.rb +1 -1
  552. data/lib/puppet/version.rb +1 -1
  553. data/lib/puppet/x509.rb +4 -4
  554. data/lib/puppet/x509/cert_provider.rb +4 -22
  555. data/lib/puppet/x509/pem_store.rb +1 -1
  556. data/lib/puppet_pal.rb +2 -2
  557. data/locales/puppet.pot +349 -305
  558. data/man/man5/puppet.conf.5 +259 -241
  559. data/man/man8/puppet-agent.8 +1 -1
  560. data/man/man8/puppet-apply.8 +1 -1
  561. data/man/man8/puppet-catalog.8 +9 -9
  562. data/man/man8/puppet-config.8 +1 -1
  563. data/man/man8/puppet-describe.8 +1 -1
  564. data/man/man8/puppet-device.8 +1 -1
  565. data/man/man8/puppet-doc.8 +1 -1
  566. data/man/man8/puppet-epp.8 +1 -1
  567. data/man/man8/puppet-facts.8 +7 -7
  568. data/man/man8/puppet-filebucket.8 +1 -1
  569. data/man/man8/puppet-generate.8 +1 -1
  570. data/man/man8/puppet-help.8 +1 -1
  571. data/man/man8/puppet-lookup.8 +1 -1
  572. data/man/man8/puppet-module.8 +1 -1
  573. data/man/man8/puppet-node.8 +5 -5
  574. data/man/man8/puppet-parser.8 +1 -1
  575. data/man/man8/puppet-plugin.8 +1 -1
  576. data/man/man8/puppet-report.8 +5 -5
  577. data/man/man8/puppet-resource.8 +1 -1
  578. data/man/man8/puppet-script.8 +1 -1
  579. data/man/man8/puppet-ssl.8 +1 -1
  580. data/man/man8/puppet.8 +2 -2
  581. data/spec/fixtures/ssl/127.0.0.1-key.pem +107 -57
  582. data/spec/fixtures/ssl/127.0.0.1.pem +52 -31
  583. data/spec/fixtures/ssl/bad-basic-constraints.pem +57 -35
  584. data/spec/fixtures/ssl/bad-int-basic-constraints.pem +57 -35
  585. data/spec/fixtures/ssl/ca.pem +57 -35
  586. data/spec/fixtures/ssl/crl.pem +28 -18
  587. data/spec/fixtures/ssl/ec-key-openssl.pem +8 -0
  588. data/spec/fixtures/ssl/ec-key-pk8.pem +5 -0
  589. data/spec/fixtures/ssl/ec-key.pem +11 -11
  590. data/spec/fixtures/ssl/ec.pem +33 -24
  591. data/spec/fixtures/ssl/encrypted-ec-key.pem +12 -12
  592. data/spec/fixtures/ssl/encrypted-key.pem +108 -58
  593. data/spec/fixtures/ssl/intermediate-agent-crl.pem +28 -19
  594. data/spec/fixtures/ssl/intermediate-agent.pem +57 -36
  595. data/spec/fixtures/ssl/intermediate-crl.pem +31 -21
  596. data/spec/fixtures/ssl/intermediate.pem +57 -36
  597. data/spec/fixtures/ssl/oid-key.pem +117 -0
  598. data/spec/fixtures/ssl/oid.pem +69 -0
  599. data/spec/fixtures/ssl/pluto-key.pem +107 -57
  600. data/spec/fixtures/ssl/pluto.pem +52 -30
  601. data/spec/fixtures/ssl/request-key.pem +107 -57
  602. data/spec/fixtures/ssl/request.pem +47 -26
  603. data/spec/fixtures/ssl/revoked-key.pem +107 -57
  604. data/spec/fixtures/ssl/revoked.pem +52 -30
  605. data/spec/fixtures/ssl/signed-key.pem +107 -57
  606. data/spec/fixtures/ssl/signed.pem +52 -30
  607. data/spec/fixtures/ssl/tampered-cert.pem +52 -30
  608. data/spec/fixtures/ssl/tampered-csr.pem +47 -26
  609. data/spec/fixtures/ssl/trusted_oid_mapping.yaml +5 -0
  610. data/spec/fixtures/ssl/unknown-127.0.0.1-key.pem +107 -57
  611. data/spec/fixtures/ssl/unknown-127.0.0.1.pem +50 -29
  612. data/spec/fixtures/ssl/unknown-ca-key.pem +107 -57
  613. data/spec/fixtures/ssl/unknown-ca.pem +55 -33
  614. data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset +9 -0
  615. data/spec/integration/application/filebucket_spec.rb +11 -0
  616. data/spec/integration/application/module_spec.rb +21 -0
  617. data/spec/integration/application/resource_spec.rb +64 -0
  618. data/spec/integration/application/ssl_spec.rb +20 -0
  619. data/spec/integration/defaults_spec.rb +5 -0
  620. data/spec/integration/environments/settings_interpolation_spec.rb +0 -4
  621. data/spec/integration/http/client_spec.rb +1 -1
  622. data/spec/integration/indirector/facts/facter_spec.rb +90 -36
  623. data/spec/integration/type/exec_spec.rb +70 -45
  624. data/spec/integration/type/file_spec.rb +5 -5
  625. data/spec/lib/puppet/test_ca.rb +7 -2
  626. data/spec/lib/puppet_spec/files.rb +1 -1
  627. data/spec/lib/puppet_spec/settings.rb +1 -0
  628. data/spec/shared_contexts/provider.rb +16 -0
  629. data/spec/spec_helper.rb +11 -1
  630. data/spec/unit/application/agent_spec.rb +7 -2
  631. data/spec/unit/configurer/downloader_spec.rb +6 -0
  632. data/spec/unit/configurer_spec.rb +23 -0
  633. data/spec/unit/environments_spec.rb +35 -0
  634. data/spec/unit/file_bucket/dipper_spec.rb +1 -1
  635. data/spec/unit/file_serving/fileset_spec.rb +60 -0
  636. data/spec/unit/file_system_spec.rb +6 -0
  637. data/spec/unit/functions/assert_type_spec.rb +1 -1
  638. data/spec/unit/functions/empty_spec.rb +10 -0
  639. data/spec/unit/functions/lookup_spec.rb +23 -0
  640. data/spec/unit/functions/unwrap_spec.rb +8 -0
  641. data/spec/unit/functions4_spec.rb +19 -10
  642. data/spec/unit/gettext/config_spec.rb +12 -0
  643. data/spec/unit/http/service/compiler_spec.rb +123 -0
  644. data/spec/unit/indirector/catalog/compiler_spec.rb +14 -10
  645. data/spec/unit/indirector/resource/ral_spec.rb +40 -75
  646. data/spec/unit/module_spec.rb +1 -1
  647. data/spec/unit/module_tool/applications/installer_spec.rb +13 -2
  648. data/spec/unit/parser/compiler_spec.rb +29 -0
  649. data/spec/unit/parser/functions/fqdn_rand_spec.rb +15 -1
  650. data/spec/unit/parser/templatewrapper_spec.rb +12 -2
  651. data/spec/unit/pops/loaders/dependency_loader_spec.rb +1 -10
  652. data/spec/unit/pops/lookup/context_spec.rb +1 -1
  653. data/spec/unit/pops/parser/lexer2_spec.rb +0 -4
  654. data/spec/unit/pops/types/p_sem_ver_type_spec.rb +18 -0
  655. data/spec/unit/pops/types/p_sensitive_type_spec.rb +18 -0
  656. data/spec/unit/pops/types/type_parser_spec.rb +2 -1
  657. data/spec/unit/provider/package/dnfmodule_spec.rb +13 -4
  658. data/spec/unit/provider/package/gem_spec.rb +3 -1
  659. data/spec/unit/provider/package/nim_spec.rb +42 -0
  660. data/spec/unit/provider/package/pip2_spec.rb +3 -1
  661. data/spec/unit/provider/package/pip3_spec.rb +3 -1
  662. data/spec/unit/provider/package/pip_spec.rb +40 -1
  663. data/spec/unit/provider/package/pkg_spec.rb +44 -44
  664. data/spec/unit/provider/package/puppet_gem_spec.rb +31 -1
  665. data/spec/unit/provider/package/puppetserver_gem_spec.rb +2 -0
  666. data/spec/unit/provider/package/windows/exe_package_spec.rb +17 -0
  667. data/spec/unit/provider/parsedfile_spec.rb +10 -0
  668. data/spec/unit/provider/service/base_spec.rb +8 -8
  669. data/spec/unit/provider/service/bsd_spec.rb +0 -4
  670. data/spec/unit/provider/service/daemontools_spec.rb +1 -1
  671. data/spec/unit/provider/service/debian_spec.rb +15 -17
  672. data/spec/unit/provider/service/freebsd_spec.rb +1 -1
  673. data/spec/unit/provider/service/gentoo_spec.rb +19 -14
  674. data/spec/unit/provider/service/init_spec.rb +29 -20
  675. data/spec/unit/provider/service/launchd_spec.rb +10 -12
  676. data/spec/unit/provider/service/openbsd_spec.rb +21 -35
  677. data/spec/unit/provider/service/openrc_spec.rb +15 -14
  678. data/spec/unit/provider/service/openwrt_spec.rb +3 -1
  679. data/spec/unit/provider/service/redhat_spec.rb +20 -19
  680. data/spec/unit/provider/service/smf_spec.rb +6 -5
  681. data/spec/unit/provider/service/src_spec.rb +5 -10
  682. data/spec/unit/provider/service/systemd_spec.rb +80 -29
  683. data/spec/unit/provider/service/upstart_spec.rb +25 -20
  684. data/spec/unit/provider/service/windows_spec.rb +202 -0
  685. data/spec/unit/provider/user/directoryservice_spec.rb +67 -35
  686. data/spec/unit/provider/user/useradd_spec.rb +18 -3
  687. data/spec/unit/resource/catalog_spec.rb +1 -1
  688. data/spec/unit/resource/type_collection_spec.rb +16 -0
  689. data/spec/unit/resource/type_spec.rb +2 -2
  690. data/spec/unit/settings/config_file_spec.rb +1 -11
  691. data/spec/unit/settings/value_translator_spec.rb +4 -5
  692. data/spec/unit/settings_spec.rb +120 -79
  693. data/spec/unit/ssl/ssl_provider_spec.rb +18 -16
  694. data/spec/unit/ssl/state_machine_spec.rb +19 -5
  695. data/spec/unit/transaction/additional_resource_generator_spec.rb +0 -2
  696. data/spec/unit/transaction_spec.rb +18 -20
  697. data/spec/unit/type/exec_spec.rb +76 -29
  698. data/spec/unit/type/file/selinux_spec.rb +3 -3
  699. data/spec/unit/type/file/source_spec.rb +4 -4
  700. data/spec/unit/type/service_spec.rb +59 -188
  701. data/spec/unit/type/tidy_spec.rb +24 -7
  702. data/spec/unit/type/user_spec.rb +45 -0
  703. data/spec/unit/util/at_fork_spec.rb +9 -9
  704. data/spec/unit/util/ldap/connection_spec.rb +10 -10
  705. data/spec/unit/util/ldap/manager_spec.rb +2 -2
  706. data/spec/unit/util/posix_spec.rb +1 -1
  707. data/spec/unit/util/selinux_spec.rb +87 -16
  708. data/spec/unit/util/windows/sid_spec.rb +39 -4
  709. data/spec/unit/util_spec.rb +1 -3
  710. data/spec/unit/x509/cert_provider_spec.rb +9 -1
  711. data/tasks/generate_cert_fixtures.rake +12 -3
  712. metadata +22 -3
@@ -505,28 +505,30 @@ describe Puppet::SSL::SSLProvider do
505
505
  }.to raise_error(Puppet::Error, /The client certificate is missing from/)
506
506
  end
507
507
 
508
- it 'loads the private key and client cert' do
509
- ssl_context = subject.load_context
508
+ context 'loading private keys', unless: RUBY_PLATFORM == 'java' do
509
+ it 'loads the private key and client cert' do
510
+ ssl_context = subject.load_context
510
511
 
511
- expect(ssl_context.private_key).to be_an(OpenSSL::PKey::RSA)
512
- expect(ssl_context.client_cert).to be_an(OpenSSL::X509::Certificate)
513
- end
512
+ expect(ssl_context.private_key).to be_an(OpenSSL::PKey::RSA)
513
+ expect(ssl_context.client_cert).to be_an(OpenSSL::X509::Certificate)
514
+ end
514
515
 
515
- it 'loads a password protected key and client cert' do
516
- FileUtils.cp(File.join(PuppetSpec::FIXTURE_DIR, 'ssl', 'encrypted-key.pem'), File.join(Puppet[:privatekeydir], 'signed.pem'))
516
+ it 'loads a password protected key and client cert' do
517
+ FileUtils.cp(File.join(PuppetSpec::FIXTURE_DIR, 'ssl', 'encrypted-key.pem'), File.join(Puppet[:privatekeydir], 'signed.pem'))
517
518
 
518
- ssl_context = subject.load_context(password: '74695716c8b6')
519
+ ssl_context = subject.load_context(password: '74695716c8b6')
519
520
 
520
- expect(ssl_context.private_key).to be_an(OpenSSL::PKey::RSA)
521
- expect(ssl_context.client_cert).to be_an(OpenSSL::X509::Certificate)
522
- end
521
+ expect(ssl_context.private_key).to be_an(OpenSSL::PKey::RSA)
522
+ expect(ssl_context.client_cert).to be_an(OpenSSL::X509::Certificate)
523
+ end
523
524
 
524
- it 'raises if the password is incorrect' do
525
- FileUtils.cp(File.join(PuppetSpec::FIXTURE_DIR, 'ssl', 'encrypted-key.pem'), File.join(Puppet[:privatekeydir], 'signed.pem'))
525
+ it 'raises if the password is incorrect' do
526
+ FileUtils.cp(File.join(PuppetSpec::FIXTURE_DIR, 'ssl', 'encrypted-key.pem'), File.join(Puppet[:privatekeydir], 'signed.pem'))
526
527
 
527
- expect {
528
- subject.load_context(password: 'wrongpassword')
529
- }.to raise_error(Puppet::SSL::SSLError, /Failed to load private key for host 'signed': Could not parse PKey/)
528
+ expect {
529
+ subject.load_context(password: 'wrongpassword')
530
+ }.to raise_error(Puppet::SSL::SSLError, /Failed to load private key for host 'signed': Could not parse PKey/)
531
+ end
530
532
  end
531
533
  end
532
534
 
@@ -31,6 +31,14 @@ describe Puppet::SSL::StateMachine, unless: Puppet::Util::Platform.jruby? do
31
31
  allow(Kernel).to receive(:sleep)
32
32
  end
33
33
 
34
+ def expected_digest(name, content)
35
+ OpenSSL::Digest.new(name).hexdigest(content)
36
+ end
37
+
38
+ def to_fingerprint(digest)
39
+ digest.scan(/../).join(':').upcase
40
+ end
41
+
34
42
  context 'when passing keyword arguments' do
35
43
  it "accepts digest" do
36
44
  expect(described_class.new(digest: 'SHA512').digest).to eq('SHA512')
@@ -395,29 +403,35 @@ describe Puppet::SSL::StateMachine, unless: Puppet::Util::Platform.jruby? do
395
403
 
396
404
  it 'verifies CA cert bundle if a ca_fingerprint is given case-insensitively' do
397
405
  Puppet[:log_level] = :info
398
- machine = described_class.new(digest: 'SHA256', ca_fingerprint: 'caacf69bbbcdad9dbcda92dd2da3608b639d1aea4c314d6cc6823cdb32d8e0f8')
406
+
407
+ digest = expected_digest('SHA256', cacert_pem)
408
+ fingerprint = to_fingerprint(digest)
409
+ machine = described_class.new(digest: 'SHA256', ca_fingerprint: digest.downcase)
399
410
  state = Puppet::SSL::StateMachine::NeedCACerts.new(machine)
400
411
  state.next_state
401
412
 
402
- expect(@logs).to include(an_object_having_attributes(message: "Verified CA bundle with digest (SHA256) CA:AC:F6:9B:BB:CD:AD:9D:BC:DA:92:DD:2D:A3:60:8B:63:9D:1A:EA:4C:31:4D:6C:C6:82:3C:DB:32:D8:E0:F8"))
413
+ expect(@logs).to include(an_object_having_attributes(message: "Verified CA bundle with digest (SHA256) #{fingerprint}"))
403
414
  end
404
415
 
405
416
  it 'verifies CA cert bundle using non-default fingerprint' do
406
417
  Puppet[:log_level] = :info
407
- machine = described_class.new(digest: 'SHA512', ca_fingerprint: '3c9d1482b878913ad95c9631feac5090cb05c6eab9496178d6fd5c14a023da3b1a8650a3cbaac516d9a48caf0b0742e1ed7eebf55105c024c74834a45056a9d9')
418
+
419
+ digest = expected_digest('SHA512', cacert_pem)
420
+ machine = described_class.new(digest: 'SHA512', ca_fingerprint: digest)
408
421
  state = Puppet::SSL::StateMachine::NeedCACerts.new(machine)
409
422
  state.next_state
410
423
 
411
- expect(@logs).to include(an_object_having_attributes(message: "Verified CA bundle with digest (SHA512) 3C:9D:14:82:B8:78:91:3A:D9:5C:96:31:FE:AC:50:90:CB:05:C6:EA:B9:49:61:78:D6:FD:5C:14:A0:23:DA:3B:1A:86:50:A3:CB:AA:C5:16:D9:A4:8C:AF:0B:07:42:E1:ED:7E:EB:F5:51:05:C0:24:C7:48:34:A4:50:56:A9:D9"))
424
+ expect(@logs).to include(an_object_having_attributes(message: "Verified CA bundle with digest (SHA512) #{to_fingerprint(digest)}"))
412
425
  end
413
426
 
414
427
  it 'returns an error if verification fails' do
415
428
  machine = described_class.new(digest: 'SHA256', ca_fingerprint: 'wrong!')
416
429
  state = Puppet::SSL::StateMachine::NeedCACerts.new(machine)
417
430
 
431
+ fingerprint = to_fingerprint(expected_digest('SHA256', cacert_pem))
418
432
  st = state.next_state
419
433
  expect(st).to be_an_instance_of(Puppet::SSL::StateMachine::Error)
420
- expect(st.message).to eq("CA bundle with digest (SHA256) CA:AC:F6:9B:BB:CD:AD:9D:BC:DA:92:DD:2D:A3:60:8B:63:9D:1A:EA:4C:31:4D:6C:C6:82:3C:DB:32:D8:E0:F8 did not match expected digest WR:ON:G!")
434
+ expect(st.message).to eq("CA bundle with digest (SHA256) #{fingerprint} did not match expected digest WR:ON:G!")
421
435
  end
422
436
  end
423
437
  end
@@ -93,8 +93,6 @@ describe Puppet::Transaction::AdditionalResourceGenerator do
93
93
  end
94
94
  end
95
95
 
96
-
97
-
98
96
  after(:each) do
99
97
  Puppet::Type.rmtype(:gen_empty)
100
98
  Puppet::Type.rmtype(:eval_after)
@@ -5,13 +5,6 @@ require 'puppet_spec/compiler'
5
5
  require 'puppet/transaction'
6
6
  require 'fileutils'
7
7
 
8
- Puppet::Type.newtype(:generator) do
9
- newparam(:name) { isnamevar }
10
-
11
- def generate
12
- end
13
- end
14
-
15
8
  describe Puppet::Transaction do
16
9
  include PuppetSpec::Files
17
10
  include PuppetSpec::Compiler
@@ -27,6 +20,19 @@ describe Puppet::Transaction do
27
20
  transaction
28
21
  end
29
22
 
23
+ before(:all) do
24
+ Puppet::Type.newtype(:transaction_generator) do
25
+ newparam(:name) { isnamevar }
26
+
27
+ def generate
28
+ end
29
+ end
30
+ end
31
+
32
+ after(:all) do
33
+ Puppet::Type.rmtype(:transaction_generator)
34
+ end
35
+
30
36
  before do
31
37
  @basepath = make_absolute("/what/ever")
32
38
  @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new, nil, Puppet::Graph::SequentialPrioritizer.new)
@@ -330,9 +336,9 @@ describe Puppet::Transaction do
330
336
  describe "when generating resources before traversal" do
331
337
  let(:catalog) { Puppet::Resource::Catalog.new }
332
338
  let(:transaction) { Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new) }
333
- let(:generator) { Puppet::Type.type(:generator).new :title => "generator" }
339
+ let(:generator) { Puppet::Type.type(:transaction_generator).new :title => "generator" }
334
340
  let(:generated) do
335
- %w[a b c].map { |name| Puppet::Type.type(:generator).new(:name => name) }
341
+ %w[a b c].map { |name| Puppet::Type.type(:transaction_generator).new(:name => name) }
336
342
  end
337
343
 
338
344
  before :each do
@@ -640,7 +646,7 @@ describe Puppet::Transaction do
640
646
  end
641
647
 
642
648
  describe "and new resources are generated" do
643
- let(:generator) { Puppet::Type.type(:generator).new :title => "generator" }
649
+ let(:generator) { Puppet::Type.type(:transaction_generator).new :title => "generator" }
644
650
  let(:generated) do
645
651
  %w[a b c].map { |name| Puppet::Type.type(:package).new :title => "foo", :name => name, :provider => :apt }
646
652
  end
@@ -753,16 +759,8 @@ describe Puppet::Transaction do
753
759
  end
754
760
 
755
761
  it "should call Selinux.matchpathcon_fini in case Selinux is enabled ", :if => Puppet.features.posix? do
756
- unless defined?(Selinux)
757
- module Selinux
758
- def self.is_selinux_enabled
759
- true
760
- end
761
-
762
- def self.matchpathcon_fini
763
- end
764
- end
765
- end
762
+ selinux = double('selinux', is_selinux_enabled: true, matchpathcon_fini: nil)
763
+ stub_const('Selinux', selinux)
766
764
 
767
765
  resource = Puppet::Type.type(:file).new(:path => make_absolute("/tmp/foo"))
768
766
  transaction = transaction_with_resource(resource)
@@ -239,6 +239,19 @@ RSpec.describe Puppet::Type.type(:exec) do
239
239
  expect(dependencies.collect(&:to_s)).to eq([Puppet::Relationship.new(tmp, execer).to_s])
240
240
  end
241
241
 
242
+ it "should be able to autorequire files mentioned in the array command" do
243
+ foo = make_absolute('/bin/foo')
244
+ catalog = Puppet::Resource::Catalog.new
245
+ tmp = Puppet::Type.type(:file).new(:name => foo)
246
+ execer = Puppet::Type.type(:exec).new(:name => 'test array', :command => [foo, 'bar'])
247
+
248
+ catalog.add_resource tmp
249
+ catalog.add_resource execer
250
+ dependencies = execer.autorequire(catalog)
251
+
252
+ expect(dependencies.collect(&:to_s)).to eq([Puppet::Relationship.new(tmp, execer).to_s])
253
+ end
254
+
242
255
  describe "when handling the path parameter" do
243
256
  expect = %w{one two three four}
244
257
  { "an array" => expect,
@@ -346,7 +359,13 @@ RSpec.describe Puppet::Type.type(:exec) do
346
359
  end
347
360
 
348
361
  shared_examples_for "all exec command parameters" do |param|
349
- { "relative" => "example", "absolute" => "/bin/example" }.sort.each do |name, command|
362
+ array_cmd = ["/bin/example", "*"]
363
+ array_cmd = [["/bin/example", "*"]] if [:onlyif, :unless].include?(param)
364
+
365
+ commands = { "relative" => "example", "absolute" => "/bin/example" }
366
+ commands["array"] = array_cmd
367
+
368
+ commands.sort.each do |name, command|
350
369
  describe "if command is #{name}" do
351
370
  before :each do
352
371
  @param = param
@@ -379,45 +398,44 @@ RSpec.describe Puppet::Type.type(:exec) do
379
398
  end
380
399
 
381
400
  shared_examples_for "all exec command parameters that take arrays" do |param|
382
- describe "when given an array of inputs" do
383
- before :each do
384
- @test = Puppet::Type.type(:exec).new(:name => @executable)
385
- end
401
+ [
402
+ %w{one two three},
403
+ [%w{one -a}, %w{two, -b}, 'three']
404
+ ].each do |input|
405
+ context "when given #{input.inspect} as input" do
406
+ let(:resource) { Puppet::Type.type(:exec).new(:name => @executable) }
386
407
 
387
- it "should accept the array when all commands return valid" do
388
- input = %w{one two three}
389
- expect(@test.provider).to receive(:validatecmd).exactly(input.length).times.and_return(true)
390
- @test[param] = input
391
- expect(@test[param]).to eq(input)
392
- end
408
+ it "accepts the array when all commands return valid" do
409
+ input = %w{one two three}
410
+ allow(resource.provider).to receive(:validatecmd).exactly(input.length).times.and_return(true)
411
+ resource[param] = input
412
+ expect(resource[param]).to eq(input)
413
+ end
393
414
 
394
- it "should reject the array when any commands return invalid" do
395
- input = %w{one two three}
396
- expect(@test.provider).to receive(:validatecmd).with(input.first).and_return(false)
397
- input[1..-1].each do |cmd|
398
- expect(@test.provider).to receive(:validatecmd).with(cmd).and_return(true)
415
+ it "rejects the array when any commands return invalid" do
416
+ input = %w{one two three}
417
+ allow(resource.provider).to receive(:validatecmd).with(input[0]).and_return(true)
418
+ allow(resource.provider).to receive(:validatecmd).with(input[1]).and_raise(Puppet::Error)
419
+
420
+ expect { resource[param] = input }.to raise_error(Puppet::ResourceError, /Parameter #{param} failed/)
399
421
  end
400
- @test[param] = input
401
- expect(@test[param]).to eq(input)
402
- end
403
422
 
404
- it "should reject the array when all commands return invalid" do
405
- input = %w{one two three}
406
- expect(@test.provider).to receive(:validatecmd).exactly(input.length).times.and_return(false)
407
- @test[param] = input
408
- expect(@test[param]).to eq(input)
423
+ it "stops at the first invalid command" do
424
+ input = %w{one two three}
425
+ allow(resource.provider).to receive(:validatecmd).with(input[0]).and_raise(Puppet::Error)
426
+
427
+ expect(resource.provider).not_to receive(:validatecmd).with(input[1])
428
+ expect(resource.provider).not_to receive(:validatecmd).with(input[2])
429
+ expect { resource[param] = input }.to raise_error(Puppet::ResourceError, /Parameter #{param} failed/)
430
+ end
409
431
  end
410
432
  end
411
433
  end
412
434
 
413
435
  describe "when setting command" do
414
436
  subject { described_class.new(:name => @command) }
415
- it "fails when passed an Array" do
416
- expect { subject[:command] = [] }.to raise_error Puppet::Error, /Command must be a String/
417
- end
418
-
419
437
  it "fails when passed a Hash" do
420
- expect { subject[:command] = {} }.to raise_error Puppet::Error, /Command must be a String/
438
+ expect { subject[:command] = {} }.to raise_error Puppet::Error, /Command must be a String or Array<String>/
421
439
  end
422
440
  end
423
441
 
@@ -759,6 +777,35 @@ RSpec.describe Puppet::Type.type(:exec) do
759
777
  end
760
778
  end
761
779
 
780
+ context 'with an array of arrays with multiple items' do
781
+ before do
782
+ [true, false].each do |check|
783
+ allow(@test.provider).to receive(:run).with([@pass, '--flag'], check).
784
+ and_return(['test output', @pass_status])
785
+ allow(@test.provider).to receive(:run).with([@fail, '--flag'], check).
786
+ and_return(['test output', @fail_status])
787
+ allow(@test.provider).to receive(:run).with([@pass], check).
788
+ and_return(['test output', @pass_status])
789
+ allow(@test.provider).to receive(:run).with([@fail], check).
790
+ and_return(['test output', @fail_status])
791
+ end
792
+ end
793
+ it "runs if all the commands exits non-zero" do
794
+ @test[param] = [[@fail, '--flag'], [@fail], [@fail, '--flag']]
795
+ expect(@test.check_all_attributes).to eq(true)
796
+ end
797
+
798
+ it "does not run if one command exits zero" do
799
+ @test[param] = [[@pass, '--flag'], [@pass], [@fail, '--flag']]
800
+ expect(@test.check_all_attributes).to eq(false)
801
+ end
802
+
803
+ it "does not run if all command exits zero" do
804
+ @test[param] = [[@pass, '--flag'], [@pass], [@pass, '--flag']]
805
+ expect(@test.check_all_attributes).to eq(false)
806
+ end
807
+ end
808
+
762
809
  it "should emit output to debug" do
763
810
  Puppet::Util::Log.level = :debug
764
811
  @test[param] = @fail
@@ -7,7 +7,7 @@ require 'spec_helper'
7
7
 
8
8
  before do
9
9
  @path = make_absolute("/my/file")
10
- @resource = Puppet::Type.type(:file).new :path => @path
10
+ @resource = Puppet::Type.type(:file).new(:path => @path, :ensure => :file)
11
11
  @sel = property.new :resource => @resource
12
12
  end
13
13
 
@@ -50,13 +50,13 @@ require 'spec_helper'
50
50
  end
51
51
 
52
52
  it "should handle no default gracefully" do
53
- expect(@sel).to receive(:get_selinux_default_context).with(@path).and_return(nil)
53
+ expect(@sel).to receive(:get_selinux_default_context).with(@path, :file).and_return(nil)
54
54
  expect(@sel.default).to be_nil
55
55
  end
56
56
 
57
57
  it "should be able to detect matchpathcon defaults" do
58
58
  allow(@sel).to receive(:debug)
59
- expect(@sel).to receive(:get_selinux_default_context).with(@path).and_return("user_u:role_r:type_t:s0")
59
+ expect(@sel).to receive(:get_selinux_default_context).with(@path, :file).and_return("user_u:role_r:type_t:s0")
60
60
  expectedresult = case param
61
61
  when :seluser; "user_u"
62
62
  when :selrole; "role_r"
@@ -263,7 +263,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
263
263
 
264
264
  expect(@resource[:owner]).to eq(100)
265
265
  expect(@resource[:group]).to eq(200)
266
- expect(@resource[:mode]).to eq("173")
266
+ expect(@resource[:mode]).to eq("0173")
267
267
 
268
268
  # Metadata calls it checksum and checksum_type, we call it content and checksum.
269
269
  expect(@resource[:content]).to eq(@metadata.checksum)
@@ -280,7 +280,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
280
280
 
281
281
  expect(@resource[:owner]).to eq(1)
282
282
  expect(@resource[:group]).to eq(2)
283
- expect(@resource[:mode]).to eq('173')
283
+ expect(@resource[:mode]).to eq('0173')
284
284
  expect(@resource[:content]).not_to eq(@metadata.checksum)
285
285
  expect(@resource[:checksum]).not_to eq(@metadata.checksum_type.to_sym)
286
286
  end
@@ -317,7 +317,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
317
317
 
318
318
  expect(@resource[:owner]).to eq(100)
319
319
  expect(@resource[:group]).to eq(200)
320
- expect(@resource[:mode]).to eq("173")
320
+ expect(@resource[:mode]).to eq("0173")
321
321
  end
322
322
 
323
323
  it "copies the remote owner" do
@@ -335,7 +335,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
335
335
  it "copies the remote mode" do
336
336
  @source.copy_source_values
337
337
 
338
- expect(@resource[:mode]).to eq("173")
338
+ expect(@resource[:mode]).to eq("0173")
339
339
  end
340
340
  end
341
341
 
@@ -72,50 +72,65 @@ describe test_title, "when validating attribute values" do
72
72
  allow(@provider.class).to receive(:supports_parameter?).and_return(true)
73
73
  end
74
74
 
75
- it "should support :true as a value" do
76
- srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :true)
77
- expect(srv.should(:enable)).to eq(:true)
78
- end
75
+ describe "for value without required features" do
76
+ before :each do
77
+ allow(@provider).to receive(:satisfies?)
78
+ end
79
79
 
80
- it "should support :false as a value" do
81
- srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :false)
82
- expect(srv.should(:enable)).to eq(:false)
83
- end
80
+ it "should not support :mask as a value" do
81
+ expect { Puppet::Type.type(:service).new(:name => "yay", :enable => :mask) }.to raise_error(
82
+ Puppet::ResourceError,
83
+ /Provider .+ must have features 'maskable' to set 'enable' to 'mask'/
84
+ )
85
+ end
84
86
 
85
- it "should support :mask as a value" do
86
- srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :mask)
87
- expect(srv.should(:enable)).to eq(:mask)
88
- end
87
+ it "should not support :manual as a value" do
88
+ expect { Puppet::Type.type(:service).new(:name => "yay", :enable => :manual) }.to raise_error(
89
+ Puppet::ResourceError,
90
+ /Provider .+ must have features 'manual_startable' to set 'enable' to 'manual'/
91
+ )
92
+ end
89
93
 
90
- it "should support :manual as a value on Windows" do
91
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
92
- srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :manual)
93
- expect(srv.should(:enable)).to eq(:manual)
94
+ it "should not support :mask as a value" do
95
+ expect { Puppet::Type.type(:service).new(:name => "yay", :enable => :delayed) }.to raise_error(
96
+ Puppet::ResourceError,
97
+ /Provider .+ must have features 'delayed_startable' to set 'enable' to 'delayed'/
98
+ )
99
+ end
94
100
  end
95
101
 
96
- it "should support :delayed as a value on Windows" do
97
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
102
+ describe "for value with required features" do
103
+ before :each do
104
+ allow(@provider).to receive(:satisfies?).and_return(:true)
105
+ end
98
106
 
99
- srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :delayed)
100
- expect(srv.should(:enable)).to eq(:delayed)
101
- end
107
+ it "should support :true as a value" do
108
+ srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :true)
109
+ expect(srv.should(:enable)).to eq(:true)
110
+ end
102
111
 
103
- it "should not support :manual as a value when not on Windows" do
104
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
112
+ it "should support :false as a value" do
113
+ srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :false)
114
+ expect(srv.should(:enable)).to eq(:false)
115
+ end
105
116
 
106
- expect { Puppet::Type.type(:service).new(:name => "yay", :enable => :manual) }.to raise_error(
107
- Puppet::Error,
108
- /Setting enable to manual is only supported on Microsoft Windows\./
109
- )
110
- end
117
+ it "should support :mask as a value" do
118
+ srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :mask)
119
+ expect(srv.should(:enable)).to eq(:mask)
120
+ end
111
121
 
112
- it "should not support :delayed as a value when not on Windows" do
113
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
122
+ it "should support :manual as a value on Windows" do
123
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
124
+ srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :manual)
125
+ expect(srv.should(:enable)).to eq(:manual)
126
+ end
114
127
 
115
- expect { Puppet::Type.type(:service).new(:name => "yay", :enable => :delayed) }.to raise_error(
116
- Puppet::Error,
117
- /Setting enable to delayed is only supported on Microsoft Windows\./
118
- )
128
+ it "should support :delayed as a value on Windows" do
129
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
130
+
131
+ srv = Puppet::Type.type(:service).new(:name => "yay", :enable => :delayed)
132
+ expect(srv.should(:enable)).to eq(:delayed)
133
+ end
119
134
  end
120
135
  end
121
136
 
@@ -150,105 +165,24 @@ describe test_title, "when validating attribute values" do
150
165
  provider_class_with_logon_credentials = Puppet::Type.type(:service).provide(:simple) do
151
166
  has_features :manages_logon_credentials
152
167
  def logonpassword=(value) end
168
+ def logonaccount_insync?(current) end
153
169
  end
154
170
  allow(Puppet::Type.type(:service)).to receive(:defaultprovider).and_return(provider_class_with_logon_credentials)
155
171
  end
156
172
 
157
173
  describe "the 'logonaccount' property" do
158
- it "should not be munged nor checked when not on Windows" do
159
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
160
- service = Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'NonWindowsUser')
174
+ let(:service) {Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser')}
161
175
 
162
- expect { service }.not_to raise_error
163
- expect(service[:logonaccount]).to eq('NonWindowsUser')
176
+ it "should let superclass implementation resolve insyncness when provider does not respond to the 'logonaccount_insync?' method" do
177
+ allow(service.provider).to receive(:respond_to?).with(:logonaccount_insync?).and_return(false)
178
+ expect(service.property(:logonaccount).insync?('myUser')).to eq(true)
164
179
  end
165
180
 
166
- context "when on Windows", :if => Puppet::Util::Platform.windows? do
167
- before do
168
- allow(Puppet::Util::Windows::User).to receive(:password_is?).and_return(true)
169
- allow(Puppet::Util::Windows::ADSI).to receive(:computer_name).and_return("myPC")
170
- allow(Puppet::Util::Windows::User).to receive(:get_rights).and_return('SeServiceLogonRight')
171
- end
172
-
173
- it "should fail when the `Log On As A Service` right is missing from given user" do
174
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(Puppet::Util::Windows::SID::Principal.new("myUser", nil, nil, "myPC", :SidTypeUser))
175
- allow(Puppet::Util::Windows::User).to receive(:get_rights).with('myPC\\myUser').and_return("")
176
-
177
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser') }.to raise_error(Puppet::Error, /"myPC\\myUser" is missing the 'Log On As A Service' right./)
178
- end
179
-
180
- it "should fail when the `Log On As A Service` right is set to denied for given user" do
181
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(Puppet::Util::Windows::SID::Principal.new("myUser", nil, nil, "myPC", :SidTypeUser))
182
- allow(Puppet::Util::Windows::User).to receive(:get_rights).with('myPC\\myUser').and_return("SeDenyServiceLogonRight")
183
-
184
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser') }.to raise_error(Puppet::Error, /"myPC\\myUser" has the 'Log On As A Service' right set to denied./)
185
- end
186
-
187
- it "should not fail when given user has the `Log On As A Service` right" do
188
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(Puppet::Util::Windows::SID::Principal.new("myUser", nil, nil, "myPC", :SidTypeUser))
189
- allow(Puppet::Util::Windows::User).to receive(:get_rights).with('myPC\\myUser').and_return("SeServiceLogonRight")
190
-
191
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser') }.not_to raise_error
192
- end
193
-
194
- it "should not fail when given user is a default system account even if the `Log On As A Service` right is missing" do
195
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(Puppet::Util::Windows::SID::Principal.new("LOCAL SERVICE", nil, nil, "NT AUTHORITY", :SidTypeUser))
196
- allow(Puppet::Util::Windows::User).to receive(:default_system_account?).and_return(true)
197
-
198
- expect(Puppet::Util::Windows::User).not_to receive(:get_rights)
199
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser') }.not_to raise_error
200
- end
201
-
202
- ['LocalSystem', '.\LocalSystem', 'myPC\LocalSystem', 'lOcALsysTem'].each do |user_input|
203
- it "should succesfully munge #{user_input} to 'LocalSystem'" do
204
- service = Puppet::Type.type(:service).new(:name => "yay", :logonaccount => user_input)
205
-
206
- expect { service }.not_to raise_error
207
- expect(service[:logonaccount]).to eq('LocalSystem')
208
- end
209
- end
210
-
211
- it "should succesfully munge local account" do
212
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(Puppet::Util::Windows::SID::Principal.new("myUser", nil, nil, "myPC", :SidTypeUser))
213
- service = Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser')
214
-
215
- expect { service }.not_to raise_error
216
- expect(service[:logonaccount]).to eq('.\myUser')
217
- end
218
-
219
- it "should succesfully munge domain account" do
220
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(Puppet::Util::Windows::SID::Principal.new("DomainUser", nil, nil, "myDomain", :SidTypeUser))
221
- service = Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'DomainUser')
222
-
223
- expect { service }.not_to raise_error
224
- expect(service[:logonaccount]).to eq('myDomain\DomainUser')
225
- end
226
-
227
- it "should succesfully munge well known user" do
228
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(Puppet::Util::Windows::SID::Principal.new("LOCAL SERVICE", nil, nil, "NT AUTHORITY", :SidTypeWellKnownGroup))
229
- service = Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'LocalService')
230
-
231
- expect { service }.not_to raise_error
232
- expect(service[:logonaccount]).to eq('NT AUTHORITY\LOCAL SERVICE')
233
- end
234
-
235
- it "should succesfully munge a SID" do
236
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(Puppet::Util::Windows::SID::Principal.new("NETWORK SERVICE", nil, nil, "NT AUTHORITY", :SidTypeUser))
237
- service = Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'S-1-5-20')
238
-
239
- expect { service }.not_to raise_error
240
- expect(service[:logonaccount]).to eq('NT AUTHORITY\NETWORK SERVICE')
241
- end
242
-
243
- it "should fail when account is invalid" do
244
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(nil)
245
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'InvalidUser') }.to raise_error(Puppet::Error, /"InvalidUser" is not a valid account/)
246
- end
247
-
248
- it "should fail when sid type is not user or well known user" do
249
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(Puppet::Util::Windows::SID::Principal.new("Administrators", nil, nil, "BUILTIN", :SidTypeAlias))
250
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'Administrators') }.to raise_error(Puppet::Error, /"Administrators" is not a valid account/)
251
- end
181
+ it "should let provider resolve insyncness when provider responds to the 'logonaccount_insync?' method" do
182
+ allow(service.provider).to receive(:respond_to?).with(:logonaccount_insync?, any_args).and_return(true)
183
+ allow(service.provider).to receive(:logonaccount_insync?).and_return(false)
184
+
185
+ expect(service.property(:logonaccount).insync?('myUser')).to eq(false)
252
186
  end
253
187
  end
254
188
 
@@ -258,7 +192,6 @@ describe test_title, "when validating attribute values" do
258
192
  end
259
193
 
260
194
  it "should default to empty string when only logonaccount is being managed" do
261
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
262
195
  service = Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser')
263
196
 
264
197
  expect { service }.not_to raise_error
@@ -271,70 +204,8 @@ describe test_title, "when validating attribute values" do
271
204
  end
272
205
 
273
206
  it "should fail when logonpassword includes the ':' character" do
274
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
275
207
  expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser', :logonpassword => 'my:Pass') }.to raise_error(Puppet::Error, /Passwords cannot include ':'/)
276
208
  end
277
-
278
- it "should not further check the password against given account when not on Windows" do
279
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
280
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser', :logonpassword => 'myPass') }.not_to raise_error
281
- end
282
-
283
- context "when on Windows", :if => Puppet::Util::Platform.windows? do
284
- before do
285
- allow(Puppet::Util::Windows::ADSI).to receive(:computer_name).and_return("myPC")
286
- allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(name_to_principal_result)
287
- allow(Puppet::Util::Windows::User).to receive(:get_rights).and_return('SeServiceLogonRight')
288
- end
289
-
290
- it "should pass validation when given account is 'LocalSystem'" do
291
- allow(Puppet::Util::Windows::User).to receive(:localsystem?).with('LocalSystem').and_return(true)
292
- allow(Puppet::Util::Windows::User).to receive(:default_system_account?).with('LocalSystem').and_return(false)
293
-
294
- expect(Puppet::Util::Windows::SID).not_to receive(:name_to_principal)
295
- expect(Puppet::Util::Windows::User).not_to receive(:password_is?)
296
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'LocalSystem') }.not_to raise_error
297
- end
298
-
299
- ['LOCAL SERVICE', 'NETWORK SERVICE', 'SYSTEM'].each do |predefined_local_account|
300
- describe "when given account is #{predefined_local_account}" do
301
- let(:name_to_principal_result) do
302
- Puppet::Util::Windows::SID::Principal.new(predefined_local_account, nil, nil, "NT AUTHORITY", :SidTypeUser)
303
- end
304
-
305
- it "should pass validation" do
306
- allow(Puppet::Util::Windows::User).to receive(:localsystem?).with(predefined_local_account).and_return(false)
307
- expect(Puppet::Util::Windows::User).to receive(:default_system_account?).with(predefined_local_account).and_return(true)
308
- expect(Puppet::Util::Windows::User).to receive(:default_system_account?).with("NT AUTHORITY\\#{predefined_local_account}").and_return(true)
309
-
310
- expect(Puppet::Util::Windows::User).not_to receive(:password_is?)
311
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => predefined_local_account) }.not_to raise_error
312
- end
313
- end
314
- end
315
-
316
- let(:name_to_principal_result) do
317
- Puppet::Util::Windows::SID::Principal.new("myUser", nil, nil, "myPC", :SidTypeUser)
318
- end
319
-
320
- describe "when given logonaccount is not a predefined local account" do
321
- before do
322
- allow(Puppet::Util::Windows::User).to receive(:localsystem?).with('myUser').and_return(false)
323
- allow(Puppet::Util::Windows::User).to receive(:default_system_account?).with('myUser').and_return(false)
324
- allow(Puppet::Util::Windows::User).to receive(:default_system_account?).with('.\\myUser').and_return(false)
325
- end
326
-
327
- it "should pass validation if password is proven correct" do
328
- allow(Puppet::Util::Windows::User).to receive(:password_is?).with('myUser', 'myPass', '.').and_return(true)
329
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser', :logonpassword => 'myPass') }.not_to raise_error
330
- end
331
-
332
- it "should not pass validation if password check fails" do
333
- allow(Puppet::Util::Windows::User).to receive(:password_is?).with('myUser', 'myWrongPass', '.').and_return(false)
334
- expect { Puppet::Type.type(:service).new(:name => "yay", :logonaccount => 'myUser', :logonpassword => 'myWrongPass') }.to raise_error(Puppet::Error, /The given password is invalid for user '.\\myUser'/)
335
- end
336
- end
337
- end
338
209
  end
339
210
  end
340
211