commit d7e7243d4ce0c32f04ff9f407a7afda5c56fd3fb · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1205
        
         shadowsocks = handleTest ./shadowsocks { };

     

       1206
        
         shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix { };

     

       1207
        
         shiori = handleTest ./shiori.nix { };

     

       1208
       -
         signal-desktop = handleTest ./signal-desktop.nix { };

     

       1209
        
         silverbullet = handleTest ./silverbullet.nix { };

     

       1210
        
         simple = handleTest ./simple.nix { };

     

       1211
        
         sing-box = handleTest ./sing-box.nix { };

···

       1205
        
         shadowsocks = handleTest ./shadowsocks { };

     

       1206
        
         shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix { };

     

       1207
        
         shiori = handleTest ./shiori.nix { };

     

       1208
       +
         signal-desktop = runTest ./signal-desktop.nix;

     

       1209
        
         silverbullet = handleTest ./silverbullet.nix { };

     

       1210
        
         simple = handleTest ./simple.nix { };

     

       1211
        
         sing-box = handleTest ./sing-box.nix { };

+70 -73

nixos/tests/signal-desktop.nix

···

       1
       -
       import ./make-test-python.nix (

     

       2
       -
         { pkgs, ... }:

     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
       -
         let

     

       5
       -
           sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" ''

     

       6
       -
             set -eu

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       7
        
       

     

       8
       -
             readonly CFG=~/.config/Signal/config.json

     

       9
       -
             readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)"

     

       10
       -
             readonly DB="$1"

     

       11
       -
             readonly SQL="SELECT * FROM sqlite_master where type='table'"

     

       12
       -
             ${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL"

     

       13
       -
           '';

     

       14
       -
         in

     

       15
       -
         {

     

       16
       -
           name = "signal-desktop";

     

       17
       -
           meta = with pkgs.lib.maintainers; {

     

       18
       -
             maintainers = [

     

       19
       -
               flokli

     

       20
       -
               primeos

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
             ];

     

       22
        
           };

     

       23
        
       

     

       24
       -
           nodes.machine =

     

       25
       -
             { ... }:

     

       26
        
       

     

       27
       -
             {

     

       28
       -
               imports = [

     

       29
       -
                 ./common/user-account.nix

     

       30
       -
                 ./common/x11.nix

     

       31
       -
               ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       32
        
       

     

       33
       -
               services.xserver.enable = true;

     

       34
       -
               test-support.displayManager.auto.user = "alice";

     

       35
       -
               environment.systemPackages = with pkgs; [

     

       36
       -
                 signal-desktop

     

       37
       -
                 file

     

       38
       -
                 sqlite

     

       39
       -
                 sqlcipher-signal

     

       40
       -
               ];

     

       41
       -
             };

     

       42
        
       

     

       43
       -
           enableOCR = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       44
        
       

     

       45
       -
           testScript =

     

       46
       -
             { nodes, ... }:

     

       47
       -
             let

     

       48
       -
               user = nodes.machine.config.users.users.alice;

     

       49
       -
             in

     

       50
       -
             ''

     

       51
       -
               start_all()

     

       52
       -
               machine.wait_for_x()

     

       53
       -
       

     

       54
       -
               # start signal desktop

     

       55
       -
               machine.execute("su - alice -c signal-desktop >&2 &")

     

       56
       -
       

     

       57
       -
               # Wait for the Signal window to appear. Since usually the tests

     

       58
       -
               # are run sandboxed and therefore with no internet, we can not wait

     

       59
       -
               # for the message "Link your phone ...". Nor should we wait for

     

       60
       -
               # the "Failed to connect to server" message, because when manually

     

       61
       -
               # running this test it will be not sandboxed.

     

       62
       -
               machine.wait_for_text("Signal")

     

       63
       -
               machine.wait_for_text("File Edit View Window Help")

     

       64
       -
               machine.screenshot("signal_desktop")

     

       65
       -
       

     

       66
       -
               # Test if the database is encrypted to prevent these issues:

     

       67
       -
               # - https://github.com/NixOS/nixpkgs/issues/108772

     

       68
       -
               # - https://github.com/NixOS/nixpkgs/pull/117555

     

       69
       -
               print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'"))

     

       70
       -
               machine.fail(

     

       71
       -
                   "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database"

     

       72
       -
               )

     

       73
       -
               # Only SQLCipher should be able to read the encrypted DB:

     

       74
       -
               machine.fail(

     

       75
       -
                   "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'"

     

       76
       -
               )

     

       77
       -
               print(machine.succeed(

     

       78
       -
                   "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"

     

       79
       -
               ))

     

       80
       -
             '';

     

       81
       -
         }

     

       82
       -
       )

···

       1
       +
       { pkgs, ... }:

     

       2
       +
       let

     

       3
       +
         sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" ''

     

       4
       +
           set -eu

     

       5
        
       

     

       6
       +
           readonly CFG=~/.config/Signal/config.json

     

       7
       +
           readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)"

     

       8
       +
           readonly DB="$1"

     

       9
       +
           readonly SQL="SELECT * FROM sqlite_master where type='table'"

     

       10
       +
           ${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL"

     

       11
       +
         '';

     

       12
       +
       in

     

       13
       +
       {

     

       14
       +
         name = "signal-desktop";

     

       15
       +
         meta = with pkgs.lib.maintainers; {

     

       16
       +
           maintainers = [

     

       17
       +
             flokli

     

       18
       +
             primeos

     

       19
       +
           ];

     

       20
       +
         };

     

       21
        
       

     

       22
       +
         nodes.machine =

     

       23
       +
           { ... }:

     

       24
       +
       

     

       25
       +
           {

     

       26
       +
             imports = [

     

       27
       +
               ./common/user-account.nix

     

       28
       +
               ./common/x11.nix

     

       29
       +
             ];

     

       30
       +
       

     

       31
       +
             services.xserver.enable = true;

     

       32
       +
             test-support.displayManager.auto.user = "alice";

     

       33
       +
             environment.systemPackages = with pkgs; [

     

       34
       +
               signal-desktop

     

       35
       +
               file

     

       36
       +
               sqlite

     

       37
       +
               sqlcipher-signal

     

       38
        
             ];

     

       39
        
           };

     

       40
        
       

     

       41
       +
         enableOCR = true;

     

       0
        
       
     

       42
        
       

     

       43
       +
         testScript =

     

       44
       +
           { nodes, ... }:

     

       45
       +
           let

     

       46
       +
             user = nodes.machine.config.users.users.alice;

     

       47
       +
           in

     

       48
       +
           ''

     

       49
       +
             start_all()

     

       50
       +
             machine.wait_for_x()

     

       51
        
       

     

       52
       +
             # start signal desktop

     

       53
       +
             machine.execute("su - alice -c signal-desktop >&2 &")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       54
        
       

     

       55
       +
             # Wait for the Signal window to appear. Since usually the tests

     

       56
       +
             # are run sandboxed and therefore with no internet, we can not wait

     

       57
       +
             # for the message "Link your phone ...". Nor should we wait for

     

       58
       +
             # the "Failed to connect to server" message, because when manually

     

       59
       +
             # running this test it will be not sandboxed.

     

       60
       +
             machine.wait_for_text("Signal")

     

       61
       +
             machine.wait_for_text("File Edit View Window Help")

     

       62
       +
             machine.screenshot("signal_desktop")

     

       63
        
       

     

       64
       +
             # Test if the database is encrypted to prevent these issues:

     

       65
       +
             # - https://github.com/NixOS/nixpkgs/issues/108772

     

       66
       +
             # - https://github.com/NixOS/nixpkgs/pull/117555

     

       67
       +
             print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'"))

     

       68
       +
             machine.fail(

     

       69
       +
                 "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database"

     

       70
       +
             )

     

       71
       +
             # Only SQLCipher should be able to read the encrypted DB:

     

       72
       +
             machine.fail(

     

       73
       +
                 "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'"

     

       74
       +
             )

     

       75
       +
             print(machine.succeed(

     

       76
       +
                 "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"

     

       77
       +
             ))

     

       78
       +
           '';

     

       79
       +
       }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0