commit 3d475651936f23c61d7f9dab707ca0c04ae8b342 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2405.section.md

···

       197
       197
        
       

     

       198
       198
        
       - [your_spotify](https://github.com/Yooooomi/your_spotify), a self hosted Spotify tracking dashboard. Available as [services.your_spotify](#opt-services.your_spotify.enable)

     

       199
       199
        
       

     

       200
       200
       +
       - [FileSender](https://filesender.org/), a file sharing software. Available as [services.filesender](#opt-services.filesender.enable).

     

       201
       201
       +
       

     

       200
       202
        
       ## Backward Incompatibilities {#sec-release-24.05-incompatibilities}

     

       201
       203
        
       

     

       202
       204
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/module-list.nix

···

       1353
       1353
        
         ./services/web-apps/dolibarr.nix

     

       1354
       1354
        
         ./services/web-apps/engelsystem.nix

     

       1355
       1355
        
         ./services/web-apps/ethercalc.nix

     

       1356
       1356
       +
         ./services/web-apps/filesender.nix

     

       1356
       1357
        
         ./services/web-apps/firefly-iii.nix

     

       1357
       1358
        
         ./services/web-apps/flarum.nix

     

       1358
       1359
        
         ./services/web-apps/fluidd.nix

+49

nixos/modules/services/web-apps/filesender.md

···

       1
       1
       +
       # FileSender {#module-services-filesender}

     

       2
       2
       +
       

     

       3
       3
       +
       [FileSender](https://filesender.org/software/) is a software that makes it easy to send and receive big files.

     

       4
       4
       +
       

     

       5
       5
       +
       ## Quickstart {#module-services-filesender-quickstart}

     

       6
       6
       +
       

     

       7
       7
       +
       FileSender uses [SimpleSAMLphp](https://simplesamlphp.org/) for authentication, which needs to be configured separately.

     

       8
       8
       +
       

     

       9
       9
       +
       Minimal working instance of FileSender that uses password-authentication would look like this:

     

       10
       10
       +
       

     

       11
       11
       +
       ```nix

     

       12
       12
       +
       {

     

       13
       13
       +
         networking.firewall.allowedTCPPorts = [ 80 443 ];

     

       14
       14
       +
         services.filesender = {

     

       15
       15
       +
           enable = true;

     

       16
       16
       +
           localDomain = "filesender.example.com";

     

       17
       17
       +
           configureNginx = true;

     

       18
       18
       +
           database.createLocally = true;

     

       19
       19
       +
       

     

       20
       20
       +
           settings = {

     

       21
       21
       +
             auth_sp_saml_authentication_source = "default";

     

       22
       22
       +
             auth_sp_saml_uid_attribute = "uid";

     

       23
       23
       +
             storage_filesystem_path = "<STORAGE PATH FOR UPLOADED FILES>";

     

       24
       24
       +
             admin = "admin";

     

       25
       25
       +
             admin_email = "admin@example.com";

     

       26
       26
       +
             email_reply_to = "noreply@example.com";

     

       27
       27
       +
           };

     

       28
       28
       +
         };

     

       29
       29
       +
         services.simplesamlphp.filesender = {

     

       30
       30
       +
           settings = {

     

       31
       31
       +
             "module.enable".exampleauth = true;

     

       32
       32
       +
           };

     

       33
       33
       +
           authSources = {

     

       34
       34
       +
             admin = [ "core:AdminPassword" ];

     

       35
       35
       +
             default = format.lib.mkMixedArray [ "exampleauth:UserPass" ] {

     

       36
       36
       +
               "admin:admin123" = {

     

       37
       37
       +
                 uid = [ "admin" ];

     

       38
       38
       +
                 cn = [ "admin" ];

     

       39
       39
       +
                 mail = [ "admin@example.com" ];

     

       40
       40
       +
               };

     

       41
       41
       +
             };

     

       42
       42
       +
           };

     

       43
       43
       +
         };

     

       44
       44
       +
       }

     

       45
       45
       +
       ```

     

       46
       46
       +
       

     

       47
       47
       +
       ::: {.warning}

     

       48
       48
       +
       Example above uses hardcoded clear-text password, in production you should use other authentication method like LDAP. You can check supported authentication methods [in SimpleSAMLphp documentation](https://simplesamlphp.org/docs/stable/simplesamlphp-idp.html).

     

       49
       49
       +
       :::

+253

nixos/modules/services/web-apps/filesender.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         format = pkgs.formats.php { finalVariable = "config"; };

     

       9
       9
       +
       

     

       10
       10
       +
         cfg = config.services.filesender;

     

       11
       11
       +
         simpleSamlCfg = config.services.simplesamlphp.filesender;

     

       12
       12
       +
         fpm = config.services.phpfpm.pools.filesender;

     

       13
       13
       +
       

     

       14
       14
       +
         filesenderConfigDirectory = pkgs.runCommand "filesender-config" { } ''

     

       15
       15
       +
           mkdir $out

     

       16
       16
       +
           cp ${format.generate "config.php" cfg.settings} $out/config.php

     

       17
       17
       +
         '';

     

       18
       18
       +
       in

     

       19
       19
       +
       {

     

       20
       20
       +
         meta = {

     

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

     

       22
       22
       +
           doc = ./filesender.md;

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         options.services.filesender = with lib; {

     

       26
       26
       +
           enable = mkEnableOption "FileSender";

     

       27
       27
       +
           package = mkPackageOption pkgs "filesender" { };

     

       28
       28
       +
           user = mkOption {

     

       29
       29
       +
             description = "User under which filesender runs.";

     

       30
       30
       +
             type = types.str;

     

       31
       31
       +
             default = "filesender";

     

       32
       32
       +
           };

     

       33
       33
       +
           database = {

     

       34
       34
       +
             createLocally = mkOption {

     

       35
       35
       +
               type = types.bool;

     

       36
       36
       +
               default = true;

     

       37
       37
       +
               description = ''

     

       38
       38
       +
                 Create the PostgreSQL database and database user locally.

     

       39
       39
       +
               '';

     

       40
       40
       +
             };

     

       41
       41
       +
             hostname = mkOption {

     

       42
       42
       +
               type = types.str;

     

       43
       43
       +
               default = "/run/postgresql";

     

       44
       44
       +
               description = "Database hostname.";

     

       45
       45
       +
             };

     

       46
       46
       +
             port = mkOption {

     

       47
       47
       +
               type = types.port;

     

       48
       48
       +
               default = 5432;

     

       49
       49
       +
               description = "Database port.";

     

       50
       50
       +
             };

     

       51
       51
       +
             name = mkOption {

     

       52
       52
       +
               type = types.str;

     

       53
       53
       +
               default = "filesender";

     

       54
       54
       +
               description = "Database name.";

     

       55
       55
       +
             };

     

       56
       56
       +
             user = mkOption {

     

       57
       57
       +
               type = types.str;

     

       58
       58
       +
               default = "filesender";

     

       59
       59
       +
               description = "Database user.";

     

       60
       60
       +
             };

     

       61
       61
       +
             passwordFile = mkOption {

     

       62
       62
       +
               type = types.nullOr types.path;

     

       63
       63
       +
               default = null;

     

       64
       64
       +
               example = "/run/keys/filesender-dbpassword";

     

       65
       65
       +
               description = ''

     

       66
       66
       +
                 A file containing the password corresponding to

     

       67
       67
       +
                 [](#opt-services.filesender.database.user).

     

       68
       68
       +
               '';

     

       69
       69
       +
             };

     

       70
       70
       +
           };

     

       71
       71
       +
           settings = mkOption {

     

       72
       72
       +
             type = types.submodule {

     

       73
       73
       +
               freeformType = format.type;

     

       74
       74
       +
               options = {

     

       75
       75
       +
                 site_url = mkOption {

     

       76
       76
       +
                   type = types.str;

     

       77
       77
       +
                   description = "Site URL. Used in emails, to build URLs for logging in, logging out, build URL for upload endpoint for web workers, to include scripts etc.";

     

       78
       78
       +
                 };

     

       79
       79
       +
                 admin = mkOption {

     

       80
       80
       +
                   type = types.commas;

     

       81
       81
       +
                   description = ''

     

       82
       82
       +
                     UIDs (as per the configured saml_uid_attribute) of FileSender administrators.

     

       83
       83
       +
                     Accounts with these UIDs can access the Admin page through the web UI.

     

       84
       84
       +
                   '';

     

       85
       85
       +
                 };

     

       86
       86
       +
                 admin_email = mkOption {

     

       87
       87
       +
                   type = types.commas;

     

       88
       88
       +
                   description = ''

     

       89
       89
       +
                     Email address of FileSender administrator(s).

     

       90
       90
       +
                     Emails regarding disk full etc. are sent here.

     

       91
       91
       +
                     You should use a role-address here.

     

       92
       92
       +
                   '';

     

       93
       93
       +
                 };

     

       94
       94
       +
                 storage_filesystem_path = mkOption {

     

       95
       95
       +
                   type = types.nullOr types.str;

     

       96
       96
       +
                   description = "When using storage type filesystem this is the absolute path to the file system where uploaded files are stored until they expire. Your FileSender storage root.";

     

       97
       97
       +
                 };

     

       98
       98
       +
                 log_facilities = mkOption {

     

       99
       99
       +
                   type = format.type;

     

       100
       100
       +
                   default = [ { type = "error_log"; } ];

     

       101
       101
       +
                   description = "Defines where FileSender logging is sent. You can sent logging to a file, to syslog or to the default PHP log facility (as configured through your webserver's PHP module). The directive takes an array of one or more logging targets. Logging can be sent to multiple targets simultaneously. Each logging target is a list containing the name of the logging target and a number of attributes which vary per log target. See below for the exact definiation of each log target.";

     

       102
       102
       +
                 };

     

       103
       103
       +
               };

     

       104
       104
       +
             };

     

       105
       105
       +
             default = { };

     

       106
       106
       +
             description = ''

     

       107
       107
       +
               Configuration options used by FileSender.

     

       108
       108
       +
               See [](https://docs.filesender.org/filesender/v2.0/admin/configuration/)

     

       109
       109
       +
               for available options.

     

       110
       110
       +
             '';

     

       111
       111
       +
           };

     

       112
       112
       +
           configureNginx = mkOption {

     

       113
       113
       +
             type = types.bool;

     

       114
       114
       +
             default = true;

     

       115
       115
       +
             description = "Configure nginx as a reverse proxy for FileSender.";

     

       116
       116
       +
           };

     

       117
       117
       +
           localDomain = mkOption {

     

       118
       118
       +
             type = types.str;

     

       119
       119
       +
             example = "filesender.example.org";

     

       120
       120
       +
             description = "The domain serving your FileSender instance.";

     

       121
       121
       +
           };

     

       122
       122
       +
           poolSettings = mkOption {

     

       123
       123
       +
             type =

     

       124
       124
       +
               with types;

     

       125
       125
       +
               attrsOf (oneOf [

     

       126
       126
       +
                 str

     

       127
       127
       +
                 int

     

       128
       128
       +
                 bool

     

       129
       129
       +
               ]);

     

       130
       130
       +
             default = {

     

       131
       131
       +
               "pm" = "dynamic";

     

       132
       132
       +
               "pm.max_children" = "32";

     

       133
       133
       +
               "pm.start_servers" = "2";

     

       134
       134
       +
               "pm.min_spare_servers" = "2";

     

       135
       135
       +
               "pm.max_spare_servers" = "4";

     

       136
       136
       +
               "pm.max_requests" = "500";

     

       137
       137
       +
             };

     

       138
       138
       +
             description = ''

     

       139
       139
       +
               Options for FileSender's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives.

     

       140
       140
       +
             '';

     

       141
       141
       +
           };

     

       142
       142
       +
         };

     

       143
       143
       +
         config = lib.mkIf cfg.enable {

     

       144
       144
       +
           services.simplesamlphp.filesender = {

     

       145
       145
       +
             phpfpmPool = "filesender";

     

       146
       146
       +
             localDomain = cfg.localDomain;

     

       147
       147
       +
             settings.baseurlpath = lib.mkDefault "https://${cfg.localDomain}/saml";

     

       148
       148
       +
           };

     

       149
       149
       +
       

     

       150
       150
       +
           services.phpfpm = {

     

       151
       151
       +
             pools.filesender = {

     

       152
       152
       +
               user = cfg.user;

     

       153
       153
       +
               group = config.services.nginx.group;

     

       154
       154
       +
               phpEnv = {

     

       155
       155
       +
                 FILESENDER_CONFIG_DIR = toString filesenderConfigDirectory;

     

       156
       156
       +
                 SIMPLESAMLPHP_CONFIG_DIR = toString simpleSamlCfg.configDir;

     

       157
       157
       +
               };

     

       158
       158
       +
               settings = {

     

       159
       159
       +
                 "listen.owner" = config.services.nginx.user;

     

       160
       160
       +
                 "listen.group" = config.services.nginx.group;

     

       161
       161
       +
               } // cfg.poolSettings;

     

       162
       162
       +
             };

     

       163
       163
       +
           };

     

       164
       164
       +
       

     

       165
       165
       +
           services.nginx = lib.mkIf cfg.configureNginx {

     

       166
       166
       +
             enable = true;

     

       167
       167
       +
             virtualHosts.${cfg.localDomain} = {

     

       168
       168
       +
               root = "${cfg.package}/www";

     

       169
       169
       +
               extraConfig = ''

     

       170
       170
       +
                 index index.php;

     

       171
       171
       +
               '';

     

       172
       172
       +
               locations = {

     

       173
       173
       +
                 "/".extraConfig = ''

     

       174
       174
       +
                   try_files $uri $uri/ /index.php?args;

     

       175
       175
       +
                 '';

     

       176
       176
       +
                 "~ [^/]\\.php(/|$)" = {

     

       177
       177
       +
                   extraConfig = ''

     

       178
       178
       +
                     fastcgi_split_path_info  ^(.+\.php)(/.+)$;

     

       179
       179
       +
                     fastcgi_pass  unix:${fpm.socket};

     

       180
       180
       +
                     include ${pkgs.nginx}/conf/fastcgi.conf;

     

       181
       181
       +
                     fastcgi_intercept_errors on;

     

       182
       182
       +
                     fastcgi_param PATH_INFO       $fastcgi_path_info;

     

       183
       183
       +
                     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

     

       184
       184
       +
                   '';

     

       185
       185
       +
                 };

     

       186
       186
       +
                 "~ /\\.".extraConfig = "deny all;";

     

       187
       187
       +
               };

     

       188
       188
       +
             };

     

       189
       189
       +
           };

     

       190
       190
       +
       

     

       191
       191
       +
           services.postgresql = lib.mkIf cfg.database.createLocally {

     

       192
       192
       +
             enable = true;

     

       193
       193
       +
             ensureDatabases = [ cfg.database.name ];

     

       194
       194
       +
             ensureUsers = [

     

       195
       195
       +
               {

     

       196
       196
       +
                 name = cfg.database.user;

     

       197
       197
       +
                 ensureDBOwnership = true;

     

       198
       198
       +
               }

     

       199
       199
       +
             ];

     

       200
       200
       +
           };

     

       201
       201
       +
       

     

       202
       202
       +
           services.filesender.settings = lib.mkMerge [

     

       203
       203
       +
             (lib.mkIf cfg.database.createLocally {

     

       204
       204
       +
               db_host = "/run/postgresql";

     

       205
       205
       +
               db_port = "5432";

     

       206
       206
       +
               db_password = "."; # FileSender requires it even when on UNIX socket auth.

     

       207
       207
       +
             })

     

       208
       208
       +
             (lib.mkIf (!cfg.database.createLocally) {

     

       209
       209
       +
               db_host = cfg.database.hostname;

     

       210
       210
       +
               db_port = toString cfg.database.port;

     

       211
       211
       +
               db_password = format.lib.mkRaw "file_get_contents('${cfg.database.passwordFile}')";

     

       212
       212
       +
             })

     

       213
       213
       +
             {

     

       214
       214
       +
               site_url = lib.mkDefault "https://${cfg.localDomain}";

     

       215
       215
       +
               db_type = "pgsql";

     

       216
       216
       +
               db_username = cfg.database.user;

     

       217
       217
       +
               db_database = cfg.database.name;

     

       218
       218
       +
               "auth_sp_saml_simplesamlphp_url" = "/saml";

     

       219
       219
       +
               "auth_sp_saml_simplesamlphp_location" = "${simpleSamlCfg.libDir}";

     

       220
       220
       +
             }

     

       221
       221
       +
           ];

     

       222
       222
       +
       

     

       223
       223
       +
           systemd.services.filesender-initdb = {

     

       224
       224
       +
             description = "Init filesender DB";

     

       225
       225
       +
       

     

       226
       226
       +
             wantedBy = [

     

       227
       227
       +
               "multi-user.target"

     

       228
       228
       +
               "phpfpm-filesender.service"

     

       229
       229
       +
             ];

     

       230
       230
       +
             after = [ "postgresql.service" ];

     

       231
       231
       +
       

     

       232
       232
       +
             restartIfChanged = true;

     

       233
       233
       +
       

     

       234
       234
       +
             serviceConfig = {

     

       235
       235
       +
               Environment = [

     

       236
       236
       +
                 "FILESENDER_CONFIG_DIR=${toString filesenderConfigDirectory}"

     

       237
       237
       +
                 "SIMPLESAMLPHP_CONFIG_DIR=${toString simpleSamlCfg.configDir}"

     

       238
       238
       +
               ];

     

       239
       239
       +
               Type = "oneshot";

     

       240
       240
       +
               Group = config.services.nginx.group;

     

       241
       241
       +
               User = "filesender";

     

       242
       242
       +
               ExecStart = "${fpm.phpPackage}/bin/php ${cfg.package}/scripts/upgrade/database.php";

     

       243
       243
       +
             };

     

       244
       244
       +
           };

     

       245
       245
       +
       

     

       246
       246
       +
           users.extraUsers.filesender = lib.mkIf (cfg.user == "filesender") {

     

       247
       247
       +
             home = "/var/lib/filesender";

     

       248
       248
       +
             group = config.services.nginx.group;

     

       249
       249
       +
             createHome = true;

     

       250
       250
       +
             isSystemUser = true;

     

       251
       251
       +
           };

     

       252
       252
       +
         };

     

       253
       253
       +
       }

nixos/tests/all-tests.nix

···

       312
       312
        
         fenics = handleTest ./fenics.nix {};

     

       313
       313
        
         ferm = handleTest ./ferm.nix {};

     

       314
       314
        
         ferretdb = handleTest ./ferretdb.nix {};

     

       315
       315
       +
         filesender = handleTest ./filesender.nix {};

     

       315
       316
        
         filesystems-overlayfs = runTest ./filesystems-overlayfs.nix;

     

       316
       317
        
         firefly-iii = handleTest ./firefly-iii.nix {};

     

       317
       318
        
         firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; };

+137

nixos/tests/filesender.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       2
       2
       +
         name = "filesender";

     

       3
       3
       +
         meta = {

     

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

     

       5
       5
       +
           broken = pkgs.stdenv.isAarch64; # selenium.common.exceptions.WebDriverException: Message: Unsupported platform/architecture combination: linux/aarch64

     

       6
       6
       +
         };

     

       7
       7
       +
       

     

       8
       8
       +
         nodes.filesender = { ... }: let

     

       9
       9
       +
           format = pkgs.formats.php { };

     

       10
       10
       +
         in {

     

       11
       11
       +
           networking.firewall.allowedTCPPorts = [ 80 ];

     

       12
       12
       +
       

     

       13
       13
       +
           services.filesender.enable = true;

     

       14
       14
       +
           services.filesender.localDomain = "filesender";

     

       15
       15
       +
           services.filesender.settings = {

     

       16
       16
       +
             auth_sp_saml_authentication_source = "default";

     

       17
       17
       +
             auth_sp_saml_uid_attribute = "uid";

     

       18
       18
       +
             storage_filesystem_path = "/tmp";

     

       19
       19
       +
             site_url = "http://filesender";

     

       20
       20
       +
             force_ssl = false;

     

       21
       21
       +
             admin = "";

     

       22
       22
       +
             admin_email = "admin@localhost";

     

       23
       23
       +
             email_reply_to = "noreply@localhost";

     

       24
       24
       +
           };

     

       25
       25
       +
           services.simplesamlphp.filesender = {

     

       26
       26
       +
             settings = {

     

       27
       27
       +
               baseurlpath = "http://filesender/saml";

     

       28
       28
       +
               "module.enable".exampleauth = true;

     

       29
       29
       +
             };

     

       30
       30
       +
             authSources = {

     

       31
       31
       +
               admin = [ "core:AdminPassword" ];

     

       32
       32
       +
               default = format.lib.mkMixedArray [ "exampleauth:UserPass" ] {

     

       33
       33
       +
                 "user:password" = {

     

       34
       34
       +
                   uid = [ "user" ];

     

       35
       35
       +
                   cn = [ "user" ];

     

       36
       36
       +
                   mail = [ "user@nixos.org" ];

     

       37
       37
       +
                 };

     

       38
       38
       +
               };

     

       39
       39
       +
             };

     

       40
       40
       +
           };

     

       41
       41
       +
         };

     

       42
       42
       +
       

     

       43
       43
       +
         nodes.client =

     

       44
       44
       +
           { pkgs

     

       45
       45
       +
           , nodes

     

       46
       46
       +
           , ...

     

       47
       47
       +
           }:

     

       48
       48
       +
           let

     

       49
       49
       +
             filesenderIP = (builtins.head (nodes.filesender.networking.interfaces.eth1.ipv4.addresses)).address;

     

       50
       50
       +
           in

     

       51
       51
       +
           {

     

       52
       52
       +
             networking.hosts.${filesenderIP} = [ "filesender" ];

     

       53
       53
       +
       

     

       54
       54
       +
             environment.systemPackages =

     

       55
       55
       +
               let

     

       56
       56
       +
                 username = "user";

     

       57
       57
       +
                 password = "password";

     

       58
       58
       +
                 browser-test =

     

       59
       59
       +
                   pkgs.writers.writePython3Bin "browser-test"

     

       60
       60
       +
                     {

     

       61
       61
       +
                       libraries = [ pkgs.python3Packages.selenium ];

     

       62
       62
       +
                       flakeIgnore = [ "E124" "E501" ];

     

       63
       63
       +
                     } ''

     

       64
       64
       +
                     from selenium.webdriver.common.by import By

     

       65
       65
       +
                     from selenium.webdriver import Firefox

     

       66
       66
       +
                     from selenium.webdriver.firefox.options import Options

     

       67
       67
       +
                     from selenium.webdriver.firefox.firefox_profile import FirefoxProfile

     

       68
       68
       +
                     from selenium.webdriver.firefox.service import Service

     

       69
       69
       +
                     from selenium.webdriver.support.ui import WebDriverWait

     

       70
       70
       +
                     from selenium.webdriver.support import expected_conditions as EC

     

       71
       71
       +
                     from subprocess import STDOUT

     

       72
       72
       +
                     import string

     

       73
       73
       +
                     import random

     

       74
       74
       +
                     import logging

     

       75
       75
       +
                     import time

     

       76
       76
       +
                     selenium_logger = logging.getLogger("selenium")

     

       77
       77
       +
                     selenium_logger.setLevel(logging.DEBUG)

     

       78
       78
       +
                     selenium_logger.addHandler(logging.StreamHandler())

     

       79
       79
       +
                     profile = FirefoxProfile()

     

       80
       80
       +
                     profile.set_preference("browser.download.folderList", 2)

     

       81
       81
       +
                     profile.set_preference("browser.download.manager.showWhenStarting", False)

     

       82
       82
       +
                     profile.set_preference("browser.download.dir", "/tmp/firefox")

     

       83
       83
       +
                     profile.set_preference("browser.helperApps.neverAsk.saveToDisk", "text/plain;text/txt")

     

       84
       84
       +
                     options = Options()

     

       85
       85
       +
                     options.profile = profile

     

       86
       86
       +
                     options.add_argument('--headless')

     

       87
       87
       +
                     service = Service(log_output=STDOUT)

     

       88
       88
       +
                     driver = Firefox(options=options)

     

       89
       89
       +
                     driver.set_window_size(1024, 768)

     

       90
       90
       +
                     driver.implicitly_wait(30)

     

       91
       91
       +
                     driver.get('http://filesender/')

     

       92
       92
       +
                     wait = WebDriverWait(driver, 20)

     

       93
       93
       +
                     wait.until(EC.title_contains("FileSender"))

     

       94
       94
       +
                     driver.find_element(By.ID, "btn_logon").click()

     

       95
       95
       +
                     wait.until(EC.title_contains("Enter your username and password"))

     

       96
       96
       +
                     driver.find_element(By.ID, 'username').send_keys(

     

       97
       97
       +
                         '${username}'

     

       98
       98
       +
                     )

     

       99
       99
       +
                     driver.find_element(By.ID, 'password').send_keys(

     

       100
       100
       +
                         '${password}'

     

       101
       101
       +
                     )

     

       102
       102
       +
                     driver.find_element(By.ID, "submit_button").click()

     

       103
       103
       +
                     wait.until(EC.title_contains("FileSender"))

     

       104
       104
       +
                     wait.until(EC.presence_of_element_located((By.ID, "topmenu_logoff")))

     

       105
       105
       +
                     test_string = "".join(random.choices(string.ascii_uppercase + string.digits, k=20))

     

       106
       106
       +
                     with open("/tmp/test_file.txt", "w") as file:

     

       107
       107
       +
                         file.write(test_string)

     

       108
       108
       +
                     driver.find_element(By.ID, "files").send_keys("/tmp/test_file.txt")

     

       109
       109
       +
                     time.sleep(2)

     

       110
       110
       +
                     driver.find_element(By.CSS_SELECTOR, '.start').click()

     

       111
       111
       +
                     wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, ".download_link")))

     

       112
       112
       +
                     download_link = driver.find_element(By.CSS_SELECTOR, '.download_link > textarea').get_attribute('value').strip()

     

       113
       113
       +
                     driver.get(download_link)

     

       114
       114
       +
                     wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, ".download")))

     

       115
       115
       +
                     driver.find_element(By.CSS_SELECTOR, '.download').click()

     

       116
       116
       +
                     wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, ".ui-dialog-buttonset > button:nth-child(2)")))

     

       117
       117
       +
                     driver.find_element(By.CSS_SELECTOR, ".ui-dialog-buttonset > button:nth-child(2)").click()

     

       118
       118
       +
                     driver.close()

     

       119
       119
       +
                     driver.quit()

     

       120
       120
       +
                   '';

     

       121
       121
       +
               in

     

       122
       122
       +
               [

     

       123
       123
       +
                 pkgs.firefox-unwrapped

     

       124
       124
       +
                 pkgs.geckodriver

     

       125
       125
       +
                 browser-test

     

       126
       126
       +
               ];

     

       127
       127
       +
           };

     

       128
       128
       +
       

     

       129
       129
       +
         testScript = ''

     

       130
       130
       +
           start_all()

     

       131
       131
       +
           filesender.wait_for_file("/run/phpfpm/filesender.sock")

     

       132
       132
       +
           filesender.wait_for_open_port(80)

     

       133
       133
       +
           if "If you have received an invitation to access this site as a guest" not in client.wait_until_succeeds("curl -sS -f http://filesender"):

     

       134
       134
       +
             raise Exception("filesender returned invalid html")

     

       135
       135
       +
           client.succeed("browser-test")

     

       136
       136
       +
         '';

     

       137
       137
       +
       })

+7 -3

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

···

       4
       4
        
         lib,

     

       5
       5
        
         nixosTests,

     

       6
       6
        
       }:

     

       7
       7
       -
       stdenv.mkDerivation rec {

     

       7
       7
       +
       stdenv.mkDerivation (finalAttrs: {

     

       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}";

     

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

     

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

     

       16
       16
        
         };

     

       17
       17
        
       

     
···

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         installPhase = ''

     

       25
       25
       +
           runHook preInstall

     

       26
       26
       +
       

     

       25
       27
        
           mkdir -p $out/

     

       26
       28
        
           cp -R . $out/

     

       29
       29
       +
       

     

       30
       30
       +
           runHook postInstall

     

       27
       31
        
         '';

     

       28
       32
        
       

     

       29
       33
        
         passthru.tests = {

     
···

       36
       40
        
           license = lib.licenses.bsd3;

     

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

     

       38
       42
        
         };

     

       39
       39
       -
       }

     

       43
       43
       +
       })

+8 -8

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

     

       2
       2
       +
       index a4d819bc..318defdf 100644

     

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

     

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

     

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

     
···

       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';

     

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

     

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

     

       21
       21
        
                    throw new ConfigFileMissingException($main_config_file);

     

       22
       22
        
                }

     
···

       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';

     

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

     

       29
       29
        
                if (file_exists($pass_config_file)) {

     

       30
       30
        
                    $config = array();

     

       31
       31
        
                    include_once($pass_config_file);

     
···

       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';

     

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

     

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

     

       39
       39
        
                        throw new ConfigFileMissingException($config_file);

     

       40
       40
        
                    } // Should exist even if empty

     
···

       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';

     

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

     

       47
       47
        
                                                if (file_exists($extra_config_file)) {

     

       48
       48
        
                                                        $config = array();

     

       49
       49
        
                                                        include_once($extra_config_file);

     
···

       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';

     

       55
       55
       +
       +            $overrides_file = FILESENDER_CONFIG_DIR.($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
        
                    

     
···

       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) {

     

       64
       64
       +
       +        foreach (scandir(FILESENDER_CONFIG_DIR) as $item) {

     

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

     

       66
       66
        
                        continue;

     

       67
       67
        
                    }

     
···

       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'))

     

       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');