--- AnyEvent/lib/AnyEvent/Handle.pm 2008/07/18 01:29:58 1.74 +++ AnyEvent/lib/AnyEvent/Handle.pm 2009/09/08 00:01:12 1.187 @@ -1,23 +1,7 @@ -package AnyEvent::Handle; - -no warnings; -use strict; - -use AnyEvent (); -use AnyEvent::Util qw(WSAEWOULDBLOCK); -use Scalar::Util (); -use Carp (); -use Fcntl (); -use Errno qw(EAGAIN EINTR); - =head1 NAME AnyEvent::Handle - non-blocking I/O on file handles via AnyEvent -=cut - -our $VERSION = 4.22; - =head1 SYNOPSIS use AnyEvent; @@ -25,21 +9,22 @@ my $cv = AnyEvent->condvar; - my $handle = - AnyEvent::Handle->new ( - fh => \*STDIN, - on_eof => sub { - $cv->broadcast; - }, + my $hdl; $hdl = new AnyEvent::Handle + fh => \*STDIN, + on_error => sub { + my ($hdl, $fatal, $msg) = @_; + warn "got error $msg\n"; + $hdl->destroy; + $cv->send; ); # send some request line - $handle->push_write ("getinfo\015\012"); + $hdl->push_write ("getinfo\015\012"); # read the response line - $handle->push_read (line => sub { - my ($handle, $line) = @_; - warn "read line <$line>\n"; + $hdl->push_read (line => sub { + my ($hdl, $line) = @_; + warn "got line <$line>\n"; $cv->send; }); @@ -48,57 +33,150 @@ =head1 DESCRIPTION This module is a helper module to make it easier to do event-based I/O on -filehandles. For utility functions for doing non-blocking connects and accepts -on sockets see L. +filehandles. + +The L tutorial contains some well-documented +AnyEvent::Handle examples. In the following, when the documentation refers to of "bytes" then this means characters. As sysread and syswrite are used for all I/O, their treatment of characters applies to this module as well. +At the very minimum, you should specify C or C, and the +C callback. + All callbacks will be invoked with the handle object as their first argument. +=cut + +package AnyEvent::Handle; + +use Scalar::Util (); +use List::Util (); +use Carp (); +use Errno qw(EAGAIN EINTR); + +use AnyEvent (); BEGIN { AnyEvent::common_sense } +use AnyEvent::Util qw(WSAEWOULDBLOCK); + +our $VERSION = $AnyEvent::VERSION; + +sub _load_func($) { + my $func = $_[0]; + + unless (defined &$func) { + my $pkg = $func; + do { + $pkg =~ s/::[^:]+$// + or return; + eval "require $pkg"; + } until defined &$func; + } + + \&$func +} + =head1 METHODS =over 4 -=item B +=item $handle = B AnyEvent::TLS fh => $filehandle, key => value... -The constructor supports these arguments (all as key => value pairs). +The constructor supports these arguments (all as C<< key => value >> pairs). =over 4 -=item fh => $filehandle [MANDATORY] +=item fh => $filehandle [C or C MANDATORY] The filehandle this L object will operate on. +NOTE: The filehandle will be set to non-blocking mode (using +C) by the constructor and needs to stay in +that mode. -NOTE: The filehandle will be set to non-blocking (using -AnyEvent::Util::fh_nonblocking). +=item connect => [$host, $service] [C or C MANDATORY] -=item on_eof => $cb->($handle) +Try to connect to the specified host and service (port), using +C. The C<$host> additionally becomes the +default C. -Set the callback to be called when an end-of-file condition is detected, -i.e. in the case of a socket, when the other side has closed the -connection cleanly. +You have to specify either this parameter, or C, above. + +It is possible to push requests on the read and write queues, and modify +properties of the stream, even while AnyEvent::Handle is connecting. + +When this parameter is specified, then the C, +C and C callbacks will be called under the +appropriate circumstances: + +=over 4 + +=item on_prepare => $cb->($handle) + +This (rarely used) callback is called before a new connection is +attempted, but after the file handle has been created. It could be used to +prepare the file handle with parameters required for the actual connect +(as opposed to settings that can be changed when the connection is already +established). + +The return value of this callback should be the connect timeout value in +seconds (or C<0>, or C, or the empty list, to indicate the default +timeout is to be used). + +=item on_connect => $cb->($handle, $host, $port, $retry->()) + +This callback is called when a connection has been successfully established. + +The actual numeric host and port (the socket peername) are passed as +parameters, together with a retry callback. + +When, for some reason, the handle is not acceptable, then calling +C<$retry> will continue with the next connection target (in case of +multi-homed hosts or SRV records there can be multiple connection +endpoints). At the time it is called the read and write queues, eof +status, tls status and similar properties of the handle will have been +reset. + +In most cases, ignoring the C<$retry> parameter is the way to go. + +=item on_connect_error => $cb->($handle, $message) -While not mandatory, it is highly recommended to set an eof callback, -otherwise you might end up with a closed socket while you are still -waiting for data. +This callback is called when the connection could not be +established. C<$!> will contain the relevant error code, and C<$message> a +message describing it (usually the same as C<"$!">). -=item on_error => $cb->($handle, $fatal) +If this callback isn't specified, then C will be called with a +fatal error instead. + +=back + +=item on_error => $cb->($handle, $fatal, $message) This is the error callback, which is called when, well, some error occured, such as not being able to resolve the hostname, failure to connect or a read error. Some errors are fatal (which is indicated by C<$fatal> being true). On -fatal errors the handle object will be shut down and will not be -usable. Non-fatal errors can be retried by simply returning, but it is -recommended to simply ignore this parameter and instead abondon the handle -object when this callback is invoked. +fatal errors the handle object will be destroyed (by a call to C<< -> +destroy >>) after invoking the error callback (which means you are free to +examine the handle object). Examples of fatal errors are an EOF condition +with active (but unsatisifable) read watchers (C) or I/O errors. In +cases where the other side can close the connection at their will it is +often easiest to not report C errors in this callback. + +AnyEvent::Handle tries to find an appropriate error code for you to check +against, but in some cases (TLS errors), this does not work well. It is +recommended to always output the C<$message> argument in human-readable +error messages (it's usually the same as C<"$!">). + +Non-fatal errors can be retried by simply returning, but it is recommended +to simply ignore this parameter and instead abondon the handle object +when this callback is invoked. Examples of non-fatal errors are timeouts +C) or badly-formatted data (C). On callback entrance, the value of C<$!> contains the operating system -error (or C, C, C or C). +error code (or C, C, C, C or +C). While not mandatory, it is I recommended to set this callback, as you will not be notified of errors otherwise. The default simply calls @@ -112,13 +190,36 @@ read buffer). To access (and remove data from) the read buffer, use the C<< ->rbuf >> -method or access the C<$handle->{rbuf}> member directly. +method or access the C<< $handle->{rbuf} >> member directly. Note that you +must not enlarge or modify the read buffer, you can only remove data at +the beginning from it. When an EOF condition is detected then AnyEvent::Handle will first try to feed all the remaining data to the queued callbacks and C before calling the C callback. If no progress can be made, then a fatal error will be raised (with C<$!> set to C). +Note that, unlike requests in the read queue, an C callback +doesn't mean you I some data: if there is an EOF and there +are outstanding read requests then an error will be flagged. With an +C callback, the C callback will be invoked. + +=item on_eof => $cb->($handle) + +Set the callback to be called when an end-of-file condition is detected, +i.e. in the case of a socket, when the other side has closed the +connection cleanly, and there are no outstanding read requests in the +queue (if there are read requests, then an EOF counts as an unexpected +connection close and will be flagged as an error). + +For sockets, this just means that the other side has stopped sending data, +you can still try to write data, and, in fact, one can return from the EOF +callback and continue writing data, as only the read part has been shut +down. + +If an EOF condition has been detected but no C callback has been +set, then a fatal error will be raised with C<$!> set to <0>. + =item on_drain => $cb->($handle) This sets the callback that is called when the write buffer becomes empty @@ -134,15 +235,27 @@ =item timeout => $fractional_seconds -If non-zero, then this enables an "inactivity" timeout: whenever this many -seconds pass without a successful read or write on the underlying file -handle, the C callback will be invoked (and if that one is -missing, an C error will be raised). +=item rtimeout => $fractional_seconds + +=item wtimeout => $fractional_seconds + +If non-zero, then these enables an "inactivity" timeout: whenever this +many seconds pass without a successful read or write on the underlying +file handle (or a call to C), the C callback +will be invoked (and if that one is missing, a non-fatal C +error will be raised). + +There are three variants of the timeouts that work fully independent +of each other, for both read and write, just read, and just write: +C, C and C, with corresponding callbacks +C, C and C, and reset functions +C, C, and C. Note that timeout processing is also active when you currently do not have any outstanding read or write requests: If you plan to keep the connection idle then you should disable the timout temporarily or ignore the timeout -in the C callback. +in the C callback, in which case AnyEvent::Handle will simply +restart the timeout. Zero (the default) disables this timeout. @@ -156,7 +269,7 @@ If defined, then a fatal error will be raised (with C<$!> set to C) when the read buffer ever (strictly) exceeds this size. This is useful to -avoid denial-of-service attacks. +avoid some forms of denial-of-service attacks. For example, a server accepting connections from untrusted sources should be configured to accept only so-and-so much data that it cannot act on @@ -167,14 +280,16 @@ =item autocork => When disabled (the default), then C will try to immediately -write the data to the handle if possible. This avoids having to register -a write watcher and wait for the next event loop iteration, but can be -inefficient if you write multiple small chunks (this disadvantage is -usually avoided by your kernel's nagle algorithm, see C). +write the data to the handle, if possible. This avoids having to register +a write watcher and wait for the next event loop iteration, but can +be inefficient if you write multiple small chunks (on the wire, this +disadvantage is usually avoided by your kernel's nagle algorithm, see +C, but this option can save costly syscalls). When enabled, then writes will always be queued till the next event loop iteration. This is efficient when you do many small writes per iteration, -but less efficient when you do a single write only. +but less efficient when you do a single write only per iteration (or when +the write buffer often is full). It also increases write latency. =item no_delay => @@ -182,16 +297,49 @@ wait a bit for more data before actually sending it out. This is called the Nagle algorithm, and usually it is beneficial. -In some situations you want as low a delay as possible, which cna be -accomplishd by setting this option to true. +In some situations you want as low a delay as possible, which can be +accomplishd by setting this option to a true value. -The default is your opertaing system's default behaviour, this option -explicitly enables or disables it, if possible. +The default is your opertaing system's default behaviour (most likely +enabled), this option explicitly enables or disables it, if possible. + +=item keepalive => + +Enables (default disable) the SO_KEEPALIVE option on the stream socket: +normally, TCP connections have no time-out once established, so TCP +connections, once established, can stay alive forever even when the other +side has long gone. TCP keepalives are a cheap way to take down long-lived +TCP connections whent he other side becomes unreachable. While the default +is OS-dependent, TCP keepalives usually kick in after around two hours, +and, if the other side doesn't reply, take down the TCP connection some 10 +to 15 minutes later. + +It is harmless to specify this option for file handles that do not support +keepalives, and enabling it on connections that are potentially long-lived +is usually a good idea. + +=item oobinline => + +BSD majorly fucked up the implementation of TCP urgent data. The result +is that almost no OS implements TCP according to the specs, and every OS +implements it slightly differently. + +If you want to handle TCP urgent data, then setting this flag (the default +is enabled) gives you the most portable way of getting urgent data, by +putting it into the stream. + +Since BSD emulation of OOB data on top of TCP's urgent data can have +security implications, AnyEvent::Handle sets this flag automatically +unless explicitly specified. Note that setting this flag after +establishing a connection I be a bit too late (data loss could +already have occured on BSD systems), but at least it will protect you +from most attacks. =item read_size => -The default read block size (the amount of bytes this module will try to read -during each (loop iteration). Default: C<8192>. +The default read block size (the amount of bytes this module will +try to read during each loop iteration, which affects memory +requirements). Default: C<8192>. =item low_water_mark => @@ -199,117 +347,237 @@ buffer: If the write reaches this size or gets even samller it is considered empty. +Sometimes it can be beneficial (for performance reasons) to add data to +the write buffer before it is fully drained, but this is a rare case, as +the operating system kernel usually buffers data as well, so the default +is good in almost all cases. + =item linger => If non-zero (default: C<3600>), then the destructor of the -AnyEvent::Handle object will check wether there is still outstanding write -data and will install a watcher that will write out this data. No errors -will be reported (this mostly matches how the operating system treats -outstanding data at socket close time). - -This will not work for partial TLS data that could not yet been -encoded. This data will be lost. +AnyEvent::Handle object will check whether there is still outstanding +write data and will install a watcher that will write this data to the +socket. No errors will be reported (this mostly matches how the operating +system treats outstanding data at socket close time). + +This will not work for partial TLS data that could not be encoded +yet. This data will be lost. Calling the C method in time might +help. + +=item peername => $string + +A string used to identify the remote site - usually the DNS hostname +(I IDN!) used to create the connection, rarely the IP address. + +Apart from being useful in error messages, this string is also used in TLS +peername verification (see C in L). This +verification will be skipped when C is not specified or +C. =item tls => "accept" | "connect" | Net::SSLeay::SSL object -When this parameter is given, it enables TLS (SSL) mode, that means it -will start making tls handshake and will transparently encrypt/decrypt -data. +When this parameter is given, it enables TLS (SSL) mode, that means +AnyEvent will start a TLS handshake as soon as the connection has been +established and will transparently encrypt/decrypt data afterwards. -TLS mode requires Net::SSLeay to be installed (it will be loaded -automatically when you try to create a TLS handle). +All TLS protocol errors will be signalled as C, with an +appropriate error message. -For the TLS server side, use C, and for the TLS client side of a -connection, use C mode. +TLS mode requires Net::SSLeay to be installed (it will be loaded +automatically when you try to create a TLS handle): this module doesn't +have a dependency on that module, so if your module requires it, you have +to add the dependency yourself. + +Unlike TCP, TLS has a server and client side: for the TLS server side, use +C, and for the TLS client side of a connection, use C +mode. You can also provide your own TLS connection object, but you have to make sure that you call either C or C on it before you pass it to -AnyEvent::Handle. +AnyEvent::Handle. Also, this module will take ownership of this connection +object. + +At some future point, AnyEvent::Handle might switch to another TLS +implementation, then the option to use your own session object will go +away. + +B since Net::SSLeay "objects" are really only integers, +passing in the wrong integer will lead to certain crash. This most often +happens when one uses a stylish C<< tls => 1 >> and is surprised about the +segmentation fault. -See the C method if you need to start TLs negotiation later. +See the C<< ->starttls >> method for when need to start TLS negotiation later. -=item tls_ctx => $ssl_ctx +=item tls_ctx => $anyevent_tls -Use the given Net::SSLeay::CTX object to create the new TLS connection +Use the given C object to create the new TLS connection (unless a connection object was specified directly). If this parameter is missing, then AnyEvent::Handle will use C. +Instead of an object, you can also specify a hash reference with C<< key +=> value >> pairs. Those will be passed to L to create a +new TLS context object. + +=item on_starttls => $cb->($handle, $success[, $error_message]) + +This callback will be invoked when the TLS/SSL handshake has finished. If +C<$success> is true, then the TLS handshake succeeded, otherwise it failed +(C will not be called in this case). + +The session in C<< $handle->{tls} >> can still be examined in this +callback, even when the handshake was not successful. + +TLS handshake failures will not cause C to be invoked when this +callback is in effect, instead, the error message will be passed to C. + +Without this callback, handshake failures lead to C being +called, as normal. + +Note that you cannot call C right again in this callback. If you +need to do that, start an zero-second timer instead whose callback can +then call C<< ->starttls >> again. + +=item on_stoptls => $cb->($handle) + +When a SSLv3/TLS shutdown/close notify/EOF is detected and this callback is +set, then it will be invoked after freeing the TLS session. If it is not, +then a TLS shutdown condition will be treated like a normal EOF condition +on the handle. + +The session in C<< $handle->{tls} >> can still be examined in this +callback. + +This callback will only be called on TLS shutdowns, not when the +underlying handle signals EOF. + =item json => JSON or JSON::XS object This is the json coder object used by the C read and write types. If you don't supply it, then AnyEvent::Handle will create and use a -suitable one, which will write and expect UTF-8 encoded JSON texts. +suitable one (on demand), which will write and expect UTF-8 encoded JSON +texts. Note that you are responsible to depend on the JSON module if you want to use this functionality, as AnyEvent does not have a dependency itself. -=item filter_r => $cb - -=item filter_w => $cb - -These exist, but are undocumented at this time. - =back =cut sub new { my $class = shift; - my $self = bless { @_ }, $class; - $self->{fh} or Carp::croak "mandatory argument fh is missing"; + if ($self->{fh}) { + $self->_start; + return unless $self->{fh}; # could be gone by now + + } elsif ($self->{connect}) { + require AnyEvent::Socket; + + $self->{peername} = $self->{connect}[0] + unless exists $self->{peername}; + + $self->{_skip_drain_rbuf} = 1; + + { + Scalar::Util::weaken (my $self = $self); + + $self->{_connect} = + AnyEvent::Socket::tcp_connect ( + $self->{connect}[0], + $self->{connect}[1], + sub { + my ($fh, $host, $port, $retry) = @_; + + if ($fh) { + $self->{fh} = $fh; + + delete $self->{_skip_drain_rbuf}; + $self->_start; + + $self->{on_connect} + and $self->{on_connect}($self, $host, $port, sub { + delete @$self{qw(fh _tw _rtw _wtw _ww _rw _eof _queue rbuf _wbuf tls _tls_rbuf _tls_wbuf)}; + $self->{_skip_drain_rbuf} = 1; + &$retry; + }); + + } else { + if ($self->{on_connect_error}) { + $self->{on_connect_error}($self, "$!"); + $self->destroy; + } else { + $self->_error ($!, 1); + } + } + }, + sub { + local $self->{fh} = $_[0]; + + $self->{on_prepare} + ? $self->{on_prepare}->($self) + : () + } + ); + } + + } else { + Carp::croak "AnyEvent::Handle: either an existing fh or the connect parameter must be specified"; + } + + $self +} + +sub _start { + my ($self) = @_; AnyEvent::Util::fh_nonblocking $self->{fh}, 1; - if ($self->{tls}) { - require Net::SSLeay; - $self->starttls (delete $self->{tls}, delete $self->{tls_ctx}); - } + $self->{_activity} = + $self->{_ractivity} = + $self->{_wactivity} = AE::now; - $self->{_activity} = AnyEvent->now; - $self->_timeout; + $self->timeout (delete $self->{timeout} ) if $self->{timeout}; + $self->rtimeout (delete $self->{rtimeout} ) if $self->{rtimeout}; + $self->wtimeout (delete $self->{wtimeout} ) if $self->{wtimeout}; - $self->on_drain (delete $self->{on_drain}) if exists $self->{on_drain}; - $self->no_delay (delete $self->{no_delay}) if exists $self->{no_delay}; + $self->no_delay (delete $self->{no_delay} ) if exists $self->{no_delay} && $self->{no_delay}; + $self->keepalive (delete $self->{keepalive}) if exists $self->{keepalive} && $self->{keepalive}; - $self->start_read - if $self->{on_read}; + $self->oobinline (exists $self->{oobinline} ? delete $self->{oobinline} : 1); - $self -} + $self->starttls (delete $self->{tls}, delete $self->{tls_ctx}) + if $self->{tls}; -sub _shutdown { - my ($self) = @_; + $self->on_drain (delete $self->{on_drain}) if $self->{on_drain}; - delete $self->{_tw}; - delete $self->{_rw}; - delete $self->{_ww}; - delete $self->{fh}; + $self->start_read + if $self->{on_read} || @{ $self->{_queue} }; - $self->stoptls; + $self->_drain_wbuf; } sub _error { - my ($self, $errno, $fatal) = @_; - - $self->_shutdown - if $fatal; + my ($self, $errno, $fatal, $message) = @_; $! = $errno; + $message ||= "$!"; if ($self->{on_error}) { - $self->{on_error}($self, $fatal); - } else { - Carp::croak "AnyEvent::Handle uncaught error: $!"; + $self->{on_error}($self, $fatal, $message); + $self->destroy if $fatal; + } elsif ($self->{fh} || $self->{connect}) { + $self->destroy; + Carp::croak "AnyEvent::Handle uncaught error: $message"; } } =item $fh = $handle->fh -This method returns the file handle of the L object. +This method returns the file handle used to create the L object. =cut @@ -337,23 +605,29 @@ =item $handle->on_timeout ($cb) -Replace the current C callback, or disables the callback -(but not the timeout) if C<$cb> = C. See C constructor -argument. +=item $handle->on_rtimeout ($cb) + +=item $handle->on_wtimeout ($cb) + +Replace the current C, C or C +callback, or disables the callback (but not the timeout) if C<$cb> = +C. See the C constructor argument and method. =cut -sub on_timeout { - $_[0]{on_timeout} = $_[1]; -} +# see below =item $handle->autocork ($boolean) Enables or disables the current autocork behaviour (see C -constructor argument). +constructor argument). Changes will only take effect on the next write. =cut +sub autocork { + $_[0]{autocork} = $_[1]; +} + =item $handle->no_delay ($boolean) Enables or disables the C setting (see constructor argument of @@ -366,62 +640,175 @@ eval { local $SIG{__DIE__}; - setsockopt $_[0]{fh}, &Socket::IPPROTO_TCP, &Socket::TCP_NODELAY, int $_[1]; + setsockopt $_[0]{fh}, Socket::IPPROTO_TCP (), Socket::TCP_NODELAY (), int $_[1] + if $_[0]{fh}; + }; +} + +=item $handle->keepalive ($boolean) + +Enables or disables the C setting (see constructor argument of +the same name for details). + +=cut + +sub keepalive { + $_[0]{keepalive} = $_[1]; + + eval { + local $SIG{__DIE__}; + setsockopt $_[0]{fh}, Socket::SOL_SOCKET (), Socket::SO_KEEPALIVE (), int $_[1] + if $_[0]{fh}; + }; +} + +=item $handle->oobinline ($boolean) + +Enables or disables the C setting (see constructor argument of +the same name for details). + +=cut + +sub oobinline { + $_[0]{oobinline} = $_[1]; + + eval { + local $SIG{__DIE__}; + setsockopt $_[0]{fh}, Socket::SOL_SOCKET (), Socket::SO_OOBINLINE (), int $_[1] + if $_[0]{fh}; + }; +} + +=item $handle->keepalive ($boolean) + +Enables or disables the C setting (see constructor argument of +the same name for details). + +=cut + +sub keepalive { + $_[0]{keepalive} = $_[1]; + + eval { + local $SIG{__DIE__}; + setsockopt $_[0]{fh}, Socket::SOL_SOCKET (), Socket::SO_KEEPALIVE (), int $_[1] + if $_[0]{fh}; }; } +=item $handle->on_starttls ($cb) + +Replace the current C callback (see the C constructor argument). + +=cut + +sub on_starttls { + $_[0]{on_starttls} = $_[1]; +} + +=item $handle->on_stoptls ($cb) + +Replace the current C callback (see the C constructor argument). + +=cut + +sub on_starttls { + $_[0]{on_stoptls} = $_[1]; +} + +=item $handle->rbuf_max ($max_octets) + +Configures the C setting (C disables it). + +=cut + +sub rbuf_max { + $_[0]{rbuf_max} = $_[1]; +} + ############################################################################# =item $handle->timeout ($seconds) +=item $handle->rtimeout ($seconds) + +=item $handle->wtimeout ($seconds) + Configures (or disables) the inactivity timeout. +=item $handle->timeout_reset + +=item $handle->rtimeout_reset + +=item $handle->wtimeout_reset + +Reset the activity timeout, as if data was received or sent. + +These methods are cheap to call. + =cut -sub timeout { - my ($self, $timeout) = @_; +for my $dir ("", "r", "w") { + my $timeout = "${dir}timeout"; + my $tw = "_${dir}tw"; + my $on_timeout = "on_${dir}timeout"; + my $activity = "_${dir}activity"; + my $cb; - $self->{timeout} = $timeout; - $self->_timeout; -} + *$on_timeout = sub { + $_[0]{$on_timeout} = $_[1]; + }; -# reset the timeout watcher, as neccessary -# also check for time-outs -sub _timeout { - my ($self) = @_; + *$timeout = sub { + my ($self, $new_value) = @_; - if ($self->{timeout}) { - my $NOW = AnyEvent->now; + $self->{$timeout} = $new_value; + delete $self->{$tw}; &$cb; + }; - # when would the timeout trigger? - my $after = $self->{_activity} + $self->{timeout} - $NOW; + *{"${dir}timeout_reset"} = sub { + $_[0]{$activity} = AE::now; + }; - # now or in the past already? - if ($after <= 0) { - $self->{_activity} = $NOW; + # main workhorse: + # reset the timeout watcher, as neccessary + # also check for time-outs + $cb = sub { + my ($self) = @_; + + if ($self->{$timeout} && $self->{fh}) { + my $NOW = AE::now; + + # when would the timeout trigger? + my $after = $self->{$activity} + $self->{$timeout} - $NOW; + + # now or in the past already? + if ($after <= 0) { + $self->{$activity} = $NOW; - if ($self->{on_timeout}) { - $self->{on_timeout}($self); - } else { - $self->_error (&Errno::ETIMEDOUT); - } + if ($self->{$on_timeout}) { + $self->{$on_timeout}($self); + } else { + $self->_error (Errno::ETIMEDOUT); + } - # callback could have changed timeout value, optimise - return unless $self->{timeout}; + # callback could have changed timeout value, optimise + return unless $self->{$timeout}; - # calculate new after - $after = $self->{timeout}; - } + # calculate new after + $after = $self->{$timeout}; + } - Scalar::Util::weaken $self; - return unless $self; # ->error could have destroyed $self + Scalar::Util::weaken $self; + return unless $self; # ->error could have destroyed $self - $self->{_tw} ||= AnyEvent->timer (after => $after, cb => sub { - delete $self->{_tw}; - $self->_timeout; - }); - } else { - delete $self->{_tw}; + $self->{$tw} ||= AE::timer $after, 0, sub { + delete $self->{$tw}; + $cb->($self); + }; + } else { + delete $self->{$tw}; + } } } @@ -455,7 +842,7 @@ $self->{on_drain} = $cb; $cb->($self) - if $cb && $self->{low_water_mark} >= length $self->{wbuf}; + if $cb && $self->{low_water_mark} >= (length $self->{wbuf}) + (length $self->{_tls_wbuf}); } =item $handle->push_write ($data) @@ -476,13 +863,13 @@ my $cb = sub { my $len = syswrite $self->{fh}, $self->{wbuf}; - if ($len >= 0) { + if (defined $len) { substr $self->{wbuf}, 0, $len, ""; - $self->{_activity} = AnyEvent->now; + $self->{_activity} = $self->{_wactivity} = AE::now; $self->{on_drain}($self) - if $self->{low_water_mark} >= length $self->{wbuf} + if $self->{low_water_mark} >= (length $self->{wbuf}) + (length $self->{_tls_wbuf}) && $self->{on_drain}; delete $self->{_ww} unless length $self->{wbuf}; @@ -495,13 +882,14 @@ $cb->() unless $self->{autocork}; # if still data left in wbuf, we need to poll - $self->{_ww} = AnyEvent->io (fh => $self->{fh}, poll => "w", cb => $cb) + $self->{_ww} = AE::io $self->{fh}, 1, $cb if length $self->{wbuf}; }; } our %WH; +# deprecated sub register_write_type($$) { $WH{$_[0]} = $_[1]; } @@ -512,22 +900,27 @@ if (@_ > 1) { my $type = shift; - @_ = ($WH{$type} or Carp::croak "unsupported type passed to AnyEvent::Handle::push_write") + @_ = ($WH{$type} ||= _load_func "$type\::anyevent_write_type" + or Carp::croak "unsupported/unloadable type '$type' passed to AnyEvent::Handle::push_write") ->($self, @_); } - if ($self->{filter_w}) { - $self->{filter_w}($self, \$_[0]); + if ($self->{tls}) { + $self->{_tls_wbuf} .= $_[0]; + &_dotls ($self) if $self->{fh}; } else { - $self->{wbuf} .= $_[0]; - $self->_drain_wbuf; + $self->{wbuf} .= $_[0]; + $self->_drain_wbuf if $self->{fh}; } } =item $handle->push_write (type => @args) -Instead of formatting your data yourself, you can also let this module do -the job by specifying a type and type-specific arguments. +Instead of formatting your data yourself, you can also let this module +do the job by specifying a type and type-specific arguments. You +can also specify the (fully qualified) name of a package, in which +case AnyEvent tries to load the package and then expects to find the +C function inside (see "custom write types", below). Predefined types are (if you have ideas for additional types, feel free to drop by and tell us): @@ -544,7 +937,7 @@ register_write_type netstring => sub { my ($self, $string) = @_; - sprintf "%d:%s,", (length $string), $string + (length $string) . ":$string," }; =item packstring => $format, $data @@ -594,13 +987,17 @@ =cut +sub json_coder() { + eval { require JSON::XS; JSON::XS->new->utf8 } + || do { require JSON; JSON->new->utf8 } +} + register_write_type json => sub { my ($self, $ref) = @_; - require JSON; + my $json = $self->{json} ||= json_coder; - $self->{json} ? $self->{json}->encode ($ref) - : JSON::encode_json ($ref) + $json->encode ($ref) }; =item storable => $reference @@ -620,17 +1017,62 @@ =back -=item AnyEvent::Handle::register_write_type type => $coderef->($handle, @args) +=item $handle->push_shutdown -This function (not method) lets you add your own types to C. -Whenever the given C is used, C will invoke the code -reference with the handle object and the remaining arguments. +Sometimes you know you want to close the socket after writing your data +before it was actually written. One way to do that is to replace your +C handler by a callback that shuts down the socket (and set +C to C<0>). This method is a shorthand for just that, and +replaces the C callback with: -The code reference is supposed to return a single octet string that will -be appended to the write buffer. + sub { shutdown $_[0]{fh}, 1 } # for push_shutdown -Note that this is a function, and all types registered this way will be -global, so try to use unique names. +This simply shuts down the write side and signals an EOF condition to the +the peer. + +You can rely on the normal read queue and C handling +afterwards. This is the cleanest way to close a connection. + +=cut + +sub push_shutdown { + my ($self) = @_; + + delete $self->{low_water_mark}; + $self->on_drain (sub { shutdown $_[0]{fh}, 1 }); +} + +=item custom write types - Package::anyevent_write_type $handle, @args + +Instead of one of the predefined types, you can also specify the name of +a package. AnyEvent will try to load the package and then expects to find +a function named C inside. If it isn't found, it +progressively tries to load the parent package until it either finds the +function (good) or runs out of packages (bad). + +Whenever the given C is used, C will the function with +the handle object and the remaining arguments. + +The function is supposed to return a single octet string that will be +appended to the write buffer, so you cna mentally treat this function as a +"arguments to on-the-wire-format" converter. + +Example: implement a custom write type C that joins the remaining +arguments using the first one. + + $handle->push_write (My::Type => " ", 1,2,3); + + # uses the following package, which can be defined in the "My::Type" or in + # the "My" modules to be auto-loaded, or just about anywhere when the + # My::Type::anyevent_write_type is defined before invoking it. + + package My::Type; + + sub anyevent_write_type { + my ($handle, $delim, @args) = @_; + + join $delim, @args + } =cut @@ -722,26 +1164,24 @@ sub _drain_rbuf { my ($self) = @_; - local $self->{_in_drain} = 1; - - if ( - defined $self->{rbuf_max} - && $self->{rbuf_max} < length $self->{rbuf} - ) { - return $self->_error (&Errno::ENOSPC, 1); - } + # avoid recursion + return if $self->{_skip_drain_rbuf}; + local $self->{_skip_drain_rbuf} = 1; while () { - no strict 'refs'; + # we need to use a separate tls read buffer, as we must not receive data while + # we are draining the buffer, and this can only happen with TLS. + $self->{rbuf} .= delete $self->{_tls_rbuf} + if exists $self->{_tls_rbuf}; my $len = length $self->{rbuf}; if (my $cb = shift @{ $self->{_queue} }) { unless ($cb->($self)) { - if ($self->{_eof}) { - # no progress can be made (not enough data and no data forthcoming) - $self->_error (&Errno::EPIPE, 1), last; - } + # no progress can be made + # (not enough data and no data forthcoming) + $self->_error (Errno::EPIPE, 1), return + if $self->{_eof}; unshift @{ $self->{_queue} }, $cb; last; @@ -758,20 +1198,32 @@ ) { # no further data will arrive # so no progress can be made - $self->_error (&Errno::EPIPE, 1), last + $self->_error (Errno::EPIPE, 1), return if $self->{_eof}; last; # more data might arrive } } else { # read side becomes idle - delete $self->{_rw}; + delete $self->{_rw} unless $self->{tls}; last; } } - $self->{on_eof}($self) - if $self->{_eof} && $self->{on_eof}; + if ($self->{_eof}) { + $self->{on_eof} + ? $self->{on_eof}($self) + : $self->_error (0, 1, "Unexpected end-of-file"); + + return; + } + + if ( + defined $self->{rbuf_max} + && $self->{rbuf_max} < length $self->{rbuf} + ) { + $self->_error (Errno::ENOSPC, 1), return; + } # may need to restart read watcher unless ($self->{_rw}) { @@ -792,15 +1244,18 @@ my ($self, $cb) = @_; $self->{on_read} = $cb; - $self->_drain_rbuf if $cb && !$self->{_in_drain}; + $self->_drain_rbuf if $cb; } =item $handle->rbuf Returns the read buffer (as a modifiable lvalue). -You can access the read buffer directly as the C<< ->{rbuf} >> member, if -you want. +You can access the read buffer directly as the C<< ->{rbuf} >> +member, if you want. However, the only operation allowed on the +read buffer (apart from looking at it) is removing data from its +beginning. Otherwise modifying or appending to it is not allowed and will +lead to hard-to-track-down bugs. NOTE: The read buffer should only be used or modified if the C, C or C methods are used. The other read methods @@ -846,12 +1301,13 @@ if (@_) { my $type = shift; - $cb = ($RH{$type} or Carp::croak "unsupported type passed to AnyEvent::Handle::push_read") + $cb = ($RH{$type} ||= _load_func "$type\::anyevent_read_type" + or Carp::croak "unsupported/unloadable type '$type' passed to AnyEvent::Handle::push_read") ->($self, $cb, @_); } push @{ $self->{_queue} }, $cb; - $self->_drain_rbuf unless $self->{_in_drain}; + $self->_drain_rbuf; } sub unshift_read { @@ -865,9 +1321,8 @@ ->($self, $cb, @_); } - unshift @{ $self->{_queue} }, $cb; - $self->_drain_rbuf unless $self->{_in_drain}; + $self->_drain_rbuf; } =item $handle->push_read (type => @args, $cb) @@ -876,7 +1331,9 @@ Instead of providing a callback that parses the data itself you can chose between a number of predefined parsing formats, for chunks of data, lines -etc. +etc. You can also specify the (fully qualified) name of a package, in +which case AnyEvent tries to load the package and then expects to find the +C function inside (see "custom read types", below). Predefined types are (if you have ideas for additional types, feel free to drop by and tell us): @@ -907,15 +1364,6 @@ } }; -# compatibility with older API -sub push_read_chunk { - $_[0]->push_read (chunk => $_[1], $_[2]); -} - -sub unshift_read_chunk { - $_[0]->unshift_read (chunk => $_[1], $_[2]); -} - =item line => [$eol, ]$cb->($handle, $line, $eol) The callback will be called only once a full line (including the end of @@ -940,29 +1388,27 @@ register_read_type line => sub { my ($self, $cb, $eol) = @_; - $eol = qr|(\015?\012)| if @_ < 3; - $eol = quotemeta $eol unless ref $eol; - $eol = qr|^(.*?)($eol)|s; + if (@_ < 3) { + # this is more than twice as fast as the generic code below + sub { + $_[0]{rbuf} =~ s/^([^\015\012]*)(\015?\012)// or return; - sub { - $_[0]{rbuf} =~ s/$eol// or return; + $cb->($_[0], $1, $2); + 1 + } + } else { + $eol = quotemeta $eol unless ref $eol; + $eol = qr|^(.*?)($eol)|s; - $cb->($_[0], $1, $2); - 1 + sub { + $_[0]{rbuf} =~ s/$eol// or return; + + $cb->($_[0], $1, $2); + 1 + } } }; -# compatibility with older API -sub push_read_line { - my $self = shift; - $self->push_read (line => @_); -} - -sub unshift_read_line { - my $self = shift; - $self->unshift_read (line => @_); -} - =item regex => $accept[, $reject[, $skip], $cb->($handle, $data) Makes a regex match against the regex object C<$accept> and returns @@ -1021,7 +1467,7 @@ # reject if ($reject && $$rbuf =~ $reject) { - $self->_error (&Errno::EBADMSG); + $self->_error (Errno::EBADMSG); } # skip @@ -1047,7 +1493,7 @@ sub { unless ($_[0]{rbuf} =~ s/^(0|[1-9][0-9]*)://) { if ($_[0]{rbuf} =~ /[^0-9]/) { - $self->_error (&Errno::EBADMSG); + $self->_error (Errno::EBADMSG); } return; } @@ -1060,7 +1506,7 @@ if ($_[1] eq ",") { $cb->($_[0], $string); } else { - $self->_error (&Errno::EBADMSG); + $self->_error (Errno::EBADMSG); } }); }); @@ -1076,7 +1522,8 @@ integer only (only one of C is allowed, plus an optional C, C<< < >> or C<< > >> modifier). -DNS over TCP uses a prefix of C, EPP uses a prefix of C. +For example, DNS over TCP uses a prefix of C (2 octet network order), +EPP uses a prefix of C (4 octtes). Example: read a block of data prefixed by its length in BER-encoded format (very efficient). @@ -1092,14 +1539,23 @@ sub { # when we can use 5.10 we can use ".", but for 5.8 we use the re-pack method - defined (my $len = eval { unpack $format, $_[0]->{rbuf} }) + defined (my $len = eval { unpack $format, $_[0]{rbuf} }) or return; - # remove prefix - substr $_[0]->{rbuf}, 0, (length pack $format, $len), ""; + $format = length pack $format, $len; - # read rest - $_[0]->unshift_read (chunk => $len, $cb); + # bypass unshift if we already have the remaining chunk + if ($format + $len <= length $_[0]{rbuf}) { + my $data = substr $_[0]{rbuf}, $format, $len; + substr $_[0]{rbuf}, 0, $format + $len, ""; + $cb->($_[0], $data); + } else { + # remove prefix + substr $_[0]{rbuf}, 0, $format, ""; + + # read remaining chunk + $_[0]->unshift_read (chunk => $len, $cb); + } 1 } @@ -1107,7 +1563,8 @@ =item json => $cb->($handle, $hash_or_arrayref) -Reads a JSON object or array, decodes it and passes it to the callback. +Reads a JSON object or array, decodes it and passes it to the +callback. When a parse error occurs, an C error will be raised. If a C object was passed to the constructor, then that will be used for the final decode, otherwise it will create a JSON coder expecting UTF-8. @@ -1126,15 +1583,13 @@ register_read_type json => sub { my ($self, $cb) = @_; - require JSON; + my $json = $self->{json} ||= json_coder; my $data; my $rbuf = \$self->{rbuf}; - my $json = $self->{json} ||= JSON->new->utf8; - sub { - my $ref = $json->incr_parse ($self->{rbuf}); + my $ref = eval { $json->incr_parse ($self->{rbuf}) }; if ($ref) { $self->{rbuf} = $json->incr_text; @@ -1142,8 +1597,19 @@ $cb->($self, $ref); 1 + } elsif ($@) { + # error case + $json->incr_skip; + + $self->{rbuf} = $json->incr_text; + $json->incr_text = ""; + + $self->_error (Errno::EBADMSG); + + () } else { $self->{rbuf} = ""; + () } } @@ -1166,44 +1632,58 @@ sub { # when we can use 5.10 we can use ".", but for 5.8 we use the re-pack method - defined (my $len = eval { unpack "w", $_[0]->{rbuf} }) + defined (my $len = eval { unpack "w", $_[0]{rbuf} }) or return; - # remove prefix - substr $_[0]->{rbuf}, 0, (length pack "w", $len), ""; + my $format = length pack "w", $len; - # read rest - $_[0]->unshift_read (chunk => $len, sub { - if (my $ref = eval { Storable::thaw ($_[1]) }) { - $cb->($_[0], $ref); - } else { - $self->_error (&Errno::EBADMSG); - } - }); + # bypass unshift if we already have the remaining chunk + if ($format + $len <= length $_[0]{rbuf}) { + my $data = substr $_[0]{rbuf}, $format, $len; + substr $_[0]{rbuf}, 0, $format + $len, ""; + $cb->($_[0], Storable::thaw ($data)); + } else { + # remove prefix + substr $_[0]{rbuf}, 0, $format, ""; + + # read remaining chunk + $_[0]->unshift_read (chunk => $len, sub { + if (my $ref = eval { Storable::thaw ($_[1]) }) { + $cb->($_[0], $ref); + } else { + $self->_error (Errno::EBADMSG); + } + }); + } + + 1 } }; =back -=item AnyEvent::Handle::register_read_type type => $coderef->($handle, $cb, @args) - -This function (not method) lets you add your own types to C. +=item custom read types - Package::anyevent_read_type $handle, $cb, @args -Whenever the given C is used, C will invoke the code -reference with the handle object, the callback and the remaining -arguments. +Instead of one of the predefined types, you can also specify the name +of a package. AnyEvent will try to load the package and then expects to +find a function named C inside. If it isn't found, it +progressively tries to load the parent package until it either finds the +function (good) or runs out of packages (bad). + +Whenever this type is used, C will invoke the function with the +handle object, the original callback and the remaining arguments. + +The function is supposed to return a callback (usually a closure) that +works as a plain read callback (see C<< ->push_read ($cb) >>), so you can +mentally treat the function as a "configurable read type to read callback" +converter. + +It should invoke the original callback when it is done reading (remember +to pass C<$handle> as first argument as all other callbacks do that, +although there is no strict requirement on this). -The code reference is supposed to return a callback (usually a closure) -that works as a plain read callback (see C<< ->push_read ($cb) >>). - -It should invoke the passed callback when it is done reading (remember to -pass C<$handle> as first argument as all other callbacks do that). - -Note that this is a function, and all types registered this way will be -global, so try to use unique names. - -For examples, see the source of this module (F, -search for C)). +For examples, see the source of this module (F, search for C)). =item $handle->stop_read @@ -1219,12 +1699,15 @@ will automatically C for you when neither C is set nor there are any read requests in the queue. +These methods will have no effect when in TLS mode (as TLS doesn't support +half-duplex connections). + =cut sub stop_read { my ($self) = @_; - delete $self->{_rw}; + delete $self->{_rw} unless $self->{tls}; } sub start_read { @@ -1233,68 +1716,111 @@ unless ($self->{_rw} || $self->{_eof}) { Scalar::Util::weaken $self; - $self->{_rw} = AnyEvent->io (fh => $self->{fh}, poll => "r", cb => sub { - my $rbuf = $self->{filter_r} ? \my $buf : \$self->{rbuf}; + $self->{_rw} = AE::io $self->{fh}, 0, sub { + my $rbuf = \($self->{tls} ? my $buf : $self->{rbuf}); my $len = sysread $self->{fh}, $$rbuf, $self->{read_size} || 8192, length $$rbuf; if ($len > 0) { - $self->{_activity} = AnyEvent->now; + $self->{_activity} = $self->{_ractivity} = AE::now; - $self->{filter_r} - ? $self->{filter_r}($self, $rbuf) - : $self->{_in_drain} || $self->_drain_rbuf; + if ($self->{tls}) { + Net::SSLeay::BIO_write ($self->{_rbio}, $$rbuf); + + &_dotls ($self); + } else { + $self->_drain_rbuf; + } } elsif (defined $len) { delete $self->{_rw}; $self->{_eof} = 1; - $self->_drain_rbuf unless $self->{_in_drain}; + $self->_drain_rbuf; } elsif ($! != EAGAIN && $! != EINTR && $! != WSAEWOULDBLOCK) { return $self->_error ($!, 1); } - }); + }; + } +} + +our $ERROR_SYSCALL; +our $ERROR_WANT_READ; + +sub _tls_error { + my ($self, $err) = @_; + + return $self->_error ($!, 1) + if $err == Net::SSLeay::ERROR_SYSCALL (); + + my $err =Net::SSLeay::ERR_error_string (Net::SSLeay::ERR_get_error ()); + + # reduce error string to look less scary + $err =~ s/^error:[0-9a-fA-F]{8}:[^:]+:([^:]+):/\L$1: /; + + if ($self->{_on_starttls}) { + (delete $self->{_on_starttls})->($self, undef, $err); + &_freetls; + } else { + &_freetls; + $self->_error (Errno::EPROTO, 1, $err); } } +# poll the write BIO and send the data if applicable +# also decode read data if possible +# this is basiclaly our TLS state machine +# more efficient implementations are possible with openssl, +# but not with the buggy and incomplete Net::SSLeay. sub _dotls { my ($self) = @_; - my $buf; + my $tmp; if (length $self->{_tls_wbuf}) { - while ((my $len = Net::SSLeay::write ($self->{tls}, $self->{_tls_wbuf})) > 0) { - substr $self->{_tls_wbuf}, 0, $len, ""; + while (($tmp = Net::SSLeay::write ($self->{tls}, $self->{_tls_wbuf})) > 0) { + substr $self->{_tls_wbuf}, 0, $tmp, ""; } - } - if (length ($buf = Net::SSLeay::BIO_read ($self->{_wbio}))) { - $self->{wbuf} .= $buf; - $self->_drain_wbuf; + $tmp = Net::SSLeay::get_error ($self->{tls}, $tmp); + return $self->_tls_error ($tmp) + if $tmp != $ERROR_WANT_READ + && ($tmp != $ERROR_SYSCALL || $!); } - while (defined ($buf = Net::SSLeay::read ($self->{tls}))) { - if (length $buf) { - $self->{rbuf} .= $buf; - $self->_drain_rbuf unless $self->{_in_drain}; - } else { - # let's treat SSL-eof as we treat normal EOF - $self->{_eof} = 1; - $self->_shutdown; - return; + while (defined ($tmp = Net::SSLeay::read ($self->{tls}))) { + unless (length $tmp) { + $self->{_on_starttls} + and (delete $self->{_on_starttls})->($self, undef, "EOF during handshake"); # ??? + &_freetls; + + if ($self->{on_stoptls}) { + $self->{on_stoptls}($self); + return; + } else { + # let's treat SSL-eof as we treat normal EOF + delete $self->{_rw}; + $self->{_eof} = 1; + } } - } - my $err = Net::SSLeay::get_error ($self->{tls}, -1); + $self->{_tls_rbuf} .= $tmp; + $self->_drain_rbuf; + $self->{tls} or return; # tls session might have gone away in callback + } - if ($err!= Net::SSLeay::ERROR_WANT_READ ()) { - if ($err == Net::SSLeay::ERROR_SYSCALL ()) { - return $self->_error ($!, 1); - } elsif ($err == Net::SSLeay::ERROR_SSL ()) { - return $self->_error (&Errno::EIO, 1); - } + $tmp = Net::SSLeay::get_error ($self->{tls}, -1); + return $self->_tls_error ($tmp) + if $tmp != $ERROR_WANT_READ + && ($tmp != $ERROR_SYSCALL || $!); - # all others are fine for our purposes + while (length ($tmp = Net::SSLeay::BIO_read ($self->{_wbio}))) { + $self->{wbuf} .= $tmp; + $self->_drain_wbuf; } + + $self->{_on_starttls} + and Net::SSLeay::state ($self->{tls}) == Net::SSLeay::ST_OK () + and (delete $self->{_on_starttls})->($self, 1, "TLS/SSL connection established"); } =item $handle->starttls ($tls[, $tls_ctx]) @@ -1303,90 +1829,145 @@ object is created, you can also do that at a later time by calling C. +Starting TLS is currently an asynchronous operation - when you push some +write data and then call C<< ->starttls >> then TLS negotiation will start +immediately, after which the queued write data is then sent. + The first argument is the same as the C constructor argument (either C<"connect">, C<"accept"> or an existing Net::SSLeay object). -The second argument is the optional C object that is -used when AnyEvent::Handle has to create its own TLS connection object. +The second argument is the optional C object that is used +when AnyEvent::Handle has to create its own TLS connection object, or +a hash reference with C<< key => value >> pairs that will be used to +construct a new context. -The TLS connection object will end up in C<< $handle->{tls} >> after this -call and can be used or changed to your liking. Note that the handshake -might have already started when this function returns. +The TLS connection object will end up in C<< $handle->{tls} >>, the TLS +context in C<< $handle->{tls_ctx} >> after this call and can be used or +changed to your liking. Note that the handshake might have already started +when this function returns. + +Due to bugs in OpenSSL, it might or might not be possible to do multiple +handshakes on the same stream. Best do not attempt to use the stream after +stopping TLS. =cut +our %TLS_CACHE; #TODO not yet documented, should we? + sub starttls { - my ($self, $ssl, $ctx) = @_; + my ($self, $tls, $ctx) = @_; - $self->stoptls; + Carp::croak "It is an error to call starttls on an AnyEvent::Handle object while TLS is already active, caught" + if $self->{tls}; - if ($ssl eq "accept") { - $ssl = Net::SSLeay::new ($ctx || TLS_CTX ()); - Net::SSLeay::set_accept_state ($ssl); - } elsif ($ssl eq "connect") { - $ssl = Net::SSLeay::new ($ctx || TLS_CTX ()); - Net::SSLeay::set_connect_state ($ssl); - } + $self->{tls} = $tls; + $self->{tls_ctx} = $ctx if @_ > 2; + + return unless $self->{fh}; + + require Net::SSLeay; + + $ERROR_SYSCALL = Net::SSLeay::ERROR_SYSCALL (); + $ERROR_WANT_READ = Net::SSLeay::ERROR_WANT_READ (); + + $tls = delete $self->{tls}; + $ctx = $self->{tls_ctx}; + + local $Carp::CarpLevel = 1; # skip ourselves when creating a new context or session - $self->{tls} = $ssl; + if ("HASH" eq ref $ctx) { + require AnyEvent::TLS; + + if ($ctx->{cache}) { + my $key = $ctx+0; + $ctx = $TLS_CACHE{$key} ||= new AnyEvent::TLS %$ctx; + } else { + $ctx = new AnyEvent::TLS %$ctx; + } + } + + $self->{tls_ctx} = $ctx || TLS_CTX (); + $self->{tls} = $tls = $self->{tls_ctx}->_get_session ($tls, $self, $self->{peername}); # basically, this is deep magic (because SSL_read should have the same issues) # but the openssl maintainers basically said: "trust us, it just works". # (unfortunately, we have to hardcode constants because the abysmally misdesigned # and mismaintained ssleay-module doesn't even offer them). # http://www.mail-archive.com/openssl-dev@openssl.org/msg22420.html - Net::SSLeay::CTX_set_mode ($self->{tls}, - (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ENABLE_PARTIAL_WRITE () } || 1) - | (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ACCEPT_MOVING_WRITE_BUFFER () } || 2)); + # + # in short: this is a mess. + # + # note that we do not try to keep the length constant between writes as we are required to do. + # we assume that most (but not all) of this insanity only applies to non-blocking cases, + # and we drive openssl fully in blocking mode here. Or maybe we don't - openssl seems to + # have identity issues in that area. +# Net::SSLeay::CTX_set_mode ($ssl, +# (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ENABLE_PARTIAL_WRITE () } || 1) +# | (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ACCEPT_MOVING_WRITE_BUFFER () } || 2)); + Net::SSLeay::CTX_set_mode ($tls, 1|2); $self->{_rbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ()); $self->{_wbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ()); - Net::SSLeay::set_bio ($ssl, $self->{_rbio}, $self->{_wbio}); + Net::SSLeay::BIO_write ($self->{_rbio}, delete $self->{rbuf}); - $self->{filter_w} = sub { - $_[0]{_tls_wbuf} .= ${$_[1]}; - &_dotls; - }; - $self->{filter_r} = sub { - Net::SSLeay::BIO_write ($_[0]{_rbio}, ${$_[1]}); - &_dotls; - }; + Net::SSLeay::set_bio ($tls, $self->{_rbio}, $self->{_wbio}); + + $self->{_on_starttls} = sub { $_[0]{on_starttls}(@_) } + if $self->{on_starttls}; + + &_dotls; # need to trigger the initial handshake + $self->start_read; # make sure we actually do read } =item $handle->stoptls -Destroys the SSL connection, if any. Partial read or write data will be -lost. +Shuts down the SSL connection - this makes a proper EOF handshake by +sending a close notify to the other side, but since OpenSSL doesn't +support non-blocking shut downs, it is not guarenteed that you can re-use +the stream afterwards. =cut sub stoptls { my ($self) = @_; - Net::SSLeay::free (delete $self->{tls}) if $self->{tls}; + if ($self->{tls}) { + Net::SSLeay::shutdown ($self->{tls}); + + &_dotls; + +# # we don't give a shit. no, we do, but we can't. no...#d# +# # we, we... have to use openssl :/#d# +# &_freetls;#d# + } +} + +sub _freetls { + my ($self) = @_; + + return unless $self->{tls}; - delete $self->{_rbio}; - delete $self->{_wbio}; - delete $self->{_tls_wbuf}; - delete $self->{filter_r}; - delete $self->{filter_w}; + $self->{tls_ctx}->_put_session (delete $self->{tls}) + if $self->{tls} > 0; + + delete @$self{qw(_rbio _wbio _tls_wbuf _on_starttls)}; } sub DESTROY { - my $self = shift; + my ($self) = @_; - $self->stoptls; + &_freetls; my $linger = exists $self->{linger} ? $self->{linger} : 3600; - if ($linger && length $self->{wbuf}) { + if ($linger && length $self->{wbuf} && $self->{fh}) { my $fh = delete $self->{fh}; my $wbuf = delete $self->{wbuf}; my @linger; - push @linger, AnyEvent->io (fh => $fh, poll => "w", cb => sub { + push @linger, AE::io $fh, 1, sub { my $len = syswrite $fh, $wbuf, length $wbuf; if ($len > 0) { @@ -1394,50 +1975,230 @@ } else { @linger = (); # end } - }); - push @linger, AnyEvent->timer (after => $linger, cb => sub { + }; + push @linger, AE::timer $linger, 0, sub { @linger = (); - }); + }; } } -=item AnyEvent::Handle::TLS_CTX +=item $handle->destroy -This function creates and returns the Net::SSLeay::CTX object used by -default for TLS mode. +Shuts down the handle object as much as possible - this call ensures that +no further callbacks will be invoked and as many resources as possible +will be freed. Any method you will call on the handle object after +destroying it in this way will be silently ignored (and it will return the +empty list). -The context is created like this: +Normally, you can just "forget" any references to an AnyEvent::Handle +object and it will simply shut down. This works in fatal error and EOF +callbacks, as well as code outside. It does I work in a read or write +callback, so when you want to destroy the AnyEvent::Handle object from +within such an callback. You I call C<< ->destroy >> explicitly in +that case. - Net::SSLeay::load_error_strings; - Net::SSLeay::SSLeay_add_ssl_algorithms; - Net::SSLeay::randomize; +Destroying the handle object in this way has the advantage that callbacks +will be removed as well, so if those are the only reference holders (as +is common), then one doesn't need to do anything special to break any +reference cycles. - my $CTX = Net::SSLeay::CTX_new; +The handle might still linger in the background and write out remaining +data, as specified by the C option, however. - Net::SSLeay::CTX_set_options $CTX, Net::SSLeay::OP_ALL +=cut + +sub destroy { + my ($self) = @_; + + $self->DESTROY; + %$self = (); + bless $self, "AnyEvent::Handle::destroyed"; +} + +sub AnyEvent::Handle::destroyed::AUTOLOAD { + #nop +} + +=item AnyEvent::Handle::TLS_CTX + +This function creates and returns the AnyEvent::TLS object used by default +for TLS mode. + +The context is created by calling L without any arguments. =cut our $TLS_CTX; sub TLS_CTX() { - $TLS_CTX || do { - require Net::SSLeay; + $TLS_CTX ||= do { + require AnyEvent::TLS; - Net::SSLeay::load_error_strings (); - Net::SSLeay::SSLeay_add_ssl_algorithms (); - Net::SSLeay::randomize (); + new AnyEvent::TLS + } +} - $TLS_CTX = Net::SSLeay::CTX_new (); +=back - Net::SSLeay::CTX_set_options ($TLS_CTX, Net::SSLeay::OP_ALL ()); - $TLS_CTX - } -} +=head1 NONFREQUENTLY ASKED QUESTIONS + +=over 4 + +=item I C the AnyEvent::Handle reference inside my callback and +still get further invocations! + +That's because AnyEvent::Handle keeps a reference to itself when handling +read or write callbacks. + +It is only safe to "forget" the reference inside EOF or error callbacks, +from within all other callbacks, you need to explicitly call the C<< +->destroy >> method. + +=item I get different callback invocations in TLS mode/Why can't I pause +reading? + +Unlike, say, TCP, TLS connections do not consist of two independent +communication channels, one for each direction. Or put differently. The +read and write directions are not independent of each other: you cannot +write data unless you are also prepared to read, and vice versa. + +This can mean than, in TLS mode, you might get C or C +callback invocations when you are not expecting any read data - the reason +is that AnyEvent::Handle always reads in TLS mode. + +During the connection, you have to make sure that you always have a +non-empty read-queue, or an C watcher. At the end of the +connection (or when you no longer want to use it) you can call the +C method. + +=item How do I read data until the other side closes the connection? + +If you just want to read your data into a perl scalar, the easiest way +to achieve this is by setting an C callback that does nothing, +clearing the C callback and in the C callback, the data +will be in C<$_[0]{rbuf}>: + + $handle->on_read (sub { }); + $handle->on_eof (undef); + $handle->on_error (sub { + my $data = delete $_[0]{rbuf}; + }); + +The reason to use C is that TCP connections, due to latencies +and packets loss, might get closed quite violently with an error, when in +fact, all data has been received. + +It is usually better to use acknowledgements when transferring data, +to make sure the other side hasn't just died and you got the data +intact. This is also one reason why so many internet protocols have an +explicit QUIT command. + +=item I don't want to destroy the handle too early - how do I wait until +all data has been written? + +After writing your last bits of data, set the C callback +and destroy the handle in there - with the default setting of +C this will be called precisely when all data has been +written to the socket: + + $handle->push_write (...); + $handle->on_drain (sub { + warn "all data submitted to the kernel\n"; + undef $handle; + }); + +If you just want to queue some data and then signal EOF to the other side, +consider using C<< ->push_shutdown >> instead. + +=item I want to contact a TLS/SSL server, I don't care about security. + +If your TLS server is a pure TLS server (e.g. HTTPS) that only speaks TLS, +simply connect to it and then create the AnyEvent::Handle with the C +parameter: + + tcp_connect $host, $port, sub { + my ($fh) = @_; + + my $handle = new AnyEvent::Handle + fh => $fh, + tls => "connect", + on_error => sub { ... }; + + $handle->push_write (...); + }; + +=item I want to contact a TLS/SSL server, I do care about security. + +Then you should additionally enable certificate verification, including +peername verification, if the protocol you use supports it (see +L, C). + +E.g. for HTTPS: + + tcp_connect $host, $port, sub { + my ($fh) = @_; + + my $handle = new AnyEvent::Handle + fh => $fh, + peername => $host, + tls => "connect", + tls_ctx => { verify => 1, verify_peername => "https" }, + ... + +Note that you must specify the hostname you connected to (or whatever +"peername" the protocol needs) as the C argument, otherwise no +peername verification will be done. + +The above will use the system-dependent default set of trusted CA +certificates. If you want to check against a specific CA, add the +C (or C) arguments to C: + + tls_ctx => { + verify => 1, + verify_peername => "https", + ca_file => "my-ca-cert.pem", + }, + +=item I want to create a TLS/SSL server, how do I do that? + +Well, you first need to get a server certificate and key. You have +three options: a) ask a CA (buy one, use cacert.org etc.) b) create a +self-signed certificate (cheap. check the search engine of your choice, +there are many tutorials on the net) or c) make your own CA (tinyca2 is a +nice program for that purpose). + +Then create a file with your private key (in PEM format, see +L), followed by the certificate (also in PEM format). The +file should then look like this: + + -----BEGIN RSA PRIVATE KEY----- + ...header data + ... lots of base64'y-stuff + -----END RSA PRIVATE KEY----- + + -----BEGIN CERTIFICATE----- + ... lots of base64'y-stuff + -----END CERTIFICATE----- + +The important bits are the "PRIVATE KEY" and "CERTIFICATE" parts. Then +specify this file as C: + + tcp_server undef, $port, sub { + my ($fh) = @_; + + my $handle = new AnyEvent::Handle + fh => $fh, + tls => "accept", + tls_ctx => { cert_file => "my-server-keycert.pem" }, + ... + +When you have intermediate CA certificates that your clients might not +know about, just append them to the C. =back + =head1 SUBCLASSING AnyEvent::Handle In many cases, you might want to subclass AnyEvent::Handle. @@ -1450,7 +2211,7 @@ =item * all constructor arguments become object members. At least initially, when you pass a C-argument to the constructor it -will end up in C<< $handle->{tls} >>. Those members might be changes or +will end up in C<< $handle->{tls} >>. Those members might be changed or mutated later on (for example C will hold the TLS connection object). =item * other object member names are prefixed with an C<_>.