user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 5/6] wwwstatic: avoid TOCTTOU for FIFO check
Date: Wed,  1 Jan 2020 10:38:58 +0000	[thread overview]
Message-ID: <20200101103859.15401-6-e@80x24.org> (raw)
In-Reply-To: <20200101103859.15401-1-e@80x24.org>

We can use Perl's sysopen function to pass O_NONBLOCK to open(2)
and avoid blocking on FIFOs.  This avoids a TOCTTOU race where
somebody can change a regular to FIFO in between the stat(2) and
open(2) syscalls.
---
 lib/PublicInbox/WwwStatic.pm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/PublicInbox/WwwStatic.pm b/lib/PublicInbox/WwwStatic.pm
index 093a7920..ce4bfe9b 100644
--- a/lib/PublicInbox/WwwStatic.pm
+++ b/lib/PublicInbox/WwwStatic.pm
@@ -4,9 +4,10 @@
 package PublicInbox::WwwStatic;
 use strict;
 use parent qw(Exporter);
-use Fcntl qw(:seek);
+use Fcntl qw(SEEK_SET O_RDONLY O_NONBLOCK);
 use HTTP::Date qw(time2str);
 use HTTP::Status qw(status_message);
+use Errno qw(EACCES ENOTDIR ENOENT);
 our @EXPORT_OK = qw(@NO_CACHE r);
 
 our @NO_CACHE = ('Expires', 'Fri, 01 Jan 1980 00:00:00 GMT',
@@ -70,15 +71,19 @@ sub prepare_range {
 
 sub response {
 	my ($env, $h, $path, $type) = @_;
-	return r(404) unless -f $path && -r _; # just in case it's a FIFO :P
 
-	my ($size, $in);
+	my $in;
 	if ($env->{REQUEST_METHOD} eq 'HEAD') {
-		$size = -s _;
+		return r(404) unless -f $path && -r _; # in case it's a FIFO :P
 	} else { # GET, callers should've already filtered out other methods
-		open $in, '<', $path or return r(403);
-		$size = -s $in;
+		if (!sysopen($in, $path, O_RDONLY|O_NONBLOCK)) {
+			return r(404) if $! == ENOENT || $! == ENOTDIR;
+			return r(403) if $! == EACCES;
+			return r(500);
+		}
+		return r(404) unless -f $in;
 	}
+	my $size = -s _; # bare "_" reuses "struct stat" from "-f" above
 	my $mtime = time2str((stat(_))[9]);
 
 	if (my $ims = $env->{HTTP_IF_MODIFIED_SINCE}) {

  parent reply	other threads:[~2020-01-01 10:39 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-01 10:38 [PATCH 0/6] wwwstatic: support directory listings Eric Wong
2020-01-01 10:38 ` [PATCH 1/6] wwwstatic: implement Last-Modified and If-Modified-Since Eric Wong
2020-01-01 19:07   ` Eric Wong
2020-01-01 10:38 ` [PATCH 2/6] www: move more logic into path_info_raw Eric Wong
2020-01-01 10:38 ` [PATCH 3/6] wwwstatic: move r(...) functions here Eric Wong
2020-01-01 10:38 ` [PATCH 4/6] wwwstatic: do not open() files for HEAD requests Eric Wong
2020-01-01 10:38 ` Eric Wong [this message]
2020-01-01 10:38 ` [PATCH 6/6] wwwstatic: add directory listing + index.html support Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200101103859.15401-6-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).