MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [user:registration] Report field validations to the user. Fix #6072 

and #6073
pull/6075/head
mokaddem 2020-06-29 10:12:22 +02:00
parent 26ae7faa53
commit 89adde7e0b
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Controller/UsersController.php
View File

@ -2353,9 +2353,16 @@ class UsersController extends AppController
public function register()
{
$fieldToValidate = array('email', 'gpgkey');
if (empty(Configure::read('Security.allow_self_registration'))) {
throw new MethodNotAllowedException(__('Self registration is not enabled on this instance.'));
}
$message = Configure::read('Security.self_registration_message');
if (empty($message)) {
$this->loadModel('Server');
$message = $this->Server->serverSettings['Security']['self_registration_message']['value'];
}
$this->set('message', $message);
if ($this->request->is('post')) {
if (isset($this->request->data['User'])) {
$this->request->data = $this->request->data['User'];
@ -2382,6 +2389,18 @@ class UsersController extends AppController
if (empty($requestObject['email'])) {
throw new BadRequestException(__('We require at least the email field to be filled.'));
}
$this->User->set($this->request->data);
if (!$this->User->validates(array('fieldList' => $fieldToValidate))) {
$errors = $this->User->validationErrors;
$message = __('Request could not be created.');
if ($this->_isRest()) {
$message .= __('Errors: %s', json_encode($errors));
return $this->RestResponse->saveFailResponse('Users', 'register', false, $message, $this->response->type());
} else {
$this->Flash->error($message);
return;
}
}
$this->loadModel('Inbox');
$this->Inbox->create();
$data = array(
@ -2409,13 +2428,6 @@ class UsersController extends AppController
$this->redirect('/');
}
}
} else {
$message = Configure::read('Security.self_registration_message');
if (empty($message)) {
$this->loadModel('Server');
$message = $this->Server->serverSettings['Security']['self_registration_message']['value'];
}
$this->set('message', $message);
}
}