" enabled. You must enable cookies".
" as we use them for login."),
_CookieRaw => $r->_fresh_secret(),
- Params => $r->_chain_params() })
+ Params => $r->chain_params() })
}
if (!$cookt || $cookt eq 'n' || $cookh ne $parmh) {
$r->_db_revoke($cookh);
return ({ Kind => 'LOGIN-BAD',
Message => $login_errormessage,
_CookieRaw => $cooks,
- Params => $r->_chain_params() })
+ Params => $r->chain_params() })
}
$r->_db_record_login_ok($parmh,$username);
return ({ Kind => 'REDIRECT-LOGGEDIN',
Message => $r->_gt("Logging in..."),
_CookieRaw => $cooks,
- Params => $r->_chain_params() });
+ Params => $r->chain_params() });
}
if ($cookt eq 't') {
$cookt = '';
return ({ Kind => 'LOGIN-INCOMINGLINK',
Message => $r->_gt("You need to log in."),
_CookieRaw => $news,
- Params => $r->_chain_params() });
+ Params => $r->chain_params() });
} else {
$r->_db_revoke($parmh);
return ({ Kind => 'LOGIN-FRESH',
return undef;
}
-sub _chain_params ($) {
-# =item C<< $authreq->_chain_params() >>
-#
-# Returns a hash of the "relevant" parameters to this request, in a form
-# used by C<url_with_query_params>. This is all of the query parameters
-# which are not related to CGI::Auth::Flexible. The PATH_INFO from the
-# request is returned as the parameter C<< '' >>.
-
+sub chain_params ($) {
my ($r) = @_;
my %p = %{ $r->_ch('get_params') };
foreach my $pncn (keys %{ $r->{S} }) {
$dbh->commit();
my $divert = $r->{Divert};
- my $cookraw = $divert->{_CookieRaw};
- $divert->{CookieSecret} = $r->_blind($cookraw);
+ my $cookraw = $divert && $divert->{_CookieRaw};
if ($cookraw) {
+ $divert->{CookieSecret} = $r->_blind($cookraw);
$divert->{Params}{$r->{S}{assoc_param_name}} = [
$r->_blind($r->hash($cookraw))
];
my $mask = $r->_random(($l+1)>>1);
$mask = substr $mask, 0, $l;
my $blound = $r->_blind_combine($in, $mask);
- return "$blound/$mask";
+ return "$blound.$mask";
}
sub _unblind ($$) {
my ($r, $in) = @_;
return $in unless $in;
- my ($blound,$mask) = ($in =~ m#^(.*)/([0-9a-f]+)$#) or die "$in ?";
+ my ($blound,$mask) = ($in =~ m#^(.*)\.([0-9a-f]+)$#) or die "$in ?";
my $l = $r->_blind_len($blound);
$l == length($mask) or die "$in ?";
return $r->_blind_combine($blound, $mask);