daemon: introduce host_with_port for identifying sockets

[public-inbox.git] / lib / PublicInbox / HTTP.pm

diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 14971f4377baa57e231f2b6e8aa2de12489c8302..6c4c20d7cf801663af01beb71d3676bc941c6479 100644 (file)
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -11,7 +11,7 @@ package PublicInbox::HTTP;
 use strict;
 use warnings;
 use base qw(Danga::Socket);
-use fields qw(httpd env rbuf input_left);
+use fields qw(httpd env rbuf input_left remote_addr remote_port);
 use Fcntl qw(:seek);
 use HTTP::Parser::XS qw(parse_http_request); # supports pure Perl fallback
 use HTTP::Status qw(status_message);
@@ -38,6 +38,8 @@ sub new ($$$) {
        $self->SUPER::new($sock);
        $self->{httpd} = $httpd;
        $self->{rbuf} = '';
+       ($self->{remote_addr}, $self->{remote_port}) =
+               PublicInbox::Daemon::host_with_port($addr);
        $self->watch_read(1);
        $self;
 }
@@ -68,10 +70,13 @@ sub rbuf_process {
 
        # We do not support Trailers in chunked requests, for now
        # (they are rarely-used and git (as of 2.7.2) does not use them)
-       return $self->quit(400) if $r == -1 || $env{HTTP_TRAILER};
+       return quit($self, 400) if $r == -1 || $env{HTTP_TRAILER};
        return $self->watch_read(1) if $r < 0; # incomplete
        $self->{rbuf} = substr($self->{rbuf}, $r);
+
        my $len = input_prepare($self, \%env);
+       defined $len or return write_err($self); # EMFILE/ENFILE
+
        $len ? event_read_input($self) : app_dispatch($self);
 }
 
@@ -90,7 +95,7 @@ sub event_read_input ($) {
        while ($len > 0) {
                if ($$rbuf ne '') {
                        my $w = write_in_full($input, $rbuf, $len);
-                       return $self->write_err unless $w;
+                       return write_err($self) unless $w;
                        $len -= $w;
                        die "BUG: $len < 0 (w=$w)" if $len < 0;
                        if ($len == 0) { # next request may be pipelined
@@ -100,7 +105,7 @@ sub event_read_input ($) {
                        $$rbuf = '';
                }
                my $r = sysread($sock, $$rbuf, 8192);
-               return $self->recv_err($r, $len) unless $r;
+               return recv_err($self, $r, $len) unless $r;
                # continue looping if $r > 0;
        }
        app_dispatch($self);
@@ -110,13 +115,16 @@ sub app_dispatch ($) {
        my ($self) = @_;
        $self->watch_read(0);
        my $env = $self->{env};
-       $env->{REMOTE_ADDR} = $self->peer_ip_string; # Danga::Socket
-       $env->{REMOTE_PORT} = $self->{peer_port}; # set by peer_ip_string
+       $env->{REMOTE_ADDR} = $self->{remote_addr};
+       $env->{REMOTE_PORT} = $self->{remote_port};
        if (my $host = $env->{HTTP_HOST}) {
                $host =~ s/:(\d+)\z// and $env->{SERVER_PORT} = $1;
                $env->{SERVER_NAME} = $host;
        }
-       sysseek($env->{'psgi.input'}, 0, SEEK_SET) or die "input seek failed: $!";
+
+       sysseek($env->{'psgi.input'}, 0, SEEK_SET) or
+                       die "BUG: psgi.input seek failed: $!";
+
        my $res = Plack::Util::run_app($self->{httpd}->{app}, $env);
        eval {
                if (ref($res) eq 'CODE') {
@@ -222,13 +230,17 @@ sub input_prepare {
        if ($len) {
                $input = IO::File->new_tmpfile;
        } elsif (env_chunked($env)) {
-               $input = IO::File->new_tmpfile;
                $len = CHUNK_START;
+               $input = IO::File->new_tmpfile;
        }
+
+       # TODO: expire idle clients on ENFILE / EMFILE
+       return unless $input;
+
        binmode $input;
        $env->{'psgi.input'} = $input;
        $self->{env} = $env;
-       $self->{input_left} = $len;
+       $self->{input_left} = $len || 0;
 }
 
 sub env_chunked { ($_[0]->{HTTP_TRANSFER_ENCODING} || '') =~ /\bchunked\b/i }
@@ -238,7 +250,7 @@ sub write_err {
        my $err = $self->{env}->{'psgi.errors'};
        my $msg = $! || '(zero write)';
        $err->print("error buffering to input: $msg\n");
-       $self->quit(500);
+       quit($self, 500);
 }
 
 sub recv_err {
@@ -250,7 +262,7 @@ sub recv_err {
        }
        my $err = $self->{env}->{'psgi.errors'};
        $err->print("error reading for input: $! ($len bytes remaining)\n");
-       $self->quit(500);
+       quit($self, 500);
 }
 
 sub write_in_full {
@@ -278,20 +290,20 @@ sub event_read_input_chunked { # unlikely...
        while (1) { # chunk start
                if ($len == CHUNK_ZEND) {
                        return app_dispatch($self) if $$rbuf =~ s/\A\r\n//s;
-                       return $self->quit(400) if length($$rbuf) > 2;
+                       return quit($self, 400) if length($$rbuf) > 2;
                }
                if ($len == CHUNK_END) {
                        if ($$rbuf =~ s/\A\r\n//s) {
                                $len = CHUNK_START;
                        } elsif (length($$rbuf) > 2) {
-                               return $self->quit(400);
+                               return quit($self, 400);
                        }
                }
                if ($len == CHUNK_START) {
                        if ($$rbuf =~ s/\A([a-f0-9]+).*?\r\n//i) {
                                $len = hex $1;
                        } elsif (length($$rbuf) > CHUNK_MAX_HDR) {
-                               return $self->quit(400);
+                               return quit($self, 400);
                        }
                        # will break from loop since $len >= 0
                }
@@ -299,7 +311,7 @@ sub event_read_input_chunked { # unlikely...
                if ($len < 0) { # chunk header is trickled, read more
                        my $off = length($$rbuf);
                        my $r = sysread($sock, $$rbuf, 8192, $off);
-                       return $self->recv_err($r, $len) unless $r;
+                       return recv_err($self, $r, $len) unless $r;
                        # (implicit) goto chunk_start if $r > 0;
                }
                $len = CHUNK_ZEND if $len == 0;
@@ -308,7 +320,7 @@ sub event_read_input_chunked { # unlikely...
                until ($len <= 0) {
                        if ($$rbuf ne '') {
                                my $w = write_in_full($input, $rbuf, $len);
-                               return $self->write_err unless $w;
+                               return write_err($self) unless $w;
                                $len -= $w;
                                if ($len == 0) {
                                        # we may have leftover data to parse
@@ -324,7 +336,7 @@ sub event_read_input_chunked { # unlikely...
                        if ($$rbuf eq '') {
                                # read more of current chunk
                                my $r = sysread($sock, $$rbuf, 8192);
-                               return $self->recv_err($r, $len) unless $r;
+                               return recv_err($self, $r, $len) unless $r;
                        }
                }
        }