commit fa8bd535fc659c7d2ce5d271c5002c83659ebc0a · pyrox.dev/nixpkgs

+6 -1

nixos/modules/services/x11/desktop-managers/enlightenment.nix

···

       63
       63
        
             fi

     

       64
       64
        
           '';

     

       65
       65
        
       

     

       66
       66
       -
           security.wrappers = (import "${e.enlightenment}/e-wrappers.nix").security.wrappers;

     

       66
       66
       +
           # Wrappers for programs installed by enlightenment that should be setuid

     

       67
       67
       +
           security.wrappers = {

     

       68
       68
       +
             enlightenment_ckpasswd.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_ckpasswd";

     

       69
       69
       +
             enlightenment_sys.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_sys";

     

       70
       70
       +
             enlightenment_system.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_system";

     

       71
       71
       +
           };

     

       67
       72
        
       

     

       68
       73
        
           environment.etc."X11/xkb".source = xcfg.xkbDir;

     

       69
       74

+114

pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch

···

       1
       1
       +
       From a1e54ae0097a3b6a0dabf4639fe8bc594c4f602d Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>

     

       3
       3
       +
       Date: Thu, 14 May 2020 16:36:34 -0300

     

       4
       4
       +
       Subject: [PATCH] wrapped setuid executables

     

       5
       5
       +
       

     

       6
       6
       +
       Installing programs with root ownership and setuid/setgid permissions

     

       7
       7
       +
       in /nix/store is not allowed. They should be wrapped in the

     

       8
       8
       +
       enlightenment service module, and the wrapped ones should be used

     

       9
       9
       +
       instead.

     

       10
       10
       +
       ---

     

       11
       11
       +
        meson/meson_inst.sh           | 4 ++--

     

       12
       12
       +
        src/bin/e_auth.c              | 6 ++----

     

       13
       13
       +
        src/bin/e_fm/e_fm_main_eeze.c | 6 +++---

     

       14
       14
       +
        src/bin/e_start_main.c        | 2 +-

     

       15
       15
       +
        src/bin/e_system.c            | 2 +-

     

       16
       16
       +
        5 files changed, 9 insertions(+), 11 deletions(-)

     

       17
       17
       +
       

     

       18
       18
       +
       diff --git a/meson/meson_inst.sh b/meson/meson_inst.sh

     

       19
       19
       +
       index 321143e40..cd2399306 100755

     

       20
       20
       +
       --- a/meson/meson_inst.sh

     

       21
       21
       +
       +++ b/meson/meson_inst.sh

     

       22
       22
       +
       @@ -1,6 +1,6 @@

     

       23
       23
       +
        #!/bin/sh

     

       24
       24
       +
        

     

       25
       25
       +
        for x in "$@" ; do

     

       26
       26
       +
       -	chown root "$DESTDIR/$x"

     

       27
       27
       +
       -	chmod a=rx,u+xs "$DESTDIR/$x"

     

       28
       28
       +
       +	echo TODO: chown root "$DESTDIR/$x"

     

       29
       29
       +
       +	echo TODO: chmod a=rx,u+xs "$DESTDIR/$x"

     

       30
       30
       +
        done

     

       31
       31
       +
       diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c

     

       32
       32
       +
       index 8b0aa6641..63c68c4bc 100644

     

       33
       33
       +
       --- a/src/bin/e_auth.c

     

       34
       34
       +
       +++ b/src/bin/e_auth.c

     

       35
       35
       +
       @@ -12,8 +12,7 @@ e_auth_begin(char *passwd)

     

       36
       36
       +
           if (pwlen == 0) goto out;

     

       37
       37
       +
        

     

       38
       38
       +
           snprintf(buf, sizeof(buf),

     

       39
       39
       +
       -            "%s/enlightenment/utils/enlightenment_ckpasswd pw",

     

       40
       40
       +
       -            e_prefix_lib_get());

     

       41
       41
       +
       +            "/run/wrappers/bin/enlightenment_ckpasswd pw");

     

       42
       42
       +
           exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL);

     

       43
       43
       +
           if (!exe) goto out;

     

       44
       44
       +
           if (ecore_exe_send(exe, passwd, pwlen) != EINA_TRUE) goto out;

     

       45
       45
       +
       @@ -47,8 +46,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid)

     

       46
       46
       +
           if (pwlen == 0) goto out;

     

       47
       47
       +
        

     

       48
       48
       +
           snprintf(buf, sizeof(buf),

     

       49
       49
       +
       -            "%s/enlightenment/utils/enlightenment_ckpasswd pk",

     

       50
       50
       +
       -            e_prefix_lib_get());

     

       51
       51
       +
       +            "/run/wrappers/bin/enlightenment_ckpasswd pk");

     

       52
       52
       +
           exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL);

     

       53
       53
       +
           if (!exe) goto out;

     

       54
       54
       +
           snprintf(buf, sizeof(buf), "%s %u %s", cookie, uid, passwd);

     

       55
       55
       +
       diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c

     

       56
       56
       +
       index 9b10b3117..0f0aa5b53 100644

     

       57
       57
       +
       --- a/src/bin/e_fm/e_fm_main_eeze.c

     

       58
       58
       +
       +++ b/src/bin/e_fm/e_fm_main_eeze.c

     

       59
       59
       +
       @@ -318,7 +318,7 @@ _e_fm_main_eeze_volume_eject(E_Volume *v)

     

       60
       60
       +
             {

     

       61
       61
       +
                char buf[PATH_MAX];

     

       62
       62
       +
        

     

       63
       63
       +
       -        snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));

     

       64
       64
       +
       +        snprintf(buf, sizeof(buf), "/run/wrappers/bin/enlightenment_sys");

     

       65
       65
       +
                eeze_disk_mount_wrapper_set(v->disk, buf);

     

       66
       66
       +
             }

     

       67
       67
       +
           v->guard = ecore_timer_loop_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_eject_timeout, v);

     

       68
       68
       +
       @@ -512,7 +512,7 @@ _e_fm_main_eeze_volume_unmount(E_Volume *v)

     

       69
       69
       +
             {

     

       70
       70
       +
                char buf[PATH_MAX];

     

       71
       71
       +
        

     

       72
       72
       +
       -        snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));

     

       73
       73
       +
       +        snprintf(buf, sizeof(buf), "/run/wrappers/bin/enlightenment_sys");

     

       74
       74
       +
                eeze_disk_mount_wrapper_set(v->disk, buf);

     

       75
       75
       +
             }

     

       76
       76
       +
           v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_unmount_timeout, v);

     

       77
       77
       +
       @@ -548,7 +548,7 @@ _e_fm_main_eeze_volume_mount(E_Volume *v)

     

       78
       78
       +
             {

     

       79
       79
       +
                char buf2[PATH_MAX];

     

       80
       80
       +
        

     

       81
       81
       +
       -        snprintf(buf2, sizeof(buf2), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));

     

       82
       82
       +
       +        snprintf(buf2, sizeof(buf2), "/run/wrappers/bin/enlightenment_sys");

     

       83
       83
       +
                eeze_disk_mount_wrapper_set(v->disk, buf2);

     

       84
       84
       +
             }

     

       85
       85
       +
           v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v);

     

       86
       86
       +
       diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c

     

       87
       87
       +
       index 8534a7a8e..f0f0061a4 100644

     

       88
       88
       +
       --- a/src/bin/e_start_main.c

     

       89
       89
       +
       +++ b/src/bin/e_start_main.c

     

       90
       90
       +
       @@ -709,7 +709,7 @@ main(int argc, char **argv)

     

       91
       91
       +
                    "E_ALERT_FONT_DIR=%s/data/fonts", eina_prefix_data_get(pfx));

     

       92
       92
       +
           putenv(buf2);

     

       93
       93
       +
           snprintf(buf3, sizeof(buf3),

     

       94
       94
       +
       -            "E_ALERT_SYSTEM_BIN=%s/enlightenment/utils/enlightenment_system", eina_prefix_lib_get(pfx));

     

       95
       95
       +
       +            "E_ALERT_SYSTEM_BIN=/run/wrappers/bin/enlightenment_system");

     

       96
       96
       +
           putenv(buf3);

     

       97
       97
       +
        

     

       98
       98
       +
           if ((valgrind_mode || valgrind_tool) &&

     

       99
       99
       +
       diff --git a/src/bin/e_system.c b/src/bin/e_system.c

     

       100
       100
       +
       index 1e7aabb64..5084933a1 100644

     

       101
       101
       +
       --- a/src/bin/e_system.c

     

       102
       102
       +
       +++ b/src/bin/e_system.c

     

       103
       103
       +
       @@ -132,7 +132,7 @@ _system_spawn(void)

     

       104
       104
       +
           else _respawn_count = 0;

     

       105
       105
       +
           if (_respawn_count > 5) return;

     

       106
       106
       +
           snprintf(buf, sizeof(buf),

     

       107
       107
       +
       -            "%s/enlightenment/utils/enlightenment_system", e_prefix_lib_get());

     

       108
       108
       +
       +            "/run/wrappers/bin/enlightenment_system");

     

       109
       109
       +
           _system_exe = ecore_exe_pipe_run

     

       110
       110
       +
             (buf, ECORE_EXE_NOT_LEADER | ECORE_EXE_TERM_WITH_PARENT |

     

       111
       111
       +
              ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_WRITE, NULL);

     

       112
       112
       +
       -- 

     

       113
       113
       +
       2.26.2

     

       114
       114
       +

+4 -14

pkgs/desktops/enlightenment/enlightenment.nix

···

       48
       48
        
         ;

     

       49
       49
        
       

     

       50
       50
        
         patches = [

     

       51
       51
       -
           # Some programs installed by enlightenment (to set the cpu frequency,

     

       52
       52
       -
           # for instance) need root ownership and setuid/setgid permissions, which

     

       53
       53
       -
           # are not allowed for files in /nix/store. Instead of allowing the

     

       54
       54
       -
           # installer to try to do this, the file $out/e-wrappers.nix is created,

     

       55
       55
       -
           # containing the needed configuration for wrapping those programs. It

     

       56
       56
       -
           # can be used in the enlightenment module. The idea is:

     

       57
       57
       -
           #

     

       58
       58
       -
           #  1) rename the original binary adding the extension .orig

     

       59
       59
       -
           #  2) wrap the renamed binary at /run/wrappers/bin/

     

       60
       60
       -
           #  3) create a new symbolic link using the original binary name (in the

     

       61
       61
       -
           #     original directory where enlightenment wants it) pointing to the

     

       62
       62
       -
           #     wrapper

     

       63
       63
       -
       

     

       64
       64
       -
           ./enlightenment.suid-exes.patch

     

       51
       51
       +
           # Executables cannot be made setuid in nix store. They should be

     

       52
       52
       +
           # wrapped in the enlightenment service module, and the wrapped

     

       53
       53
       +
           # executables should be used instead.

     

       54
       54
       +
           ./0001-wrapped-setuid-executables.patch

     

       65
       55
        
         ];

     

       66
       56
        
       

     

       67
       57
        
         postPatch = ''

-25

pkgs/desktops/enlightenment/enlightenment.suid-exes.patch

···

       1
       1
       -
       --- enlightenment-0.22.0.orig/meson/meson_inst.sh	2017-09-25 10:55:43.000000000 -0300

     

       2
       2
       -
       +++ enlightenment-0.22.0/meson/meson_inst.sh	2017-11-15 08:31:03.336844920 -0200

     

       3
       3
       -
       @@ -1,6 +1,19 @@

     

       4
       4
       -
       -#!/bin/sh

     

       5
       5
       -
       +#!/bin/sh -x

     

       6
       6
       -
       +

     

       7
       7
       -
       +w="$out"/e-wrappers.nix

     

       8
       8
       -
       +

     

       9
       9
       -
       +echo "# Wrappers for programs installed by enlightenment that should be setuid" > $w

     

       10
       10
       -
       +echo "" >> $w

     

       11
       11
       -
       +echo "{" >> $w

     

       12
       12
       -
       +echo "  security.wrappers = {" >> $w

     

       13
       13
       -
        

     

       14
       14
       -
        for x in "$@" ; do

     

       15
       15
       -
       -	chown root "$DESTDIR/$x"

     

       16
       16
       -
       -	chmod a=rx,u+xs "$DESTDIR/$x"

     

       17
       17
       -
       +	f="$DESTDIR$x";

     

       18
       18
       -
       +	b=$(basename "$f".orig)

     

       19
       19
       -
       +	mv -v "$f" "$f".orig

     

       20
       20
       -
       +	ln -sv /run/wrappers/bin/"$b" "$f"

     

       21
       21
       -
       +	echo "    \"$b\".source = \"$f.orig\";" >> $w

     

       22
       22
       -
        done

     

       23
       23
       -
       +

     

       24
       24
       -
       +echo "  };" >> $w

     

       25
       25
       -
       +echo "}" >> $w