Skip to content

Commit 4824bcb

Browse files
committed
Quote username in error message
1 parent e1b1293 commit 4824bcb

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

app/models/runtime/constraints/process_user_policy.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@ def validate
1111
return if @process.user.blank?
1212
return if @allowed_users.map(&:downcase).include?(@process.user.downcase)
1313

14-
@errors.add(:user, sprintf(ERROR_MSG, requested_user: @process.user, allowed_users: formatted_users_for_error))
14+
@errors.add(:user, sprintf(ERROR_MSG, requested_user: quote_user(@process.user), allowed_users: formatted_users_for_error))
1515
end
1616

1717
private
1818

1919
def formatted_users_for_error
20-
@allowed_users.map { |u| "'#{u}'" }.join(', ')
20+
@allowed_users.map { |u| quote_user(u) }.join(', ')
21+
end
22+
23+
def quote_user(user)
24+
"'#{user}'"
2125
end
2226
end

spec/unit/models/runtime/constraints/process_user_policy_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
let(:process_user) { 'vcarp' }
4141

4242
it 'is not valid' do
43-
expect(validator).to validate_with_error(process, :user, sprintf(ProcessUserPolicy::ERROR_MSG, requested_user: process.user, allowed_users: "'vcap', 'ContainerUser'"))
43+
expect(validator).to validate_with_error(process, :user, sprintf(ProcessUserPolicy::ERROR_MSG, requested_user: "'vcarp'", allowed_users: "'vcap', 'ContainerUser'"))
4444
end
4545
end
4646

0 commit comments

Comments
 (0)