Skip to content

Commit

Permalink
Bug 1061271: Add a hook into Bugzilla::User::check_and_send_account_c…
Browse files Browse the repository at this point in the history
…reation_confirmation()

r=gerv a=glob
  • Loading branch information
LpSolit committed Feb 26, 2015
1 parent 0a0c32b commit 0a8f7a5
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 1 deletion.
18 changes: 18 additions & 0 deletions Bugzilla/Hook.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1592,6 +1592,24 @@ name), you can get it from here.
=back
=head2 user_check_account_creation
This hook permits you to do extra checks before the creation of a new user
account. This hook is called after email address validation has been done.
Note that this hook can also access the IP address of the requester thanks
to the C<remote_ip()> subroutine exported by C<Bugzilla::Util>.
Params:
=over
=item C<login>
The login of the new account. This is usually an email address, unless the
C<emailsuffix> parameter is not empty.
=back
=head2 user_preferences
This hook allows you to add additional panels to the User Preferences page,
Expand Down
4 changes: 4 additions & 0 deletions Bugzilla/User.pm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use Bugzilla::Classification;
use Bugzilla::Field;
use Bugzilla::Group;
use Bugzilla::BugUserLastVisit;
use Bugzilla::Hook;

use DateTime::TimeZone;
use List::Util qw(max);
Expand Down Expand Up @@ -2417,6 +2418,9 @@ sub check_and_send_account_creation_confirmation {
ThrowUserError('account_creation_restricted');
}

# Allow extensions to do extra checks.
Bugzilla::Hook::process('user_check_account_creation', { login => $login });

# Create and send a token for this new account.
require Bugzilla::Token;
Bugzilla::Token::issue_new_user_account_token($login);
Expand Down
22 changes: 21 additions & 1 deletion extensions/Example/Extension.pm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use Bugzilla::Error;
use Bugzilla::Group;
use Bugzilla::User;
use Bugzilla::User::Setting;
use Bugzilla::Util qw(diff_arrays html_quote);
use Bugzilla::Util qw(diff_arrays html_quote remote_ip);
use Bugzilla::Status qw(is_open_state);
use Bugzilla::Install::Filesystem;
use Bugzilla::WebService::Constants;
Expand Down Expand Up @@ -953,6 +953,26 @@ sub template_before_process {
}
}

sub user_check_account_creation {
my ($self, $args) = @_;

my $login = $args->{login};
my $ip = remote_ip();

# Log all requests.
warn "USER ACCOUNT CREATION REQUEST FOR $login ($ip)";

# Reject requests based on their email address.
if ($login =~ /\@evil\.com$/) {
ThrowUserError('account_creation_restricted');
}

# Reject requests based on their IP address.
if ($ip =~ /^192\.168\./) {
ThrowUserError('account_creation_restricted');
}
}

sub user_preferences {
my ($self, $args) = @_;
my $tab = $args->{current_tab};
Expand Down

0 comments on commit 0a8f7a5

Please sign in to comment.