Perlbot/perlbuut
1
0
Fork 0
mirror of https://github.com/perlbot/perlbuut synced 2025-06-07 16:55:42 -04:00
Code Issues Releases Wiki Activity

Add support for perl4. This required using sysread to get the eval type so we can prevent it from needing to write a temp file.

Browse source
This commit is contained in:
Ryan Voots 2017-04-04 14:42:32 -04:00
parent 72eb3c71ee
commit 5f7d37b8f0
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/eval.pl
View file

@ -56,6 +56,7 @@ $|++;
#*STDOUT = $stdh; #*STDOUT = $stdh;
my %version_map = ( my %version_map = (
'4' => '/perl5/perlbrew/perls/perl-4.036/bin/perl',
'5.5' => '/perl5/perlbrew/perls/perl-5.005_04/bin/perl', '5.5' => '/perl5/perlbrew/perls/perl-5.005_04/bin/perl',
'5.6' => '/perl5/perlbrew/perls/perl-5.6.2/bin/perl', '5.6' => '/perl5/perlbrew/perls/perl-5.6.2/bin/perl',
'5.8' => '/perl5/perlbrew/perls/perl-5.8.9/bin/perl', '5.8' => '/perl5/perlbrew/perls/perl-5.8.9/bin/perl',
@ -247,7 +248,30 @@ use Tie::Hash::NamedCapture;
use Carp::Heavy; use Carp::Heavy;
use Storable qw/nfreeze/; nfreeze([]); #Preload Nfreeze since it's loaded on demand use Storable qw/nfreeze/; nfreeze([]); #Preload Nfreeze since it's loaded on demand
my $code = do { local $/; <STDIN> }; my $type = do { local $/=" ";
# have to do this with sysread in order to keep it from destroying STDIN for exec later.
my $q;
my $c;
while (sysread STDIN, $c, 1) {
$q .= $c;
last if $c eq $/;
}
chomp $q; $q
};
my $code;
if ($type ne 'perl4') { # Perl 4 has special needs. It rides on the short bus.
$code = do {local $/; <STDIN>};
# redirect STDIN to /dev/null, to avoid warnings in convoluted cases.
# we have to leave this open for perl4, so only do this for other systems
open STDIN, '<', '/dev/null' or die "Can't open /dev/null: $!";
}
# print Dumper({type => $type, code => $code});
# Close every other filehandle we may have open # Close every other filehandle we may have open
# this is probably legacy code at this point since it was used # this is probably legacy code at this point since it was used
@ -275,8 +299,6 @@ use Storable qw/nfreeze/; nfreeze([]); #Preload Nfreeze since it's loaded on dem
# The chroot section # The chroot section
chdir($FindBin::Bin."/../jail") or die "Jail not made, see bin/makejail.sh"; chdir($FindBin::Bin."/../jail") or die "Jail not made, see bin/makejail.sh";
# redirect STDIN to /dev/null, to avoid warnings in convoluted cases.
open STDIN, '<', '/dev/null' or die "Can't open /dev/null: $!";
chroot(".") or die $!; chroot(".") or die $!;
@ -331,9 +353,6 @@ use Storable qw/nfreeze/; nfreeze([]); #Preload Nfreeze since it's loaded on dem
# Setup SECCOMP for us # Setup SECCOMP for us
get_seccomp(); get_seccomp();
$code =~ s/^\s*(\S+)\s*//
or die "Failed to parse code type! $code";
my $type = $1;
# Chomp code.. # Chomp code..
$code =~ s/\s*$//; $code =~ s/\s*$//;
@ -449,7 +468,12 @@ Biqsip biqsip 'ugh chan ghitlh lursa' nuh bey' ngun petaq qeng soj tlhej waqboch
} }
'; ';
exec($version_map{$version}, '-e', $wrapper);
unless ($version eq '4') {
exec($version_map{$version}, '-e', $wrapper);
} else {
exec($version_map{$version}, '-'); # the code for perl4 is actually still in STDIN, if we try to -e it needs to write files
}
} }
# sub javascript_code { # sub javascript_code {

2
plugins/eval.pm
View file

@ -11,7 +11,7 @@ use strict;
no warnings 'void'; no warnings 'void';
my @versions = ('', qw(5.5 5.6 5.8 5.10 5.12 5.14 5.16 5.18 5.20 5.22 5.24)); my @versions = ('', qw(4 5.5 5.6 5.8 5.10 5.12 5.14 5.16 5.18 5.20 5.22 5.24));
sub new { sub new {
my( $class ) = @_; my( $class ) = @_;