X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Session-State-Cookie.git;a=blobdiff_plain;f=lib%2FCatalyst%2FPlugin%2FSession%2FState%2FCookie.pm;h=648516f7db03fc0971cf2ca99e87c8be01cd6103;hp=536f82f9b1e86a825069af04df8ae5deb757f9b9;hb=ef0cdc56b1d1caebc3b106934963c10203eb64d9;hpb=602b9593e1528d5d1085e3414400e6bc6458c1f6 diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm index 536f82f..648516f 100644 --- a/lib/Catalyst/Plugin/Session/State/Cookie.pm +++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm @@ -1,22 +1,22 @@ package Catalyst::Plugin::Session::State::Cookie; -use base qw/Catalyst::Plugin::Session::State Class::Accessor::Fast/; +use Moose; +use namespace::autoclean; -use strict; -use warnings; +extends 'Catalyst::Plugin::Session::State'; use MRO::Compat; use Catalyst::Utils (); -our $VERSION = "0.11"; +our $VERSION = "0.17"; -BEGIN { __PACKAGE__->mk_accessors(qw/_deleted_session_id/) } +has _deleted_session_id => ( is => 'rw' ); sub setup_session { my $c = shift; $c->maybe::next::method(@_); - $c->config->{session}{cookie_name} + $c->_session_plugin_config->{cookie_name} ||= Catalyst::Utils::appprefix($c) . '_session'; } @@ -40,27 +40,27 @@ sub set_session_id { sub update_session_cookie { my ( $c, $updated ) = @_; - + unless ( $c->cookie_is_rejecting( $updated ) ) { - my $cookie_name = $c->config->{session}{cookie_name}; + my $cookie_name = $c->_session_plugin_config->{cookie_name}; $c->response->cookies->{$cookie_name} = $updated; } } sub cookie_is_rejecting { my ( $c, $cookie ) = @_; - + if ( $cookie->{path} ) { return 1 if index '/'.$c->request->path, $cookie->{path}; } - + return 0; } sub make_session_cookie { my ( $c, $sid, %attrs ) = @_; - my $cfg = $c->config->{session}; + my $cfg = $c->_session_plugin_config; my $cookie = { value => $sid, ( $cfg->{cookie_domain} ? ( domain => $cfg->{cookie_domain} ) : () ), @@ -72,7 +72,14 @@ sub make_session_cookie { $cookie->{expires} = $c->calculate_session_cookie_expires(); } - $cookie->{secure} = 1 if $cfg->{cookie_secure}; + #beware: we have to accept also the old syntax "cookie_secure = true" + my $sec = $cfg->{cookie_secure} || 0; # default = 0 (not set) + $cookie->{secure} = 1 unless ( ($sec==0) || ($sec==2) ); + $cookie->{secure} = 1 if ( ($sec==2) && $c->req->secure ); + + $cookie->{httponly} = $cfg->{cookie_httponly}; + $cookie->{httponly} = 1 + unless defined $cookie->{httponly}; # default = 1 (set httponly) return $cookie; } @@ -84,7 +91,7 @@ sub calc_expiry { # compat sub calculate_session_cookie_expires { my $c = shift; - my $cfg = $c->config->{session}; + my $cfg = $c->_session_plugin_config; my $value = $c->maybe::next::method(@_); return $value if $value; @@ -105,7 +112,7 @@ sub calculate_session_cookie_expires { sub get_session_cookie { my $c = shift; - my $cookie_name = $c->config->{session}{cookie_name}; + my $cookie_name = $c->_session_plugin_config->{cookie_name}; return $c->request->cookies->{$cookie_name}; } @@ -113,7 +120,7 @@ sub get_session_cookie { sub get_session_id { my $c = shift; - if ( !$c->_deleted_session_id and my $cookie = $c->get_session_cookie ) { + if ( !$c->_deleted_session_id and my $cookie = $c->get_session_cookie ) { my $sid = $cookie->value; $c->log->debug(qq/Found sessionid "$sid" in cookie/) if $c->debug; return $sid if $sid; @@ -124,7 +131,7 @@ sub get_session_id { sub delete_session_id { my ( $c, $sid ) = @_; - + $c->_deleted_session_id(1); # to prevent get_session_id from returning it $c->update_session_cookie( $c->make_session_cookie( $sid, expires => 0 ) ); @@ -216,13 +223,40 @@ The name of the domain to store in the cookie (defaults to current host) =item cookie_expires -Number of seconds from now you want to elapse before cookie will expire. -Set to 0 to create a session cookie, ie one which will die when the +Number of seconds from now you want to elapse before cookie will expire. +Set to 0 to create a session cookie, ie one which will die when the user's browser is shut down. =item cookie_secure -If this attribute set true, the cookie will only be sent via HTTPS. +If this attribute B the cookie will not have the secure flag. + +If this attribute B (or true for backward compatibility) - the cookie +send by the server to the client will got the secure flag that tells the browser +to send this cookies back to the server only via HTTPS. + +If this attribute B then the cookie will got the secure flag only if +the request that caused cookie generation was sent over https (this option is +not good if you are mixing https and http in you application). + +Default vaule is 0. + +=item cookie_httponly + +If this attribute B, the cookie will not have HTTPOnly flag. + +If this attribute B, the cookie will got HTTPOnly flag that should +prevent client side Javascript accessing the cookie value - this makes some +sort of session hijacking attacks significantly harder. Unfortunately not all +browsers support this flag (MSIE 6 SP1+, Firefox 3.0.0.6+, Opera 9.5+); if +a browser is not aware of HTTPOnly the flag will be ignored. + +Default value is 1. + +Note1: Many peole are confused by the name "HTTPOnly" - it B +that this cookie works only over HTTP and not over HTTPS. + +Note2: This parameter requires Catalyst::Runtime 5.80005 otherwise is skipped. =item cookie_path @@ -232,7 +266,7 @@ The path of the request url where cookie should be baked. For example, you could stick this in MyApp.pm: - __PACKAGE__->config( session => { + __PACKAGE__->config( 'Plugin::Session' => { cookie_domain => '.mydomain.com', }); @@ -269,9 +303,16 @@ has been heavily modified since. Marcus Ramberg Jonathan Rockway Ejrockway@cpan.orgE Sebastian Riedel + Florian Ragwitz =head1 COPYRIGHT +Copyright (c) 2005 - 2009 +the Catalyst::Plugin::Session::State::Cookie L and L +as listed above. + +=head1 LICENSE + This program is free software, you can redistribute it and/or modify it under the same terms as Perl itself.