Page MenuHomePhabricator
Files F14422716

D7576.id17107.diff
No OneTemporary
Actions

D7576.id17107.diff
View Options

Index: scripts/user/account_admin.php
===================================================================
--- scripts/user/account_admin.php
+++ scripts/user/account_admin.php
@@ -181,6 +181,7 @@
$editor->createNewUser($user, $email);
} else {
if ($verify_email) {
+ $user->setIsEmailVerified(1);
$verify_email->setIsVerified($set_verified ? 1 : 0);
}
$editor->updateUser($user, $verify_email);
Index: scripts/user/add_user.php
===================================================================
--- scripts/user/add_user.php
+++ scripts/user/add_user.php
@@ -42,6 +42,7 @@
$user = new PhabricatorUser();
$user->setUsername($username);
$user->setRealname($realname);
+$user->setIsApproved(1);
$email_object = id(new PhabricatorUserEmail())
->setAddress($email)
Index: src/applications/auth/controller/PhabricatorAuthRegisterController.php
===================================================================
--- src/applications/auth/controller/PhabricatorAuthRegisterController.php
+++ src/applications/auth/controller/PhabricatorAuthRegisterController.php
@@ -232,6 +232,19 @@
$user->setUsername($value_username);
$user->setRealname($value_realname);
+ if ($is_setup) {
+ $must_approve = false;
+ } else {
+ $must_approve = PhabricatorEnv::getEnvConfig(
+ 'auth.require-approval');
+ }
+
+ if ($must_approve) {
+ $user->setIsApproved(0);
+ } else {
+ $user->setIsApproved(1);
+ }
+
$user->openTransaction();
$editor = id(new PhabricatorUserEditor())
@@ -257,6 +270,10 @@
$email_obj->sendVerificationEmail($user);
}
+ if ($must_approve) {
+ $this->sendWaitingForApprovalEmail($user);
+ }
+
return $this->loginUser($user);
} catch (AphrontQueryDuplicateKeyException $exception) {
$same_username = id(new PhabricatorUser())->loadOneWhere(
@@ -506,4 +523,43 @@
array($message));
}
+ private function sendWaitingForApprovalEmail(PhabricatorUser $user) {
+ $title = '[Phabricator] '.pht(
+ 'New User "%s" Awaiting Approval',
+ $user->getUsername());
+
+ $body = new PhabricatorMetaMTAMailBody();
+
+ $body->addRawSection(
+ pht(
+ 'Newly registered user "%s" is awaiting account approval by an '.
+ 'administrator.',
+ $user->getUsername()));
+
+ $body->addTextSection(
+ pht('APPROVAL QUEUE'),
+ PhabricatorEnv::getProductionURI(
+ '/people/query/approval/'));
+
+ $body->addTextSection(
+ pht('DISABLE APPROVAL QUEUE'),
+ PhabricatorEnv::getProductionURI(
+ '/config/edit/auth.require-approval/'));
+
+ $admins = id(new PhabricatorPeopleQuery())
+ ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->withIsAdmin(true)
+ ->execute();
+
+ if (!$admins) {
+ return;
+ }
+
+ $mail = id(new PhabricatorMetaMTAMail())
+ ->addTos(mpull($admins, 'getPHID'))
+ ->setSubject($title)
+ ->setBody($body->render())
+ ->saveAndSend();
+ }
+
}
Index: src/applications/config/controller/PhabricatorConfigEditController.php
===================================================================
--- src/applications/config/controller/PhabricatorConfigEditController.php
+++ src/applications/config/controller/PhabricatorConfigEditController.php
@@ -490,7 +490,7 @@
$table[] = phutil_tag('tr', array(), array(
phutil_tag('th', array(), $description),
- phutil_tag('th', array(), $value),
+ phutil_tag('td', array(), $value),
));
}
Index: src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
===================================================================
--- src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
+++ src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
@@ -21,7 +21,7 @@
"Maximum number of simultaneous web sessions each user is ".
"permitted to have. Setting this to '1' will prevent a user from ".
"logging in on more than one browser at the same time.")),
- $this->newOption('auth.sessions.conduit', 'int', 5)
+ $this->newOption('auth.sessions.conduit', 'int', 5)
->setSummary(
pht(
"Number of simultaneous Conduit sessions each user is permitted."))
@@ -29,7 +29,7 @@
pht(
"Maximum number of simultaneous Conduit sessions each user is ".
"permitted to have.")),
- $this->newOption('auth.require-email-verification', 'bool', false)
+ $this->newOption('auth.require-email-verification', 'bool', false)
->setBoolOptions(
array(
pht("Require email verification"),
@@ -41,24 +41,47 @@
pht(
"If true, email addresses must be verified (by clicking a link ".
"in an email) before a user can login. By default, verification ".
- "is optional unless 'auth.email-domains' is nonempty.")),
- $this->newOption('auth.email-domains', 'list<string>', array())
+ "is optional unless {{auth.email-domains}} is nonempty.")),
+ $this->newOption('auth.require-approval', 'bool', true)
+ ->setBoolOptions(
+ array(
+ pht("Require Administrators to Approve Accounts"),
+ pht("Don't Require Manual Approval"),
+ ))
+ ->setSummary(
+ pht("Require administrators to approve new accounts."))
+ ->setDescription(
+ pht(
+ "Newly registered Phabricator accounts can either be placed ".
+ "into a manual approval queue for administrative review, or ".
+ "automatically activated immediately. The approval queue is ".
+ "enabled by default because it gives you greater control over ".
+ "who can register an account and access Phabricator.\n\n".
+ "If your install is completely public, or on a VPN, or users can ".
+ "only register with a trusted provider like LDAP, or you've ".
+ "otherwise configured Phabricator to prevent unauthorized ".
+ "registration, you can disable the queue to reduce administrative ".
+ "overhead.\n\n".
+ "NOTE: Before you disable the queue, make sure ".
+ "{{auth.email-domains}} is configured correctly for your ".
+ "install!")),
+ $this->newOption('auth.email-domains', 'list<string>', array())
->setSummary(pht("Only allow registration from particular domains."))
->setDescription(
pht(
"You can restrict allowed email addresses to certain domains ".
- "(like 'yourcompany.com') by setting a list of allowed domains ".
- "here. Users will only be allowed to register using email ".
+ "(like `yourcompany.com`) by setting a list of allowed domains ".
+ "here.\n\nUsers will only be allowed to register using email ".
"addresses at one of the domains, and will only be able to add ".
"new email addresses for these domains. If you configure this, ".
- "it implies 'auth.require-email-verification'.\n\n".
- "You should omit the '@' from domains. Note that the domain must ".
- "match exactly. If you allow 'yourcompany.com', that permits ".
- "'joe@yourcompany.com' but rejects 'joe@mail.yourcompany.com'."))
+ "it implies {{auth.require-email-verification}}.\n\n".
+ "You should omit the `@` from domains. Note that the domain must ".
+ "match exactly. If you allow `yourcompany.com`, that permits ".
+ "`joe@yourcompany.com` but rejects `joe@mail.yourcompany.com`."))
->addExample(
"yourcompany.com\nmail.yourcompany.com",
pht('Valid Setting')),
- $this->newOption('auth.login-message', 'string', null)
+ $this->newOption('auth.login-message', 'string', null)
->setLocked(true)
->setSummary(pht("A block of HTML displayed on the login screen."))
->setDescription(
@@ -66,7 +89,7 @@
"You can provide an arbitrary block of HTML here, which will ".
"appear on the login screen. Normally, you'd use this to provide ".
"login or registration instructions to users.")),
- $this->newOption('account.editable', 'bool', true)
+ $this->newOption('account.editable', 'bool', true)
->setBoolOptions(
array(
pht("Allow editing"),
@@ -83,7 +106,7 @@
"synchronize account information from some other authoritative ".
"system, you can disable this to ensure information remains ".
"consistent across both systems.")),
- $this->newOption('account.minimum-password-length', 'int', 8)
+ $this->newOption('account.minimum-password-length', 'int', 8)
->setSummary(pht("Minimum password length."))
->setDescription(
pht(
Index: src/applications/people/controller/PhabricatorPeopleEditController.php
===================================================================
--- src/applications/people/controller/PhabricatorPeopleEditController.php
+++ src/applications/people/controller/PhabricatorPeopleEditController.php
@@ -182,6 +182,9 @@
->setAddress($new_email)
->setIsVerified(0);
+ // Automatically approve the user, since an admin is creating them.
+ $user->setIsApproved(1);
+
id(new PhabricatorUserEditor())
->setActor($admin)
->createNewUser($user, $email);
Index: src/applications/people/storage/PhabricatorUser.php
===================================================================
--- src/applications/people/storage/PhabricatorUser.php
+++ src/applications/people/storage/PhabricatorUser.php
@@ -30,7 +30,7 @@
protected $isAdmin = 0;
protected $isDisabled = 0;
protected $isEmailVerified = 0;
- protected $isApproved = 1;
+ protected $isApproved = 0;
private $profileImage = null;
private $profile = null;
Index: src/infrastructure/testing/PhabricatorTestCase.php
===================================================================
--- src/infrastructure/testing/PhabricatorTestCase.php
+++ src/infrastructure/testing/PhabricatorTestCase.php
@@ -181,7 +181,8 @@
$user = id(new PhabricatorUser())
->setRealName("Test User {$seed}}")
- ->setUserName("test{$seed}");
+ ->setUserName("test{$seed}")
+ ->setIsApproved(1);
$email = id(new PhabricatorUserEmail())
->setAddress("testuser{$seed}@example.com")

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 26, 8:03 AM (2 m, 11 s ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6928712
Default Alt Text
D7576.id17107.diff (10 KB)

Event Timeline

Phabricator · Built by Phacility