Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-11 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement permission check in routes

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-08-17 19:56:21 +02:00
parent 8a3893b36b
commit cd8f4945e6
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Autoloader.php
View File

@ -81,7 +81,7 @@ final class Autoloader
$class = \str_replace(['_', '\\'], '/', $class); $class = \str_replace(['_', '\\'], '/', $class);
foreach (self::$paths as $path) { foreach (self::$paths as $path) {
if (file_exists($file = $path . $class . '.php')) { if (\file_exists($file = $path . $class . '.php')) {
include_once $file; include_once $file;
return; return;
@ -106,7 +106,7 @@ final class Autoloader
$class = \str_replace(['_', '\\'], '/', $class); $class = \str_replace(['_', '\\'], '/', $class);
foreach (self::$paths as $path) { foreach (self::$paths as $path) {
if (file_exists($file = $path . $class . '.php')) { if (\file_exists($file = $path . $class . '.php')) {
return true; return true;
} }
} }

26
Router/Router.php
View File

@ -60,7 +60,7 @@ final class Router
* Add route. * Add route.
* *
* @param string $route Route regex * @param string $route Route regex
* @param mixed $destination Destination e.g. Module:function & verb * @param mixed $destination Destination e.g. Module:function string or callback
* @param int $verb Request verb * @param int $verb Request verb
* *
* @return void * @return void
@ -91,22 +91,22 @@ final class Router
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function route($request, int $verb = RouteVerb::GET) : array public function route(string $request, int $verb = RouteVerb::GET, string $app = '', string $orgId = '', $account = null) : array
{ {
if ($request instanceof RequestAbstract) {
$uri = $request->getUri()->getRoute();
$verb = $request->getRouteVerb();
} elseif (\is_string($request)) {
$uri = $request;
} else {
throw new \InvalidArgumentException();
}
$bound = []; $bound = [];
foreach ($this->routes as $route => $destination) { foreach ($this->routes as $route => $destination) {
foreach ($destination as $d) { foreach ($destination as $d) {
if ($this->match($route, $d['verb'], $uri, $verb)) { if ($this->match($route, $d['verb'], $request, $verb)) {
$bound[] = ['dest' => $d['dest']]; if (!isset($d['permission'])
|| !isset($account)
|| (isset($d['permission'])
&& isset($account)
&& $account->hasPermission($d['permission']['type'], $orgId, $app, $d['permission']['module'], $d['permission']['state']))
) {
$bound[] = ['dest' => $d['dest']];
} else {
array_merge($bound, $this->route('/' . $app . '/e403', $verb));
}
} }
} }
} }

9
tests/Router/RouterTest.php
View File

@ -75,13 +75,4 @@ class RouterTest extends \PHPUnit\Framework\TestCase
$router->route('http://test.com/backends/admin/settings/general/something?test', RouteVerb::GET) $router->route('http://test.com/backends/admin/settings/general/something?test', RouteVerb::GET)
); );
} }
/**
* @expectedException \InvalidArgumentException
*/
public function testInvalidRequestType()
{
$router = new Router();
$router->route([]);
}
} }