return $getter->can_logout;
}
-sub login_token {
- my ($self) = @_;
- my $getter = $self->{_info_getter}->{successful};
- if ($getter && $getter->isa('Bugzilla::Auth::Login::Cookie')) {
- return $getter->login_token;
- }
- return undef;
-}
-
sub user_can_create_account {
my ($self) = @_;
my $verifier = $self->{_verifier}->{successful};
Returns: C<true> if users can change their own email address,
C<false> otherwise.
-=item C<login_token>
-
-Description: If a login token was used instead of a cookie then this
- will return the current login token data such as user id
- and the token itself.
-Params: None
-Returns: A hash containing C<login_token> and C<user_id>.
-
=back
=head1 STRUCTURE
package Bugzilla::Auth::Login;
use strict;
-use fields qw(_login_token);
+use fields qw();
# Determines whether or not a user can logout. It's really a subroutine,
# but we implement it here as a constant. Override it in subclasses if
use constant requires_persistence => 0;
use constant requires_verification => 0;
use constant can_login => 0;
-
-sub is_automatic { return $_[0]->login_token ? 0 : 1; }
+use constant is_automatic => 1;
# Note that Cookie never consults the Verifier, it always assumes
# it has a valid DB account or it fails.
my ($self) = @_;
my $cgi = Bugzilla->cgi;
my $dbh = Bugzilla->dbh;
- my ($user_id, $login_cookie);
- if (!Bugzilla->request_cache->{auth_no_automatic_login}) {
- $login_cookie = $cgi->cookie("Bugzilla_logincookie");
- $user_id = $cgi->cookie("Bugzilla_login");
+ my $ip_addr = remote_ip();
+ my $login_cookie = $cgi->cookie("Bugzilla_logincookie");
+ my $user_id = $cgi->cookie("Bugzilla_login");
- # If cookies cannot be found, this could mean that they haven't
- # been made available yet. In this case, look at Bugzilla_cookie_list.
- unless ($login_cookie) {
- my $cookie = first {$_->name eq 'Bugzilla_logincookie'}
- @{$cgi->{'Bugzilla_cookie_list'}};
- $login_cookie = $cookie->value if $cookie;
- }
- unless ($user_id) {
- my $cookie = first {$_->name eq 'Bugzilla_login'}
- @{$cgi->{'Bugzilla_cookie_list'}};
- $user_id = $cookie->value if $cookie;
- }
+ # If cookies cannot be found, this could mean that they haven't
+ # been made available yet. In this case, look at Bugzilla_cookie_list.
+ unless ($login_cookie) {
+ my $cookie = first {$_->name eq 'Bugzilla_logincookie'}
+ @{$cgi->{'Bugzilla_cookie_list'}};
+ $login_cookie = $cookie->value if $cookie;
}
-
- # If no cookies were provided, we also look for a login token
- # passed in the parameters of a webservice
- my $token = $self->login_token;
- if ($token && (!$login_cookie || !$user_id)) {
- ($user_id, $login_cookie) = ($token->{'user_id'}, $token->{'login_token'});
+ unless ($user_id) {
+ my $cookie = first {$_->name eq 'Bugzilla_login'}
+ @{$cgi->{'Bugzilla_cookie_list'}};
+ $user_id = $cookie->value if $cookie;
}
- my $ip_addr = remote_ip();
-
if ($login_cookie && $user_id) {
# Anything goes for these params - they're just strings which
# we're going to verify against the db
return { failure => AUTH_NODATA };
}
-sub login_token {
- my ($self) = @_;
- my $input = Bugzilla->input_params;
- my $usage_mode = Bugzilla->usage_mode;
-
- return $self->{'_login_token'} if exists $self->{'_login_token'};
-
- if ($usage_mode ne USAGE_MODE_XMLRPC
- && $usage_mode ne USAGE_MODE_JSON)
- {
- return $self->{'_login_token'} = undef;
- }
-
- # Check if a token was passed in via requests for WebServices
- my $token = trim(delete $input->{'Bugzilla_token'});
- return $self->{'_login_token'} = undef if !$token;
-
- my ($user_id, $login_token) = split('-', $token, 2);
- if (!detaint_natural($user_id) || !$login_token) {
- return $self->{'_login_token'} = undef;
- }
-
- return $self->{'_login_token'} = {
- user_id => $user_id,
- login_token => $login_token
- };
-}
-
1;
use Bugzilla::Util;
use Bugzilla::Token;
-use Bugzilla::Auth::Login::Cookie qw(login_token);
-
use List::Util qw(first);
sub new {
my $dbh = Bugzilla->dbh;
my $cgi = Bugzilla->cgi;
- my $input = Bugzilla->input_params;
$param = {} unless $param;
my $user = $param->{user} || Bugzilla->user;
my $type = $param->{type} || LOGOUT_ALL;
# The LOGOUT_*_CURRENT options require the current login cookie.
# If a new cookie has been issued during this run, that's the current one.
# If not, it's the one we've received.
- my @login_cookies;
my $cookie = first {$_->name eq 'Bugzilla_logincookie'}
@{$cgi->{'Bugzilla_cookie_list'}};
+ my $login_cookie;
if ($cookie) {
- push(@login_cookies, $cookie->value);
+ $login_cookie = $cookie->value;
}
else {
- push(@login_cookies, $cgi->cookie("Bugzilla_logincookie"));
- }
-
- # If we are a webservice using a token instead of cookie
- # then add that as well to the login cookies to delete
- if (my $login_token = $user->authorizer->login_token) {
- push(@login_cookies, $login_token->{'login_token'});
+ $login_cookie = $cgi->cookie("Bugzilla_logincookie") || '';
}
-
- return if !@login_cookies;
+ trick_taint($login_cookie);
# These queries use both the cookie ID and the user ID as keys. Even
# though we know the userid must match, we still check it in the SQL
# logged in and got the same cookie, we could be logging the other
# user out here. Yes, this is very very very unlikely, but why take
# chances? - bbaetz
- map { trick_taint($_) } @login_cookies;
- @login_cookies = map { $dbh->quote($_) } @login_cookies;
if ($type == LOGOUT_KEEP_CURRENT) {
- $dbh->do("DELETE FROM logincookies WHERE " .
- $dbh->sql_in('cookie', \@login_cookies, 1) .
- " AND userid = ?",
- undef, $user->id);
+ $dbh->do("DELETE FROM logincookies WHERE cookie != ? AND userid = ?",
+ undef, $login_cookie, $user->id);
} elsif ($type == LOGOUT_CURRENT) {
- $dbh->do("DELETE FROM logincookies WHERE " .
- $dbh->sql_in('cookie', \@login_cookies) .
- " AND userid = ?",
- undef, $user->id);
+ $dbh->do("DELETE FROM logincookies WHERE cookie = ? AND userid = ?",
+ undef, $login_cookie, $user->id);
} else {
die("Invalid type $type supplied to logout()");
}
if ($type != LOGOUT_KEEP_CURRENT) {
clear_browser_cookies();
}
+
}
sub clear_browser_cookies {
use Bugzilla::Error;
use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Util qw(taint_data fix_credentials);
+use Bugzilla::WebService::Util qw(taint_data);
use Bugzilla::Util qw(correct_urlbase trim disable_utf8);
use HTTP::Message;
}
}
- # Update the params to allow for several convenience key/values
- # use for authentication
- fix_credentials($params);
-
Bugzilla->input_params($params);
if ($self->request->method eq 'POST') {
use Bugzilla::Error;
use Bugzilla::WebService::Constants qw(XMLRPC_CONTENT_TYPE_WHITELIST);
-use Bugzilla::WebService::Util qw(fix_credentials);
use Scalar::Util qw(tainted);
sub deserialize {
my $params = $som->paramsin;
# This allows positional parameters for Testopia.
$params = {} if ref $params ne 'HASH';
-
- # Update the params to allow for several convenience key/values
- # use for authentication
- fix_credentials($params);
-
Bugzilla->input_params($params);
return $som;
}
use Bugzilla::Util qw(trim detaint_natural);
use Bugzilla::WebService::Util qw(filter validate translate params_to_objects);
-use List::Util qw(first min);
+use List::Util qw(min);
# Don't need auth to login
use constant LOGIN_EXEMPT => {
$input_params->{'Bugzilla_password'} = $params->{password};
$input_params->{'Bugzilla_remember'} = $remember;
- my $user = Bugzilla->login();
-
- my $result = { id => $self->type('int', $user->id) };
-
- # We will use the stored cookie value combined with the user id
- # to create a token that can be used with future requests in the
- # query parameters
- my $login_cookie = first { $_->name eq 'Bugzilla_logincookie' }
- @{ Bugzilla->cgi->{'Bugzilla_cookie_list'} };
- if ($login_cookie) {
- $result->{'token'} = $user->id . "-" . $login_cookie->value;
- }
-
- return $result;
+ Bugzilla->login();
+ return { id => $self->type('int', Bugzilla->user->id) };
}
sub logout {
my $self = shift;
Bugzilla->logout;
+ return undef;
}
#################
=item B<Returns>
-On success, a hash containing two items, C<id>, the numeric id of the
-user that was logged in, and a C<token> which can be passed in
-the parameters as authentication in other calls. A set of http cookies
-is also sent with the response. These cookies *or* the token can be sent
-along with any future requests to the webservice, for the duration of the
-session.
+On success, a hash containing one item, C<id>, the numeric id of the
+user that was logged in. A set of http cookies is also sent with the
+response. These cookies must be sent along with any future requests
+to the webservice, for the duration of the session.
=item B<Errors>
validate
translate
params_to_objects
- fix_credentials
);
sub filter ($$;$) {
return \@objects;
}
-sub fix_credentials {
- my ($params) = @_;
- # Allow user to pass in login=foo&password=bar as a convenience
- # even if not calling User.login. We also do not delete them as
- # User.login requires "login" and "password".
- if (exists $params->{'login'} && exists $params->{'password'}) {
- $params->{'Bugzilla_login'} = $params->{'login'};
- $params->{'Bugzilla_password'} = $params->{'password'};
- }
- # Allow user to pass token=12345678 as a convenience which becomes
- # "Bugzilla_token" which is what the auth code looks for.
- if (exists $params->{'token'}) {
- $params->{'Bugzilla_token'} = $params->{'token'};
- }
-}
-
__END__
=head1 NAME
Helps make life simpler for WebService methods that internally create objects
via both "ids" and "names" fields. Also de-duplicates objects that were loaded
by both "ids" and "names". Returns an arrayref of objects.
-
-=head2 fix_credentials
-
-Allows for certain parameters related to authentication such as Bugzilla_login,
-Bugzilla_password, and Bugzilla_token to have shorter named equivalents passed in.
-This function converts the shorter versions to their respective internal names.
projects / thirdparty / bugzilla.git / commitdiff
