puppet 7.5.0-x64-mingw32 → 7.9.0-x64-mingw32

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

Potentially problematic release.


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

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
@@ -925,28 +925,75 @@ end
925
925
  }
926
926
  end
927
927
 
928
- it 'should call set_salted_sha512 on 10.7 when given a salted-SHA512 password hash' do
929
- expect(provider).to receive(:get_users_plist).and_return(sample_users_plist)
930
- expect(provider).to receive(:get_shadow_hash_data).with(sample_users_plist).and_return(sha512_shadowhashdata)
931
- expect(provider.class).to receive(:get_os_version).and_return('10.7')
932
- expect(provider).to receive(:set_salted_sha512).with(sample_users_plist, sha512_shadowhashdata, sha512_password_hash)
933
- provider.write_password_to_users_plist(sha512_password_hash)
928
+ before do
929
+ allow(provider).to receive(:merge_attribute_with_dscl).with('Users', username, 'AuthenticationAuthority', any_args)
934
930
  end
935
931
 
936
- it 'should call set_salted_pbkdf2 on 10.8 when given a PBKDF2 password hash' do
937
- expect(provider).to receive(:get_users_plist).and_return(sample_users_plist)
938
- expect(provider).to receive(:get_shadow_hash_data).with(sample_users_plist).and_return(pbkdf2_shadowhashdata)
939
- expect(provider.class).to receive(:get_os_version).and_return('10.8')
940
- expect(provider).to receive(:set_salted_pbkdf2).with(sample_users_plist, pbkdf2_shadowhashdata, 'entropy', pbkdf2_password_hash)
941
- provider.write_password_to_users_plist(pbkdf2_password_hash)
932
+ describe 'when on macOS 11 (Big Sur) or greater' do
933
+ before do
934
+ allow(provider.class).to receive(:get_os_version).and_return('11.0.0')
935
+ end
936
+
937
+ it 'should add salted_sha512_pbkdf2 AuthenticationAuthority key if missing' do
938
+ expect(provider).to receive(:get_users_plist).and_return(sample_users_plist)
939
+ expect(provider).to receive(:get_shadow_hash_data).with(sample_users_plist).and_return(pbkdf2_shadowhashdata)
940
+ expect(provider).to receive(:set_salted_pbkdf2).with(sample_users_plist, pbkdf2_shadowhashdata, 'entropy', pbkdf2_password_hash)
941
+ expect(provider).to receive(:needs_sha512_pbkdf2_authentication_authority_to_be_added?).and_return(true)
942
+
943
+ expect(Puppet).to receive(:debug).with("Adding 'SALTED-SHA512-PBKDF2' AuthenticationAuthority key for ShadowHash to user 'nonexistent_user'")
944
+ provider.write_password_to_users_plist(pbkdf2_password_hash)
945
+ end
946
+
947
+ it 'should not add salted_sha512_pbkdf2 AuthenticationAuthority key if not missing' do
948
+ expect(provider).to receive(:get_users_plist).and_return(sample_users_plist)
949
+ expect(provider).to receive(:get_shadow_hash_data).with(sample_users_plist).and_return(pbkdf2_shadowhashdata)
950
+ expect(provider).to receive(:set_salted_pbkdf2).with(sample_users_plist, pbkdf2_shadowhashdata, 'entropy', pbkdf2_password_hash)
951
+ expect(provider).to receive(:needs_sha512_pbkdf2_authentication_authority_to_be_added?).and_return(false)
952
+
953
+ expect(Puppet).not_to receive(:debug).with("Adding 'SALTED-SHA512-PBKDF2' AuthenticationAuthority key for ShadowHash to user 'nonexistent_user'")
954
+ provider.write_password_to_users_plist(pbkdf2_password_hash)
955
+ end
942
956
  end
943
957
 
944
- it "should delete the SALTED-SHA512 key in the shadow_hash_data hash if it exists on a 10.8 system and write_password_to_users_plist has been called to set the user's password" do
945
- expect(provider).to receive(:get_users_plist).and_return('users_plist')
946
- expect(provider).to receive(:get_shadow_hash_data).with('users_plist').and_return(sha512_shadowhashdata)
947
- expect(provider.class).to receive(:get_os_version).and_return('10.8')
948
- expect(provider).to receive(:set_salted_pbkdf2).with('users_plist', {}, 'entropy', pbkdf2_password_hash)
949
- provider.write_password_to_users_plist(pbkdf2_password_hash)
958
+ describe 'when on macOS version lower than 11' do
959
+ before do
960
+ allow(provider.class).to receive(:get_os_version)
961
+ allow(provider).to receive(:needs_sha512_pbkdf2_authentication_authority_to_be_added?).and_return(false)
962
+ end
963
+
964
+ it 'should not add salted_sha512_pbkdf2 AuthenticationAuthority' do
965
+ expect(provider).to receive(:get_users_plist).and_return(sample_users_plist)
966
+ expect(provider).to receive(:get_shadow_hash_data).with(sample_users_plist).and_return(pbkdf2_shadowhashdata)
967
+ expect(provider).to receive(:set_salted_pbkdf2).with(sample_users_plist, pbkdf2_shadowhashdata, 'entropy', pbkdf2_password_hash)
968
+ expect(provider).to receive(:needs_sha512_pbkdf2_authentication_authority_to_be_added?).and_return(false)
969
+
970
+ expect(Puppet).not_to receive(:debug).with("Adding 'SALTED-SHA512-PBKDF2' AuthenticationAuthority key for ShadowHash to user 'nonexistent_user'")
971
+ provider.write_password_to_users_plist(pbkdf2_password_hash)
972
+ end
973
+
974
+ it 'should call set_salted_sha512 on 10.7 when given a salted-SHA512 password hash' do
975
+ expect(provider).to receive(:get_users_plist).and_return(sample_users_plist)
976
+ expect(provider).to receive(:get_shadow_hash_data).with(sample_users_plist).and_return(sha512_shadowhashdata)
977
+ expect(provider.class).to receive(:get_os_version).and_return('10.7')
978
+ expect(provider).to receive(:set_salted_sha512).with(sample_users_plist, sha512_shadowhashdata, sha512_password_hash)
979
+ provider.write_password_to_users_plist(sha512_password_hash)
980
+ end
981
+
982
+ it 'should call set_salted_pbkdf2 on 10.8 when given a PBKDF2 password hash' do
983
+ expect(provider).to receive(:get_users_plist).and_return(sample_users_plist)
984
+ expect(provider).to receive(:get_shadow_hash_data).with(sample_users_plist).and_return(pbkdf2_shadowhashdata)
985
+ expect(provider.class).to receive(:get_os_version).and_return('10.8')
986
+ expect(provider).to receive(:set_salted_pbkdf2).with(sample_users_plist, pbkdf2_shadowhashdata, 'entropy', pbkdf2_password_hash)
987
+ provider.write_password_to_users_plist(pbkdf2_password_hash)
988
+ end
989
+
990
+ it "should delete the SALTED-SHA512 key in the shadow_hash_data hash if it exists on a 10.8 system and write_password_to_users_plist has been called to set the user's password" do
991
+ expect(provider).to receive(:get_users_plist).and_return('users_plist')
992
+ expect(provider).to receive(:get_shadow_hash_data).with('users_plist').and_return(sha512_shadowhashdata)
993
+ expect(provider.class).to receive(:get_os_version).and_return('10.8')
994
+ expect(provider).to receive(:set_salted_pbkdf2).with('users_plist', {}, 'entropy', pbkdf2_password_hash)
995
+ provider.write_password_to_users_plist(pbkdf2_password_hash)
996
+ end
950
997
  end
951
998
  end
952
999
 
@@ -974,16 +1021,7 @@ end
974
1021
  describe '#set_shadow_hash_data' do
975
1022
  let(:users_plist) { {'ShadowHashData' => ['string_data'] } }
976
1023
 
977
- it 'should flush the plist data to disk on OS X < 10.15' do
978
- allow(provider.class).to receive(:get_os_version).and_return('10.12')
979
-
980
- expect(provider).to receive(:write_users_plist_to_disk)
981
- provider.set_shadow_hash_data(users_plist, pbkdf2_embedded_plist)
982
- end
983
-
984
- it 'should flush the plist data a temporary file on OS X >= 10.15' do
985
- allow(provider.class).to receive(:get_os_version).and_return('10.15')
986
-
1024
+ it 'should flush the plist data to a temporary file' do
987
1025
  expect(provider).to receive(:write_and_import_shadow_hash_data)
988
1026
  provider.set_shadow_hash_data(users_plist, pbkdf2_embedded_plist)
989
1027
  end
@@ -1033,13 +1071,6 @@ end
1033
1071
  end
1034
1072
  end
1035
1073
 
1036
- describe '#write_users_plist_to_disk' do
1037
- it 'should save the passed plist to disk and convert it to a binary plist' do
1038
- expect(Puppet::Util::Plist).to receive(:write_plist_file).with(user_plist_xml, "#{users_plist_dir}/nonexistent_user.plist", :binary)
1039
- provider.write_users_plist_to_disk(user_plist_xml)
1040
- end
1041
- end
1042
-
1043
1074
  describe '#write_and_import_shadow_hash_data' do
1044
1075
  it 'should save the passed plist to a temporary file and import it' do
1045
1076
  tmpfile = double('tempfile', :path => "/tmp/dsimport_#{username}", :flush => nil)
@@ -1203,6 +1234,7 @@ end
1203
1234
  before :each do
1204
1235
  allow(provider.class).to receive(:get_all_users).and_return(all_users_hash)
1205
1236
  allow(provider.class).to receive(:get_list_of_groups).and_return(group_plist_hash_guid)
1237
+ allow(provider).to receive(:merge_attribute_with_dscl).with('Users', username, 'AuthenticationAuthority', any_args)
1206
1238
  provider.class.prefetch({})
1207
1239
  end
1208
1240
 
@@ -375,21 +375,36 @@ describe Puppet::Type.type(:user).provider(:useradd) do
375
375
  before { described_class.has_feature :manages_local_users_and_groups }
376
376
 
377
377
  let(:content) do
378
- <<~EOF
378
+ StringIO.new(<<~EOF)
379
379
  group1:x:0:myuser
380
380
  group2:x:999:
381
381
  group3:x:998:myuser
382
382
  EOF
383
383
  end
384
384
 
385
+ let(:content_with_empty_line) do
386
+ StringIO.new(<<~EOF)
387
+ group1:x:0:myuser
388
+ group2:x:999:
389
+ group3:x:998:myuser
390
+
391
+ EOF
392
+ end
393
+
385
394
  it "should return the local groups string when forcelocal is true" do
386
395
  resource[:forcelocal] = true
387
- group1, group2, group3 = content.split
388
396
  allow(Puppet::FileSystem).to receive(:exist?).with('/etc/group').and_return(true)
389
- allow(Puppet::FileSystem).to receive(:each_line).with('/etc/group').and_yield(group1).and_yield(group2).and_yield(group3)
397
+ allow(File).to receive(:open).with(Pathname.new('/etc/group')).and_yield(content)
390
398
  expect(provider.groups).to eq(['group1', 'group3'])
391
399
  end
392
400
 
401
+ it "does not raise when parsing empty lines in /etc/group" do
402
+ resource[:forcelocal] = true
403
+ allow(Puppet::FileSystem).to receive(:exist?).with('/etc/group').and_return(true)
404
+ allow(File).to receive(:open).with(Pathname.new('/etc/group')).and_yield(content_with_empty_line)
405
+ expect { provider.groups }.not_to raise_error
406
+ end
407
+
393
408
  it "should fall back to nameservice groups when forcelocal is false" do
394
409
  resource[:forcelocal] = false
395
410
  allow(Puppet::Util::POSIX).to receive(:groups_of).with('myuser').and_return(['remote groups'])
@@ -205,7 +205,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
205
205
  end
206
206
 
207
207
  it "should set itself as the catalog for each converted resource" do
208
- @catalog.vertices.each { |v| expect(v.catalog.object_id).to equal(@catalog.object_id) }
208
+ @catalog.vertices.each { |v| expect(v.catalog.object_id).to eql(@catalog.object_id) }
209
209
  end
210
210
 
211
211
  # This tests #931.
@@ -43,6 +43,14 @@ describe Puppet::Resource::TypeCollection do
43
43
  end.to raise_error(Puppet::ParseError, /cannot redefine/)
44
44
  end
45
45
 
46
+ it "should fail if a hostclass duplicates a node" do
47
+ @code.add(Puppet::Resource::Type.new(:node, "foo"))
48
+
49
+ expect do
50
+ @code.add(Puppet::Resource::Type.new(:hostclass, "foo"))
51
+ end.to raise_error(Puppet::ParseError, /Node 'foo' is already defined; cannot be redefined as a class/)
52
+ end
53
+
46
54
  it "should store hostclasses as hostclasses" do
47
55
  klass = Puppet::Resource::Type.new(:hostclass, "foo")
48
56
 
@@ -60,6 +68,14 @@ describe Puppet::Resource::TypeCollection do
60
68
  }.to raise_error(/.*is already defined; cannot redefine/)
61
69
  end
62
70
 
71
+ it "should fail if a node duplicates a hostclass" do
72
+ @code.add(Puppet::Resource::Type.new(:hostclass, "foo"))
73
+
74
+ expect do
75
+ @code.add(Puppet::Resource::Type.new(:node, "foo"))
76
+ end.to raise_error(Puppet::ParseError, /Class 'foo' is already defined; cannot be redefined as a node/)
77
+ end
78
+
63
79
  it "should store definitions as definitions" do
64
80
  define = Puppet::Resource::Type.new(:definition, "foo")
65
81
 
@@ -462,9 +462,9 @@ describe Puppet::Resource::Type do
462
462
  end
463
463
 
464
464
  it "should be able to find parent nodes" do
465
- parent = Puppet::Resource::Type.new(:node, "bar")
465
+ parent = Puppet::Resource::Type.new(:node, "node_bar")
466
466
  @krt.add parent
467
- child = Puppet::Resource::Type.new(:node, "foo", :parent => "bar")
467
+ child = Puppet::Resource::Type.new(:node, "node_foo", :parent => "node_bar")
468
468
  @krt.add child
469
469
 
470
470
  expect(child.parent_type(@scope)).to equal(parent)
@@ -135,16 +135,6 @@ badline
135
135
  with_setting(:var, "value changed", NO_META)))
136
136
  end
137
137
 
138
- it "does not try to transform an entry named 'mode'" do
139
- config = Puppet::Settings::ConfigFile.new(Proc.new { raise "Should not transform" })
140
-
141
- result = config.parse_file(filename, "mode = value")
142
-
143
- expect(result).to eq(Conf.new.
144
- with_section(Section.new(:main).
145
- with_setting(:mode, "value", NO_META)))
146
- end
147
-
148
138
  it "accepts non-UTF8 encoded text" do
149
139
  result = the_parse_of("var = value".encode("UTF-16LE"))
150
140
 
@@ -152,6 +142,6 @@ badline
152
142
  with_section(Section.new(:main).
153
143
  with_setting(:var, "value", NO_META)))
154
144
 
155
- end
145
+ end
156
146
  end
157
147
 
@@ -25,13 +25,12 @@ describe Puppet::Settings::ValueTranslator do
25
25
  end
26
26
 
27
27
  context "numbers" do
28
- it "translates integer strings to integers" do
29
- expect(translator["1"]).to eq(1)
30
- expect(translator["2"]).to eq(2)
28
+ it "leaves integer strings" do
29
+ expect(translator["1"]).to eq("1")
31
30
  end
32
31
 
33
- it "translates numbers starting with a 0 as octal" do
34
- expect(translator["011"]).to eq(9)
32
+ it "leaves octal numbers as strings" do
33
+ expect(translator["011"]).to eq("011")
35
34
  end
36
35
 
37
36
  it "leaves hex numbers as strings" do
@@ -29,6 +29,17 @@ describe Puppet::Settings do
29
29
  end
30
30
  end
31
31
 
32
+ def stub_config_with(content)
33
+ allow(Puppet.features).to receive(:root?).and_return(false)
34
+ expect(Puppet::FileSystem).to receive(:exist?).
35
+ with(user_config_file_default_location).
36
+ and_return(true).ordered
37
+ expect(@settings).to receive(:read_file).
38
+ with(user_config_file_default_location).
39
+ and_return(content).ordered
40
+ @settings.send(:parse_config_files)
41
+ end
42
+
32
43
  describe "when specifying defaults" do
33
44
  before do
34
45
  @settings = Puppet::Settings.new
@@ -264,23 +275,31 @@ describe Puppet::Settings do
264
275
  expect(@settings[:myval]).to eq("")
265
276
  end
266
277
 
267
- it "should flag string settings from the CLI" do
278
+ it "should retrieve numeric settings from the CLI" do
268
279
  @settings.handlearg("--myval", "12")
269
- expect(@settings.set_by_cli?(:myval)).to be_truthy
280
+ expect(@settings.set_by_cli(:myval)).to eq("12")
281
+ expect(@settings.set_by_cli?(:myval)).to be true
270
282
  end
271
283
 
272
- it "should flag bool settings from the CLI" do
284
+ it "should retrieve string settings from the CLI" do
285
+ @settings.handlearg("--myval", "something")
286
+ expect(@settings.set_by_cli(:myval)).to eq("something")
287
+ expect(@settings.set_by_cli?(:myval)).to be true
288
+ end
289
+
290
+ it "should retrieve bool settings from the CLI" do
273
291
  @settings.handlearg("--bool")
274
- expect(@settings.set_by_cli?(:bool)).to be_truthy
292
+ expect(@settings.set_by_cli(:bool)).to be true
293
+ expect(@settings.set_by_cli?(:bool)).to be true
275
294
  end
276
295
 
277
- it "should not flag settings memory as from CLI" do
296
+ it "should not retrieve settings set in memory as from CLI" do
278
297
  @settings[:myval] = "12"
279
- expect(@settings.set_by_cli?(:myval)).to be_falsey
298
+ expect(@settings.set_by_cli?(:myval)).to be false
280
299
  end
281
300
 
282
301
  it "should find no configured settings by default" do
283
- expect(@settings.set_by_config?(:myval)).to be_falsey
302
+ expect(@settings.set_by_config?(:myval)).to be false
284
303
  end
285
304
 
286
305
  it "should identify configured settings in memory" do
@@ -304,64 +323,66 @@ describe Puppet::Settings do
304
323
  expect(@settings.set_by_config?(:manifest, Puppet[:environment])).to be_truthy
305
324
  end
306
325
 
307
- it "should identify configured settings from the preferred run mode" do
308
- user_config_text = "[#{@settings.preferred_run_mode}]\nmyval = foo"
326
+ context "when handling puppet.conf" do
327
+ describe "#set_by_config?" do
328
+ it "should identify configured settings from the preferred run mode" do
329
+ stub_config_with(<<~CONFIG)
330
+ [#{@settings.preferred_run_mode}]
331
+ myval = foo
332
+ CONFIG
309
333
 
310
- allow(Puppet.features).to receive(:root?).and_return(false)
311
- expect(Puppet::FileSystem).to receive(:exist?).
312
- with(user_config_file_default_location).
313
- and_return(true).ordered
314
- expect(@settings).to receive(:read_file).
315
- with(user_config_file_default_location).
316
- and_return(user_config_text).ordered
334
+ expect(@settings.set_by_config?(:myval)).to be_truthy
335
+ end
317
336
 
318
- @settings.send(:parse_config_files)
319
- expect(@settings.set_by_config?(:myval)).to be_truthy
320
- end
337
+ it "should identify configured settings from the specified run mode" do
338
+ stub_config_with(<<~CONFIG)
339
+ [server]
340
+ myval = foo
341
+ CONFIG
321
342
 
322
- it "should identify configured settings from the specified run mode" do
323
- user_config_text = "[server]\nmyval = foo"
343
+ expect(@settings.set_by_config?(:myval, nil, :server)).to be_truthy
344
+ end
324
345
 
325
- allow(Puppet.features).to receive(:root?).and_return(false)
326
- expect(Puppet::FileSystem).to receive(:exist?).
327
- with(user_config_file_default_location).
328
- and_return(true).ordered
329
- expect(@settings).to receive(:read_file).
330
- with(user_config_file_default_location).
331
- and_return(user_config_text).ordered
346
+ it "should not identify configured settings from an unspecified run mode" do
347
+ stub_config_with(<<~CONFIG)
348
+ [zaz]
349
+ myval = foo
350
+ CONFIG
332
351
 
333
- @settings.send(:parse_config_files)
334
- expect(@settings.set_by_config?(:myval, nil, :server)).to be_truthy
335
- end
352
+ expect(@settings.set_by_config?(:myval)).to be_falsey
353
+ end
336
354
 
337
- it "should not identify configured settings from an unspecified run mode" do
338
- user_config_text = "[zaz]\nmyval = foo"
355
+ it "should identify configured settings from the main section" do
356
+ stub_config_with(<<~CONFIG)
357
+ [main]
358
+ myval = foo
359
+ CONFIG
339
360
 
340
- allow(Puppet.features).to receive(:root?).and_return(false)
341
- expect(Puppet::FileSystem).to receive(:exist?).
342
- with(user_config_file_default_location).
343
- and_return(true).ordered
344
- expect(@settings).to receive(:read_file).
345
- with(user_config_file_default_location).
346
- and_return(user_config_text).ordered
361
+ expect(@settings.set_by_config?(:myval)).to be_truthy
362
+ end
363
+ end
347
364
 
348
- @settings.send(:parse_config_files)
349
- expect(@settings.set_by_config?(:myval)).to be_falsey
350
- end
365
+ describe "#set_in_section" do
366
+ it "should retrieve configured settings from the specified section" do
367
+ stub_config_with(<<~CONFIG)
368
+ [agent]
369
+ myval = foo
370
+ CONFIG
351
371
 
352
- it "should identify configured settings from the main section" do
353
- user_config_text = "[main]\nmyval = foo"
372
+ expect(@settings.set_in_section(:myval, :agent)).to eq("foo")
373
+ expect(@settings.set_in_section?(:myval, :agent)).to be true
374
+ end
354
375
 
355
- allow(Puppet.features).to receive(:root?).and_return(false)
356
- expect(Puppet::FileSystem).to receive(:exist?).
357
- with(user_config_file_default_location).
358
- and_return(true).ordered
359
- expect(@settings).to receive(:read_file).
360
- with(user_config_file_default_location).
361
- and_return(user_config_text).ordered
376
+ it "should not retrieve configured settings from a different section" do
377
+ stub_config_with(<<~CONFIG)
378
+ [main]
379
+ myval = foo
380
+ CONFIG
362
381
 
363
- @settings.send(:parse_config_files)
364
- expect(@settings.set_by_config?(:myval)).to be_truthy
382
+ expect(@settings.set_in_section(:myval, :agent)).to be nil
383
+ expect(@settings.set_in_section?(:myval, :agent)).to be false
384
+ end
385
+ end
365
386
  end
366
387
 
367
388
  it "should clear the cache when setting getopt-specific values" do
@@ -1024,7 +1045,7 @@ describe Puppet::Settings do
1024
1045
  expect(@settings[:two]).to eq(false)
1025
1046
  end
1026
1047
 
1027
- it "should convert integers in the configuration file into Ruby Integers" do
1048
+ it "doesn't convert integers in the configuration file" do
1028
1049
  File.write(@file, <<~CONF)
1029
1050
  [main]
1030
1051
  one = 65
@@ -1032,7 +1053,7 @@ describe Puppet::Settings do
1032
1053
 
1033
1054
  @settings.initialize_global_settings
1034
1055
 
1035
- expect(@settings[:one]).to eq(65)
1056
+ expect(@settings[:one]).to eq('65')
1036
1057
  end
1037
1058
 
1038
1059
  it "should support specifying all metadata (owner, group, mode) in the configuration file" do
@@ -1087,10 +1108,10 @@ describe Puppet::Settings do
1087
1108
  context "when setting serverport and masterport" do
1088
1109
  before(:each) do
1089
1110
  @settings.define_settings :main, PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS
1090
- @settings.define_settings :server, :masterport => { :desc => "a", :default => 1000 }
1111
+ @settings.define_settings :server, :masterport => { :desc => "a", :default => 1000, :type => :port }
1091
1112
  @settings.define_settings :server, :serverport => { :type => :alias, :alias_for => :masterport }
1092
- @settings.define_settings :server, :ca_port => { :desc => "a", :default => "$serverport" }
1093
- @settings.define_settings :server, :report_port => { :desc => "a", :default => "$serverport" }
1113
+ @settings.define_settings :server, :ca_port => { :desc => "a", :default => "$serverport", :type => :port }
1114
+ @settings.define_settings :server, :report_port => { :desc => "a", :default => "$serverport", :type => :port }
1094
1115
 
1095
1116
  config_file = tmpfile('config')
1096
1117
  @settings[:config] = config_file
@@ -1111,8 +1132,8 @@ describe Puppet::Settings do
1111
1132
  end
1112
1133
 
1113
1134
  it { expect(@settings[:serverport]).to eq(444) }
1114
- it { expect(@settings[:ca_port]).to eq("444") }
1115
- it { expect(@settings[:report_port]).to eq("444") }
1135
+ it { expect(@settings[:ca_port]).to eq(444) }
1136
+ it { expect(@settings[:report_port]).to eq(444) }
1116
1137
  it { expect(@settings[:masterport]).to eq(445) }
1117
1138
  end
1118
1139
 
@@ -1125,8 +1146,8 @@ describe Puppet::Settings do
1125
1146
  end
1126
1147
 
1127
1148
  it { expect(@settings[:serverport]).to eq(445) }
1128
- it { expect(@settings[:ca_port]).to eq("445") }
1129
- it { expect(@settings[:report_port]).to eq("445") }
1149
+ it { expect(@settings[:ca_port]).to eq(445) }
1150
+ it { expect(@settings[:report_port]).to eq(445) }
1130
1151
  it { expect(@settings[:masterport]).to eq(444) }
1131
1152
  end
1132
1153
 
@@ -1139,8 +1160,8 @@ describe Puppet::Settings do
1139
1160
  end
1140
1161
 
1141
1162
  it { expect(@settings[:serverport]).to eq(445) }
1142
- it { expect(@settings[:ca_port]).to eq("445") }
1143
- it { expect(@settings[:report_port]).to eq("445") }
1163
+ it { expect(@settings[:ca_port]).to eq(445) }
1164
+ it { expect(@settings[:report_port]).to eq(445) }
1144
1165
  it { expect(@settings[:masterport]).to eq(444) }
1145
1166
  end
1146
1167
 
@@ -1156,8 +1177,8 @@ describe Puppet::Settings do
1156
1177
  end
1157
1178
 
1158
1179
  it { expect(@settings[:serverport]).to eq(445) }
1159
- it { expect(@settings[:ca_port]).to eq("445") }
1160
- it { expect(@settings[:report_port]).to eq("445") }
1180
+ it { expect(@settings[:ca_port]).to eq(445) }
1181
+ it { expect(@settings[:report_port]).to eq(445) }
1161
1182
  it { expect(@settings[:masterport]).to eq(444) }
1162
1183
  end
1163
1184
 
@@ -1171,8 +1192,8 @@ describe Puppet::Settings do
1171
1192
  end
1172
1193
 
1173
1194
  it { expect(@settings[:serverport]).to eq(444) }
1174
- it { expect(@settings[:ca_port]).to eq("444") }
1175
- it { expect(@settings[:report_port]).to eq("444") }
1195
+ it { expect(@settings[:ca_port]).to eq(444) }
1196
+ it { expect(@settings[:report_port]).to eq(444) }
1176
1197
  it { expect(@settings[:masterport]).to eq(445) }
1177
1198
  end
1178
1199
 
@@ -1184,8 +1205,8 @@ describe Puppet::Settings do
1184
1205
  end
1185
1206
 
1186
1207
  it { expect(@settings[:serverport]).to eq(445) }
1187
- it { expect(@settings[:ca_port]).to eq("445") }
1188
- it { expect(@settings[:report_port]).to eq("445") }
1208
+ it { expect(@settings[:ca_port]).to eq(445) }
1209
+ it { expect(@settings[:report_port]).to eq(445) }
1189
1210
  it { expect(@settings[:masterport]).to eq(445) }
1190
1211
  end
1191
1212
 
@@ -1197,8 +1218,8 @@ describe Puppet::Settings do
1197
1218
  end
1198
1219
 
1199
1220
  it { expect(@settings[:serverport]).to eq(445) }
1200
- it { expect(@settings[:ca_port]).to eq("445") }
1201
- it { expect(@settings[:report_port]).to eq("445") }
1221
+ it { expect(@settings[:ca_port]).to eq(445) }
1222
+ it { expect(@settings[:report_port]).to eq(445) }
1202
1223
  it { expect(@settings[:masterport]).to eq(445) }
1203
1224
  end
1204
1225
 
@@ -1211,8 +1232,8 @@ describe Puppet::Settings do
1211
1232
 
1212
1233
  it { expect(@settings[:serverport]).to eq(445) }
1213
1234
  it { expect(@settings[:masterport]).to eq(1000) }
1214
- it { expect(@settings[:ca_port]).to eq("445") }
1215
- it { expect(@settings[:report_port]).to eq("445") }
1235
+ it { expect(@settings[:ca_port]).to eq(445) }
1236
+ it { expect(@settings[:report_port]).to eq(445) }
1216
1237
  end
1217
1238
 
1218
1239
  context 'with serverport in main' do
@@ -1224,8 +1245,8 @@ describe Puppet::Settings do
1224
1245
 
1225
1246
  it { expect(@settings[:serverport]).to eq(445) }
1226
1247
  it { expect(@settings[:masterport]).to eq(1000) }
1227
- it { expect(@settings[:ca_port]).to eq("445") }
1228
- it { expect(@settings[:report_port]).to eq("445") }
1248
+ it { expect(@settings[:ca_port]).to eq(445) }
1249
+ it { expect(@settings[:report_port]).to eq(445) }
1229
1250
  end
1230
1251
  end
1231
1252
 
@@ -2137,7 +2158,7 @@ describe Puppet::Settings do
2137
2158
  end
2138
2159
 
2139
2160
  def a_user_type_for(username)
2140
- user = double('user')
2161
+ user = double('user', 'suitable?': true, to_s: "User[#{username}]")
2141
2162
  expect(Puppet::Type.type(:user)).to receive(:new).with(hash_including(name: username)).and_return(user)
2142
2163
  user
2143
2164
  end
@@ -2170,6 +2191,16 @@ describe Puppet::Settings do
2170
2191
 
2171
2192
  expect(settings).to be_service_user_available
2172
2193
  end
2194
+
2195
+ it "raises if the user is not suitable" do
2196
+ settings[:user] = "foo"
2197
+
2198
+ expect(a_user_type_for("foo")).to receive(:suitable?).and_return(false)
2199
+
2200
+ expect {
2201
+ settings.service_user_available?
2202
+ }.to raise_error(Puppet::Error, /Cannot manage owner permissions, because the provider for 'User\[foo\]' is not functional/)
2203
+ end
2173
2204
  end
2174
2205
 
2175
2206
  describe "when determining if the service group is available" do
@@ -2180,7 +2211,7 @@ describe Puppet::Settings do
2180
2211
  end
2181
2212
 
2182
2213
  def a_group_type_for(groupname)
2183
- group = double('group')
2214
+ group = double('group', 'suitable?': true, to_s: "Group[#{groupname}]")
2184
2215
  expect(Puppet::Type.type(:group)).to receive(:new).with(hash_including(name: groupname)).and_return(group)
2185
2216
  group
2186
2217
  end
@@ -2213,6 +2244,16 @@ describe Puppet::Settings do
2213
2244
 
2214
2245
  expect(settings).to be_service_group_available
2215
2246
  end
2247
+
2248
+ it "raises if the group is not suitable" do
2249
+ settings[:group] = "foo"
2250
+
2251
+ expect(a_group_type_for("foo")).to receive(:suitable?).and_return(false)
2252
+
2253
+ expect {
2254
+ settings.service_group_available?
2255
+ }.to raise_error(Puppet::Error, /Cannot manage group permissions, because the provider for 'Group\[foo\]' is not functional/)
2256
+ end
2216
2257
  end
2217
2258
 
2218
2259
  describe "when dealing with command-line options" do