Skip to content

RequestFactory: rejects invalid URL [WIP] #41

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

RequestFactory: rejects invalid URL [WIP] #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2d40e5
RequestFactory: rejects invalid URL [Closes #30]
dg Dec 27, 2014
8fa7fa4
RequestFactory: drops complete cookie/post when contain invalid chars…
dg Dec 27, 2014
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
30 changes: 10 additions & 20 deletions src/Http/RequestFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,12 @@ public function createHttpRequest(): Request
}

// path & query
$reChars = '#^[' . self::CHARS . ']*+\z#u';
$requestUrl = $_SERVER['REQUEST_URI'] ?? '/';
$requestUrl = preg_replace('#^\w++://[^/]++#', '', $requestUrl);
if (!$this->binary && (!preg_match($reChars, rawurldecode($requestUrl)) || preg_last_error())) {
// TODO: invalid request
}
$requestUrl = Strings::replace($requestUrl, $this->urlFilters['url']);
$tmp = explode('?', $requestUrl, 2);
$path = Url::unescape($tmp[0], '%/?#');
Expand All @@ -100,34 +104,20 @@ public function createHttpRequest(): Request
}
$url->setScriptPath($path);

// GET, POST, COOKIE
// POST, COOKIE
$useFilter = (!in_array(ini_get('filter.default'), ['', 'unsafe_raw'], true) || ini_get('filter.default_flags'));

$query = $url->getQueryParameters();
$post = $useFilter ? filter_input_array(INPUT_POST, FILTER_UNSAFE_RAW) : (empty($_POST) ? [] : $_POST);
$cookies = $useFilter ? filter_input_array(INPUT_COOKIE, FILTER_UNSAFE_RAW) : (empty($_COOKIE) ? [] : $_COOKIE);

// remove invalid characters
$reChars = '#^[' . self::CHARS . ']*+\z#u';
if (!$this->binary) {
$list = [&$query, &$post, &$cookies];
foreach ($list as $key => &$val) {
foreach ($val as $k => $v) {
if (is_string($k) && (!preg_match($reChars, $k) || preg_last_error())) {
unset($list[$key][$k]);

} elseif (is_array($v)) {
$list[$key][$k] = $v;
$list[] = &$list[$key][$k];

} else {
$list[$key][$k] = (string) preg_replace('#[^' . self::CHARS . ']+#u', '', $v);
}
}
if (!preg_match($reChars, rawurldecode(http_build_query($post))) || preg_last_error()) {
$post = [];
}
if (!preg_match($reChars, rawurldecode(http_build_query($cookies))) || preg_last_error()) {
$cookies = [];
}
unset($list, $key, $val, $k, $v);
}
$url->setQuery($query);


// FILES and create FileUpload objects
Expand Down