commit dad760061eebae26c33415a1b38704ff1b1a88d2 · pyrox.dev/nixpkgs

nixos/modules/module-list.nix

···

       504
        
         ./services/networking/wpa_supplicant.nix

     

       505
        
         ./services/networking/xinetd.nix

     

       506
        
         ./services/networking/xl2tpd.nix

     

       0
        
       
     

       507
        
         ./services/networking/zerobin.nix

     

       508
        
         ./services/networking/zerotierone.nix

     

       509
        
         ./services/networking/znc.nix

···

       504
        
         ./services/networking/wpa_supplicant.nix

     

       505
        
         ./services/networking/xinetd.nix

     

       506
        
         ./services/networking/xl2tpd.nix

     

       507
       +
         ./services/networking/xrdp.nix

     

       508
        
         ./services/networking/zerobin.nix

     

       509
        
         ./services/networking/zerotierone.nix

     

       510
        
         ./services/networking/znc.nix

+150

nixos/modules/services/networking/xrdp.nix

···

       1
       +
       { config, lib, pkgs, ... }:

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       

     

       5
       +
       let

     

       6
       +
         cfg = config.services.xrdp;

     

       7
       +
         confDir = pkgs.runCommand "xrdp.conf" { } ''

     

       8
       +
           mkdir $out

     

       9
       +
       

     

       10
       +
           cp ${cfg.package}/etc/xrdp/{km-*,xrdp,sesman,xrdp_keyboard}.ini $out

     

       11
       +
       

     

       12
       +
           ${cfg.package}/bin/xrdp-keygen xrdp $out/rsakeys.ini

     

       13
       +
       

     

       14
       +
           cat > $out/startwm.sh <<EOF

     

       15
       +
           #!/bin/sh

     

       16
       +
           . /etc/profile

     

       17
       +
           ${cfg.defaultWindowManager}

     

       18
       +
           EOF

     

       19
       +
           chmod +x $out/startwm.sh

     

       20
       +
           

     

       21
       +
           substituteInPlace $out/xrdp.ini \

     

       22
       +
             --replace "certificate=" "certificate=${cfg.sslCert}" \

     

       23
       +
             --replace "key_file=" "key_file=${cfg.sslKey}" \

     

       24
       +
             --replace LogFile=xrdp.log LogFile=/dev/null \

     

       25
       +
             --replace EnableSyslog=true EnableSyslog=false

     

       26
       +
       

     

       27
       +
           substituteInPlace $out/sesman.ini \

     

       28
       +
             --replace LogFile=xrdp-sesman.log LogFile=/dev/null \

     

       29
       +
             --replace EnableSyslog=1 EnableSyslog=0

     

       30
       +
         '';

     

       31
       +
       in

     

       32
       +
       {

     

       33
       +
       

     

       34
       +
         ###### interface

     

       35
       +
       

     

       36
       +
         options = {

     

       37
       +
       

     

       38
       +
           services.xrdp = {

     

       39
       +
       

     

       40
       +
             enable = mkEnableOption "Whether xrdp should be run on startup.";

     

       41
       +
       

     

       42
       +
             package = mkOption {

     

       43
       +
               type = types.package;

     

       44
       +
               default = pkgs.xrdp;

     

       45
       +
               defaultText = "pkgs.xrdp";

     

       46
       +
               description = ''

     

       47
       +
                 The package to use for the xrdp daemon's binary.

     

       48
       +
               '';

     

       49
       +
             };

     

       50
       +
       

     

       51
       +
             port = mkOption {

     

       52
       +
               type = types.int;

     

       53
       +
               default = 3389;

     

       54
       +
               description = ''

     

       55
       +
                 Specifies on which port the xrdp daemon listens.

     

       56
       +
               '';

     

       57
       +
             };

     

       58
       +
       

     

       59
       +
             sslKey = mkOption {

     

       60
       +
               type = types.str;

     

       61
       +
               default = "/etc/xrdp/key.pem";

     

       62
       +
               example = "/path/to/your/key.pem";

     

       63
       +
               description = ''

     

       64
       +
                 ssl private key path

     

       65
       +
                 A self-signed certificate will be generated if file not exists.

     

       66
       +
               '';

     

       67
       +
             };

     

       68
       +
       

     

       69
       +
             sslCert = mkOption {

     

       70
       +
               type = types.str;

     

       71
       +
               default = "/etc/xrdp/cert.pem";

     

       72
       +
               example = "/path/to/your/cert.pem";

     

       73
       +
               description = ''

     

       74
       +
                 ssl certificate path

     

       75
       +
                 A self-signed certificate will be generated if file not exists.

     

       76
       +
               '';

     

       77
       +
             };

     

       78
       +
       

     

       79
       +
             defaultWindowManager = mkOption {

     

       80
       +
               type = types.str;

     

       81
       +
               default = "xterm";

     

       82
       +
               example = "xfce4-session";

     

       83
       +
               description = ''

     

       84
       +
                 The script to run when user log in, usually a window manager, e.g. "icewm", "xfce4-session"

     

       85
       +
                 This is per-user overridable, if file ~/startwm.sh exists it will be used instead.

     

       86
       +
               '';

     

       87
       +
             };

     

       88
       +
       

     

       89
       +
           };

     

       90
       +
         };

     

       91
       +
       

     

       92
       +
       

     

       93
       +
         ###### implementation

     

       94
       +
       

     

       95
       +
         config = mkIf cfg.enable {

     

       96
       +
       

     

       97
       +
           systemd = {

     

       98
       +
             services.xrdp = {

     

       99
       +
               wantedBy = [ "multi-user.target" ];

     

       100
       +
               after = [ "network.target" ];

     

       101
       +
               description = "xrdp daemon";

     

       102
       +
               requires = [ "xrdp-sesman.service" ];

     

       103
       +
               preStart = ''

     

       104
       +
                 # prepare directory for unix sockets (the sockets will be owned by loggedinuser:xrdp)

     

       105
       +
                 mkdir -p /tmp/.xrdp || true

     

       106
       +
                 chown xrdp:xrdp /tmp/.xrdp

     

       107
       +
                 chmod 3777 /tmp/.xrdp

     

       108
       +
       

     

       109
       +
                 # generate a self-signed certificate

     

       110
       +
                 if [ ! -s ${cfg.sslCert} -o ! -s ${cfg.sslKey} ]; then

     

       111
       +
                   mkdir -p $(dirname ${cfg.sslCert}) || true

     

       112
       +
                   mkdir -p $(dirname ${cfg.sslKey}) || true

     

       113
       +
                   ${pkgs.openssl.bin}/bin/openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 365 \

     

       114
       +
                     -subj /C=US/ST=CA/L=Sunnyvale/O=xrdp/CN=www.xrdp.org \

     

       115
       +
                     -config ${cfg.package}/share/xrdp/openssl.conf \

     

       116
       +
                     -keyout ${cfg.sslKey} -out ${cfg.sslCert}

     

       117
       +
                   chown root:xrdp ${cfg.sslKey} ${cfg.sslCert}

     

       118
       +
                   chmod 440 ${cfg.sslKey} ${cfg.sslCert}

     

       119
       +
                 fi

     

       120
       +
               '';

     

       121
       +
               serviceConfig = {

     

       122
       +
                 User = "xrdp";

     

       123
       +
                 Group = "xrdp";

     

       124
       +
                 PermissionsStartOnly = true;

     

       125
       +
                 ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini";

     

       126
       +
               };

     

       127
       +
             };

     

       128
       +
       

     

       129
       +
             services.xrdp-sesman = {

     

       130
       +
               wantedBy = [ "multi-user.target" ];

     

       131
       +
               after = [ "network.target" ];

     

       132
       +
               description = "xrdp session manager";

     

       133
       +
               serviceConfig = {

     

       134
       +
                 ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini";

     

       135
       +
               };

     

       136
       +
             };

     

       137
       +
       

     

       138
       +
           };

     

       139
       +
       

     

       140
       +
           users.users.xrdp = {

     

       141
       +
             description   = "xrdp daemon user";

     

       142
       +
             isSystemUser  = true;

     

       143
       +
             group         = "xrdp";

     

       144
       +
           };

     

       145
       +
           users.groups.xrdp = {};

     

       146
       +
       

     

       147
       +
           security.pam.services.xrdp-sesman = { allowNullPassword = true; startSession = true; };

     

       148
       +
         };

     

       149
       +
       

     

       150
       +
       }

+45

nixos/tests/xrdp.nix

···

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

     

       2
       +
         name = "xrdp";

     

       3
       +
         meta = with pkgs.stdenv.lib.maintainers; {

     

       4
       +
           maintainers = [ volth ];

     

       5
       +
         };

     

       6
       +
       

     

       7
       +
         nodes = {

     

       8
       +
           server = { lib, pkgs, ... }: {

     

       9
       +
             imports = [ ./common/user-account.nix ];

     

       10
       +
             services.xrdp.enable = true;

     

       11
       +
             services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm";

     

       12
       +
             networking.firewall.allowedTCPPorts = [ 3389 ];

     

       13
       +
           };

     

       14
       +
       

     

       15
       +
           client = { lib, pkgs, ... }: {

     

       16
       +
             imports = [ ./common/x11.nix ./common/user-account.nix ];

     

       17
       +
             services.xserver.displayManager.auto.user = "alice";

     

       18
       +
             environment.systemPackages = [ pkgs.freerdp ];

     

       19
       +
             services.xrdp.enable = true;

     

       20
       +
             services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm";

     

       21
       +
           };

     

       22
       +
         };

     

       23
       +
       

     

       24
       +
         testScript = { nodes, ... }: ''

     

       25
       +
           startAll;

     

       26
       +
       

     

       27
       +
           $client->waitForX;

     

       28
       +
           $client->waitForFile("/home/alice/.Xauthority");

     

       29
       +
           $client->succeed("xauth merge ~alice/.Xauthority");

     

       30
       +
       

     

       31
       +
           $client->sleep(5);

     

       32
       +
       

     

       33
       +
           $client->execute("xterm &");

     

       34
       +
           $client->sleep(1);

     

       35
       +
           $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:alice /p:foobar\n");

     

       36
       +
           $client->sleep(5);

     

       37
       +
           $client->screenshot("localrdp");

     

       38
       +
       

     

       39
       +
           $client->execute("xterm &");

     

       40
       +
           $client->sleep(1);

     

       41
       +
           $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:alice /p:foobar\n");

     

       42
       +
           $client->sleep(5);

     

       43
       +
           $client->screenshot("remoterdp");

     

       44
       +
         '';

     

       45
       +
       })

+111

pkgs/applications/networking/remote/xrdp/default.nix

···

       1
       +
       { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:

     

       2
       +
       

     

       3
       +
       let

     

       4
       +
         xorgxrdp = stdenv.mkDerivation rec {

     

       5
       +
           name = "xorgxrdp-${version}";

     

       6
       +
           version = "0.2.0";

     

       7
       +
         

     

       8
       +
           src = fetchFromGitHub {

     

       9
       +
             owner = "neutrinolabs";

     

       10
       +
             repo = "xorgxrdp";

     

       11
       +
             rev = "v${version}";

     

       12
       +
             sha256 = "125mv7lm2ns1gdgz6zf647d3pay8if8506rclb3312wwa5qfd2hn";

     

       13
       +
           };

     

       14
       +
       

     

       15
       +
           nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];

     

       16
       +
       

     

       17
       +
           buildInputs = [ xorg.xorgserver ];

     

       18
       +
       

     

       19
       +
           postPatch = ''

     

       20
       +
             # patch from Debian, allows to run xrdp daemon under unprivileged user

     

       21
       +
             substituteInPlace module/rdpClientCon.c \

     

       22
       +
               --replace 'g_sck_listen(dev->listen_sck);' 'g_sck_listen(dev->listen_sck); g_chmod_hex(dev->uds_data, 0x0660);'

     

       23
       +
       

     

       24
       +
             substituteInPlace configure.ac \

     

       25
       +
               --replace 'moduledir=`pkg-config xorg-server --variable=moduledir`' "moduledir=$out/lib/xorg/modules" \

     

       26
       +
               --replace 'sysconfdir="/etc"' "sysconfdir=$out/etc"

     

       27
       +
           '';

     

       28
       +
       

     

       29
       +
           preConfigure = "./bootstrap";

     

       30
       +
       

     

       31
       +
           configureFlags = [ "XRDP_CFLAGS=-I${xrdp.src}/common"  ];

     

       32
       +
       

     

       33
       +
           enableParallelBuilding = true;

     

       34
       +
         };

     

       35
       +
       

     

       36
       +
         xrdp = stdenv.mkDerivation rec {

     

       37
       +
           version = "0.9.1";

     

       38
       +
           rev = "0920933"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be fixed already

     

       39
       +
           name = "xrdp-${version}.${rev}";

     

       40
       +
         

     

       41
       +
           src = fetchFromGitHub {

     

       42
       +
             owner = "volth";

     

       43
       +
             repo = "xrdp";

     

       44
       +
             rev = rev;

     

       45
       +
             fetchSubmodules = true;

     

       46
       +
             sha256 = "0a000h82728vp0abvjk2m03nqqiw2lky7kqk41b70cyd3bp0vdnz";

     

       47
       +
           };

     

       48
       +
       

     

       49
       +
           nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];

     

       50
       +
       

     

       51
       +
           buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ];

     

       52
       +
       

     

       53
       +
           postPatch = ''

     

       54
       +
             substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q"

     

       55
       +
             substituteInPlace common/file_loc.h --replace /etc/xrdp $out/etc/xrdp --replace /usr/local $out

     

       56
       +
             substituteInPlace instfiles/xrdp.sh --replace /etc/xrdp $out/etc/xrdp --replace /usr/local $out

     

       57
       +
           '';

     

       58
       +
       

     

       59
       +
           preConfigure = ''

     

       60
       +
             (cd librfxcodec && ./bootstrap && ./configure --prefix=$out --enable-static --disable-shared)

     

       61
       +
             ./bootstrap

     

       62
       +
           '';

     

       63
       +
           dontDisableStatic = true;

     

       64
       +
           configureFlags = [ "--with-systemdsystemunitdir=./do-not-install" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ];

     

       65
       +
       

     

       66
       +
           installFlags = [ "DESTDIR=$(out)" "prefix=" ];

     

       67
       +
       

     

       68
       +
           postInstall = ''

     

       69
       +
             # remove generated keys as non-determenistic

     

       70
       +
             rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem}

     

       71
       +
       

     

       72
       +
             cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf

     

       73
       +
       

     

       74
       +
             substituteInPlace $out/etc/xrdp/sesman.ini --replace /etc/xrdp/pulse $out/etc/xrdp/pulse

     

       75
       +
       

     

       76
       +
             # remove all session types except Xorg (they are not supported by this setup)

     

       77
       +
             ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini

     

       78
       +
          

     

       79
       +
             # remove all session types and then add Xorg

     

       80
       +
             ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini

     

       81
       +
          

     

       82
       +
             cat >> $out/etc/xrdp/sesman.ini <<EOF

     

       83
       +
          

     

       84
       +
             [Xorg]

     

       85
       +
             param=${xorg.xorgserver}/bin/Xorg

     

       86
       +
             param=-modulepath

     

       87
       +
             param=${xorgxrdp}/lib/xorg/modules,${xorg.xorgserver}/lib/xorg/modules

     

       88
       +
             ; the following two lines are needless after https://github.com/NixOS/nixpkgs/pull/21653

     

       89
       +
             param=-xkbdir

     

       90
       +
             param=${xorg.xkeyboardconfig}/share/X11/xkb

     

       91
       +
             param=-config

     

       92
       +
             param=${xorgxrdp}/etc/X11/xrdp/xorg.conf

     

       93
       +
             param=-noreset

     

       94
       +
             param=-nolisten

     

       95
       +
             param=tcp

     

       96
       +
             param=-logfile

     

       97
       +
             param=.xorgxrdp.%s.log

     

       98
       +
             EOF

     

       99
       +
           '';

     

       100
       +
       

     

       101
       +
           enableParallelBuilding = true;

     

       102
       +
       

     

       103
       +
           meta = with stdenv.lib; {

     

       104
       +
             description = "An open source RDP server";

     

       105
       +
             homepage = https://github.com/neutrinolabs/xrdp;

     

       106
       +
             license = licenses.asl20;

     

       107
       +
             maintainers = [ maintainers.volth ];

     

       108
       +
             platforms = platforms.linux;

     

       109
       +
           };

     

       110
       +
         };

     

       111
       +
       in xrdp

pkgs/top-level/all-packages.nix

···

       13854
        
         xfontsel = callPackage ../applications/misc/xfontsel { };

     

       13855
        
         inherit (xorg) xlsfonts;

     

       13856
        
       

     

       0
        
       
     

       0
        
       
     

       13857
        
         freerdp = callPackage ../applications/networking/remote/freerdp {

     

       13858
        
           inherit libpulseaudio;

     

       13859
        
           inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;

···

       13854
        
         xfontsel = callPackage ../applications/misc/xfontsel { };

     

       13855
        
         inherit (xorg) xlsfonts;

     

       13856
        
       

     

       13857
       +
         xrdp = callPackage ../applications/networking/remote/xrdp { };

     

       13858
       +
       

     

       13859
        
         freerdp = callPackage ../applications/networking/remote/freerdp {

     

       13860
        
           inherit libpulseaudio;

     

       13861
        
           inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;