jro_apps/redmine Commit - r1789:f5f51f4f832d

Add write control on repository from Redmine interface...

Nicolas Chuche -

r1789:f5f51f4f832d

parent child

Context file:

r1789:f5f51f4f832d

Collapse all files

db/migrate/20080827185639_add_repository_write_access.rb created 644 +14 0

@@ -0,0 +1,14
	1	class AddRepositoryWriteAccess < ActiveRecord::Migration
	2
	3	def self.up
	4	Role.find(:all).select { \|r\| not r.builtin? }.each do \|r\|
	5	r.add_permission!(:commit_access)
	6	end
	7	end
	8
	9	def self.down
	10	Role.find(:all).select { \|r\| not r.builtin? }.each do \|r\|
	11	r.remove_permission!(:commit_access)
	12	end
	13	end
	14	end

app/models/role.rb +20 -2

               has_many :members
               acts_as_list
-              serialize :permissions
+              serialize :permissions, Array
               attr_protected :builtin
               validates_presence_of :name
               end
               def permissions=(perms)
-                perms = perms.collect {|p| p.to_sym unless p.blank? }.compact if perms
+                perms = perms.collect {|p| p.to_sym unless p.blank? }.compact.uniq if perms
                 write_attribute(:permissions, perms)
               end
+              def add_permission!(*perms)
+                self.permissions = [] unless permissions.is_a?(Array)
+                permissions_will_change!
+                perms.each do |p|
+                  p = p.to_sym
+                  permissions << p unless permissions.include?(p)
+                end
+                save!
+              end
+              def remove_permission!(*perms)
+                return unless permissions.is_a?(Array)
+                permissions_will_change!
+                perms.each { |p| permissions.delete(p.to_sym) }
+                save!
+              end
               def <=>(role)
                 position <=> role.position
               end

extra/svn/Redmine.pm +9 -6

               my ($self, $parms, $arg) = @_;
               $self->{RedmineDSN} = $arg;
               my $query = "SELECT
-                             hashed_password, auth_source_id
+                             hashed_password, auth_source_id, permissions
-                          FROM members, projects, users
+                          FROM members, projects, users, roles
                           WHERE
                             projects.id=members.project_id
                             AND users.id=members.user_id
+                            AND roles.id=members.role_id
                             AND users.status=1
                             AND login=?
                             AND identifier=? ";
               $sth->execute($redmine_user, $project_id);
               my $ret;
-              while (my @row = $sth->fetchrow_array) {
+              while (my ($hashed_password, $auth_source_id, $permissions) = $sth->fetchrow_array) {
-                  unless ($row[1]) {
-                      if ($row[0] eq $pass_digest) {
+                  unless ($auth_source_id) {
+            	  my $method = $r->method;
+                      if ($hashed_password eq $pass_digest && (defined $read_only_methods{$method} || $permissions =~ /:commit_access/) ) {
                           $ret = 1;
                           last;
                       }
                       my $sthldap = $dbh->prepare(
                           "SELECT host,port,tls,account,account_password,base_dn,attr_login from auth_sources WHERE id = ?;"
                       );
-                      $sthldap->execute($row[1]);
+                      $sthldap->execute($auth_source_id);
                       while (my @rowldap = $sthldap->fetchrow_array) {
                         my $ldap = Authen::Simple::LDAP->new(
                             host    =>      ($rowldap[2] == 1 || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]" : $rowldap[0],

lib/redmine.rb +1 0

                 map.permission :manage_repository, {:repositories => [:edit, :destroy]}, :require => :member
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
+                map.permission :commit_access, {}
               end
               map.project_module :boards do |map|

lib/redmine/default_data/loader.rb +2 -1

                                                                   :view_files,
                                                                   :manage_files,
                                                                   :browse_repository,
-                                                                  :view_changesets]
+                                                                  :view_changesets,
+                                                                  :commit_access]
                         reporter = Role.create! :name => l(:default_role_reporter),
                                                 :position => 3,

test/unit/role_test.rb +20 0

@@ -30,4 +30,24 class RoleTest < Test::Unit::TestCase
30	target.reload	30	target.reload
31	assert_equal 90, target.workflows.size	31	assert_equal 90, target.workflows.size
32	end	32	end
		33
		34	def test_add_permission
		35	role = Role.find(1)
		36	size = role.permissions.size
		37	role.add_permission!("apermission", "anotherpermission")
		38	role.reload
		39	assert role.permissions.include?(:anotherpermission)
		40	assert_equal size + 2, role.permissions.size
		41	end
		42
		43	def test_remove_permission
		44	role = Role.find(1)
		45	size = role.permissions.size
		46	perm = role.permissions[0..1]
		47	role.remove_permission!(*perm)
		48	role.reload
		49	assert ! role.permissions.include?(perm[0])
		50	assert_equal size - 2, role.permissions.size
		51	end
		52
33	end	53	end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages