mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-07-17 18:43:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for extension user files (#3433)

Browse Source 
Extension user files can be stored easily in the user folder instead of the static folder.
This commit is contained in:
Alexis Degrugillier
2021-02-26 12:42:10 -05:00
committed by GitHub
parent 9ea3e7710a
commit 0ce798d40b
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/Minz/Extension.php
View File

@@ -148,19 +148,22 @@ abstract class Minz_Extension {
*
* @param $filename name of the file to serve.
* @param $type the type (js or css) of the file to serve.
* @param $isStatic indicates if the file is a static file or a user file. Default is static.
* @return the url corresponding to the file.
*/
public function getFileUrl($filename, $type) {
$dir = substr(strrchr($this->path, '/'), 1);
$file_name_url = urlencode($dir . '/static/' . $filename);
public function getFileUrl($filename, $type, $isStatic = true) {
if ($isStatic) {
$dir = basename($this->path);
$file_name_url = urlencode("{$dir}/static/{$filename}");
$mtime = @filemtime("{$this->path}/static/{$filename}");
} else {
$username = Minz_Session::param('currentUser');
$path = USERS_PATH . "/{$username}/{$this->config_key}/{$this->getName()}/{$filename}";
$file_name_url = urlencode("{$username}/{$this->config_key}/{$this->getName()}/{$filename}");
$mtime = @filemtime($path);
}
$absolute_path = $this->path . '/static/' . $filename;
$mtime = @filemtime($absolute_path);
$url = '/ext.php?f=' . $file_name_url .
'&t=' . $type .
'&' . $mtime;
return Minz_Url::display($url, 'php');
return Minz_Url::display("/ext.php?f={$file_name_url}&t={$type}&{$mtime}", 'php');
}
/**
@@ -269,7 +272,7 @@ abstract class Minz_Extension {
$this->user_configuration = $configuration;
}
public function removeUserConfiguration(){
public function removeUserConfiguration() {
if (!$this->isUserConfigurationEnabled()) {
return;
}
@@ -288,4 +291,24 @@ abstract class Minz_Extension {
$this->user_configuration = null;
}
public function saveFile(string $filename, string $content) {
$username = Minz_Session::param('currentUser');
$path = USERS_PATH . "/{$username}/{$this->config_key}/{$this->getName()}";
if (!file_exists($path)) {
mkdir($path, 0777, true);
}
file_put_contents("{$path}/{$filename}", $content);
}
public function removeFile(string $filename) {
$username = Minz_Session::param('currentUser');
$path = USERS_PATH . "/{$username}/{$this->config_key}/{$this->getName()}/{$filename}";
if (file_exists($path)) {
unlink($path);
}
}
}

16
p/ext.php
View File

@@ -32,10 +32,15 @@ function get_absolute_filename(string $file_name) {
return $third_party_extension;
}
$user = realpath(USERS_PATH . '/' . $file_name);
if (false !== $user) {
return $user;
}
return '';
}
function is_valid_path_extension($path, $extensionPath) {
function is_valid_path_extension($path, $extensionPath, $isStatic = true) {
// It must be under the extension path.
$real_ext_path = realpath($extensionPath);
@@ -48,7 +53,12 @@ function is_valid_path_extension($path, $extensionPath) {
return false;
}
// File to serve must be under a `ext_dir/static/` directory.
// User files do not need further validations
if (!$isStatic) {
return true;
}
// Static files to serve must be under a `ext_dir/static/` directory.
$path_relative_to_ext = substr($path, strlen($real_ext_path) + 1);
list(,$static,$file) = sscanf($path_relative_to_ext, '%[^/]/%[^/]/%s');
if (null === $file || 'static' !== $static) {
@@ -69,7 +79,7 @@ function is_valid_path_extension($path, $extensionPath) {
*
*/
function is_valid_path($path) {
return is_valid_path_extension($path, CORE_EXTENSIONS_PATH) || is_valid_path_extension($path, THIRDPARTY_EXTENSIONS_PATH);
return is_valid_path_extension($path, CORE_EXTENSIONS_PATH) || is_valid_path_extension($path, THIRDPARTY_EXTENSIONS_PATH) || is_valid_path_extension($path, USERS_PATH, $false);
}
function sendBadRequestResponse(string $message = null) {