Run user programs as nobody:nogroup

diff --git a/ex/makevm b/ex/makevm
index c1d8c02303098291217a85692c3fb17a1eabd014..c054cf15700bdf184137a2ecf3ec9d8c4039c3e4 100755 (executable)
--- a/ex/makevm
+++ b/ex/makevm
@@ -25,7 +25,7 @@ squashfs
 9pnet_virtio
 EOF
 install gruntmaster-exec gruntmaster-compile vm/usr/bin/
 9pnet_virtio
 EOF
 install gruntmaster-exec gruntmaster-compile vm/usr/bin/

-sed -i -e "s/setgid 65534/setgid $GROUP/" -e "s/setuid 65534/setuid $USER/" vm/usr/bin/gruntmaster-exec
+sed -i -e "s/USER => 65534/USER => $USER/" -e "s/GROUP => 65534/GROUP => $GROUP/" vm/usr/bin/gruntmaster-exec

 chroot vm update-initramfs -d -k 3.2.0-4-amd64
 chroot vm update-initramfs -c -k 3.2.0-4-amd64
 umount vm/proc
 chroot vm update-initramfs -d -k 3.2.0-4-amd64
 chroot vm update-initramfs -c -k 3.2.0-4-amd64
 umount vm/proc

diff --git a/gruntmaster-exec b/gruntmaster-exec
index dec8be38835c02ed0913078584cce3c1aee16b03..e7d7363d4c44308c0622a32e4ecbb7565682c88c 100755 (executable)
--- a/gruntmaster-exec
+++ b/gruntmaster-exec
@@ -18,6 +18,9 @@ use constant +{
        DIED => 5,
        REJ => 10,
 };
        DIED => 5,
        REJ => 10,
 };

+# These constants are changed by ex/makevm
+use constant USER => 65534;
+use constant GROUP => 65534;

 
 use BSD::Resource qw/setrlimit RLIMIT_AS RLIMIT_FSIZE/;
 use IPC::Signal qw/sig_name sig_num/;
 
 use BSD::Resource qw/setrlimit RLIMIT_AS RLIMIT_FSIZE/;
 use IPC::Signal qw/sig_name sig_num/;


@@ -27,7 +30,7 @@ use Getopt::Long;
 use POSIX qw//;
 use Time::HiRes qw/alarm/;
 
 use POSIX qw//;
 use Time::HiRes qw/alarm/;
 

-my (@fds, $timeout, $mlimit, $olimit);
+my (@fds, $timeout, $mlimit, $olimit, $nobody);

 my $close = 1;
 
 GetOptions(
 my $close = 1;
 
 GetOptions(


@@ -36,6 +39,7 @@ GetOptions(
        "mlimit=i"  => \$mlimit,
        "olimit=i"  => \$olimit,
        "close!"    => \$close,
        "mlimit=i"  => \$mlimit,
        "olimit=i"  => \$olimit,
        "close!"    => \$close,

+       "nobody!"   => \$nobody,

 );
 
 my $ret = fork // die 'Cannot fork';
 );
 
 my $ret = fork // die 'Cannot fork';


@@ -69,8 +73,8 @@ if ($ret) {
        %ENV = (ONLINE_JUDGE => 1, PATH => $ENV{PATH}, HOME => $ENV{HOME});
        setrlimit RLIMIT_AS, $mlimit, $mlimit or die $! if $mlimit;
        setrlimit RLIMIT_FSIZE, $olimit, $olimit or die $! if $olimit;
        %ENV = (ONLINE_JUDGE => 1, PATH => $ENV{PATH}, HOME => $ENV{HOME});
        setrlimit RLIMIT_AS, $mlimit, $mlimit or die $! if $mlimit;
        setrlimit RLIMIT_FSIZE, $olimit, $olimit or die $! if $olimit;

-       POSIX::setgid 65534; # Set group id to nogroup
-       POSIX::setuid 65534; # Set user id to nobody
+       POSIX::setgid $nobody ? 65534 : USER;
+       POSIX::setuid $nobody ? 65534 : GROUP;

        exec @ARGV;
 }
 
        exec @ARGV;
 }
 

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 28aa5339bf6cb1319623a9516b2041404659fa94..529931fbf8d88827ca8dc25abd0a746583ec29e9 100644 (file)
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -85,7 +85,7 @@ sub mkrun{
                my ($name, %args) = @_;
                get_logger->trace("Running $name...");
                my $basename = fileparse $name, qr/[.][^.]*/s;
                my ($name, %args) = @_;
                get_logger->trace("Running $name...");
                my $basename = fileparse $name, qr/[.][^.]*/s;

-               my @args;
+               my @args = ('--nobody');

                push @args, '--timeout', $args{timeout} if $args{timeout};
                push @args, '--mlimit',  $args{mlimit}  if $args{mlimit};
                push @args, '--olimit',  $args{olimit}  if $args{olimit};
                push @args, '--timeout', $args{timeout} if $args{timeout};
                push @args, '--mlimit',  $args{mlimit}  if $args{mlimit};
                push @args, '--olimit',  $args{olimit}  if $args{olimit};