Skip to content

update the caGetHTMLPurifier to check for dir #1927

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
Monica-Wood wants to merge 1 commit into
base: dev/2.0
Choose a base branch
from
+14 −5
Open

update the caGetHTMLPurifier to check for dir #1927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions app/helpers/utilityHelpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5071,6 +5071,15 @@ function caQuoteRegexDelimiter(string $regex, string $delimiter) : string {
function caGetHTMLPurifier(?array $options=null) : HTMLPurifier {
$config = HTMLPurifier_Config::createDefault();
$config->set('URI.DisableExternalResources', !Configuration::load()->get('purify_allow_external_references'));
$serializer_path = Configuration::load()->get('purify_serializer_path');
# Check if path exists, if not make dir and set owner:group to same as ca tmp dir
if(!file_exists($serializer_path)) {
$tempdir_info = stat(Configuration::load()->get('ca_temp_dir'));
mkdir($serializer_path, 0770, true);
chown($serializer_path, $tempdir_info['uid']);
chgrp($serializer_path, $tempdir_info['gid']);
clearstatcache();
}
$config->set('Cache.SerializerPath', Configuration::load()->get('purify_serializer_path'));
return new HTMLPurifier($config);
}
Expand Down
10 changes: 5 additions & 5 deletions app/lib/Utils/CLIUtils/Maintenance.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,12 +1062,12 @@ public static function clear_caches($opts=null) {
if (in_array($cache, ['all', 'app'])) {
CLIUtils::addMessage(_t('Clearing application caches...'));
if (is_writable($config->get('taskqueue_tmp_directory'))) {
$tempdir_info = stat($config->get('taskqueue_tmp_directory'));
# $tempdir_info = stat($config->get('taskqueue_tmp_directory'));
caRemoveDirectory($config->get('taskqueue_tmp_directory'), false);
mkdir($config->get('purify_serializer_path'), $tempdir_info['mode']);
chown($config->get('purify_serializer_path'), $tempdir_info['uid']);
chgrp($config->get('purify_serializer_path'), $tempdir_info['gid']);
clearstatcache();
# mkdir($config->get('purify_serializer_path'), $tempdir_info['mode']);
# chown($config->get('purify_serializer_path'), $tempdir_info['uid']);
# chgrp($config->get('purify_serializer_path'), $tempdir_info['gid']);
# clearstatcache();
} else {
CLIUtils::addError(_t('Skipping clearing of application cache because it is not writable'));
}
Expand Down