use overload ();
use Object::Signature ();
-our $VERSION = "0.05";
+our $VERSION = "0.09";
my @session_data_accessors; # used in delete_session
BEGIN {
_flash
_flash_keep_keys
_flash_key_hashes
+ _tried_loading_session_id
+ _tried_loading_session_data
+ _tried_loading_session_expires
+ _tried_loading_flash_data
/
);
}
my $c = shift;
if ( $c->config->{session}{flash_to_stash}
- and $c->_sessionid
+ and $c->sessionid
and my $flash_data = $c->flash )
{
@{ $c->stash }{ keys %$flash_data } = values %$flash_data;
sub finalize {
my $c = shift;
+ $c->_save_session_expires;
$c->_save_session;
$c->_save_flash;
+ $c->_save_session_id;
$c->NEXT::finalize(@_);
}
-sub _save_session {
+sub _save_session_id {
my $c = shift;
+}
- if ( my $sid = $c->_sessionid ) {
+sub _save_session_expires {
+ my $c = shift;
- # all sessions are extended at the end of the request
- my $now = time;
+ if ( defined(my $expires = $c->_session_expires) ) {
+ my $sid = $c->sessionid;
+ $c->store_session_data( "expires:$sid" => $expires );
- if ( my $expires = $c->session_expires ) {
- $c->store_session_data( "expires:$sid" => $expires );
- }
+ $c->_session_expires(undef);
+ $c->_tried_loading_session_expires(undef);
+ }
+}
- if ( my $session_data = $c->_session ) {
+sub _save_session {
+ my $c = shift;
- no warnings 'uninitialized';
- if ( Object::Signature::signature($session_data) ne
- $c->_session_data_sig )
- {
- $session_data->{__updated} = $now;
- $c->store_session_data( "session:$sid" => $session_data );
- }
+ if ( my $session_data = $c->_session ) {
+
+ no warnings 'uninitialized';
+ if ( Object::Signature::signature($session_data) ne
+ $c->_session_data_sig )
+ {
+ $session_data->{__updated} = time();
+ my $sid = $c->sessionid;
+ $c->store_session_data( "session:$sid" => $session_data );
}
+
+ $c->_session(undef);
+ $c->_tried_loading_session_data(undef);
}
}
sub _save_flash {
my $c = shift;
- if ( my $sid = $c->_sessionid ) {
- if ( my $flash_data = $c->_flash ) {
+ if ( my $flash_data = $c->_flash ) {
- my $hashes = $c->_flash_key_hashes || {};
- my $keep = $c->_flash_keep_keys || {};
- foreach my $key ( keys %$hashes ) {
- if ( !exists $keep->{$key} and Object::Signature::signature( \$flash_data->{$key} ) eq $hashes->{$key} ) {
- delete $flash_data->{$key};
- }
+ my $hashes = $c->_flash_key_hashes || {};
+ my $keep = $c->_flash_keep_keys || {};
+ foreach my $key ( keys %$hashes ) {
+ if ( !exists $keep->{$key} and Object::Signature::signature( \$flash_data->{$key} ) eq $hashes->{$key} ) {
+ delete $flash_data->{$key};
}
+ }
+
+ my $sid = $c->sessionid;
- if (%$flash_data) {
- $c->store_session_data( "flash:$sid", $flash_data );
- }
- else {
- $c->delete_session_data("flash:$sid");
- }
+ if (%$flash_data) {
+ $c->store_session_data( "flash:$sid", $flash_data );
+ }
+ else {
+ $c->delete_session_data("flash:$sid");
+ }
+
+ $c->_flash(undef);
+ $c->_tried_loading_flash_data(undef);
+ }
+}
+
+sub _load_session_expires {
+ my $c = shift;
+ 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 );
+ } else {
+ $c->delete_session( "session expired" );
+ return 0;
}
}
+
+ return;
}
sub _load_session {
my $c = shift;
+ return $c->_session if $c->_tried_loading_session_data;
+ $c->_tried_loading_session_data(1);
- if ( my $sid = $c->_sessionid ) {
+ if ( my $sid = $c->sessionid ) {
if ( $c->session_expires ) { # > 0
- my $session_data = $c->get_session_data("session:$sid");
+ my $session_data = $c->get_session_data("session:$sid") || return;
$c->_session($session_data);
no warnings 'uninitialized'; # ne __address
$c->log->warn(
"Deleting session $sid due to address mismatch ("
. $session_data->{__address} . " != "
- . $c->request->address . ")",
+ . $c->request->address . ")"
);
$c->delete_session("address mismatch");
return;
sub _load_flash {
my $c = shift;
+ return $c->_flash if $c->_tried_loading_flash_data;
+ $c->_tried_loading_flash_data(1);
- if ( my $sid = $c->_sessionid ) {
+ if ( my $sid = $c->sessionid ) {
if ( my $flash_data = $c->_flash
|| $c->_flash( $c->get_session_data("flash:$sid") ) )
{
$c->_flash_key_hashes({ map { $_ => Object::Signature::signature( \$flash_data->{$_} ) } keys %$flash_data });
+
return $flash_data;
}
}
- return undef;
+ return;
}
sub _expire_session_keys {
my $now = time;
- my $expiry = ( $data || $c->_session || {} )->{__expire_keys} || {};
- foreach my $key ( grep { $expiry->{$_} < $now } keys %$expiry ) {
+ my $expire_times = ( $data || $c->_session || {} )->{__expire_keys} || {};
+ foreach my $key ( grep { $expire_times->{$_} < $now } keys %$expire_times ) {
delete $c->_session->{$key};
- delete $expiry->{$key};
+ delete $expire_times->{$key};
}
}
sub delete_session {
my ( $c, $msg ) = @_;
+ $c->log->debug("Deleting session") if $c->debug;
+
# delete the session data
- my $sid = $c->_sessionid || return;
- $c->delete_session_data("${_}:${sid}") for qw/session expires flash/;
+ 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
sub session_delete_reason {
my $c = shift;
- $c->_load_session
- if ( $c->_sessionid && !$c->_session ); # must verify session data
+ $c->session_is_valid; # check that it was loaded
$c->_session_delete_reason(@_);
}
sub session_expires {
- my ( $c, $should_create ) = @_;
+ my $c = shift;
- $c->_session_expires || do {
- if ( my $sid = $c->_sessionid ) {
- my $now = time;
+ if ( defined( my $expires = $c->_session_expires ) ) {
+ return $expires;
+ } elsif ( defined( $expires = $c->_load_session_expires ) ) {
+ $c->_session_expires($expires);
+ return $expires;
+ } else {
+ return 0;
+ }
+}
- if ( !$should_create ) {
- if ( ( $c->get_session_data("expires:$sid") || 0 ) < $now ) {
+sub extend_session_expires {
+ my ( $c, $expires ) = @_;
+ $c->_session_expires( my $updated = $c->calculate_extended_session_expires( $expires ) );
+ $c->extend_session_id( $c->sessionid, $updated );
+ return $updated;
+}
- # session expired
- $c->log->debug("Deleting session $sid (expired)")
- if $c->debug;
- $c->delete_session("session expired");
- return 0;
- }
- }
+sub calculate_initial_session_expires {
+ my $c = shift;
+ return ( time() + $c->config->{session}{expires} );
+}
- return $c->_session_expires(
- $now + $c->config->{session}{expires} );
- }
- };
+sub calculate_extended_session_expires {
+ my ( $c, $prev ) = @_;
+ $c->calculate_initial_session_expires;
+}
+
+sub reset_session_expires {
+ my ( $c, $sid ) = @_;
+ $c->_session_expires( my $exp = $c->calculate_initial_session_expires );
+ $exp;
}
sub sessionid {
my $c = shift;
+
+ return $c->_sessionid || $c->_load_sessionid;
+}
- if (@_) {
- if($c->_sessionid()) {
- $c->log->warn('Session ID already set, ignoring.');
- return $c->_sessionid();
- }
- if ( $c->validate_session_id( my $sid = shift ) ) {
+sub _load_sessionid {
+ my $c = shift;
+ return if $c->_tried_loading_session_id;
+ $c->_tried_loading_session_id(1);
+
+ if ( defined( my $sid = $c->get_session_id ) ) {
+ if ( $c->validate_session_id($sid) ) {
+ # temporarily set the inner key, so that validation will work
$c->_sessionid($sid);
- return unless defined wantarray;
- }
- else {
+ return $sid;
+ } else {
my $err = "Tried to set invalid session ID '$sid'";
$c->log->error($err);
Catalyst::Exception->throw($err);
}
}
- $c->_load_session
- if ( $c->_sessionid && !$c->_session ); # must verify session data
+ return;
+}
- return $c->_sessionid;
+sub session_is_valid {
+ my $c = shift;
+
+ # force a check for expiry, but also __address, etc
+ if ( $c->_load_session ) {
+ return 1;
+ } else {
+ return;
+ }
}
sub validate_session_id {
my $c = shift;
$c->_session || $c->_load_session || do {
- $c->create_session_id;
-
+ $c->create_session_id_if_needed;
$c->initialize_session_data;
};
}
sub keep_flash {
my ( $c, @keys ) = @_;
- ($c->_flash_keep_keys->{@keys}) = ((undef) x @keys);
+ my $href = $c->_flash_keep_keys || $c->_flash_keep_keys({});
+ (@{$href}{@keys}) = ((undef) x @keys);
}
sub flash {
my $c = shift;
$c->_flash || $c->_load_flash || do {
- $c->create_session_id;
+ $c->create_session_id_if_needed;
$c->_flash( {} );
- }
+ }
}
sub session_expire_key {
return $digest->hexdigest;
}
+sub create_session_id_if_needed {
+ my $c = shift;
+ $c->create_session_id unless $c->sessionid;
+}
+
sub create_session_id {
my $c = shift;
+
+ my $sid = $c->generate_session_id;
- if ( !$c->_sessionid ) {
- my $sid = $c->generate_session_id;
+ $c->log->debug(qq/Created session "$sid"/) if $c->debug;
- $c->log->debug(qq/Created session "$sid"/) if $c->debug;
+ $c->_sessionid($sid);
+ $c->reset_session_expires;
+ $c->set_session_id($sid);
- $c->sessionid($sid);
- $c->session_expires(1);
- }
+ return $sid;
}
my $counter;
);
}
+
+sub get_session_id { shift->NEXT::get_session_id(@_) }
+sub set_session_id { shift->NEXT::set_session_id(@_) }
+sub delete_session_id { shift->NEXT::delete_session_id(@_) }
+sub extend_session_id { shift->NEXT::extend_session_id(@_) }
+
__PACKAGE__;
__END__
The flash data will be cleaned up only on requests on which actually use
$c->flash (thus allowing multiple redirections), and the policy is to delete
-all the keys which were present at the time the data was loaded just before the
-data is saved.
+all the keys which haven't changed since the flash data was loaded at the end
+of every request.
sub moose : Local {
my ( $self, $c ) = @_;
}
}
+=item keep_flash @keys
+
+If you wawnt to keep a flash key for the next request too, even if it hasn't
+changed, call C<keep_flash> and pass in the keys as arguments.
+
+=item delete_session REASON
+
+This method is used to invalidate a session. It takes an optional parameter
+which will be saved in C<session_delete_reason> if provided.
+
=item session_delete_reason
This accessor contains a string with the reason a session was deleted. Possible
This method is extended and will extend the expiry time, as well as persist the
session data if a session exists.
-=item delete_session REASON
-
-This method is used to invalidate a session. It takes an optional parameter
-which will be saved in C<session_delete_reason> if provided.
-
=item initialize_session_data
This method will initialize the internal structure of the session, and is
projects / catagits/Catalyst-Plugin-Session.git / blobdiff