summaryrefslogtreecommitdiff
path: root/app/helpers/application_helper.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-25 22:12:11 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-25 22:12:11 +0200
commitdb8baf2895f111652699c5b48d8cb2663eed6c3f (patch)
treea538d6872123435c295327c2fb5cc45bb0688165 /app/helpers/application_helper.rb
parentd0646babdbb54c652ce19e6329b904193be8522c (diff)
downloadgitlab-ce-db8baf2895f111652699c5b48d8cb2663eed6c3f.tar.gz
Since search_autocomplete_source rendered with raw all human input should be sanitized to prevent XSS
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d02130c5eb1..dad23471a90 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -72,7 +72,7 @@ module ApplicationHelper
end
def search_autocomplete_source
- projects = current_user.authorized_projects.map { |p| { label: "project: #{p.name_with_namespace}", url: project_path(p) } }
+ projects = current_user.authorized_projects.map { |p| { label: "project: #{simple_sanitize(p.name_with_namespace)}", url: project_path(p) } }
groups = current_user.authorized_groups.map { |group| { label: "group: #{simple_sanitize(group.name)}", url: group_path(group) } }
teams = current_user.authorized_teams.map { |team| { label: "team: #{simple_sanitize(team.name)}", url: team_path(team) } }
@@ -98,15 +98,15 @@ module ApplicationHelper
project_nav = []
if @project && @project.repository && @project.repository.root_ref
project_nav = [
- { label: "#{@project.name_with_namespace} - Issues", url: project_issues_path(@project) },
- { label: "#{@project.name_with_namespace} - Commits", url: project_commits_path(@project, @ref || @project.repository.root_ref) },
- { label: "#{@project.name_with_namespace} - Merge Requests", url: project_merge_requests_path(@project) },
- { label: "#{@project.name_with_namespace} - Milestones", url: project_milestones_path(@project) },
- { label: "#{@project.name_with_namespace} - Snippets", url: project_snippets_path(@project) },
- { label: "#{@project.name_with_namespace} - Team", url: project_team_index_path(@project) },
- { label: "#{@project.name_with_namespace} - Tree", url: project_tree_path(@project, @ref || @project.repository.root_ref) },
- { label: "#{@project.name_with_namespace} - Wall", url: wall_project_path(@project) },
- { label: "#{@project.name_with_namespace} - Wiki", url: project_wikis_path(@project) },
+ { label: "#{simple_sanitize(@project.name_with_namespace)} - Issues", url: project_issues_path(@project) },
+ { label: "#{simple_sanitize(@project.name_with_namespace)} - Commits", url: project_commits_path(@project, @ref || @project.repository.root_ref) },
+ { label: "#{simple_sanitize(@project.name_with_namespace)} - Merge Requests", url: project_merge_requests_path(@project) },
+ { label: "#{simple_sanitize(@project.name_with_namespace)} - Milestones", url: project_milestones_path(@project) },
+ { label: "#{simple_sanitize(@project.name_with_namespace)} - Snippets", url: project_snippets_path(@project) },
+ { label: "#{simple_sanitize(@project.name_with_namespace)} - Team", url: project_team_index_path(@project) },
+ { label: "#{simple_sanitize(@project.name_with_namespace)} - Tree", url: project_tree_path(@project, @ref || @project.repository.root_ref) },
+ { label: "#{simple_sanitize(@project.name_with_namespace)} - Wall", url: wall_project_path(@project) },
+ { label: "#{simple_sanitize(@project.name_with_namespace)} - Wiki", url: project_wikis_path(@project) },
]
end