Skip to content

GRIF-683: Fixing escape invalid ascii characters in LCM bricks parameters #2070

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

Open
hung-nguyen-hoang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GRIF-683: Fixing escape invalid ascii characters in LCM bricks parameters #2070

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
23 changes: 21 additions & 2 deletions lib/gooddata/helpers/global_helpers_params.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,23 @@ def decode_params(params, options = {})
end

begin
parsed_data_params = data_params.is_a?(Hash) ? data_params : JSON.parse(data_params)
parsed_data_params = if data_params.is_a?(Hash)
data_params
else
JSON.parse(sanitize_invalid_ascii_chars(data_params))
end
rescue JSON::ParserError => exception
reason = exception.message
reference_values.each { |secret_value| reason.gsub!("\"#{secret_value}\"", '"***"') }
raise exception.class, "Error reading json from '#{key}', reason: #{reason}"
end

begin
parsed_hidden_data_params = hidden_data_params.is_a?(Hash) ? hidden_data_params : JSON.parse(hidden_data_params)
parsed_hidden_data_params = if hidden_data_params.is_a?(Hash)
hidden_data_params
else
JSON.parse(sanitize_invalid_ascii_chars(hidden_data_params))
end
rescue JSON::ParserError => exception
raise exception.class, "Error reading json from '#{hidden_key}'"
end
Expand Down Expand Up @@ -240,6 +248,17 @@ def stringify_values(value)

private

# JSON does not allow unescaped ASCII control characters (0x00-0x1F) in strings.
# If such characters appear in the JSON payload coming from the platform, then we replace
# each raw control character with its escaped unicode form (\u0000 - \u001F).
def sanitize_invalid_ascii_chars(json_string)
return json_string unless json_string.is_a?(String)

json_string.gsub(/[\x00-\x1F]/) do |ch|
"\\u%04x" % ch.ord
end
end

def resolve_reference_params(data_params, params)
reference_values = []
regexps = Regexp.union(/\\\\/, /\\\$/, /\$\{([^\n\{\}]+)\}/)
Expand Down
Loading