use Digest ();
use overload ();
use Object::Signature ();
+use Carp;
-our $VERSION = "0.05";
+our $VERSION = "0.19";
my @session_data_accessors; # used in delete_session
BEGIN {
_sessionid
_session
_session_expires
+ _extended_session_expires
_session_data_sig
_flash
_flash_keep_keys
%$cfg = (
expires => 7200,
- verify_address => 1,
+ verify_address => 0,
%$cfg,
);
$c->NEXT::prepare_action(@_);
}
-sub finalize {
+sub finalize_headers {
my $c = shift;
+ # fix cookie before we send headers
$c->_save_session_expires;
+
+ return $c->NEXT::finalize_headers(@_);
+}
+
+sub finalize {
+ my $c = shift;
+ my $ret = $c->NEXT::finalize(@_);
+
+ # then finish the rest
+ $c->finalize_session;
+ return $ret;
+}
+
+sub finalize_session {
+ my $c = shift;
+
+ $c->NEXT::finalize_session;
+
+ $c->_save_session_id;
$c->_save_session;
$c->_save_flash;
- $c->NEXT::finalize(@_);
+ $c->_clear_session_instance_data;
+}
+
+sub _save_session_id {
+ my $c = shift;
+
+ # we already called set when allocating
+ # no need to tell the state plugins anything new
}
sub _save_session_expires {
my $c = shift;
- if ( defined(my $expires = $c->_session_expires) ) {
+ if ( defined($c->_session_expires) ) {
+ my $expires = $c->session_expires; # force extension
+
my $sid = $c->sessionid;
$c->store_session_data( "expires:$sid" => $expires );
-
- $c->_session_expires(undef);
- $c->_tried_loading_session_expires(undef);
}
}
my $sid = $c->sessionid;
$c->store_session_data( "session:$sid" => $session_data );
}
-
- $c->_session(undef);
- $c->_tried_loading_session_data(undef);
}
}
else {
$c->delete_session_data("flash:$sid");
}
-
- $c->_flash(undef);
- $c->_tried_loading_flash_data(undef);
}
}
sub _load_session_expires {
my $c = shift;
- return if $c->_tried_loading_session_expires;
+ return $c->_session_expires if $c->_tried_loading_session_expires;
$c->_tried_loading_session_expires(1);
if ( my $sid = $c->sessionid ) {
my $expires = $c->get_session_data("expires:$sid") || 0;
if ( $expires >= time() ) {
- return $c->extend_session_expires( $expires );
+ $c->_session_expires( $expires );
+ return $expires;
} else {
$c->delete_session( "session expired" );
return 0;
sub _load_session {
my $c = shift;
- return if $c->_tried_loading_session_data;
+ return $c->_session if $c->_tried_loading_session_data;
$c->_tried_loading_session_data(1);
if ( my $sid = $c->sessionid ) {
- if ( $c->session_expires ) { # > 0
+ if ( $c->_load_session_expires ) { # > 0
my $session_data = $c->get_session_data("session:$sid") || return;
$c->_session($session_data);
sub _load_flash {
my $c = shift;
- return if $c->_tried_loading_flash_data;
+ return $c->_flash if $c->_tried_loading_flash_data;
$c->_tried_loading_flash_data(1);
if ( my $sid = $c->sessionid ) {
}
}
+sub _clear_session_instance_data {
+ my $c = shift;
+ $c->$_(undef) for @session_data_accessors;
+ $c->NEXT::_clear_session_instance_data; # allow other plugins to hook in on this
+}
+
sub delete_session {
my ( $c, $msg ) = @_;
- # delete the session data
- my $sid = $c->sessionid || return;
- $c->delete_session_data("${_}:${sid}") for qw/session expires flash/;
+ $c->log->debug("Deleting session" . ( defined($msg) ? "($msg)" : '(no reason given)') ) if $c->debug;
- $c->delete_session_id;
+ # delete the session data
+ if ( my $sid = $c->sessionid ) {
+ $c->delete_session_data("${_}:${sid}") for qw/session expires flash/;
+ $c->delete_session_id($sid);
+ }
# reset the values in the context object
# see the BEGIN block
- $c->$_(undef) for @session_data_accessors;
+ $c->_clear_session_instance_data;
$c->_session_delete_reason($msg);
}
sub session_expires {
my $c = shift;
- if ( defined( my $expires = $c->_session_expires ) ) {
+ if ( defined( my $expires = $c->_extended_session_expires ) ) {
return $expires;
} elsif ( defined( $expires = $c->_load_session_expires ) ) {
- $c->_session_expires($expires);
- return $expires;
+ return $c->extend_session_expires( $expires );
} else {
return 0;
}
sub extend_session_expires {
my ( $c, $expires ) = @_;
- $c->_session_expires( my $updated = $c->calculate_extended_session_expires( $expires ) );
+ $c->_extended_session_expires( my $updated = $c->calculate_extended_session_expires( $expires ) );
$c->extend_session_id( $c->sessionid, $updated );
return $updated;
}
sub reset_session_expires {
my ( $c, $sid ) = @_;
- $c->_session_expires( my $exp = $c->calculate_initial_session_expires );
+
+ my $exp = $c->calculate_initial_session_expires;
+ $c->_session_expires( $exp );
+ $c->_extended_session_expires( $exp );
$exp;
}
if ( defined( my $sid = $c->get_session_id ) ) {
if ( $c->validate_session_id($sid) ) {
- $c->_sessionid( $sid );
+ # temporarily set the inner key, so that validation will work
+ $c->_sessionid($sid);
return $sid;
} else {
my $err = "Tried to set invalid session ID '$sid'";
sub session_is_valid {
my $c = shift;
- $c->_load_session; # check expiry and also __address, etc
-
- if ( $c->_session ) {
+ # force a check for expiry, but also __address, etc
+ if ( $c->_load_session ) {
return 1;
} else {
return;
(@{$href}{@keys}) = ((undef) x @keys);
}
-sub flash {
+sub _flash_data {
my $c = shift;
$c->_flash || $c->_load_flash || do {
$c->create_session_id_if_needed;
$c->_flash( {} );
+ };
+}
+
+sub _set_flash {
+ my $c = shift;
+ if (@_) {
+ my $items = @_ > 1 ? {@_} : $_[0];
+ croak('flash takes a hash or hashref') unless ref $items;
+ @{ $c->_flash }{ keys %$items } = values %$items;
}
}
+sub flash {
+ my $c = shift;
+ $c->_flash_data;
+ $c->_set_flash(@_);
+ return $c->_flash;
+}
+
+sub clear_flash {
+ my $c = shift;
+
+ #$c->delete_session_data("flash:" . $c->sessionid); # should this be in here? or delayed till finalization?
+ $c->_flash_key_hashes({});
+ $c->_flash_keep_keys({});
+ $c->_flash({});
+}
+
sub session_expire_key {
my ( $c, %keys ) = @_;
This plugin links the two pieces together.
-=head1 RECCOMENDED BACKENDS
+=head1 RECOMENDED BACKENDS
=over 4
}
}
+=item clear_flash
+
+Zap all the keys in the flash regardless of their current state.
+
=item keep_flash @keys
If you wawnt to keep a flash key for the next request too, even if it hasn't
parameter is on - then it will copy the contents of the flash to the stash at
prepare time.
+=item finalize_headers
+
+This method is extended and will extend the expiry time before sending
+the response.
+
=item finalize
-This method is extended and will extend the expiry time, as well as persist the
-session data if a session exists.
+This method is extended and will call finalize_session after the other
+finalizes run. Here we persist the session data if a session exists.
=item initialize_session_data
Also have a look at L<Crypt::Random> and the various openssl bindings - these
modules provide APIs for cryptographically secure random data.
+=item finalize_session
+
+Clean up the session during C<finalize>.
+
+This clears the various accessors after saving to the store.
+
=item dump_these
See L<Catalyst/dump_these> - ammends the session data structure to the list of
dumped objects if session ID is defined.
+
+=item calculate_extended_session_expires
+
+=item calculate_initial_session_expires
+
+=item create_session_id_if_needed
+
+=item delete_session_id
+
+=item extend_session_expires
+
+=item extend_session_id
+
+=item get_session_id
+
+=item reset_session_expires
+
+=item session_is_valid
+
+=item set_session_id
+
=back
=head1 USING SESSIONS DURING PREPARE
When true, C<<$c->request->address>> will be checked at prepare time. If it is
not the same as the address that initiated the session, the session is deleted.
+Defaults to false.
+
=item flash_to_stash
This option makes it easier to have actions behave the same whether they were
projects / catagits/Catalyst-Plugin-Session.git / blobdiff