Skip to content

Develop #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 8, 2017
Merged

Develop #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76d3dd0
Remove Xss
stiv-pro Jun 8, 2017
216b78f
Remove Xss
stiv-pro Jun 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"require": {
"propel/propel": "~2.0@dev",
"wollanup/php-api-rest-interfaces": "^1.1.11",
"wollanup/php-api-rest-interfaces": "^1.1.12",
"wollanup/php-api-rest-propel-behavior": "^1.1",
"wollanup/php-api-rest-service-request": "^1.0.1",
"wollanup/php-api-rest-utils": "^1.1",
Expand Down
16 changes: 0 additions & 16 deletions src/Container/Container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
use Eukles\Service\Router\RouterInterface;
use Eukles\Service\RoutesClasses\Exception\RoutesClassesServiceMissingException;
use Eukles\Service\RoutesClasses\RoutesClassesInterface;
use Eukles\Service\XssCleaner\XssCleaner;
use Eukles\Service\XssCleaner\XssCleanerInterface;
use Eukles\Slim\Handlers\ActionError;
use Eukles\Slim\Handlers\ActionErrorInterface;
use Eukles\Slim\Handlers\EntityRequestError;
Expand Down Expand Up @@ -120,13 +118,6 @@ public function __construct(array $values = [])
return new ActionError();
};
}

# Xss cleaner
if (!isset($values[self::XSS_CLEANER])) {
$this[self::XSS_CLEANER] = function () {
return new XssCleaner();
};
}
}

/**
Expand Down Expand Up @@ -209,11 +200,4 @@ public function getRoutesClasses()
return $this[self::ROUTES_CLASSES];
}

/**
* @return XssCleanerInterface
*/
public function getXssCleaner()
{
return $this[self::XSS_CLEANER];
}
}
5 changes: 1 addition & 4 deletions src/Entity/EntityFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ public function create(

# Then, alter object with allowed properties
/** @noinspection PhpUndefinedMethodInspection */
$params = $entityRequest->getContainer()->getXssCleaner()->cleanArray($request->getParams());
/** @noinspection PhpUndefinedMethodInspection */
$obj->fromArray($entityRequest->getAllowedDataFromRequest($params, $request->getMethod()));
$obj->fromArray($entityRequest->getAllowedDataFromRequest($request->getParams(), $request->getMethod()));

# Execute afterCreate hook, which can alter record
$entityRequest->afterCreate($obj);
Expand Down Expand Up @@ -115,7 +113,6 @@ public function fetch(
if ($postParams) {
$params = array_merge($params, (array)$postParams);
}
$params = $entityRequest->getContainer()->getXssCleaner()->cleanArray($params);

# Then, alter object with allowed properties
$obj->fromArray($entityRequest->getAllowedDataFromRequest($params, $request->getMethod()));
Expand Down
33 changes: 0 additions & 33 deletions src/Service/XssCleaner/XssCleaner.php
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions src/Slim/Handlers/Strategies/ActionStrategy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ private function buildParams(
);
}
} else {
$cleaner = $this->container->getXssCleaner();
if (isset($routeArguments[$name])) {
$paramValue = $routeArguments[$name];
} elseif (isset($requestParams[$name])) {
Expand All @@ -154,13 +153,7 @@ private function buildParams(
"Missing or null required parameter '{$name}' in " . $r->getName() . "::" . $m->getName()
);
}
if (is_array($paramValue)) {
$buildParams[] = $cleaner->cleanArray($paramValue);
} elseif (is_scalar($paramValue)) {
$buildParams[] = $cleaner->cleanString($paramValue);
} else {
$buildParams[] = $paramValue;
}
$buildParams[] = $paramValue;
}
}

Expand Down