Reposman_Redmine_0.8.2.patch - Redmine

app/apis/sys_api.rb (working copy)
20	20	member :identifier, :string
21	21	member :name, :string
22	22	member :is_public, :bool
	23	member :public_repo, :bool
23	24	member :repository, Repository
24	25	end
25	26

app/controllers/projects_controller.rb (working copy)
70	70	@project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
71	71	@project.trackers = Tracker.all
72	72	@project.is_public = Setting.default_projects_public?
	73	@project.public_repo = Setting.default_projects_public?
73	74	@project.enabled_module_names = Redmine::AccessControl.available_project_modules
74	75	else
75	76	@project.enabled_module_names = params[:enabled_modules]

     <% end %></p>
     <p><%= f.text_field :homepage, :size => 60 %></p>
     <p><%= f.check_box :is_public %></p>
     <p><%= f.check_box :create_repo, :disabled => !Setting.sys_api_enabled? %></p>
     <p><%= f.check_box :public_repo, :disabled => !Setting.sys_api_enabled? %></p>
     <%= wikitoolbar_for 'project_description' %>
     <% @project.custom_field_values.each do |value| %>

       my $project_id = get_project_identifier($r);
       $r->set_handlers(PerlAuthenHandler => [\&OK])
           if is_public_project($project_id, $r);
          if (is_public_project($project_id, $r) && public_repository($project_id, $r));
       return OK
+    }
-...
       my ($res, $redmine_pass) =  $r->get_basic_auth_pw();
       return $res unless $res == OK;
       if (is_member($r->user, $redmine_pass, $r)) {
       if (is_member($r->user, $redmine_pass, $r) && can_browse($r->user, $redmine_pass, $r)) {
           return OK;
       } else {
           $r->note_auth_failure();
-...
     #     return 1 if (stat($repos_path))[2] & 00007;
     # }
     sub public_repository {
         my $project_id = shift;
         my $r = shift;
         my $dbh = connect_database($r);
         my $sth = $dbh->prepare(
             "SELECT * FROM projects WHERE projects.identifier=? and projects.public_repo=true;"
         );
         $sth->execute($project_id);
         my $ret = $sth->fetchrow_array ? 1 : 0;
         $sth->finish();
         $dbh->disconnect();
         $ret;
+    }
     sub is_member {
       my $redmine_user = shift;
       my $redmine_pass = shift;
-...
       $ret;
+    }
     sub can_browse {
       my $redmine_user = shift;
       my $redmine_pass = shift;
       my $r = shift;
       my $dbh         = connect_database($r);
       my $project_id  = get_project_identifier($r);
       my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass);
       my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config);
       my $usrprojpass;
       if ($cfg->{RedmineCacheCredsMax}) {
         $usrprojpass = $cfg->{RedmineCacheCreds}->get($redmine_user.":".$project_id);
         return 1 if (defined $usrprojpass and ($usrprojpass eq $pass_digest));
+      }
       my $query = $cfg->{RedmineQuery};
       my $sth = $dbh->prepare($query);
       $sth->execute($redmine_user, $project_id);
       my $ret;
       while (my ($hashed_password, $auth_source_id, $permissions) = $sth->fetchrow_array) {
           unless ($auth_source_id) {
     	  my $method = $r->method;
               if ($hashed_password eq $pass_digest && $permissions =~ /:browse_repository/) {
                   $ret = 1;
                   last;
+              }
           } elsif ($CanUseLDAPAuth) {
               my $sthldap = $dbh->prepare(
                   "SELECT host,port,tls,account,account_password,base_dn,attr_login from auth_sources WHERE id = ?;"
               );
               $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],
                     port    =>      $rowldap[1],
                     basedn  =>      $rowldap[5],
                     binddn  =>      $rowldap[3] ? $rowldap[3] : "",
                     bindpw  =>      $rowldap[4] ? $rowldap[4] : "",
                     filter  =>      "(".$rowldap[6]."=%s)"
                 );
                 $ret = 1 if ($ldap->authenticate($redmine_user, $redmine_pass));
+              }
               $sthldap->finish();
+          }
+      }
       $sth->finish();
       $dbh->disconnect();
       if ($cfg->{RedmineCacheCredsMax} and $ret) {
         if (defined $usrprojpass) {
           $cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id, $pass_digest);
         } else {
           if ($cfg->{RedmineCacheCredsCount} < $cfg->{RedmineCacheCredsMax}) {
             $cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id, $pass_digest);
             $cfg->{RedmineCacheCredsCount}++;
           } else {
             $cfg->{RedmineCacheCreds}->clear();
             $cfg->{RedmineCacheCredsCount} = 0;
+          }
+        }
+      }
       $ret;
+    }
     sub get_project_identifier {
         my $r = shift;

         yield if block_given?
       else
         uid, gid = Etc.getpwnam($svn_owner).uid, ($use_groupid ? Etc.getgrnam(project.identifier).gid : 0)
         right = project.is_public ? 0775 : 0770
         right = project.public_repo ? 0775 : 0770
         yield if block_given?
         Find.find(repos_path) do |f|
           File.chmod right, f
-...
         # rights before leaving
         other_read = other_read_right?(repos_path)
         owner      = owner_name(repos_path)
         next if project.is_public == other_read and owner == $svn_owner
         next if project.public_repo == other_read and owner == $svn_owner
         if $test
           log("\tchange mode on #{repos_path}")
-...
           next
         end
         project.is_public ? File.umask(0002) : File.umask(0007)
         project.public_repo ? File.umask(0002) : File.umask(0007)
         if $test
           log("\tcreate repository #{repos_path}")

     field_role: Role
     field_homepage: Homepage
     field_is_public: Public
     field_create_repo: Create Repository
     field_public_repo: Public Repository
     field_parent: Subproject of
     field_is_in_chlog: Issues displayed in changelog
     field_is_in_roadmap: Issues displayed in roadmap

Project

General

Profile

Redmine

Feature #3079 » Reposman_Redmine_0.8.2.patch