Skip to content

O
OHR Support
Commit f021c856 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Fixed: issue details view discloses relations to issues that the user is not… 

Fixed: issue details view discloses relations to issues that the user is not allowed to view (#2589).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2343 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 2679150e
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 1 deletion
app/models/issue.rb
View file @ f021c856
......@@ -54,6 +54,11 @@ class Issue < ActiveRecord::Base
named_scope :visible, lambda {|*args| { :include => :project,
:conditions => Project.allowed_to_condition(args.first || User.current, :view_issues) } }
# Returns true if usr or current user is allowed to view the issue
def visible?(usr=nil)
(usr || User.current).allowed_to?(:view_issues, self.project)
end
def after_initialize
if new_record?
# set default values for new records only
......
app/views/issues/_relations.rhtml
View file @ f021c856
......@@ -8,7 +8,7 @@
<% if @issue.relations.any? %>
<table style="width:100%">
<% @issue.relations.each do |relation| %>
<% @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation| %>
<tr>
<td><%= l(relation.label_for(@issue)) %> <%= "(#{lwr(:actionview_datehelper_time_in_words_day, relation.delay)})" if relation.delay && relation.delay != 0 %>
<%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %> <%= link_to_issue relation.other_issue(@issue) %></td>
......
test/functional/issues_controller_test.rb
View file @ f021c856
......@@ -324,6 +324,21 @@ class IssuesControllerTest < Test::Unit::TestCase
:content => /Notes/ } }
end
def test_show_should_not_disclose_relations_to_invisible_issues
Setting.cross_project_issue_relations = '1'
IssueRelation.create!(:issue_from => Issue.find(1), :issue_to => Issue.find(2), :relation_type => 'relates')
# Relation to a private project issue
IssueRelation.create!(:issue_from => Issue.find(1), :issue_to => Issue.find(4), :relation_type => 'relates')
get :show, :id => 1
assert_response :success
assert_tag :div, :attributes => { :id => 'relations' },
:descendant => { :tag => 'a', :content => /#2$/ }
assert_no_tag :div, :attributes => { :id => 'relations' },
:descendant => { :tag => 'a', :content => /#4$/ }
end
def test_new_routing
assert_routing(
{:method => :get, :path => '/projects/1/issues/new'},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment