puppet 7.1.0 → 7.3.0

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 (118) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +15 -13
  3. data/lib/puppet/application.rb +10 -6
  4. data/lib/puppet/application/agent.rb +1 -0
  5. data/lib/puppet/application/apply.rb +3 -2
  6. data/lib/puppet/application/device.rb +1 -0
  7. data/lib/puppet/application/script.rb +1 -0
  8. data/lib/puppet/configurer.rb +16 -3
  9. data/lib/puppet/defaults.rb +5 -14
  10. data/lib/puppet/face/facts.rb +15 -1
  11. data/lib/puppet/file_serving/configuration/parser.rb +5 -2
  12. data/lib/puppet/module_tool/applications/installer.rb +48 -2
  13. data/lib/puppet/module_tool/errors/shared.rb +17 -2
  14. data/lib/puppet/network/formats.rb +67 -0
  15. data/lib/puppet/parser/ast/leaf.rb +3 -2
  16. data/lib/puppet/pops/evaluator/deferred_resolver.rb +5 -3
  17. data/lib/puppet/pops/model/ast_transformer.rb +1 -1
  18. data/lib/puppet/provider/package/apt.rb +4 -0
  19. data/lib/puppet/reference/configuration.rb +6 -5
  20. data/lib/puppet/settings.rb +33 -28
  21. data/lib/puppet/settings/alias_setting.rb +37 -0
  22. data/lib/puppet/util/autoload.rb +1 -8
  23. data/lib/puppet/util/posix.rb +1 -1
  24. data/lib/puppet/version.rb +1 -1
  25. data/locales/puppet.pot +157 -141
  26. data/man/man5/puppet.conf.5 +6 -6
  27. data/man/man8/puppet-agent.8 +2 -2
  28. data/man/man8/puppet-apply.8 +2 -2
  29. data/man/man8/puppet-catalog.8 +1 -1
  30. data/man/man8/puppet-config.8 +1 -1
  31. data/man/man8/puppet-describe.8 +1 -1
  32. data/man/man8/puppet-device.8 +2 -2
  33. data/man/man8/puppet-doc.8 +1 -1
  34. data/man/man8/puppet-epp.8 +1 -1
  35. data/man/man8/puppet-facts.8 +5 -2
  36. data/man/man8/puppet-filebucket.8 +1 -1
  37. data/man/man8/puppet-generate.8 +1 -1
  38. data/man/man8/puppet-help.8 +1 -1
  39. data/man/man8/puppet-lookup.8 +1 -1
  40. data/man/man8/puppet-module.8 +1 -1
  41. data/man/man8/puppet-node.8 +1 -1
  42. data/man/man8/puppet-parser.8 +1 -1
  43. data/man/man8/puppet-plugin.8 +1 -1
  44. data/man/man8/puppet-report.8 +1 -1
  45. data/man/man8/puppet-resource.8 +1 -1
  46. data/man/man8/puppet-script.8 +2 -2
  47. data/man/man8/puppet-ssl.8 +1 -1
  48. data/man/man8/puppet.8 +2 -2
  49. data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +91 -0
  50. data/spec/integration/application/agent_spec.rb +127 -3
  51. data/spec/integration/application/apply_spec.rb +19 -0
  52. data/spec/integration/defaults_spec.rb +0 -7
  53. data/spec/integration/indirector/file_content/file_server_spec.rb +0 -2
  54. data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -2
  55. data/spec/integration/resource/type_collection_spec.rb +2 -6
  56. data/spec/integration/transaction_spec.rb +4 -9
  57. data/spec/integration/util/windows/adsi_spec.rb +3 -1
  58. data/spec/integration/util/windows/registry_spec.rb +0 -10
  59. data/spec/spec_helper.rb +1 -4
  60. data/spec/unit/agent_spec.rb +8 -6
  61. data/spec/unit/application/agent_spec.rb +0 -1
  62. data/spec/unit/application/filebucket_spec.rb +0 -2
  63. data/spec/unit/application_spec.rb +17 -9
  64. data/spec/unit/confine/feature_spec.rb +1 -1
  65. data/spec/unit/confine_spec.rb +8 -2
  66. data/spec/unit/face/node_spec.rb +0 -11
  67. data/spec/unit/file_serving/configuration/parser_spec.rb +8 -1
  68. data/spec/unit/file_serving/metadata_spec.rb +3 -3
  69. data/spec/unit/file_serving/terminus_helper_spec.rb +11 -4
  70. data/spec/unit/forge/module_release_spec.rb +2 -7
  71. data/spec/unit/indirector/face_spec.rb +0 -1
  72. data/spec/unit/indirector/facts/facter_spec.rb +11 -5
  73. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +26 -8
  74. data/spec/unit/indirector/indirection_spec.rb +8 -12
  75. data/spec/unit/indirector_spec.rb +2 -2
  76. data/spec/unit/module_tool/applications/installer_spec.rb +66 -0
  77. data/spec/unit/network/formats_spec.rb +41 -0
  78. data/spec/unit/network/http/api/indirected_routes_spec.rb +0 -4
  79. data/spec/unit/parser/compiler_spec.rb +3 -19
  80. data/spec/unit/parser/resource_spec.rb +14 -8
  81. data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +20 -0
  82. data/spec/unit/property_spec.rb +1 -0
  83. data/spec/unit/provider/nameservice_spec.rb +66 -65
  84. data/spec/unit/provider/package/apt_spec.rb +4 -8
  85. data/spec/unit/provider/package/base_spec.rb +6 -5
  86. data/spec/unit/provider/package/pacman_spec.rb +18 -12
  87. data/spec/unit/provider/package/pip_spec.rb +6 -11
  88. data/spec/unit/provider/package/pkgdmg_spec.rb +0 -4
  89. data/spec/unit/provider/user/hpux_spec.rb +1 -1
  90. data/spec/unit/provider_spec.rb +6 -8
  91. data/spec/unit/resource/type_spec.rb +1 -1
  92. data/spec/unit/resource_spec.rb +11 -10
  93. data/spec/unit/settings_spec.rb +13 -6
  94. data/spec/unit/ssl/base_spec.rb +0 -1
  95. data/spec/unit/ssl/ssl_provider_spec.rb +5 -2
  96. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -7
  97. data/spec/unit/transaction/event_manager_spec.rb +14 -11
  98. data/spec/unit/transaction_spec.rb +13 -4
  99. data/spec/unit/type/file/content_spec.rb +0 -1
  100. data/spec/unit/type/file/selinux_spec.rb +0 -2
  101. data/spec/unit/type/file_spec.rb +0 -6
  102. data/spec/unit/type/group_spec.rb +13 -6
  103. data/spec/unit/type/resources_spec.rb +7 -7
  104. data/spec/unit/type/service_spec.rb +1 -1
  105. data/spec/unit/type/tidy_spec.rb +0 -1
  106. data/spec/unit/type_spec.rb +2 -2
  107. data/spec/unit/util/at_fork_spec.rb +2 -2
  108. data/spec/unit/util/autoload_spec.rb +5 -1
  109. data/spec/unit/util/backups_spec.rb +1 -2
  110. data/spec/unit/util/execution_spec.rb +15 -11
  111. data/spec/unit/util/inifile_spec.rb +6 -14
  112. data/spec/unit/util/log_spec.rb +8 -7
  113. data/spec/unit/util/logging_spec.rb +3 -3
  114. data/spec/unit/util/posix_spec.rb +16 -10
  115. data/spec/unit/util/selinux_spec.rb +76 -52
  116. data/spec/unit/util/suidmanager_spec.rb +44 -41
  117. data/spec/unit/util_spec.rb +13 -6
  118. metadata +7 -2
@@ -111,15 +111,19 @@ describe Puppet::Util::SELinux do
111
111
  end
112
112
 
113
113
  it "should return a context" do
114
- expect(self).to receive(:selinux_support?).and_return(true)
115
- expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:role_r:type_t:s0"])
116
- expect(get_selinux_current_context("/foo")).to eq("user_u:role_r:type_t:s0")
114
+ without_partial_double_verification do
115
+ expect(self).to receive(:selinux_support?).and_return(true)
116
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:role_r:type_t:s0"])
117
+ expect(get_selinux_current_context("/foo")).to eq("user_u:role_r:type_t:s0")
118
+ end
117
119
  end
118
120
 
119
121
  it "should return nil if lgetfilecon fails" do
120
- expect(self).to receive(:selinux_support?).and_return(true)
121
- expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return(-1)
122
- expect(get_selinux_current_context("/foo")).to be_nil
122
+ without_partial_double_verification do
123
+ expect(self).to receive(:selinux_support?).and_return(true)
124
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return(-1)
125
+ expect(get_selinux_current_context("/foo")).to be_nil
126
+ end
123
127
  end
124
128
  end
125
129
 
@@ -130,47 +134,57 @@ describe Puppet::Util::SELinux do
130
134
  end
131
135
 
132
136
  it "should return a context if a default context exists" do
133
- expect(self).to receive(:selinux_support?).and_return(true)
134
- fstat = double('File::Stat', :mode => 0)
135
- expect(Puppet::FileSystem).to receive(:lstat).with('/foo').and_return(fstat)
136
- expect(self).to receive(:find_fs).with("/foo").and_return("ext3")
137
- expect(Selinux).to receive(:matchpathcon).with("/foo", 0).and_return([0, "user_u:role_r:type_t:s0"])
138
-
139
- expect(get_selinux_default_context("/foo")).to eq("user_u:role_r:type_t:s0")
137
+ without_partial_double_verification do
138
+ expect(self).to receive(:selinux_support?).and_return(true)
139
+ fstat = double('File::Stat', :mode => 0)
140
+ expect(Puppet::FileSystem).to receive(:lstat).with('/foo').and_return(fstat)
141
+ expect(self).to receive(:find_fs).with("/foo").and_return("ext3")
142
+ expect(Selinux).to receive(:matchpathcon).with("/foo", 0).and_return([0, "user_u:role_r:type_t:s0"])
143
+
144
+ expect(get_selinux_default_context("/foo")).to eq("user_u:role_r:type_t:s0")
145
+ end
140
146
  end
141
147
 
142
148
  it "handles permission denied errors by issuing a warning" do
143
- allow(self).to receive(:selinux_support?).and_return(true)
144
- allow(self).to receive(:selinux_label_support?).and_return(true)
145
- allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 0).and_return(-1)
146
- allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::EACCES, "/root/chuj")
149
+ without_partial_double_verification do
150
+ allow(self).to receive(:selinux_support?).and_return(true)
151
+ allow(self).to receive(:selinux_label_support?).and_return(true)
152
+ allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 0).and_return(-1)
153
+ allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::EACCES, "/root/chuj")
147
154
 
148
- expect(get_selinux_default_context("/root/chuj")).to be_nil
155
+ expect(get_selinux_default_context("/root/chuj")).to be_nil
156
+ end
149
157
  end
150
158
 
151
159
  it "handles no such file or directory errors by issuing a warning" do
152
- allow(self).to receive(:selinux_support?).and_return(true)
153
- allow(self).to receive(:selinux_label_support?).and_return(true)
154
- allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 0).and_return(-1)
155
- allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::ENOENT, "/root/chuj")
160
+ without_partial_double_verification do
161
+ allow(self).to receive(:selinux_support?).and_return(true)
162
+ allow(self).to receive(:selinux_label_support?).and_return(true)
163
+ allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 0).and_return(-1)
164
+ allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::ENOENT, "/root/chuj")
156
165
 
157
- expect(get_selinux_default_context("/root/chuj")).to be_nil
166
+ expect(get_selinux_default_context("/root/chuj")).to be_nil
167
+ end
158
168
  end
159
169
 
160
170
  it "should return nil if matchpathcon returns failure" do
161
- expect(self).to receive(:selinux_support?).and_return(true)
162
- fstat = double('File::Stat', :mode => 0)
163
- expect(Puppet::FileSystem).to receive(:lstat).with('/foo').and_return(fstat)
164
- expect(self).to receive(:find_fs).with("/foo").and_return("ext3")
165
- expect(Selinux).to receive(:matchpathcon).with("/foo", 0).and_return(-1)
166
-
167
- expect(get_selinux_default_context("/foo")).to be_nil
171
+ without_partial_double_verification do
172
+ expect(self).to receive(:selinux_support?).and_return(true)
173
+ fstat = double('File::Stat', :mode => 0)
174
+ expect(Puppet::FileSystem).to receive(:lstat).with('/foo').and_return(fstat)
175
+ expect(self).to receive(:find_fs).with("/foo").and_return("ext3")
176
+ expect(Selinux).to receive(:matchpathcon).with("/foo", 0).and_return(-1)
177
+
178
+ expect(get_selinux_default_context("/foo")).to be_nil
179
+ end
168
180
  end
169
181
 
170
182
  it "should return nil if selinux_label_support returns false" do
171
- expect(self).to receive(:selinux_support?).and_return(true)
172
- expect(self).to receive(:find_fs).with("/foo").and_return("nfs")
173
- expect(get_selinux_default_context("/foo")).to be_nil
183
+ without_partial_double_verification do
184
+ expect(self).to receive(:selinux_support?).and_return(true)
185
+ expect(self).to receive(:find_fs).with("/foo").and_return("nfs")
186
+ expect(get_selinux_default_context("/foo")).to be_nil
187
+ end
174
188
  end
175
189
  end
176
190
 
@@ -261,37 +275,47 @@ describe Puppet::Util::SELinux do
261
275
  end
262
276
 
263
277
  it "should use lsetfilecon to set a context" do
264
- expect(self).to receive(:selinux_support?).and_return(true)
265
- expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
266
- expect(set_selinux_context("/foo", "user_u:role_r:type_t:s0")).to be_truthy
278
+ without_partial_double_verification do
279
+ expect(self).to receive(:selinux_support?).and_return(true)
280
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
281
+ expect(set_selinux_context("/foo", "user_u:role_r:type_t:s0")).to be_truthy
282
+ end
267
283
  end
268
284
 
269
285
  it "should use lsetfilecon to set user_u user context" do
270
- expect(self).to receive(:selinux_support?).and_return(true)
271
- expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "foo:role_r:type_t:s0"])
272
- expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
273
- expect(set_selinux_context("/foo", "user_u", :seluser)).to be_truthy
286
+ without_partial_double_verification do
287
+ expect(self).to receive(:selinux_support?).and_return(true)
288
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "foo:role_r:type_t:s0"])
289
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
290
+ expect(set_selinux_context("/foo", "user_u", :seluser)).to be_truthy
291
+ end
274
292
  end
275
293
 
276
294
  it "should use lsetfilecon to set role_r role context" do
277
- expect(self).to receive(:selinux_support?).and_return(true)
278
- expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:foo:type_t:s0"])
279
- expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
280
- expect(set_selinux_context("/foo", "role_r", :selrole)).to be_truthy
295
+ without_partial_double_verification do
296
+ expect(self).to receive(:selinux_support?).and_return(true)
297
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:foo:type_t:s0"])
298
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
299
+ expect(set_selinux_context("/foo", "role_r", :selrole)).to be_truthy
300
+ end
281
301
  end
282
302
 
283
303
  it "should use lsetfilecon to set type_t type context" do
284
- expect(self).to receive(:selinux_support?).and_return(true)
285
- expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:role_r:foo:s0"])
286
- expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
287
- expect(set_selinux_context("/foo", "type_t", :seltype)).to be_truthy
304
+ without_partial_double_verification do
305
+ expect(self).to receive(:selinux_support?).and_return(true)
306
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:role_r:foo:s0"])
307
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").and_return(0)
308
+ expect(set_selinux_context("/foo", "type_t", :seltype)).to be_truthy
309
+ end
288
310
  end
289
311
 
290
312
  it "should use lsetfilecon to set s0:c3,c5 range context" do
291
- expect(self).to receive(:selinux_support?).and_return(true)
292
- expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:role_r:type_t:s0"])
293
- expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0:c3,c5").and_return(0)
294
- expect(set_selinux_context("/foo", "s0:c3,c5", :selrange)).to be_truthy
313
+ without_partial_double_verification do
314
+ expect(self).to receive(:selinux_support?).and_return(true)
315
+ expect(Selinux).to receive(:lgetfilecon).with("/foo").and_return([0, "user_u:role_r:type_t:s0"])
316
+ expect(Selinux).to receive(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0:c3,c5").and_return(0)
317
+ expect(set_selinux_context("/foo", "s0:c3,c5", :selrange)).to be_truthy
318
+ end
295
319
  end
296
320
  end
297
321
 
@@ -14,12 +14,14 @@ describe Puppet::Util::SUIDManager do
14
14
  pwent = double('pwent', :name => 'fred', :uid => 42, :gid => 42)
15
15
  allow(Etc).to receive(:getpwuid).with(42).and_return(pwent)
16
16
 
17
- [:euid, :egid, :uid, :gid, :groups].each do |id|
18
- allow(Process).to receive("#{id}=") {|value| xids[id] = value}
17
+ unless Puppet::Util::Platform.windows?
18
+ [:euid, :egid, :uid, :gid, :groups].each do |id|
19
+ allow(Process).to receive("#{id}=") {|value| xids[id] = value}
20
+ end
19
21
  end
20
22
  end
21
23
 
22
- describe "#initgroups" do
24
+ describe "#initgroups", unless: Puppet::Util::Platform.windows? do
23
25
  it "should use the primary group of the user as the 'basegid'" do
24
26
  expect(Process).to receive(:initgroups).with('fred', 42)
25
27
  described_class.initgroups(42)
@@ -27,7 +29,7 @@ describe Puppet::Util::SUIDManager do
27
29
  end
28
30
 
29
31
  describe "#uid" do
30
- it "should allow setting euid/egid" do
32
+ it "should allow setting euid/egid", unless: Puppet::Util::Platform.windows? do
31
33
  Puppet::Util::SUIDManager.egid = user[:gid]
32
34
  Puppet::Util::SUIDManager.euid = user[:uid]
33
35
 
@@ -37,8 +39,7 @@ describe Puppet::Util::SUIDManager do
37
39
  end
38
40
 
39
41
  describe "#asuser" do
40
- it "should not get or set euid/egid when not root" do
41
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
42
+ it "should not get or set euid/egid when not root", unless: Puppet::Util::Platform.windows? do
42
43
  allow(Process).to receive(:uid).and_return(1)
43
44
 
44
45
  allow(Process).to receive(:egid).and_return(51)
@@ -49,13 +50,12 @@ describe Puppet::Util::SUIDManager do
49
50
  expect(xids).to be_empty
50
51
  end
51
52
 
52
- context "when root and not windows" do
53
+ context "when root and not Windows" do
53
54
  before :each do
54
55
  allow(Process).to receive(:uid).and_return(0)
55
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
56
56
  end
57
57
 
58
- it "should set euid/egid" do
58
+ it "should set euid/egid", unless: Puppet::Util::Platform.windows? do
59
59
  allow(Process).to receive(:egid).and_return(51, 51, user[:gid])
60
60
  allow(Process).to receive(:euid).and_return(50, 50, user[:uid])
61
61
 
@@ -79,29 +79,23 @@ describe Puppet::Util::SUIDManager do
79
79
  end
80
80
 
81
81
  it "should just yield if user and group are nil" do
82
- yielded = false
83
- Puppet::Util::SUIDManager.asuser(nil, nil) { yielded = true }
84
- expect(yielded).to be_truthy
82
+ expect { |b| Puppet::Util::SUIDManager.asuser(nil, nil, &b) }.to yield_control
85
83
  expect(xids).to eq({})
86
84
  end
87
85
 
88
- it "should just change group if only group is given" do
89
- yielded = false
90
- Puppet::Util::SUIDManager.asuser(nil, 42) { yielded = true }
91
- expect(yielded).to be_truthy
86
+ it "should just change group if only group is given", unless: Puppet::Util::Platform.windows? do
87
+ expect { |b| Puppet::Util::SUIDManager.asuser(nil, 42, &b) }.to yield_control
92
88
  expect(xids).to eq({ :egid => 42 })
93
89
  end
94
90
 
95
- it "should change gid to the primary group of uid by default" do
91
+ it "should change gid to the primary group of uid by default", unless: Puppet::Util::Platform.windows? do
96
92
  allow(Process).to receive(:initgroups)
97
93
 
98
- yielded = false
99
- Puppet::Util::SUIDManager.asuser(42) { yielded = true }
100
- expect(yielded).to be_truthy
94
+ expect { |b| Puppet::Util::SUIDManager.asuser(42, nil, &b) }.to yield_control
101
95
  expect(xids).to eq({ :euid => 42, :egid => 42 })
102
96
  end
103
97
 
104
- it "should change both uid and gid if given" do
98
+ it "should change both uid and gid if given", unless: Puppet::Util::Platform.windows? do
105
99
  # I don't like the sequence, but it is the only way to assert on the
106
100
  # internal behaviour in a reliable fashion, given we need multiple
107
101
  # sequenced calls to the same methods. --daniel 2012-02-05
@@ -110,21 +104,23 @@ describe Puppet::Util::SUIDManager do
110
104
  expect(Puppet::Util::SUIDManager).to receive(:change_group).with(Puppet::Util::SUIDManager.egid, false).ordered()
111
105
  expect(Puppet::Util::SUIDManager).to receive(:change_user).with(Puppet::Util::SUIDManager.euid, false).ordered()
112
106
 
113
- yielded = false
114
- Puppet::Util::SUIDManager.asuser(42, 43) { yielded = true }
115
- expect(yielded).to be_truthy
107
+ expect { |b| Puppet::Util::SUIDManager.asuser(42, 43, &b) }.to yield_control
116
108
  end
117
109
  end
118
110
 
119
- it "should not get or set euid/egid on Windows", if: Puppet::Util::Platform.windows? do
120
- Puppet::Util::SUIDManager.asuser(user[:uid], user[:gid]) {}
121
-
122
- expect(xids).to be_empty
111
+ it "should just yield on Windows", if: Puppet::Util::Platform.windows? do
112
+ expect { |b| Puppet::Util::SUIDManager.asuser(1, 2, &b) }.to yield_control
123
113
  end
124
114
  end
125
115
 
126
116
  describe "#change_group" do
127
- describe "when changing permanently" do
117
+ it "raises on Windows", if: Puppet::Util::Platform.windows? do
118
+ expect {
119
+ Puppet::Util::SUIDManager.change_group(42, true)
120
+ }.to raise_error(NotImplementedError, /change_privilege\(\) function is unimplemented/)
121
+ end
122
+
123
+ describe "when changing permanently", unless: Puppet::Util::Platform.windows? do
128
124
  it "should change_privilege" do
129
125
  expect(Process::GID).to receive(:change_privilege) do |gid|
130
126
  Process.gid = gid
@@ -150,7 +146,7 @@ describe Puppet::Util::SUIDManager do
150
146
  end
151
147
  end
152
148
 
153
- describe "when changing temporarily" do
149
+ describe "when changing temporarily", unless: Puppet::Util::Platform.windows? do
154
150
  it "should change only egid" do
155
151
  Puppet::Util::SUIDManager.change_group(42, false)
156
152
 
@@ -161,7 +157,13 @@ describe Puppet::Util::SUIDManager do
161
157
  end
162
158
 
163
159
  describe "#change_user" do
164
- describe "when changing permanently" do
160
+ it "raises on Windows", if: Puppet::Util::Platform.windows? do
161
+ expect {
162
+ Puppet::Util::SUIDManager.change_user(42, true)
163
+ }.to raise_error(NotImplementedError, /initgroups\(\) function is unimplemented/)
164
+ end
165
+
166
+ describe "when changing permanently", unless: Puppet::Util::Platform.windows? do
165
167
  it "should change_privilege" do
166
168
  expect(Process::UID).to receive(:change_privilege) do |uid|
167
169
  Process.uid = uid
@@ -191,7 +193,7 @@ describe Puppet::Util::SUIDManager do
191
193
  end
192
194
  end
193
195
 
194
- describe "when changing temporarily" do
196
+ describe "when changing temporarily", unless: Puppet::Util::Platform.windows? do
195
197
  it "should change only euid and groups" do
196
198
  allow(Puppet::Util::SUIDManager).to receive(:initgroups).and_return([])
197
199
  Puppet::Util::SUIDManager.change_user(42, false)
@@ -221,12 +223,7 @@ describe Puppet::Util::SUIDManager do
221
223
  end
222
224
 
223
225
  describe "#root?" do
224
- describe "on POSIX systems" do
225
- before :each do
226
- allow(Puppet.features).to receive(:posix?).and_return(true)
227
- allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
228
- end
229
-
226
+ describe "on POSIX systems", unless: Puppet::Util::Platform.windows? do
230
227
  it "should be root if uid is 0" do
231
228
  allow(Process).to receive(:uid).and_return(0)
232
229
 
@@ -240,7 +237,7 @@ describe Puppet::Util::SUIDManager do
240
237
  end
241
238
  end
242
239
 
243
- describe "on Microsoft Windows", :if => Puppet::Util::Platform.windows? do
240
+ describe "on Windows", :if => Puppet::Util::Platform.windows? do
244
241
  it "should be root if user is privileged" do
245
242
  allow(Puppet::Util::Windows::User).to receive(:admin?).and_return(true)
246
243
 
@@ -261,13 +258,19 @@ describe 'Puppet::Util::SUIDManager#groups=' do
261
258
  Puppet::Util::SUIDManager
262
259
  end
263
260
 
264
- it "(#3419) should rescue Errno::EINVAL on OS X" do
261
+ it "raises on Windows", if: Puppet::Util::Platform.windows? do
262
+ expect {
263
+ subject.groups = []
264
+ }.to raise_error(NotImplementedError, /groups=\(\) function is unimplemented/)
265
+ end
266
+
267
+ it "(#3419) should rescue Errno::EINVAL on OS X", unless: Puppet::Util::Platform.windows? do
265
268
  expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
266
269
  expect(subject).to receive(:osx_maj_ver).and_return('10.7').twice
267
270
  subject.groups = ['list', 'of', 'groups']
268
271
  end
269
272
 
270
- it "(#3419) should fail if an Errno::EINVAL is raised NOT on OS X" do
273
+ it "(#3419) should fail if an Errno::EINVAL is raised NOT on OS X", unless: Puppet::Util::Platform.windows? do
271
274
  expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
272
275
  expect(subject).to receive(:osx_maj_ver).and_return(false)
273
276
  expect { subject.groups = ['list', 'of', 'groups'] }.to raise_error(Errno::EINVAL)
@@ -309,7 +309,7 @@ describe Puppet::Util do
309
309
 
310
310
  describe "when using platform :posix" do
311
311
  before :each do
312
- allow(Puppet.features).to receive(:posix).and_return(true)
312
+ allow(Puppet.features).to receive(:posix?).and_return(true)
313
313
  allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
314
314
  end
315
315
 
@@ -322,7 +322,7 @@ describe Puppet::Util do
322
322
 
323
323
  describe "when using platform :windows" do
324
324
  before :each do
325
- allow(Puppet.features).to receive(:posix).and_return(false)
325
+ allow(Puppet.features).to receive(:posix?).and_return(false)
326
326
  allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
327
327
  end
328
328
 
@@ -456,7 +456,7 @@ describe Puppet::Util do
456
456
 
457
457
  describe "when using platform :posix" do
458
458
  before :each do
459
- allow(Puppet.features).to receive(:posix).and_return(true)
459
+ allow(Puppet.features).to receive(:posix?).and_return(true)
460
460
  allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
461
461
  end
462
462
 
@@ -495,7 +495,7 @@ describe Puppet::Util do
495
495
 
496
496
  describe "when using platform :windows" do
497
497
  before :each do
498
- allow(Puppet.features).to receive(:posix).and_return(false)
498
+ allow(Puppet.features).to receive(:posix?).and_return(false)
499
499
  allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
500
500
  end
501
501
 
@@ -533,7 +533,6 @@ describe Puppet::Util do
533
533
  expect(Puppet::Util.uri_to_path(URI.parse('http://foo/bar%20baz'))).to eq('/bar baz')
534
534
  end
535
535
 
536
-
537
536
  [
538
537
  "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E",
539
538
  "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E".force_encoding(Encoding::ASCII)
@@ -583,7 +582,15 @@ describe Puppet::Util do
583
582
  end
584
583
  end
585
584
 
586
- describe "safe_posix_fork" do
585
+ describe "safe_posix_fork on Windows and JRuby", if: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
586
+ it "raises not implemented error" do
587
+ expect {
588
+ Puppet::Util.safe_posix_fork
589
+ }.to raise_error(NotImplementedError, /fork/)
590
+ end
591
+ end
592
+
593
+ describe "safe_posix_fork", unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
587
594
  let(:pid) { 5501 }
588
595
 
589
596
  before :each do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.1.0
4
+ version: 7.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet Labs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-12-14 00:00:00.000000000 Z
11
+ date: 2021-01-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: facter
@@ -1111,6 +1111,7 @@ files:
1111
1111
  - lib/puppet/scheduler/splay_job.rb
1112
1112
  - lib/puppet/scheduler/timer.rb
1113
1113
  - lib/puppet/settings.rb
1114
+ - lib/puppet/settings/alias_setting.rb
1114
1115
  - lib/puppet/settings/array_setting.rb
1115
1116
  - lib/puppet/settings/autosign_setting.rb
1116
1117
  - lib/puppet/settings/base_setting.rb
@@ -1354,6 +1355,7 @@ files:
1354
1355
  - man/man8/puppet.8
1355
1356
  - spec/fixtures/faulty_face/puppet/face/syntax.rb
1356
1357
  - spec/fixtures/hiera.yaml
1358
+ - spec/fixtures/integration/application/agent/cached_deferred_catalog.json
1357
1359
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
1358
1360
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
1359
1361
  - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -2209,6 +2211,7 @@ files:
2209
2211
  - spec/unit/pops/evaluator/collections_ops_spec.rb
2210
2212
  - spec/unit/pops/evaluator/comparison_ops_spec.rb
2211
2213
  - spec/unit/pops/evaluator/conditionals_spec.rb
2214
+ - spec/unit/pops/evaluator/deferred_resolver_spec.rb
2212
2215
  - spec/unit/pops/evaluator/evaluating_parser_spec.rb
2213
2216
  - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
2214
2217
  - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb
@@ -2592,6 +2595,7 @@ summary: Puppet, an automated configuration management tool
2592
2595
  test_files:
2593
2596
  - spec/fixtures/faulty_face/puppet/face/syntax.rb
2594
2597
  - spec/fixtures/hiera.yaml
2598
+ - spec/fixtures/integration/application/agent/cached_deferred_catalog.json
2595
2599
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
2596
2600
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
2597
2601
  - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -3447,6 +3451,7 @@ test_files:
3447
3451
  - spec/unit/pops/evaluator/collections_ops_spec.rb
3448
3452
  - spec/unit/pops/evaluator/comparison_ops_spec.rb
3449
3453
  - spec/unit/pops/evaluator/conditionals_spec.rb
3454
+ - spec/unit/pops/evaluator/deferred_resolver_spec.rb
3450
3455
  - spec/unit/pops/evaluator/evaluating_parser_spec.rb
3451
3456
  - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
3452
3457
  - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb