Skip to content

(MODULES-10623) explicitly top-scope calls to JSON methods #1101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2020
Merged

(MODULES-10623) explicitly top-scope calls to JSON methods #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/facter/facter_dot_d.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ def json_parser(file)
retry if require 'rubygems'
raise
end

JSON.parse(File.read(file)).each_pair do |f, v|
# Call ::JSON to ensure it references the JSON library from Ruby’s standard library
# instead of a random JSON namespace that might be in scope due to user code.
::JSON.parse(File.read(file)).each_pair do |f, v|
Facter.add(f) do
setcode { v }
end
Expand Down
5 changes: 4 additions & 1 deletion lib/puppet/functions/to_json_pretty.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'json'

# @summary
# Convert data structure and output to pretty JSON
#
Expand Down Expand Up @@ -72,6 +73,8 @@ def to_json_pretty(data, skip_undef = false, opts = nil)
data = data.reject { |_, value| value.nil? }
end
end
JSON.pretty_generate(data, opts) << "\n"
# Call ::JSON to ensure it references the JSON library from Ruby’s standard library
# instead of a random JSON namespace that might be in scope due to user code.
::JSON.pretty_generate(data, opts) << "\n"
end
end