projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 78356 - cleaned up error message display
[freeside.git]
/
FS
/
FS
/
AuthCookieHandler.pm
diff --git
a/FS/FS/AuthCookieHandler.pm
b/FS/FS/AuthCookieHandler.pm
index
b571e47
..
93d8ea6
100644
(file)
--- a/
FS/FS/AuthCookieHandler.pm
+++ b/
FS/FS/AuthCookieHandler.pm
@@
-6,6
+6,12
@@
use FS::UID qw( adminsuidsetup preuser_setup );
use FS::CurrentUser;
use FS::Auth;
use FS::CurrentUser;
use FS::Auth;
+#Apache 2.2 and below
+sub useragent_ip {
+ my( $self, $r ) = @_;
+ $r->connection->remote_ip;
+}
+
sub authen_cred {
my( $self, $r, $username, $password ) = @_;
sub authen_cred {
my( $self, $r, $username, $password ) = @_;
@@
-14,11
+20,11
@@
sub authen_cred {
my $info = {};
unless ( FS::Auth->authenticate($username, $password, $info) ) {
my $info = {};
unless ( FS::Auth->authenticate($username, $password, $info) ) {
- warn "failed auth $username from ". $
r->connection->remote_ip
. "\n";
+ warn "failed auth $username from ". $
self->useragent_ip($r)
. "\n";
return undef;
}
return undef;
}
- warn "authenticated $username from ". $
r->connection->remote_ip
. "\n";
+ warn "authenticated $username from ". $
self->useragent_ip($r)
. "\n";
FS::CurrentUser->load_user( $username,
'autocreate' => FS::Auth->auth_class->autocreate,
FS::CurrentUser->load_user( $username,
'autocreate' => FS::Auth->auth_class->autocreate,
@@
-36,7
+42,7
@@
sub authen_ses_key {
my $curuser = FS::CurrentUser->load_user_session( $sessionkey );
unless ( $curuser ) {
my $curuser = FS::CurrentUser->load_user_session( $sessionkey );
unless ( $curuser ) {
- warn "bad session $sessionkey from ". $
r->connection->remote_ip
. "\n";
+ warn "bad session $sessionkey from ". $
self->useragent_ip($r)
. "\n";
return undef;
}
return undef;
}