jro_apps/redmine Commit - r7693:2beeae00a23a

204

205

my $method = $r->method;

205

my $method = $r->method;

206

return OK unless defined $read_only_methods{$method};

206

return OK unless defined $read_only_methods{$method};

207

208

return OK if is_authentication_forced($r);

209

207

210

my $project_id = get_project_identifier($r);

208

my $project_id = get_project_identifier($r);

211

209

221

my ($res, $redmine_pass) = $r->get_basic_auth_pw();

219

my ($res, $redmine_pass) = $r->get_basic_auth_pw();

222

return $res unless $res == OK;

220

return $res unless $res == OK;

223

221

224

my $project_id = get_project_identifier($r);

225

my $method = $r->method;

226

if (defined $read_only_methods{$method} && is_public_project($project_id, $r) && non_member_role_allows_browse_repository($r)) {

227

return OK;

228

}

229

230

if (is_member($r->user, $redmine_pass, $r)) {

222

if (is_member($r->user, $redmine_pass, $r)) {

231

return OK;

223

return OK;

232

} else {

224

} else {

263

sub is_public_project {

255

sub is_public_project {

264

my $project_id = shift;

256

my $project_id = shift;

265

my $r = shift;

257

my $r = shift;

258

259

if (is_authentication_forced($r)) {

260

return 0;

261

}

266

262

267

my $dbh = connect_database($r);

263

my $dbh = connect_database($r);

268

my $sth = $dbh->prepare(

264

my $sth = $dbh->prepare(

284

$ret;

280

$ret;

285

}

281

}

286

282

287

sub ~~system~~_role_allows_browse_repository {

283

sub anonymous_role_allows_browse_repository {

288

my $r = shift;

284

my $r = shift;

289

my $system_role = shift;

290

285

291

my $dbh = connect_database($r);

286

my $dbh = connect_database($r);

292

my $sth = $dbh->prepare(

287

my $sth = $dbh->prepare(

293

"SELECT permissions FROM roles WHERE builtin = ?;"

288

"SELECT permissions FROM roles WHERE builtin = 2;"

294

);

289

);

295

290

296

$sth->execute(~~$system_role~~);

291

$sth->execute();

297

my $ret = 0;

292

my $ret = 0;

298

if (my @row = $sth->fetchrow_array) {

293

if (my @row = $sth->fetchrow_array) {

299

if ($row[0] =~ /:browse_repository/) {

294

if ($row[0] =~ /:browse_repository/) {

308

$ret;

303

$ret;

309

}

304

}

310

305

311

sub non_member_role_allows_browse_repository {

312

my $r = shift;

313

my $ret = system_role_allows_browse_repository($r, 1);

314

$ret;

315

}

316

317

sub anonymous_role_allows_browse_repository {

318

my $r = shift;

319

my $ret = system_role_allows_browse_repository($r, 2);

320

$ret;

321

}

322

323

# perhaps we should use repository right (other read right) to check public access.

306

# perhaps we should use repository right (other read right) to check public access.

324

# it could be faster BUT it doesn't work for the moment.

307

# it could be faster BUT it doesn't work for the moment.

325

# sub is_public_project_by_file {

308

# sub is_public_project_by_file {

	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

               my $method = $r->method;
               return OK unless defined $read_only_methods{$method};
-              return OK if is_authentication_forced($r);
               my $project_id = get_project_identifier($r);
               my ($res, $redmine_pass) =  $r->get_basic_auth_pw();
               return $res unless $res == OK;
-              my $project_id = get_project_identifier($r);
-              my $method = $r->method;
-              if (defined $read_only_methods{$method} && is_public_project($project_id, $r) && non_member_role_allows_browse_repository($r)) {
-                  return OK;
               if (is_member($r->user, $redmine_pass, $r)) {
                   return OK;
               } else {
             sub is_public_project {
                 my $project_id = shift;
                 my $r = shift;
+                if (is_authentication_forced($r)) {
+                  return 0;
+                }
                 my $dbh = connect_database($r);
                 my $sth = $dbh->prepare(
                 $ret;
             }
-            sub system_role_allows_browse_repository {
+            sub anonymous_role_allows_browse_repository {
               my $r = shift;
-              my $system_role = shift;
               my $dbh = connect_database($r);
               my $sth = $dbh->prepare(
-                  "SELECT permissions FROM roles WHERE builtin = ?;"
+                  "SELECT permissions FROM roles WHERE builtin = 2;"
               );
-              $sth->execute($system_role);
+              $sth->execute();
               my $ret = 0;
               if (my @row = $sth->fetchrow_array) {
                 if ($row[0] =~ /:browse_repository/) {
               $ret;
             }
-            sub non_member_role_allows_browse_repository {
-              my $r = shift;
-              my $ret = system_role_allows_browse_repository($r, 1);
-              $ret;
-            sub anonymous_role_allows_browse_repository {
-              my $r = shift;
-              my $ret = system_role_allows_browse_repository($r, 2);
-              $ret;
             # perhaps we should use repository right (other read right) to check public access.
             # it could be faster BUT it doesn't work for the moment.
             # sub is_public_project_by_file {