X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=blobdiff_plain;f=cgi-auth-flexible.pm;h=a2975199a14a65cbbf5266759e9de6b92bf62cc9;hp=b4985cacb099d3109c6f7d75eaa35204517e8c23;hb=8fdc8b3c4aafee033887c600384a7a78521b9a18;hpb=75f96dbe2a96bfbf323b7d48e447b9f57e8f78c5

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index b4985ca..a297519 100644
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -844,7 +844,7 @@ sub _check_divert_core ($) {
                                          " 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);
@@ -862,13 +862,13 @@ sub _check_divert_core ($) {
             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 = '';
@@ -888,7 +888,7 @@ sub _check_divert_core ($) {
 	    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',
@@ -922,14 +922,7 @@ sub _check_divert_core ($) {
     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} }) {
@@ -1037,9 +1030,9 @@ sub check_divert ($) {
     $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))
 	    ];
@@ -1185,13 +1178,13 @@ sub _blind ($$) {
     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);