Skip to content

Commit 80e9ccc

Browse files
authored
Merge pull request #9473 from shubhamshinde360/PUP-12076-main
(PUP-12076) Fix windows password compliance issue
2 parents 32499bc + 2227c86 commit 80e9ccc

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

acceptance/tests/resource/service/windows.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ def service_manifest(name, params)
5050
fresh_user_manifest = <<-MANIFEST
5151
user { '#{fresh_user}':
5252
ensure => present,
53-
password => 'freshUserPassword',
53+
password => 'freshUserPassword#123',
5454
roles => 'SeServiceLogonRight'
5555
}
5656
5757
service { '#{mock_service_nofail[:name]}':
5858
logonaccount => '#{fresh_user}',
59-
logonpassword => 'freshUserPassword',
59+
logonpassword => 'freshUserPassword#123',
6060
require => User['#{fresh_user}']
6161
}
6262
MANIFEST
@@ -161,7 +161,7 @@ def service_manifest(name, params)
161161
end
162162

163163
step "Create a new user named #{new_user}" do
164-
on(agent, puppet("resource user #{new_user} ensure=present password=firstPassword")) do |result|
164+
on(agent, puppet("resource user #{new_user} ensure=present password=firstPassword#123")) do |result|
165165
assert_match(/User\[#{new_user}\]\/ensure: created/, result.stdout)
166166
end
167167
end
@@ -187,7 +187,7 @@ def service_manifest(name, params)
187187

188188
step "Verify that #{new_user} can be set as logonaccount and service is still running" do
189189
assert_service_properties_on(agent, mock_service_nofail[:name], StartName: 'LocalSystem')
190-
on(agent, puppet("resource service #{mock_service_nofail[:name]} logonaccount=#{new_user} logonpassword=firstPassword ensure=running --debug")) do |result|
190+
on(agent, puppet("resource service #{mock_service_nofail[:name]} logonaccount=#{new_user} logonpassword=firstPassword#123 ensure=running --debug")) do |result|
191191
assert_match(/Service\[#{mock_service_nofail[:name]}\]\/logonaccount: logonaccount changed 'LocalSystem' to '.\\#{new_user}'/, result.stdout)
192192
assert_match(/Transitioning the #{mock_service_nofail[:name]} service from SERVICE_RUNNING to SERVICE_STOPPED/, result.stdout)
193193
assert_match(/Successfully started the #{mock_service_nofail[:name]} service/, result.stdout)
@@ -196,22 +196,22 @@ def service_manifest(name, params)
196196
end
197197

198198
step "Change password for #{new_user} and verify that service state isn't yet affected by this" do
199-
on(agent, puppet("resource user #{new_user} ensure=present password=secondPassword")) do |result|
199+
on(agent, puppet("resource user #{new_user} ensure=present password=secondPassword#123")) do |result|
200200
assert_match(/User\[#{new_user}\]\/password: changed \[redacted\] to \[redacted\]/, result.stdout)
201201
end
202202
assert_service_properties_on(agent, mock_service_nofail[:name], StartName: new_user, State: 'Running')
203203
end
204204

205205
step 'Verify that setting logonpassword fails when using old password and service remains running' do
206-
apply_manifest_on(agent, service_manifest(mock_service_long_start_stop[:name], logonaccount: new_user, logonpassword: 'firstPassword'), :acceptable_exit_codes => [1]) do |result|
206+
apply_manifest_on(agent, service_manifest(mock_service_long_start_stop[:name], logonaccount: new_user, logonpassword: 'firstPassword#123'), :acceptable_exit_codes => [1]) do |result|
207207
assert_match(/The given password is invalid for user/, result.stderr)
208208
end
209209
assert_service_properties_on(agent, mock_service_nofail[:name], StartName: new_user, State: 'Running')
210210
end
211211

212212
step 'Verify that setting the new logonpassword does not report any changes' do
213213
assert_service_properties_on(agent, mock_service_nofail[:name], StartName: new_user, State: 'Running')
214-
apply_manifest_on(agent, service_manifest(mock_service_nofail[:name], logonaccount: new_user, logonpassword: 'secondPassword'), catch_changes: true)
214+
apply_manifest_on(agent, service_manifest(mock_service_nofail[:name], logonaccount: new_user, logonpassword: 'secondPassword#123'), catch_changes: true)
215215
assert_service_properties_on(agent, mock_service_nofail[:name], StartName: new_user, State: 'Running')
216216
end
217217

0 commit comments

Comments
 (0)