rewrite SCRIPT_FILENAME to full-path

h2o · Dec 8, 2015 · 150bda5 · 150bda5
1 parent 73e32d6
commit 150bda5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/misc/fastcgi-cgi.pl b/misc/fastcgi-cgi.pl
@@ -8,7 +8,7 @@
 use Net::FastCGI::Constant qw(:common :type :flag :role :protocol_status);
 use Net::FastCGI::IO qw(:all);
 use Net::FastCGI::Protocol qw(:all);
-use POSIX qw(:sys_wait_h);
+use POSIX qw(:sys_wait_h getcwd);
 use Socket qw(SOMAXCONN SOCK_STREAM);
 
 my $master_pid = $$;
@@ -24,6 +24,7 @@
     exit 0;
 };
 
+my $base_dir = getcwd;
 chdir "/"
     or die "failed to chdir to /:$!";
 
@@ -89,6 +90,8 @@ sub handle_connection {
     my $env = parse_params($params);
     die "SCRIPT_FILENAME not defined"
         unless $env->{SCRIPT_FILENAME};
+    $env->{SCRIPT_FILENAME} = "$base_dir/$env->{SCRIPT_FILENAME}"
+        if $env->{SCRIPT_FILENAME} !~ m{^/};
 
     # accumulate FCGI_STDIN
     while (1) {

diff --git a/share/h2o/fastcgi-cgi b/share/h2o/fastcgi-cgi
@@ -69,7 +69,7 @@ use Net::FastCGI;
 use Net::FastCGI::Constant qw(:common :type :flag :role :protocol_status);
 use Net::FastCGI::IO qw(:all);
 use Net::FastCGI::Protocol qw(:all);
-use POSIX qw(:sys_wait_h);
+use POSIX qw(:sys_wait_h getcwd);
 use Socket qw(SOMAXCONN SOCK_STREAM);
 
 my $master_pid = $$;
@@ -85,6 +85,7 @@ $SIG{TERM} = sub {
     exit 0;
 };
 
+my $base_dir = getcwd;
 chdir "/"
     or die "failed to chdir to /:$!";
 
@@ -150,6 +151,8 @@ sub handle_connection {
     my $env = parse_params($params);
     die "SCRIPT_FILENAME not defined"
         unless $env->{SCRIPT_FILENAME};
+    $env->{SCRIPT_FILENAME} = "$base_dir/$env->{SCRIPT_FILENAME}"
+        if $env->{SCRIPT_FILENAME} !~ m{^/};
 
     # accumulate FCGI_STDIN
     while (1) {