Browse Source

Moved into existing check

improve_error_ms_for_permissions
Don Richards 2 years ago committed by GitHub
parent
commit
80391bc372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      src/MediaSource/MediaSourceService.php

10
src/MediaSource/MediaSourceService.php

@ -290,17 +290,11 @@ class MediaSourceService {
$directory = $this->fileSystem->dirname($content_location);
// Check if the directory is writable.
if (!is_writable(dirname($directory))) {
if (!$this->fileSystem->prepareDirectory($directory, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS)) {
$parent_directory = dirname($directory);
$error_current_user = shell_exec('whoami');
$sanitized_current_user = str_replace(array("\n", "\r"), '', $error_current_user);
throw new HttpException(500, "The user '$sanitized_current_user' does not have permissions to write to: '$parent_directory' . Error");
}
if (!$this->fileSystem->prepareDirectory($directory, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS)) {
throw new HttpException(500, "The destination directory does not exist, could not be created, or is not writable: $directory");
throw new HttpException(500, "The destination directory does not exist, could not be created, or is not writable by $sanitized_current_user: $directory");
}
// Copy over the file content.

Loading…
Cancel
Save