use Bugzilla::Field;
use base qw(Bugzilla::Object Exporter);
-@Bugzilla::User::EXPORT = qw(insert_new_user is_available_username
+@Bugzilla::User::EXPORT = qw(is_available_username
login_to_id user_id_to_login validate_password
UserInGroup
USER_MATCH_MULTIPLE USER_MATCH_FAILED USER_MATCH_SUCCESS
use constant NAME_FIELD => 'login_name';
use constant ID_FIELD => 'userid';
+use constant REQUIRED_CREATE_FIELDS => qw(login_name cryptpassword);
+
+use constant VALIDATORS => {
+ cryptpassword => \&_check_password,
+ disable_mail => \&_check_disable_mail,
+ disabledtext => \&_check_disabledtext,
+ login_name => \&check_login_name_for_creation,
+ realname => \&_check_realname,
+};
+
################################################################################
# Functions
################################################################################
return $class->SUPER::new(@_);
}
+################################################################################
+# Validators
+################################################################################
+
+sub _check_disable_mail { return $_[0] ? 1 : 0; }
+sub _check_disabledtext { return trim($_[0]) || ''; }
+
+# This is public since createaccount.cgi needs to use it before issuing
+# a token for account creation.
+sub check_login_name_for_creation {
+ my ($name) = @_;
+ $name = trim($name);
+ $name || ThrowUserError('user_login_required');
+ validate_email_syntax($name)
+ || ThrowUserError('illegal_email_address', { addr => $name });
+ is_available_username($name)
+ || ThrowUserError('account_exists', { email => $name });
+ return $name;
+}
+
+sub _check_password {
+ my ($pass) = @_;
+
+ # If the password is '*', do not encrypt it or validate it further--we
+ # are creating a user who should not be able to log in using DB
+ # authentication.
+ return $pass if $pass eq '*';
+
+ validate_password($pass);
+ my $cryptpassword = bz_crypt($pass);
+ return $cryptpassword;
+}
+
+sub _check_realname { return trim($_[0]) || ''; }
+
+################################################################################
+# Methods
+################################################################################
+
# Accessors for user attributes
sub login { $_[0]->{login}; }
sub email { $_[0]->{login} . Bugzilla->params->{'emailsuffix'}; }
return $self->{'userlist'};
}
-sub insert_new_user {
- my ($username, $realname, $password, $disabledtext, $disable_mail) = (@_);
+sub create {
+ my $invocant = shift;
+ my $class = ref($invocant) || $invocant;
my $dbh = Bugzilla->dbh;
- $disabledtext ||= '';
- $disable_mail ||= 0;
+ $dbh->bz_lock_tables('profiles WRITE', 'profiles_activity WRITE',
+ 'user_group_map WRITE', 'email_setting WRITE', 'groups READ',
+ 'tokens READ', 'fielddefs READ');
- # If not specified, generate a new random password for the user.
- # If the password is '*', do not encrypt it; we are creating a user
- # based on the ENV auth method.
- $password ||= generate_random_password();
- my $cryptpassword = ($password ne '*') ? bz_crypt($password) : $password;
-
- # XXX - These should be moved into is_available_username or validate_email_syntax
- # At the least, they shouldn't be here. They're safe for now, though.
- trick_taint($username);
- trick_taint($realname);
-
- # Insert the new user record into the database.
- $dbh->do("INSERT INTO profiles
- (login_name, realname, cryptpassword, disabledtext,
- disable_mail)
- VALUES (?, ?, ?, ?, ?)",
- undef,
- ($username, $realname, $cryptpassword, $disabledtext,
- $disable_mail));
+ my $user = $class->SUPER::create(@_);
# Turn on all email for the new user
- my $new_userid = $dbh->bz_last_key('profiles', 'userid');
-
foreach my $rel (RELATIONSHIPS) {
foreach my $event (POS_EVENTS, NEG_EVENTS) {
# These "exceptions" define the default email preferences.
next if (($event == EVT_CC) && ($rel != REL_REPORTER));
$dbh->do('INSERT INTO email_setting (user_id, relationship, event)
- VALUES (?, ?, ?)', undef, ($new_userid, $rel, $event));
+ VALUES (?, ?, ?)', undef, ($user->id, $rel, $event));
}
}
foreach my $event (GLOBAL_EVENTS) {
$dbh->do('INSERT INTO email_setting (user_id, relationship, event)
- VALUES (?, ?, ?)', undef, ($new_userid, REL_ANY, $event));
+ VALUES (?, ?, ?)', undef, ($user->id, REL_ANY, $event));
}
- my $user = new Bugzilla::User($new_userid);
$user->derive_regexp_groups();
# Add the creation date to the profiles_activity table.
VALUES (?, ?, NOW(), ?, NOW())',
undef, ($user->id, $who, $creation_date_fieldid));
+ $dbh->bz_unlock_tables();
+
# Return the newly created user account.
return $user;
}
$user->get_selectable_classifications;
# Class Functions
- $user = insert_new_user($username, $realname, $password, $disabledtext);
+ $user = Bugzilla::User->create({
+ login_name => $username,
+ realname => $realname,
+ cryptpassword => $plaintext_password,
+ disabledtext => $disabledtext,
+ disable_mail => 0});
=head1 DESCRIPTION
=over 4
-=item C<insert_new_user>
-
-Creates a new user in the database.
-
-Params: $username (scalar, string) - The login name for the new user.
- $realname (scalar, string) - The full name for the new user.
- $password (scalar, string) - Optional. The password for the new user;
- if not given, a random password will be
- generated.
- $disabledtext (scalar, string) - Optional. The disable text for the new
- user; if not given, it will be empty.
- If given, the user will be disabled,
- meaning the account will be
- unavailable for login.
- $disable_mail (scalar, boolean) - Optional, defaults to 0.
- If 1, bug-related mail will not be
- sent to this user; if 0, mail will
- be sent depending on the user's
- email preferences.
-
-Returns: The Bugzilla::User object representing the new user account.
+=item C<create>
+
+The same as L<Bugzilla::Object/create>.
+
+Params: login_name - B<Required> The login name for the new user.
+ realname - The full name for the new user.
+ cryptpassword - B<Required> The password for the new user.
+ Even though the name says "crypt", you should just specify
+ a plain-text password. If you specify '*', the user will not
+ be able to log in using DB authentication.
+ disabledtext - The disable-text for the new user. If given, the user
+ will be disabled, meaning he cannot log in. Defaults to an
+ empty string.
+ disable_mail - If 1, bug-related mail will not be sent to this user;
+ if 0, mail will be sent depending on the user's email preferences.
=item C<is_available_username>
action => "add",
object => "users"});
- my $login = $cgi->param('login');
- my $password = $cgi->param('password');
- my $realname = trim($cgi->param('name') || '');
- my $disabledtext = trim($cgi->param('disabledtext') || '');
- my $disable_mail = $cgi->param('disable_mail') ? 1 : 0;
-
- # Lock tables during the check+creation session.
- $dbh->bz_lock_tables('profiles WRITE', 'profiles_activity WRITE',
- 'email_setting WRITE', 'user_group_map WRITE',
- 'groups READ', 'tokens READ', 'fielddefs READ');
-
- # Validity checks
- $login || ThrowUserError('user_login_required');
- validate_email_syntax($login)
- || ThrowUserError('illegal_email_address', {addr => $login});
- is_available_username($login)
- || ThrowUserError('account_exists', {email => $login});
- validate_password($password);
-
- # Login and password are validated now, and realname and disabledtext
- # are allowed to contain anything
- trick_taint($login);
- trick_taint($realname);
- trick_taint($password);
- trick_taint($disabledtext);
-
- insert_new_user($login, $realname, $password, $disabledtext, $disable_mail);
- my $new_user_id = $dbh->bz_last_key('profiles', 'userid');
- $dbh->bz_unlock_tables();
- userDataToVars($new_user_id);
+ my $new_user = Bugzilla::User->create({
+ login_name => $cgi->param('login'),
+ cryptpassword => $cgi->param('password'),
+ realname => $cgi->param('name'),
+ disabledtext => $cgi->param('disabledtext'),
+ disable_mail => $cgi->param('disable_mail')});
+
+ userDataToVars($new_user->id);
$vars->{'message'} = 'account_created';
$template->process('admin/users/edit.html.tmpl', $vars)
sub confirm_create_account {
my (undef, undef, $login_name) = Bugzilla::Token::GetTokenData($::token);
- (defined $cgi->param('passwd1') && defined $cgi->param('passwd2'))
- || ThrowUserError('new_password_missing');
- validate_password($cgi->param('passwd1'), $cgi->param('passwd2'));
-
- my $realname = $cgi->param('realname');
- my $password = $cgi->param('passwd1');
-
- $dbh->bz_lock_tables('profiles WRITE', 'profiles_activity WRITE',
- 'email_setting WRITE', 'user_group_map WRITE',
- 'groups READ', 'tokens READ', 'fielddefs READ');
-
- # The email syntax may have changed since the initial creation request.
- validate_email_syntax($login_name)
- || ThrowUserError('illegal_email_address', {addr => $login_name});
- # Also, maybe that this user account has already been created meanwhile.
- is_available_username($login_name)
- || ThrowUserError('account_exists', {email => $login_name});
-
- # Login and password are validated now, and realname is allowed to
- # contain anything.
- trick_taint($realname);
- trick_taint($password);
-
- my $otheruser = insert_new_user($login_name, $realname, $password);
- $dbh->bz_unlock_tables();
+ validate_password($cgi->param('passwd1') || '',
+ $cgi->param('passwd2') || '');
+
+ my $otheruser = Bugzilla::User->create({
+ login_name => $login_name,
+ realname => $cgi->param('realname'),
+ cryptpassword => $cgi->param('passwd1')});
# Now delete this token.
Bugzilla::Token::DeleteToken($::token);
projects / thirdparty / bugzilla.git / commitdiff
