commit b56286db09b5a67e14b521b919d4e46290f411ee · pyrox.dev/nixpkgs

+39

pkgs/by-name/fi/filesender/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         nixosTests,

     

       6
       6
       +
       }:

     

       7
       7
       +
       stdenv.mkDerivation rec {

     

       8
       8
       +
         pname = "filesender";

     

       9
       9
       +
         version = "2.48";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "filesender";

     

       13
       13
       +
           repo = "filesender";

     

       14
       14
       +
           rev = "filesender-${version}";

     

       15
       15
       +
           hash = "sha256-lXA9XZ5gbfut2EQ5bF2w8rhAEM++8rQseWviKwfRWGk=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         patches = [

     

       19
       19
       +
           # /nix/store is read-only, but filesender searches config and logs inside of installation directory.

     

       20
       20
       +
           # This patch changes search directories to FILESENDER_CONFIG_DIR and FILESENDER_LOG_DIR environment variables.

     

       21
       21
       +
           ./separate_mutable_paths.patch

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         installPhase = ''

     

       25
       25
       +
           mkdir -p $out/

     

       26
       26
       +
           cp -R . $out/

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         passthru.tests = {

     

       30
       30
       +
           inherit (nixosTests) filesender;

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         meta = {

     

       34
       34
       +
           description = "Web application for sending large files to other users";

     

       35
       35
       +
           homepage = "https://filesender.org/";

     

       36
       36
       +
           license = lib.licenses.bsd3;

     

       37
       37
       +
           maintainers = with lib.maintainers; [ nhnn ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+122

pkgs/by-name/fi/filesender/separate_mutable_paths.patch

···

       1
       1
       +
       diff --git a/classes/utils/Config.class.php b/classes/utils/Config.class.php

     

       2
       2
       +
       index a4d819bc..3c2ed287 100644

     

       3
       3
       +
       --- a/classes/utils/Config.class.php

     

       4
       4
       +
       +++ b/classes/utils/Config.class.php

     

       5
       5
       +
       @@ -30,7 +30,7 @@

     

       6
       6
       +
         * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

     

       7
       7
       +
         */

     

       8
       8
       +
        

     

       9
       9
       +
       -if (!defined('FILESENDER_BASE')) {        // Require environment (fatal)

     

       10
       10
       +
       +if (!defined('FILESENDER_BASE') || !defined("FILESENDER_CONFIG_DIR")) {        // Require environment (fatal)

     

       11
       11
       +
            die('Missing environment');

     

       12
       12
       +
        }

     

       13
       13
       +
        

     

       14
       14
       +
       @@ -116,7 +116,7 @@ class Config

     

       15
       15
       +
                }

     

       16
       16
       +
                

     

       17
       17
       +
                // Check if main config exists

     

       18
       18
       +
       -        $main_config_file = FILESENDER_BASE.'/config/config.php';

     

       19
       19
       +
       +        $main_config_file = FILESENDER_CONFIG_DIR.'/config/config.php';

     

       20
       20
       +
                if (!file_exists($main_config_file)) {

     

       21
       21
       +
                    throw new ConfigFileMissingException($main_config_file);

     

       22
       22
       +
                }

     

       23
       23
       +
       @@ -136,7 +136,7 @@ class Config

     

       24
       24
       +
        

     

       25
       25
       +
        

     

       26
       26
       +
                // load password file if it is there

     

       27
       27
       +
       -        $pass_config_file = FILESENDER_BASE.'/config/config-passwords.php';

     

       28
       28
       +
       +        $pass_config_file = FILESENDER_CONFIG_DIR.'/config/config-passwords.php';

     

       29
       29
       +
                if (file_exists($pass_config_file)) {

     

       30
       30
       +
                    $config = array();

     

       31
       31
       +
                    include_once($pass_config_file);

     

       32
       32
       +
       @@ -153,7 +153,7 @@ class Config

     

       33
       33
       +
                        throw new ConfigBadParameterException('virtualhost');

     

       34
       34
       +
                    }

     

       35
       35
       +
                    

     

       36
       36
       +
       -            $config_file = FILESENDER_BASE.'/config/'.$virtualhost.'/config.php';

     

       37
       37
       +
       +            $config_file = FILESENDER_CONFIG_DIR.'/config/'.$virtualhost.'/config.php';

     

       38
       38
       +
                    if (!file_exists($config_file)) {

     

       39
       39
       +
                        throw new ConfigFileMissingException($config_file);

     

       40
       40
       +
                    } // Should exist even if empty

     

       41
       41
       +
       @@ -175,7 +175,7 @@ class Config

     

       42
       42
       +
                                }

     

       43
       43
       +
                                foreach ($regex_and_configs as $regex => $extra_config_name) {

     

       44
       44
       +
                                        if (preg_match('`'.$regex.'`', $auth_attrs[$attr])) {

     

       45
       45
       +
       -                                        $extra_config_file = FILESENDER_BASE.'/config/config-' . $extra_config_name . '.php';

     

       46
       46
       +
       +                                        $extra_config_file = FILESENDER_CONFIG_DIR.'/config/config-' . $extra_config_name . '.php';

     

       47
       47
       +
                                                if (file_exists($extra_config_file)) {

     

       48
       48
       +
                                                        $config = array();

     

       49
       49
       +
                                                        include_once($extra_config_file);

     

       50
       50
       +
       @@ -204,7 +204,7 @@ class Config

     

       51
       51
       +
                // Load config overrides if any

     

       52
       52
       +
                $overrides_cfg = self::get('config_overrides');

     

       53
       53
       +
                if ($overrides_cfg) {

     

       54
       54
       +
       -            $overrides_file = FILESENDER_BASE.'/config/'.($virtualhost ? $virtualhost.'/' : '').'config_overrides.json';

     

       55
       55
       +
       +            $overrides_file = FILESENDER_CONFIG_DIR.'/config/'.($virtualhost ? $virtualhost.'/' : '').'config_overrides.json';

     

       56
       56
       +
                    

     

       57
       57
       +
                    $overrides = file_exists($overrides_file) ? json_decode(trim(file_get_contents($overrides_file))) : new StdClass();

     

       58
       58
       +
                    

     

       59
       59
       +
       @@ -431,7 +431,7 @@ class Config

     

       60
       60
       +
            public static function getVirtualhosts()

     

       61
       61
       +
            {

     

       62
       62
       +
                $virtualhosts = array();

     

       63
       63
       +
       -        foreach (scandir(FILESENDER_BASE.'/config') as $item) {

     

       64
       64
       +
       +        foreach (scandir(FILESENDER_CONFIG_DIR.'/config') as $item) {

     

       65
       65
       +
                    if (!preg_match('`^(.+)\.conf\.php$`', $item, $match)) {

     

       66
       66
       +
                        continue;

     

       67
       67
       +
                    }

     

       68
       68
       +
       diff --git a/config/csrf-protector-config.php b/config/csrf-protector-config.php

     

       69
       69
       +
       index 83759ca4..ea4a3173 100755

     

       70
       70
       +
       --- a/config/csrf-protector-config.php

     

       71
       71
       +
       +++ b/config/csrf-protector-config.php

     

       72
       72
       +
       @@ -40,7 +40,7 @@ return array(

     

       73
       73
       +
        	 // The following should be set correctly from your config.php

     

       74
       74
       +
        	 // information

     

       75
       75
       +
        	"jsUrl" => $config['site_url'] . "/js/csrfprotector.js",

     

       76
       76
       +
       -	"logDirectory" => FILESENDER_BASE.'/log/',

     

       77
       77
       +
       +	"logDirectory" => FILESENDER_LOG_DIR,

     

       78
       78
       +
        

     

       79
       79
       +
                // I found that leaving this with the _ as default

     

       80
       80
       +
                // caused the implicit token to be stripped

     

       81
       81
       +
       diff --git a/includes/ConfigDefaults.php b/includes/ConfigDefaults.php

     

       82
       82
       +
       index 733550e7..8d99b5f0 100644

     

       83
       83
       +
       --- a/includes/ConfigDefaults.php

     

       84
       84
       +
       +++ b/includes/ConfigDefaults.php

     

       85
       85
       +
       @@ -224,7 +224,7 @@ $default = array(

     

       86
       86
       +
            'log_facilities' => array(

     

       87
       87
       +
                array(

     

       88
       88
       +
                    'type' => 'file',

     

       89
       89
       +
       -            'path' => FILESENDER_BASE.'/log/',

     

       90
       90
       +
       +            'path' => FILESENDER_LOG_DIR,

     

       91
       91
       +
                    'rotate' => 'hourly'

     

       92
       92
       +
                )

     

       93
       93
       +
            ),

     

       94
       94
       +
       diff --git a/includes/ConfigValidation.php b/includes/ConfigValidation.php

     

       95
       95
       +
       index 5c1e7f61..b1fb57e4 100644

     

       96
       96
       +
       --- a/includes/ConfigValidation.php

     

       97
       97
       +
       +++ b/includes/ConfigValidation.php

     

       98
       98
       +
       @@ -31,9 +31,9 @@

     

       99
       99
       +
         */

     

       100
       100
       +
        

     

       101
       101
       +
        // Require environment (fatal)

     

       102
       102
       +
       -if(!defined('FILESENDER_BASE')) die('Missing environment');

     

       103
       103
       +
       +if(!defined('FILESENDER_BASE') || !defined("FILESENDER_CONFIG_DIR")) die('Missing environment');

     

       104
       104
       +
        

     

       105
       105
       +
       -if(!file_exists(FILESENDER_BASE.'/config/config.php'))

     

       106
       106
       +
       ++if(!file_exists(FILESENDER_CONFIG_DIR.'/config.php'))

     

       107
       107
       +
            die('Configuration file not found');

     

       108
       108
       +
        

     

       109
       109
       +
        ConfigValidator::addCheck('site_url', 'string');

     

       110
       110
       +
       diff --git a/includes/init.php b/includes/init.php

     

       111
       111
       +
       index ba7fa82f..31812c54 100644

     

       112
       112
       +
       --- a/includes/init.php

     

       113
       113
       +
       +++ b/includes/init.php

     

       114
       114
       +
       @@ -35,6 +35,8 @@ if(PHP_INT_SIZE !== 8) {

     

       115
       115
       +
        }

     

       116
       116
       +
        

     

       117
       117
       +
        define('FILESENDER_BASE', dirname( __DIR__ ));

     

       118
       118
       +
       +define('FILESENDER_CONFIG_DIR', getenv('FILESENDER_CONFIG_DIR', true) ?: (FILESENDER_BASE.'/config'));

     

       119
       119
       +
       +define('FILESENDER_LOG_DIR', getenv('FILESENDER_LOG_DIR', true) ?: (FILESENDER_BASE.'/log'));

     

       120
       120
       +
        

     

       121
       121
       +
        // Include classes autoloader

     

       122
       122
       +
        require_once(FILESENDER_BASE.'/classes/autoload.php');