GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-02-16 21:40:46 +01:00
Code Issues Projects Releases Wiki Activity

Harden compiler vm server a bit

Browse Source 
Instead of adding compiler user to dialout/serial/ttyS0 group, we now
run compiler_vm_server.pl as root to access ttyS0 and then drop privileges
to the compiler user to compile snippets that do not have access to ttyS0.
This commit is contained in:
Pragmatic Software 2017-09-09 18:21:20 -07:00
parent 2361436d34
commit 76b9aa49bd
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/compiler_vm/compiler_vm_server.pl
View File

@ -8,13 +8,15 @@ use warnings;
use strict; use strict;
use File::Basename; use File::Basename;
use POSIX;
my $USERNAME = 'compiler';
my $USE_LOCAL = defined $ENV{'CC_LOCAL'}; my $USE_LOCAL = defined $ENV{'CC_LOCAL'};
# uncomment the following if installed to the virtual machine # uncomment the following if installed to the virtual machine
# use constant MOD_DIR => '/usr/local/share/compiler_vm/languages'; # use constant MOD_DIR => '/usr/local/share/compiler_vm/languages';
use constant MOD_DIR => 'languages/server'; use constant MOD_DIR => '/usr/local/share/compiler_vm/languages';
use lib MOD_DIR; use lib MOD_DIR;
@ -67,11 +69,33 @@ sub run_server {
print "Attempting compile [$lang] ...\n"; print "Attempting compile [$lang] ...\n";
my $result = interpret($lang, $sourcefile, $execfile, $code, $cmdline, $user_input, $date); my $pid = fork;
print "Done compiling; result: [$result]\n"; if (not defined $pid) {
print $output "result:$result\n"; print "fork failed: $!\n";
print $output "result:end\n"; next;
}
if ($pid == 0) {
my ($uid, $gid) = (getpwnam $USERNAME)[2, 3];
if (not $uid and not $gid) {
print "Could not find user $USERNAME: $!\n";
exit;
}
POSIX::setgid($gid);
POSIX::setuid($uid);
my $result = interpret($lang, $sourcefile, $execfile, $code, $cmdline, $user_input, $date);
print "Done compiling; result: [$result]\n";
print $output "result:$result\n";
print $output "result:end\n";
exit;
} else {
waitpid $pid, 0;
}
if(not defined $USE_LOCAL or $USE_LOCAL == 0) { if(not defined $USE_LOCAL or $USE_LOCAL == 0) {
print "input: "; print "input: ";
@ -125,6 +149,7 @@ sub interpret {
$lang = '_default' if not exists $languages{$lang}; $lang = '_default' if not exists $languages{$lang};
system("chmod -R 755 /home/compiler"); system("chmod -R 755 /home/compiler");
system("rm -rf /home/compiler/prog*");
my $mod = $lang->new(sourcefile => $sourcefile, execfile => $execfile, code => $code, my $mod = $lang->new(sourcefile => $sourcefile, execfile => $execfile, code => $code,
cmdline => $cmdline, input => $input, date => $date); cmdline => $cmdline, input => $input, date => $date);