kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makes Redmine.pm handle project status (#3640). 

Repositories of archived projects are no longer accessible. Repositories of closed projects are read-only.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9887 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-06-25 20:08:49 +00:00
parent 2ceb6b8230
commit 21ac4a3d0e
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extra/svn/Redmine.pm
View File

@ -239,7 +239,7 @@ sub RedmineDSN {
my ($self, $parms, $arg) = @_; my ($self, $parms, $arg) = @_;
$self->{RedmineDSN} = $arg; $self->{RedmineDSN} = $arg;
my $query = "SELECT my $query = "SELECT
hashed_password, salt, auth_source_id, permissions users.hashed_password, users.salt, users.auth_source_id, roles.permissions, projects.status
FROM projects, users, roles FROM projects, users, roles
WHERE WHERE
users.login=? users.login=?
@ -381,7 +381,7 @@ sub is_public_project {
my $dbh = connect_database($r); my $dbh = connect_database($r);
my $sth = $dbh->prepare( my $sth = $dbh->prepare(
"SELECT is_public FROM projects WHERE projects.identifier = ?;" "SELECT is_public FROM projects WHERE projects.identifier = ? AND projects.status <> 9;"
); );
$sth->execute($project_id); $sth->execute($project_id);
@ -460,7 +460,10 @@ sub is_member {
$sth->execute($redmine_user, $project_id); $sth->execute($redmine_user, $project_id);
my $ret; my $ret;
while (my ($hashed_password, $salt, $auth_source_id, $permissions) = $sth->fetchrow_array) { while (my ($hashed_password, $salt, $auth_source_id, $permissions, $project_status) = $sth->fetchrow_array) {
if ($project_status eq "9" || ($project_status ne "1" && $access_mode eq "W")) {
last;
}
unless ($auth_source_id) { unless ($auth_source_id) {
my $method = $r->method; my $method = $r->method;

43
test/extra/redmine_pm/repository_subversion_test.rb
View File

@ -168,6 +168,49 @@ class RedminePmTest::RepositorySubversionTest < RedminePmTest::TestCase
end end
end end
def test_read_on_archived_projects_should_fail
Project.find(1).update_attribute :status, Project::STATUS_ARCHIVED
assert_failure "ls", svn_url
end
def test_read_on_archived_private_projects_should_fail
Project.find(1).update_attribute :status, Project::STATUS_ARCHIVED
Project.find(1).update_attribute :is_public, false
with_credentials "dlopper", "foo" do
assert_failure "ls", svn_url
end
end
def test_read_on_closed_projects_should_succeed
Project.find(1).update_attribute :status, Project::STATUS_CLOSED
assert_success "ls", svn_url
end
def test_read_on_closed_private_projects_should_succeed
Project.find(1).update_attribute :status, Project::STATUS_CLOSED
Project.find(1).update_attribute :is_public, false
with_credentials "dlopper", "foo" do
assert_success "ls", svn_url
end
end
def test_commit_on_closed_projects_should_fail
Project.find(1).update_attribute :status, Project::STATUS_CLOSED
Role.find(2).add_permission! :commit_access
with_credentials "dlopper", "foo" do
assert_failure "mkdir --message Creating_a_directory", svn_url(random_filename)
end
end
def test_commit_on_closed_private_projects_should_fail
Project.find(1).update_attribute :status, Project::STATUS_CLOSED
Project.find(1).update_attribute :is_public, false
Role.find(2).add_permission! :commit_access
with_credentials "dlopper", "foo" do
assert_failure "mkdir --message Creating_a_directory", svn_url(random_filename)
end
end
if ldap_configured? if ldap_configured?
def test_user_with_ldap_auth_source_should_authenticate_with_ldap_credentials def test_user_with_ldap_auth_source_should_authenticate_with_ldap_credentials
ldap_user = User.new(:mail => 'example1@redmine.org', :firstname => 'LDAP', :lastname => 'user', :auth_source_id => 1) ldap_user = User.new(:mail => 'example1@redmine.org', :firstname => 'LDAP', :lastname => 'user', :auth_source_id => 1)