Skip to content
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

Fix ouroboros #1372

Merged
merged 4 commits into from
Jan 7, 2025
Merged

Fix ouroboros #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
034cc8f
[core] filter_var options should default to 0 not null
socram8888 Dec 30, 2024
b4c8a90
[ouroboros_api] fix api path matching after change to page_matches
socram8888 Dec 30, 2024
ae86f08
[ouroboros] remove deprecated FILTER_SANITIZE_STRING and simplify
socram8888 Dec 30, 2024
590474f
[ouroboros] remove hard dependency on tag map
socram8888 Dec 30, 2024
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 core/stdlib_ex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function dir_ex(string $directory): \Directory
return false_throws(dir($directory));
}

function filter_var_ex(mixed $variable, int $filter = FILTER_DEFAULT, mixed $options = null): mixed
function filter_var_ex(mixed $variable, int $filter = FILTER_DEFAULT, mixed $options = 0): mixed
{
return false_throws(filter_var($variable, $filter, $options));
}
Expand Down
137 changes: 66 additions & 71 deletions ext/ouroboros_api/main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,7 @@ public function __construct(array $post)
);
}
if (array_key_exists('description', $post)) {
$this->description = filter_var_ex(
$post['description'],
FILTER_SANITIZE_STRING
);
$this->description = $post['description'];
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this feels like it would be a security concern, if anything was reading description and expecting it to be safe -- but as far as I can see nothing is reading description? (and if at some point in the future we want to read description, it should be sanitised-on-output like everything else)

}
if (array_key_exists('is_rating_locked', $post)) {
assert(
Expand Down Expand Up @@ -240,68 +237,61 @@ class OuroborosAPI extends Extension
public const ERROR_POST_CREATE_DUPE = 'Duplicate';
public const OK_POST_CREATE_UPDATE = 'Updated';

public const MIME_JSON = 'application/json; charset=utf-8';
public const MIME_XML = 'text/xml; charset=utf-8';

public function onPageRequest(PageRequestEvent $event): void
{
global $page, $user;

if (preg_match("%\.(xml|json)$%", implode('/', $event->args), $matches)) {
$this->type = $matches[1];
if ($this->type == 'json') {
$page->set_mime('application/json; charset=utf-8');
} elseif ($this->type == 'xml') {
$page->set_mime('text/xml; charset=utf-8');
}
$page->set_mode(PageMode::DATA);
$this->tryAuth();

if ($event->page_matches('post')) {
if ($this->match($event, 'create')) {
// Create
if ($user->can(Permissions::CREATE_IMAGE)) {
$md5 = !empty($_REQUEST['md5']) ? filter_var_ex($_REQUEST['md5'], FILTER_SANITIZE_STRING) : null;
$this->postCreate(new OuroborosPost($_REQUEST['post']), $md5);
} else {
$this->sendResponse(403, 'You cannot create new posts');
}
} elseif ($this->match($event, 'update')) {
throw new ServerError("update not implemented");
} elseif ($this->match($event, 'show')) {
// Show
$id = !empty($_REQUEST['id']) ? (int)filter_var_ex($_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT) : null;
$this->postShow($id);
} elseif ($this->match($event, 'index') || $this->match($event, 'list')) {
// List
$limit = !empty($_REQUEST['limit']) ? intval(
filter_var_ex($_REQUEST['limit'], FILTER_SANITIZE_NUMBER_INT)
) : 45;
$p = !empty($_REQUEST['page']) ? intval(
filter_var_ex($_REQUEST['page'], FILTER_SANITIZE_NUMBER_INT)
) : 1;
$tags = !empty($_REQUEST['tags']) ? filter_var_ex($_REQUEST['tags'], FILTER_SANITIZE_STRING) : [];
if (is_string($tags)) {
$tags = Tag::explode($tags);
}
$this->postIndex($limit, $p, $tags);
if (preg_match("%(.*)\.(xml|json)$%", implode('/', $event->args), $matches) === 1) {
$event_args = $matches[1];
$this->type = $matches[2];

if ($event_args == 'post/create') {
// Create
$this->tryAuth();
if ($user->can(Permissions::CREATE_IMAGE)) {
$md5 = isset($_REQUEST['md5']) && preg_match("%^[0-9A-Fa-f]{32}$%", $_REQUEST['md5']) ? strtolower($_REQUEST['md5']) : null;
$this->postCreate(new OuroborosPost($_REQUEST['post']), $md5);
} else {
$this->sendResponse(403, 'You cannot create new posts');
}
} elseif ($event_args == 'post/show') {
// Show
$this->tryAuth();
$id = int_escape(@$_REQUEST['id']);
$this->postShow($id);
} elseif ($event_args == 'post/index' || $event_args == 'post/list') {
// List
$this->tryAuth();
$limit = int_escape(@$_REQUEST['limit']);
if ($limit <= 0) {
$limit = 45;
}
$p = int_escape(@$_REQUEST['page']);
if ($p <= 0) {
$p = 1;
}
$tags = Tag::explode(@$_REQUEST['tags'] ?: '');
$this->postIndex($limit, $p, $tags);
} elseif ($event_args == 'tag/index' || $event_args == 'tag/list') {
$this->tryAuth();
$limit = int_escape(@$_REQUEST['limit']);
if ($limit <= 0) {
$limit = 50;
}
} elseif ($event->page_matches('tag')) {
if ($this->match($event, 'index') || $this->match($event, 'list')) {
$limit = !empty($_REQUEST['limit']) ? intval(
filter_var_ex($_REQUEST['limit'], FILTER_SANITIZE_NUMBER_INT)
) : 50;
$p = !empty($_REQUEST['page']) ? intval(
filter_var_ex($_REQUEST['page'], FILTER_SANITIZE_NUMBER_INT)
) : 1;
$order = (!empty($_REQUEST['order']) && ($_REQUEST['order'] == 'date' || $_REQUEST['order'] == 'count' || $_REQUEST['order'] == 'name')) ? filter_var_ex(
$_REQUEST['order'],
FILTER_SANITIZE_STRING
) : 'date';
$name = !empty($_REQUEST['name']) ? filter_var_ex($_REQUEST['name'], FILTER_SANITIZE_STRING) : '';
$name_pattern = !empty($_REQUEST['name_pattern']) ? filter_var_ex(
$_REQUEST['name_pattern'],
FILTER_SANITIZE_STRING
) : '';
$this->tagIndex($limit, $p, $order, $name, $name_pattern);
$p = int_escape(@$_REQUEST['page']);
if ($p <= 0) {
$p = 1;
}
$order = @$_REQUEST['order'];
if (!in_array($order, ['date', 'count', 'name'])) {
$order = 'date';
}
$name = @$_REQUEST['name'] ?: '';
$name_pattern = @$_REQUEST['name_pattern'] ?: '';
$this->tagIndex($limit, $p, $order, $name, $name_pattern);
}
} elseif ($event->page_matches('post/show')) {
$page->set_mode(PageMode::REDIRECT);
Expand Down Expand Up @@ -340,7 +330,7 @@ protected function postCreate(OuroborosPost $post, ?string $md5 = ''): void
if (
empty($post->file) &&
!empty($post->file_url) &&
filter_var_ex($post->file_url, FILTER_VALIDATE_URL) !== false
filter_var_ex($post->file_url, FILTER_VALIDATE_URL)
) {
// Transload from source
$meta['file'] = shm_tempnam('transload_' . $config->get_string(UploadConfig::TRANSLOAD_ENGINE));
Expand Down Expand Up @@ -431,6 +421,13 @@ protected function postIndex(int $limit, int $page, array $tags): void
protected function tagIndex(int $limit, int $page, string $order, string $name, string $name_pattern): void
{
global $database, $config;

// This class will only exist if the tag map plugin is enabled
$tags_min = 0;
if (class_exists('\Shimmie2\TagMapConfig')) {
$tags_min = $config->get_int(TagMapConfig::TAGS_MIN);
}

$start = ($page - 1) * $limit;
switch ($order) {
case 'name':
Expand All @@ -442,7 +439,7 @@ protected function tagIndex(int $limit, int $page, string $order, string $name,
WHERE count >= :tags_min
ORDER BY LOWER(substr(tag, 1, 1)) LIMIT :start, :max_items
",
['tags_min' => $config->get_int(TagMapConfig::TAGS_MIN), 'start' => $start, 'max_items' => $limit]
['tags_min' => $tags_min, 'start' => $start, 'max_items' => $limit]
);
break;
case 'count':
Expand All @@ -454,7 +451,7 @@ protected function tagIndex(int $limit, int $page, string $order, string $name,
WHERE count >= :tags_min
ORDER BY count DESC, tag ASC LIMIT :start, :max_items
",
['tags_min' => $config->get_int(TagMapConfig::TAGS_MIN), 'start' => $start, 'max_items' => $limit]
['tags_min' => $tags_min, 'start' => $start, 'max_items' => $limit]
);
break;
}
Expand Down Expand Up @@ -500,12 +497,14 @@ private function sendResponse(int $code = 200, string $reason = '', bool $locati
}
$response = ['success' => $success, 'reason' => $reason];
if ($this->type == 'json') {
$page->set_mime(self::MIME_JSON);
if ($location !== false) {
$response['location'] = $response['reason'];
unset($response['reason']);
}
$response = \Safe\json_encode($response);
} elseif ($this->type == 'xml') {
$page->set_mime(self::MIME_XML);
// Seriously, XML sucks...
$xml = new \XMLWriter();
$xml->openMemory();
Expand All @@ -523,6 +522,7 @@ private function sendResponse(int $code = 200, string $reason = '', bool $locati
unset($xml);
}
$page->set_data($response);
$page->set_mode(PageMode::DATA);
}

/**
Expand All @@ -533,8 +533,10 @@ private function sendData(string $type = '', array $data = [], int $offset = 0):
global $page;
$response = '';
if ($this->type == 'json') {
$page->set_mime(self::MIME_JSON);
$response = \Safe\json_encode($data);
} elseif ($this->type == 'xml') {
$page->set_mime(self::MIME_XML);
$xml = new \XMLWriter();
$xml->openMemory();
$xml->startDocument('1.0', 'utf-8');
Expand All @@ -557,6 +559,7 @@ private function sendData(string $type = '', array $data = [], int $offset = 0):
unset($xml);
}
$page->set_data($response);
$page->set_mode(PageMode::DATA);
}

private function createItemXML(\XMLWriter $xml, string $type, _SafeOuroborosTag|_SafeOuroborosImage $item): void
Expand Down Expand Up @@ -611,12 +614,4 @@ private function tryAuth(): void
send_event(new UserLoginEvent($user));
}
}

/**
* Helper for matching API methods from event
*/
private function match(PageRequestEvent $event, string $page): bool
{
return (preg_match("%{$page}\.(xml|json)$%", implode('/', $event->args), $matches) === 1);
}
}