Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2025-11-17 19:20:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Proper branch name validation, fixes #272

Browse Source
This commit is contained in:
Klaus Silveira
2013-03-29 00:26:16 -03:00
parent cf9aeaf773
commit 4eaebed43b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/GitList/Controller/TreeController.php
View File

@@ -68,13 +68,13 @@ class TreeController implements ControllerProviderInterface
'tags' => $repository->getTags(), 'tags' => $repository->getTags(),
)); ));
})->assert('repo', $app['util.routing']->getRepositoryRegex()) })->assert('repo', $app['util.routing']->getRepositoryRegex())
->assert('branch', '[\w-._\/]+') ->assert('branch', $app['util.routing']->getBranchRegex())
->bind('search'); ->bind('search');
$route->get('{repo}/{branch}/', function ($repo, $branch) use ($app, $treeController) { $route->get('{repo}/{branch}/', function ($repo, $branch) use ($app, $treeController) {
return $treeController($repo, $branch); return $treeController($repo, $branch);
})->assert('repo', $app['util.routing']->getRepositoryRegex()) })->assert('repo', $app['util.routing']->getRepositoryRegex())
->assert('branch', '[\w-._\/]+') ->assert('branch', $app['util.routing']->getBranchRegex())
->bind('branch'); ->bind('branch');
$route->get('{repo}/', function ($repo) use ($app, $treeController) { $route->get('{repo}/', function ($repo) use ($app, $treeController) {
@@ -111,7 +111,7 @@ class TreeController implements ControllerProviderInterface
)); ));
})->assert('format', '(zip|tar)') })->assert('format', '(zip|tar)')
->assert('repo', $app['util.routing']->getRepositoryRegex()) ->assert('repo', $app['util.routing']->getRepositoryRegex())
->assert('branch', '[\w-._\/]+') ->assert('branch', $app['util.routing']->getBranchRegex())
->bind('archive'); ->bind('archive');
return $route; return $route;

2
src/GitList/Util/Routing.php
View File

@@ -85,7 +85,7 @@ class Routing
static $branchRegex = null; static $branchRegex = null;
if ($branchRegex === null) { if ($branchRegex === null) {
$branchRegex = '[\w-._\/]+'; $branchRegex = '(?!/|.*([/.]\.|//|@\{|\\\\))[^\040\177 ~^:?*\[]+(?<!\.lock|[/.])';
} }
return $branchRegex; return $branchRegex;