From b635d1ffa8cf56bd2d3c9ff93a0e561ea1cb5f84 Mon Sep 17 00:00:00 2001 From: Marcelo Fabri Date: Sun, 27 Aug 2017 07:21:05 -0300 Subject: [PATCH] Escape HTML tags in oss-check --- Dangerfile | 2 +- script/oss-check | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dangerfile b/Dangerfile index b4a492f8cf..f04da8f81c 100644 --- a/Dangerfile +++ b/Dangerfile @@ -16,7 +16,7 @@ has_app_changes = !modified_files.grep(/Source/).empty? has_test_changes = !modified_files.grep(/Tests/).empty? has_danger_changes = !modified_files.grep(/Dangerfile|script\/oss-check|Gemfile/).empty? has_rules_changes = !modified_files.grep(/Source\/SwiftLintFramework\/Rules/).empty? -has_rules_docs_changes = !modified_files.include?('Rules.md') +has_rules_docs_changes = modified_files.include?('Rules.md') # Add a CHANGELOG entry for app changes if !modified_files.include?('CHANGELOG.md') && has_app_changes diff --git a/script/oss-check b/script/oss-check index 701aa68a2d..b6a8057bce 100755 --- a/script/oss-check +++ b/script/oss-check @@ -7,6 +7,7 @@ require 'fileutils' require 'open3' require 'optparse' +require 'erb' ################################ # Options @@ -227,10 +228,12 @@ def diff_and_report_changes_to_danger master = non_empty_lines("#{@working_dir}/master_reports/#{repo.name}.txt") (master - branch).each do |fixed| - message "This PR fixed a violation in #{repo.name}: [#{fixed}](#{convert_to_link(repo, fixed)})" + escaped_message = ERB::Util.html_escape fixed + message "This PR fixed a violation in #{repo.name}: [#{escaped_message}](#{convert_to_link(repo, fixed)})" end (branch - master).each do |violation| - warn "This PR introduced a violation in #{repo.name}: [#{violation}](#{convert_to_link(repo, violation)})" + escaped_message = ERB::Util.html_escape violation + warn "This PR introduced a violation in #{repo.name}: [#{escaped_message}](#{convert_to_link(repo, violation)})" end message repo.duration_report end