chiark
/
gitweb
/
~ian
/
cgi-auth-flexible.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b2d0c9b
)
wip
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Nov 2012 18:22:41 +0000
(18:22 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Nov 2012 18:22:41 +0000
(18:22 +0000)
cgi-auth-hybrid.pm
patch
|
blob
|
history
diff --git
a/cgi-auth-hybrid.pm
b/cgi-auth-hybrid.pm
index 6d2838764ea5f477a8ed66e59b58e02e91d84e4c..070603dd685096f5e182fdeaeb28689302b286f4 100644
(file)
--- a/
cgi-auth-hybrid.pm
+++ b/
cgi-auth-hybrid.pm
@@
-246,23
+246,25
@@
sub check_divert ($) {
die unless $parmt;
$r->_db_perhaps_revoke($cookv);
$r->_db_perhaps_revoke($parmv);
die unless $parmt;
$r->_db_perhaps_revoke($cookv);
$r->_db_perhaps_revoke($parmv);
- return 'LOGOUT';
+ $r->_queue_set_cookie('');
+ return 'REDIRECT-LOGGEDOUT';
}
if ($r->_ch('is_login')) {
return 'NOCOOKIE' if !$cookt && $parmt eq 't';
return 'LOGIN-STALE' if $parmt eq 'n';
}
if ($r->_ch('is_login')) {
return 'NOCOOKIE' if !$cookt && $parmt eq 't';
return 'LOGIN-STALE' if $parmt eq 'n';
- $r->_db_perhpa
+ $r->_db_perhaps_revoke($cookv)
+ if defined $cookv && !(defined $parmv && $cookv eq $parmv);
+ $r->_queue_set_cookie($parmv);
my $username = $r->_ch('login_ok');
return 'LOGIN-BAD' unless defined $username && length $username;
my $username = $r->_ch('login_ok');
return 'LOGIN-BAD' unless defined $username && length $username;
- $r->_db_
-
- }
-
-
- $r->_will_set_cookie('');
-
+ $r->_db_record_login_ok($parmv,$username);
+ return 'REDIRECT-LOGGEDIN';
}
}
-
+ if (!$r->{S}{promise_check_mutate}) {
+ something with method get, check parameter, etc.
+ return 'FRONTPAGE';
+ }
+
UP TO HERE
UP TO HERE