-
-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #39 from LyseonTech/feature-account-create
Feature account create
- Loading branch information
Showing
10 changed files
with
459 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <?php | ||
|
|
||
| namespace OCA\Libresign\Controller; | ||
|
|
||
| use OCA\Libresign\AppInfo\Application; | ||
| use OCA\Libresign\Helper\JSActions; | ||
| use OCA\Libresign\Service\AccountService; | ||
| use OCP\AppFramework\ApiController; | ||
| use OCP\AppFramework\Http; | ||
| use OCP\AppFramework\Http\JSONResponse; | ||
| use OCP\IL10N; | ||
| use OCP\IRequest; | ||
|
|
||
| class AccountController extends ApiController { | ||
| /** @var IL10N */ | ||
| private $l10n; | ||
| /** @var AccountService */ | ||
| private $account; | ||
|
|
||
| public function __construct( | ||
| IRequest $request, | ||
| IL10N $l10n, | ||
| AccountService $account | ||
| ) { | ||
| parent::__construct(Application::APP_ID, $request); | ||
| $this->l10n = $l10n; | ||
| $this->account = $account; | ||
| } | ||
|
|
||
| /** | ||
| * @NoAdminRequired | ||
| * @CORS | ||
| * @NoCSRFRequired | ||
| * @return JSONResponse | ||
| */ | ||
| public function createToSign(string $uuid, string $email, string $password, string $signPassword) { | ||
| try { | ||
| $data = [ | ||
| 'uuid' => $uuid, | ||
| 'email' => $email, | ||
| 'password' => $password, | ||
| 'signPassword' => $signPassword | ||
| ]; | ||
| $this->account->validateCreateToSign($data); | ||
| $this->account->createToSign($uuid, $email, $password, $signPassword); | ||
| } catch (\Throwable $th) { | ||
| return new JSONResponse( | ||
| [ | ||
| 'message' => $th->getMessage(), | ||
| 'action' => JSActions::ACTION_DO_NOTHING | ||
| ], | ||
| Http::STATUS_UNPROCESSABLE_ENTITY | ||
| ); | ||
| } | ||
| return new JSONResponse( | ||
| [ | ||
| 'message' => $this->l10n->t('Success'), | ||
| 'action' => JSActions::ACTION_SIGN | ||
| ], | ||
| Http::STATUS_OK | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| <?php | ||
|
|
||
| namespace OCA\Libresign\Service; | ||
|
|
||
| use OC\Files\Filesystem; | ||
| use OCA\Libresign\AppInfo\Application; | ||
| use OCA\Libresign\Db\FileUser; | ||
| use OCA\Libresign\Db\FileUserMapper; | ||
| use OCA\Libresign\Exception\LibresignException; | ||
| use OCA\Libresign\Handler\CfsslHandler; | ||
| use OCA\Settings\Mailer\NewUserMailHelper; | ||
| use OCP\Files\File; | ||
| use OCP\IConfig; | ||
| use OCP\IL10N; | ||
| use OCP\IUserManager; | ||
| use Sabre\DAV\UUIDUtil; | ||
|
|
||
| class AccountService { | ||
| /** @var IL10N */ | ||
| private $l10n; | ||
| /** @var FileUserMapper */ | ||
| private $fileUserMapper; | ||
| /** @var IUserManager */ | ||
| protected $userManager; | ||
| /** @var SignatureService */ | ||
| private $signature; | ||
| /** @var FolderService */ | ||
| private $folder; | ||
| /** @var IConfig */ | ||
| private $config; | ||
| /** @var NewUserMailHelper */ | ||
| private $newUserMail; | ||
| /** @var CfsslHandler */ | ||
| private $cfsslHandler; | ||
|
|
||
| public function __construct( | ||
| IL10N $l10n, | ||
| FileUserMapper $fileUserMapper, | ||
| IUserManager $userManager, | ||
| SignatureService $signature, | ||
| FolderService $folder, | ||
| IConfig $config, | ||
| NewUserMailHelper $newUserMail, | ||
| CfsslHandler $cfsslHandler | ||
| ) { | ||
| $this->l10n = $l10n; | ||
| $this->fileUserMapper = $fileUserMapper; | ||
| $this->userManager = $userManager; | ||
| $this->signature = $signature; | ||
| $this->folder = $folder; | ||
| $this->config = $config; | ||
| $this->newUserMail = $newUserMail; | ||
| $this->cfsslHandler = $cfsslHandler; | ||
| } | ||
|
|
||
| public function validateCreateToSign(array $data) { | ||
| if (!UUIDUtil::validateUUID($data['uuid'])) { | ||
| throw new LibresignException($this->l10n->t('Invalid UUID'), 1); | ||
| } | ||
| try { | ||
| $fileUser = $this->getFileUserByUuid($data['uuid']); | ||
| } catch (\Throwable $th) { | ||
| throw new LibresignException($this->l10n->t('UUID not found'), 1); | ||
| } | ||
| if (!filter_var($data['email'], FILTER_VALIDATE_EMAIL)) { | ||
| throw new LibresignException($this->l10n->t('Invalid email'), 1); | ||
| } | ||
| if ($fileUser->getEmail() != $data['email']) { | ||
| throw new LibresignException($this->l10n->t('Dont is your file'), 1); | ||
| } | ||
| if ($this->userManager->userExists($data['email'])) { | ||
| throw new LibresignException($this->l10n->t('User already exists'), 1); | ||
| } | ||
| if (empty($data['password'])) { | ||
| throw new LibresignException($this->l10n->t('Password is mandatory'), 1); | ||
| } | ||
| if (empty($data['signPassword'])) { | ||
| throw new LibresignException($this->l10n->t('Password to sign is mandatory'), 1); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Get fileUser by Uuid | ||
| * | ||
| * @param string $uuid | ||
| * @return FileUser | ||
| */ | ||
| private function getFileUserByUuid($uuid) { | ||
| if (!$this->fileUser) { | ||
| $this->fileUser = $this->fileUserMapper->getByUuid($uuid); | ||
| } | ||
| return $this->fileUser; | ||
| } | ||
|
|
||
| public function createToSign($uuid, $uid, $password, $signPassword) { | ||
| $fileUser = $this->getFileUserByUuid($uuid); | ||
| $newUser = $this->userManager->createUser($uid, $password); | ||
| $fileUser->setUserId($newUser->getUID()); | ||
| $this->fileUserMapper->update($fileUser); | ||
|
|
||
| $newUser->setEMailAddress($uid); | ||
| if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') { | ||
| try { | ||
| $emailTemplate = $this->newUserMail->generateTemplate($newUser, false); | ||
| $this->newUserMail->sendMail($newUser, $emailTemplate); | ||
| } catch (\Exception $e) { | ||
| throw new LibresignException('Unable to send the invitation', 1); | ||
| } | ||
| } | ||
| $this->folder->setUserId($newUser->getUID()); | ||
|
|
||
| $content = $this->cfsslHandler->generateCertificate( | ||
| $this->config->getAppValue(Application::APP_ID, 'commonName'), | ||
| [], | ||
| $this->config->getAppValue(Application::APP_ID, 'country'), | ||
| $this->config->getAppValue(Application::APP_ID, 'organization'), | ||
| $this->config->getAppValue(Application::APP_ID, 'organizationUnit'), | ||
| $signPassword, | ||
| $this->config->getAppValue(Application::APP_ID, 'cfsslUri') | ||
| ); | ||
| if (!$content) { | ||
| throw new LibresignException('Failure on generate certificate', 1); | ||
| } | ||
| $this->savePfx($uid, $content); | ||
| } | ||
|
|
||
| private function savePfx($uid, $content) { | ||
| Filesystem::initMountPoints($uid); | ||
| $folder = $this->folder->getFolderForUser(); | ||
| $filename = 'signature.pfx'; | ||
| if ($folder->nodeExists($filename)) { | ||
| $node = $folder->get($filename); | ||
| if (!$node instanceof File) { | ||
| throw new LibresignException("path {$filename} already exists and is not a file!", 400); | ||
| } | ||
| $node->putContent($content); | ||
| return $node; | ||
| } | ||
|
|
||
| $file = $folder->newFile($filename); | ||
| $file->putContent($content); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.