@@ -28,55 +28,55 @@ |
||
28 | 28 | use OCP\Settings\IIconSection; |
29 | 29 | |
30 | 30 | class Section implements IIconSection { |
31 | - /** @var IL10N */ |
|
32 | - private $l; |
|
33 | - /** @var IURLGenerator */ |
|
34 | - private $url; |
|
31 | + /** @var IL10N */ |
|
32 | + private $l; |
|
33 | + /** @var IURLGenerator */ |
|
34 | + private $url; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param IURLGenerator $url |
|
38 | - * @param IL10N $l |
|
39 | - */ |
|
40 | - public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | - $this->url = $url; |
|
42 | - $this->l = $l; |
|
43 | - } |
|
36 | + /** |
|
37 | + * @param IURLGenerator $url |
|
38 | + * @param IL10N $l |
|
39 | + */ |
|
40 | + public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | + $this->url = $url; |
|
42 | + $this->l = $l; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | - * e.g. 'ldap' |
|
48 | - * |
|
49 | - * @returns string |
|
50 | - */ |
|
51 | - public function getID() { |
|
52 | - return 'theming'; |
|
53 | - } |
|
45 | + /** |
|
46 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | + * e.g. 'ldap' |
|
48 | + * |
|
49 | + * @returns string |
|
50 | + */ |
|
51 | + public function getID() { |
|
52 | + return 'theming'; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | - * integration'. Use the L10N service to translate it. |
|
58 | - * |
|
59 | - * @return string |
|
60 | - */ |
|
61 | - public function getName() { |
|
62 | - return $this->l->t('Theming'); |
|
63 | - } |
|
55 | + /** |
|
56 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | + * integration'. Use the L10N service to translate it. |
|
58 | + * |
|
59 | + * @return string |
|
60 | + */ |
|
61 | + public function getName() { |
|
62 | + return $this->l->t('Theming'); |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @return int whether the form should be rather on the top or bottom of |
|
67 | - * the settings navigation. The sections are arranged in ascending order of |
|
68 | - * the priority values. It is required to return a value between 0 and 99. |
|
69 | - * |
|
70 | - * E.g.: 70 |
|
71 | - */ |
|
72 | - public function getPriority() { |
|
73 | - return 30; |
|
74 | - } |
|
65 | + /** |
|
66 | + * @return int whether the form should be rather on the top or bottom of |
|
67 | + * the settings navigation. The sections are arranged in ascending order of |
|
68 | + * the priority values. It is required to return a value between 0 and 99. |
|
69 | + * |
|
70 | + * E.g.: 70 |
|
71 | + */ |
|
72 | + public function getPriority() { |
|
73 | + return 30; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * {@inheritdoc} |
|
78 | - */ |
|
79 | - public function getIcon() { |
|
80 | - return $this->url->imagePath('theming', 'app-dark.svg'); |
|
81 | - } |
|
76 | + /** |
|
77 | + * {@inheritdoc} |
|
78 | + */ |
|
79 | + public function getIcon() { |
|
80 | + return $this->url->imagePath('theming', 'app-dark.svg'); |
|
81 | + } |
|
82 | 82 | } |
@@ -30,46 +30,46 @@ |
||
30 | 30 | |
31 | 31 | class SettingsController extends Controller { |
32 | 32 | |
33 | - /** @var BackupCodeStorage */ |
|
34 | - private $storage; |
|
33 | + /** @var BackupCodeStorage */ |
|
34 | + private $storage; |
|
35 | 35 | |
36 | - /** @var IUserSession */ |
|
37 | - private $userSession; |
|
36 | + /** @var IUserSession */ |
|
37 | + private $userSession; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param string $appName |
|
41 | - * @param IRequest $request |
|
42 | - * @param BackupCodeStorage $storage |
|
43 | - * @param IUserSession $userSession |
|
44 | - */ |
|
45 | - public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) { |
|
46 | - parent::__construct($appName, $request); |
|
47 | - $this->userSession = $userSession; |
|
48 | - $this->storage = $storage; |
|
49 | - } |
|
39 | + /** |
|
40 | + * @param string $appName |
|
41 | + * @param IRequest $request |
|
42 | + * @param BackupCodeStorage $storage |
|
43 | + * @param IUserSession $userSession |
|
44 | + */ |
|
45 | + public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) { |
|
46 | + parent::__construct($appName, $request); |
|
47 | + $this->userSession = $userSession; |
|
48 | + $this->storage = $storage; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @NoAdminRequired |
|
53 | - * @return JSONResponse |
|
54 | - */ |
|
55 | - public function state() { |
|
56 | - $user = $this->userSession->getUser(); |
|
57 | - return $this->storage->getBackupCodesState($user); |
|
58 | - } |
|
51 | + /** |
|
52 | + * @NoAdminRequired |
|
53 | + * @return JSONResponse |
|
54 | + */ |
|
55 | + public function state() { |
|
56 | + $user = $this->userSession->getUser(); |
|
57 | + return $this->storage->getBackupCodesState($user); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @NoAdminRequired |
|
62 | - * @PasswordConfirmationRequired |
|
63 | - * |
|
64 | - * @return JSONResponse |
|
65 | - */ |
|
66 | - public function createCodes() { |
|
67 | - $user = $this->userSession->getUser(); |
|
68 | - $codes = $this->storage->createCodes($user); |
|
69 | - return new JSONResponse([ |
|
70 | - 'codes' => $codes, |
|
71 | - 'state' => $this->storage->getBackupCodesState($user), |
|
72 | - ]); |
|
73 | - } |
|
60 | + /** |
|
61 | + * @NoAdminRequired |
|
62 | + * @PasswordConfirmationRequired |
|
63 | + * |
|
64 | + * @return JSONResponse |
|
65 | + */ |
|
66 | + public function createCodes() { |
|
67 | + $user = $this->userSession->getUser(); |
|
68 | + $codes = $this->storage->createCodes($user); |
|
69 | + return new JSONResponse([ |
|
70 | + 'codes' => $codes, |
|
71 | + 'state' => $this->storage->getBackupCodesState($user), |
|
72 | + ]); |
|
73 | + } |
|
74 | 74 | |
75 | 75 | } |
@@ -34,13 +34,13 @@ |
||
34 | 34 | */ |
35 | 35 | class BackupCode extends Entity { |
36 | 36 | |
37 | - /** @var string */ |
|
38 | - protected $userId; |
|
37 | + /** @var string */ |
|
38 | + protected $userId; |
|
39 | 39 | |
40 | - /** @var string */ |
|
41 | - protected $code; |
|
40 | + /** @var string */ |
|
41 | + protected $code; |
|
42 | 42 | |
43 | - /** @var int */ |
|
44 | - protected $used; |
|
43 | + /** @var int */ |
|
44 | + protected $used; |
|
45 | 45 | |
46 | 46 | } |
@@ -21,17 +21,17 @@ |
||
21 | 21 | */ |
22 | 22 | // @codeCoverageIgnoreStart |
23 | 23 | return [ |
24 | - 'routes' => [ |
|
25 | - [ |
|
26 | - 'name' => 'settings#state', |
|
27 | - 'url' => '/settings/state', |
|
28 | - 'verb' => 'GET' |
|
29 | - ], |
|
30 | - [ |
|
31 | - 'name' => 'settings#createCodes', |
|
32 | - 'url' => '/settings/create', |
|
33 | - 'verb' => 'POST' |
|
34 | - ], |
|
35 | - ] |
|
24 | + 'routes' => [ |
|
25 | + [ |
|
26 | + 'name' => 'settings#state', |
|
27 | + 'url' => '/settings/state', |
|
28 | + 'verb' => 'GET' |
|
29 | + ], |
|
30 | + [ |
|
31 | + 'name' => 'settings#createCodes', |
|
32 | + 'url' => '/settings/create', |
|
33 | + 'verb' => 'POST' |
|
34 | + ], |
|
35 | + ] |
|
36 | 36 | ]; |
37 | 37 | // @codeCoverageIgnoreEnd |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password']))); |
6 | 6 | if ( isset($_['expiration']) ) { |
7 | - print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); |
|
8 | - print_unescaped("\n\n"); |
|
7 | + print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); |
|
8 | + print_unescaped("\n\n"); |
|
9 | 9 | } |
10 | 10 | // TRANSLATORS term at the end of a mail |
11 | 11 | p($l->t("Cheers!")); |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | /** @var array $_ */ |
4 | 4 | |
5 | 5 | print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password']))); |
6 | -if ( isset($_['expiration']) ) { |
|
6 | +if (isset($_['expiration'])) { |
|
7 | 7 | print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); |
8 | 8 | print_unescaped("\n\n"); |
9 | 9 | } |
@@ -12,5 +12,5 @@ discard block |
||
12 | 12 | ?> |
13 | 13 | |
14 | 14 | -- |
15 | -<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?> |
|
15 | +<?php p($theme->getName().' - '.$theme->getSlogan()); ?> |
|
16 | 16 | <?php print_unescaped("\n".$theme->getBaseUrl()); |
@@ -15,10 +15,10 @@ |
||
15 | 15 | <td width="20px"> </td> |
16 | 16 | <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;"> |
17 | 17 | <?php |
18 | - print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', array($_['password']))); |
|
19 | - // TRANSLATORS term at the end of a mail |
|
20 | - p($l->t('Cheers!')); |
|
21 | - ?> |
|
18 | + print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', array($_['password']))); |
|
19 | + // TRANSLATORS term at the end of a mail |
|
20 | + p($l->t('Cheers!')); |
|
21 | + ?> |
|
22 | 22 | </td> |
23 | 23 | </tr> |
24 | 24 | <tr><td colspan="2"> </td></tr> |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | <tr><td> |
28 | 28 | <table cellspacing="0" cellpadding="0" border="0" width="600px"> |
29 | 29 | <tr> |
30 | - <td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>"> |
|
30 | + <td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>"> |
|
31 | 31 | <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/> |
32 | 32 | </td> |
33 | 33 | </tr> |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br> |
53 | 53 | <?php p($theme->getName()); ?> - |
54 | 54 | <?php p($theme->getSlogan()); ?> |
55 | - <br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a> |
|
55 | + <br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a> |
|
56 | 56 | </td> |
57 | 57 | </tr> |
58 | 58 | <tr> |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | * @return bool |
164 | 164 | */ |
165 | 165 | public function userHasFiles($uid) { |
166 | - return $this->files->file_exists($uid . '/files'); |
|
166 | + return $this->files->file_exists($uid.'/files'); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | /** |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | if (count($parts) > 1) { |
180 | 180 | $owner = $parts[1]; |
181 | 181 | if ($this->userManager->userExists($owner) === false) { |
182 | - throw new \BadMethodCallException('Unknown user: ' . |
|
182 | + throw new \BadMethodCallException('Unknown user: '. |
|
183 | 183 | 'method expects path to a user folder relative to the data folder'); |
184 | 184 | } |
185 | 185 |
@@ -37,166 +37,166 @@ |
||
37 | 37 | use OCP\PreConditionNotMetException; |
38 | 38 | |
39 | 39 | class Util { |
40 | - /** |
|
41 | - * @var View |
|
42 | - */ |
|
43 | - private $files; |
|
44 | - /** |
|
45 | - * @var Crypt |
|
46 | - */ |
|
47 | - private $crypt; |
|
48 | - /** |
|
49 | - * @var ILogger |
|
50 | - */ |
|
51 | - private $logger; |
|
52 | - /** |
|
53 | - * @var bool|IUser |
|
54 | - */ |
|
55 | - private $user; |
|
56 | - /** |
|
57 | - * @var IConfig |
|
58 | - */ |
|
59 | - private $config; |
|
60 | - /** |
|
61 | - * @var IUserManager |
|
62 | - */ |
|
63 | - private $userManager; |
|
64 | - |
|
65 | - /** |
|
66 | - * Util constructor. |
|
67 | - * |
|
68 | - * @param View $files |
|
69 | - * @param Crypt $crypt |
|
70 | - * @param ILogger $logger |
|
71 | - * @param IUserSession $userSession |
|
72 | - * @param IConfig $config |
|
73 | - * @param IUserManager $userManager |
|
74 | - */ |
|
75 | - public function __construct(View $files, |
|
76 | - Crypt $crypt, |
|
77 | - ILogger $logger, |
|
78 | - IUserSession $userSession, |
|
79 | - IConfig $config, |
|
80 | - IUserManager $userManager |
|
81 | - ) { |
|
82 | - $this->files = $files; |
|
83 | - $this->crypt = $crypt; |
|
84 | - $this->logger = $logger; |
|
85 | - $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser() : false; |
|
86 | - $this->config = $config; |
|
87 | - $this->userManager = $userManager; |
|
88 | - } |
|
89 | - |
|
90 | - /** |
|
91 | - * check if recovery key is enabled for user |
|
92 | - * |
|
93 | - * @param string $uid |
|
94 | - * @return bool |
|
95 | - */ |
|
96 | - public function isRecoveryEnabledForUser($uid) { |
|
97 | - $recoveryMode = $this->config->getUserValue($uid, |
|
98 | - 'encryption', |
|
99 | - 'recoveryEnabled', |
|
100 | - '0'); |
|
101 | - |
|
102 | - return ($recoveryMode === '1'); |
|
103 | - } |
|
104 | - |
|
105 | - /** |
|
106 | - * check if the home storage should be encrypted |
|
107 | - * |
|
108 | - * @return bool |
|
109 | - */ |
|
110 | - public function shouldEncryptHomeStorage() { |
|
111 | - $encryptHomeStorage = $this->config->getAppValue( |
|
112 | - 'encryption', |
|
113 | - 'encryptHomeStorage', |
|
114 | - '1' |
|
115 | - ); |
|
116 | - |
|
117 | - return ($encryptHomeStorage === '1'); |
|
118 | - } |
|
119 | - |
|
120 | - /** |
|
121 | - * set the home storage encryption on/off |
|
122 | - * |
|
123 | - * @param bool $encryptHomeStorage |
|
124 | - */ |
|
125 | - public function setEncryptHomeStorage($encryptHomeStorage) { |
|
126 | - $value = $encryptHomeStorage ? '1' : '0'; |
|
127 | - $this->config->setAppValue( |
|
128 | - 'encryption', |
|
129 | - 'encryptHomeStorage', |
|
130 | - $value |
|
131 | - ); |
|
132 | - } |
|
133 | - |
|
134 | - /** |
|
135 | - * check if master key is enabled |
|
136 | - * |
|
137 | - * @return bool |
|
138 | - */ |
|
139 | - public function isMasterKeyEnabled() { |
|
140 | - $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1'); |
|
141 | - return ($userMasterKey === '1'); |
|
142 | - } |
|
143 | - |
|
144 | - /** |
|
145 | - * @param $enabled |
|
146 | - * @return bool |
|
147 | - */ |
|
148 | - public function setRecoveryForUser($enabled) { |
|
149 | - $value = $enabled ? '1' : '0'; |
|
150 | - |
|
151 | - try { |
|
152 | - $this->config->setUserValue($this->user->getUID(), |
|
153 | - 'encryption', |
|
154 | - 'recoveryEnabled', |
|
155 | - $value); |
|
156 | - return true; |
|
157 | - } catch (PreConditionNotMetException $e) { |
|
158 | - return false; |
|
159 | - } |
|
160 | - } |
|
161 | - |
|
162 | - /** |
|
163 | - * @param string $uid |
|
164 | - * @return bool |
|
165 | - */ |
|
166 | - public function userHasFiles($uid) { |
|
167 | - return $this->files->file_exists($uid . '/files'); |
|
168 | - } |
|
169 | - |
|
170 | - /** |
|
171 | - * get owner from give path, path relative to data/ expected |
|
172 | - * |
|
173 | - * @param string $path relative to data/ |
|
174 | - * @return string |
|
175 | - * @throws \BadMethodCallException |
|
176 | - */ |
|
177 | - public function getOwner($path) { |
|
178 | - $owner = ''; |
|
179 | - $parts = explode('/', $path, 3); |
|
180 | - if (count($parts) > 1) { |
|
181 | - $owner = $parts[1]; |
|
182 | - if ($this->userManager->userExists($owner) === false) { |
|
183 | - throw new \BadMethodCallException('Unknown user: ' . |
|
184 | - 'method expects path to a user folder relative to the data folder'); |
|
185 | - } |
|
186 | - |
|
187 | - } |
|
188 | - |
|
189 | - return $owner; |
|
190 | - } |
|
191 | - |
|
192 | - /** |
|
193 | - * get storage of path |
|
194 | - * |
|
195 | - * @param string $path |
|
196 | - * @return \OC\Files\Storage\Storage |
|
197 | - */ |
|
198 | - public function getStorage($path) { |
|
199 | - return $this->files->getMount($path)->getStorage(); |
|
200 | - } |
|
40 | + /** |
|
41 | + * @var View |
|
42 | + */ |
|
43 | + private $files; |
|
44 | + /** |
|
45 | + * @var Crypt |
|
46 | + */ |
|
47 | + private $crypt; |
|
48 | + /** |
|
49 | + * @var ILogger |
|
50 | + */ |
|
51 | + private $logger; |
|
52 | + /** |
|
53 | + * @var bool|IUser |
|
54 | + */ |
|
55 | + private $user; |
|
56 | + /** |
|
57 | + * @var IConfig |
|
58 | + */ |
|
59 | + private $config; |
|
60 | + /** |
|
61 | + * @var IUserManager |
|
62 | + */ |
|
63 | + private $userManager; |
|
64 | + |
|
65 | + /** |
|
66 | + * Util constructor. |
|
67 | + * |
|
68 | + * @param View $files |
|
69 | + * @param Crypt $crypt |
|
70 | + * @param ILogger $logger |
|
71 | + * @param IUserSession $userSession |
|
72 | + * @param IConfig $config |
|
73 | + * @param IUserManager $userManager |
|
74 | + */ |
|
75 | + public function __construct(View $files, |
|
76 | + Crypt $crypt, |
|
77 | + ILogger $logger, |
|
78 | + IUserSession $userSession, |
|
79 | + IConfig $config, |
|
80 | + IUserManager $userManager |
|
81 | + ) { |
|
82 | + $this->files = $files; |
|
83 | + $this->crypt = $crypt; |
|
84 | + $this->logger = $logger; |
|
85 | + $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser() : false; |
|
86 | + $this->config = $config; |
|
87 | + $this->userManager = $userManager; |
|
88 | + } |
|
89 | + |
|
90 | + /** |
|
91 | + * check if recovery key is enabled for user |
|
92 | + * |
|
93 | + * @param string $uid |
|
94 | + * @return bool |
|
95 | + */ |
|
96 | + public function isRecoveryEnabledForUser($uid) { |
|
97 | + $recoveryMode = $this->config->getUserValue($uid, |
|
98 | + 'encryption', |
|
99 | + 'recoveryEnabled', |
|
100 | + '0'); |
|
101 | + |
|
102 | + return ($recoveryMode === '1'); |
|
103 | + } |
|
104 | + |
|
105 | + /** |
|
106 | + * check if the home storage should be encrypted |
|
107 | + * |
|
108 | + * @return bool |
|
109 | + */ |
|
110 | + public function shouldEncryptHomeStorage() { |
|
111 | + $encryptHomeStorage = $this->config->getAppValue( |
|
112 | + 'encryption', |
|
113 | + 'encryptHomeStorage', |
|
114 | + '1' |
|
115 | + ); |
|
116 | + |
|
117 | + return ($encryptHomeStorage === '1'); |
|
118 | + } |
|
119 | + |
|
120 | + /** |
|
121 | + * set the home storage encryption on/off |
|
122 | + * |
|
123 | + * @param bool $encryptHomeStorage |
|
124 | + */ |
|
125 | + public function setEncryptHomeStorage($encryptHomeStorage) { |
|
126 | + $value = $encryptHomeStorage ? '1' : '0'; |
|
127 | + $this->config->setAppValue( |
|
128 | + 'encryption', |
|
129 | + 'encryptHomeStorage', |
|
130 | + $value |
|
131 | + ); |
|
132 | + } |
|
133 | + |
|
134 | + /** |
|
135 | + * check if master key is enabled |
|
136 | + * |
|
137 | + * @return bool |
|
138 | + */ |
|
139 | + public function isMasterKeyEnabled() { |
|
140 | + $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1'); |
|
141 | + return ($userMasterKey === '1'); |
|
142 | + } |
|
143 | + |
|
144 | + /** |
|
145 | + * @param $enabled |
|
146 | + * @return bool |
|
147 | + */ |
|
148 | + public function setRecoveryForUser($enabled) { |
|
149 | + $value = $enabled ? '1' : '0'; |
|
150 | + |
|
151 | + try { |
|
152 | + $this->config->setUserValue($this->user->getUID(), |
|
153 | + 'encryption', |
|
154 | + 'recoveryEnabled', |
|
155 | + $value); |
|
156 | + return true; |
|
157 | + } catch (PreConditionNotMetException $e) { |
|
158 | + return false; |
|
159 | + } |
|
160 | + } |
|
161 | + |
|
162 | + /** |
|
163 | + * @param string $uid |
|
164 | + * @return bool |
|
165 | + */ |
|
166 | + public function userHasFiles($uid) { |
|
167 | + return $this->files->file_exists($uid . '/files'); |
|
168 | + } |
|
169 | + |
|
170 | + /** |
|
171 | + * get owner from give path, path relative to data/ expected |
|
172 | + * |
|
173 | + * @param string $path relative to data/ |
|
174 | + * @return string |
|
175 | + * @throws \BadMethodCallException |
|
176 | + */ |
|
177 | + public function getOwner($path) { |
|
178 | + $owner = ''; |
|
179 | + $parts = explode('/', $path, 3); |
|
180 | + if (count($parts) > 1) { |
|
181 | + $owner = $parts[1]; |
|
182 | + if ($this->userManager->userExists($owner) === false) { |
|
183 | + throw new \BadMethodCallException('Unknown user: ' . |
|
184 | + 'method expects path to a user folder relative to the data folder'); |
|
185 | + } |
|
186 | + |
|
187 | + } |
|
188 | + |
|
189 | + return $owner; |
|
190 | + } |
|
191 | + |
|
192 | + /** |
|
193 | + * get storage of path |
|
194 | + * |
|
195 | + * @param string $path |
|
196 | + * @return \OC\Files\Storage\Storage |
|
197 | + */ |
|
198 | + public function getStorage($path) { |
|
199 | + return $this->files->getMount($path)->getStorage(); |
|
200 | + } |
|
201 | 201 | |
202 | 202 | } |
@@ -32,58 +32,58 @@ |
||
32 | 32 | use OCP\IUserSession; |
33 | 33 | |
34 | 34 | class Setup { |
35 | - /** |
|
36 | - * @var Crypt |
|
37 | - */ |
|
38 | - private $crypt; |
|
39 | - /** |
|
40 | - * @var KeyManager |
|
41 | - */ |
|
42 | - private $keyManager; |
|
43 | - /** |
|
44 | - * @var ILogger |
|
45 | - */ |
|
46 | - private $logger; |
|
47 | - /** |
|
48 | - * @var bool|string |
|
49 | - */ |
|
50 | - private $user; |
|
35 | + /** |
|
36 | + * @var Crypt |
|
37 | + */ |
|
38 | + private $crypt; |
|
39 | + /** |
|
40 | + * @var KeyManager |
|
41 | + */ |
|
42 | + private $keyManager; |
|
43 | + /** |
|
44 | + * @var ILogger |
|
45 | + */ |
|
46 | + private $logger; |
|
47 | + /** |
|
48 | + * @var bool|string |
|
49 | + */ |
|
50 | + private $user; |
|
51 | 51 | |
52 | 52 | |
53 | - /** |
|
54 | - * @param ILogger $logger |
|
55 | - * @param IUserSession $userSession |
|
56 | - * @param Crypt $crypt |
|
57 | - * @param KeyManager $keyManager |
|
58 | - */ |
|
59 | - public function __construct(ILogger $logger, |
|
60 | - IUserSession $userSession, |
|
61 | - Crypt $crypt, |
|
62 | - KeyManager $keyManager) { |
|
63 | - $this->logger = $logger; |
|
64 | - $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false; |
|
65 | - $this->crypt = $crypt; |
|
66 | - $this->keyManager = $keyManager; |
|
67 | - } |
|
53 | + /** |
|
54 | + * @param ILogger $logger |
|
55 | + * @param IUserSession $userSession |
|
56 | + * @param Crypt $crypt |
|
57 | + * @param KeyManager $keyManager |
|
58 | + */ |
|
59 | + public function __construct(ILogger $logger, |
|
60 | + IUserSession $userSession, |
|
61 | + Crypt $crypt, |
|
62 | + KeyManager $keyManager) { |
|
63 | + $this->logger = $logger; |
|
64 | + $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false; |
|
65 | + $this->crypt = $crypt; |
|
66 | + $this->keyManager = $keyManager; |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * @param string $uid user id |
|
71 | - * @param string $password user password |
|
72 | - * @return bool |
|
73 | - */ |
|
74 | - public function setupUser($uid, $password) { |
|
75 | - if (!$this->keyManager->userHasKeys($uid)) { |
|
76 | - return $this->keyManager->storeKeyPair($uid, $password, |
|
77 | - $this->crypt->createKeyPair()); |
|
78 | - } |
|
79 | - return true; |
|
80 | - } |
|
69 | + /** |
|
70 | + * @param string $uid user id |
|
71 | + * @param string $password user password |
|
72 | + * @return bool |
|
73 | + */ |
|
74 | + public function setupUser($uid, $password) { |
|
75 | + if (!$this->keyManager->userHasKeys($uid)) { |
|
76 | + return $this->keyManager->storeKeyPair($uid, $password, |
|
77 | + $this->crypt->createKeyPair()); |
|
78 | + } |
|
79 | + return true; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * make sure that all system keys exists |
|
84 | - */ |
|
85 | - public function setupSystem() { |
|
86 | - $this->keyManager->validateShareKey(); |
|
87 | - $this->keyManager->validateMasterKey(); |
|
88 | - } |
|
82 | + /** |
|
83 | + * make sure that all system keys exists |
|
84 | + */ |
|
85 | + public function setupSystem() { |
|
86 | + $this->keyManager->validateShareKey(); |
|
87 | + $this->keyManager->validateMasterKey(); |
|
88 | + } |
|
89 | 89 | } |
@@ -38,129 +38,129 @@ |
||
38 | 38 | |
39 | 39 | class SettingsController extends Controller { |
40 | 40 | |
41 | - /** @var IL10N */ |
|
42 | - private $l; |
|
43 | - |
|
44 | - /** @var IUserManager */ |
|
45 | - private $userManager; |
|
46 | - |
|
47 | - /** @var IUserSession */ |
|
48 | - private $userSession; |
|
49 | - |
|
50 | - /** @var KeyManager */ |
|
51 | - private $keyManager; |
|
52 | - |
|
53 | - /** @var Crypt */ |
|
54 | - private $crypt; |
|
55 | - |
|
56 | - /** @var Session */ |
|
57 | - private $session; |
|
58 | - |
|
59 | - /** @var ISession */ |
|
60 | - private $ocSession; |
|
61 | - |
|
62 | - /** @var Util */ |
|
63 | - private $util; |
|
64 | - |
|
65 | - /** |
|
66 | - * @param string $AppName |
|
67 | - * @param IRequest $request |
|
68 | - * @param IL10N $l10n |
|
69 | - * @param IUserManager $userManager |
|
70 | - * @param IUserSession $userSession |
|
71 | - * @param KeyManager $keyManager |
|
72 | - * @param Crypt $crypt |
|
73 | - * @param Session $session |
|
74 | - * @param ISession $ocSession |
|
75 | - * @param Util $util |
|
76 | - */ |
|
77 | - public function __construct($AppName, |
|
78 | - IRequest $request, |
|
79 | - IL10N $l10n, |
|
80 | - IUserManager $userManager, |
|
81 | - IUserSession $userSession, |
|
82 | - KeyManager $keyManager, |
|
83 | - Crypt $crypt, |
|
84 | - Session $session, |
|
85 | - ISession $ocSession, |
|
86 | - Util $util |
|
41 | + /** @var IL10N */ |
|
42 | + private $l; |
|
43 | + |
|
44 | + /** @var IUserManager */ |
|
45 | + private $userManager; |
|
46 | + |
|
47 | + /** @var IUserSession */ |
|
48 | + private $userSession; |
|
49 | + |
|
50 | + /** @var KeyManager */ |
|
51 | + private $keyManager; |
|
52 | + |
|
53 | + /** @var Crypt */ |
|
54 | + private $crypt; |
|
55 | + |
|
56 | + /** @var Session */ |
|
57 | + private $session; |
|
58 | + |
|
59 | + /** @var ISession */ |
|
60 | + private $ocSession; |
|
61 | + |
|
62 | + /** @var Util */ |
|
63 | + private $util; |
|
64 | + |
|
65 | + /** |
|
66 | + * @param string $AppName |
|
67 | + * @param IRequest $request |
|
68 | + * @param IL10N $l10n |
|
69 | + * @param IUserManager $userManager |
|
70 | + * @param IUserSession $userSession |
|
71 | + * @param KeyManager $keyManager |
|
72 | + * @param Crypt $crypt |
|
73 | + * @param Session $session |
|
74 | + * @param ISession $ocSession |
|
75 | + * @param Util $util |
|
76 | + */ |
|
77 | + public function __construct($AppName, |
|
78 | + IRequest $request, |
|
79 | + IL10N $l10n, |
|
80 | + IUserManager $userManager, |
|
81 | + IUserSession $userSession, |
|
82 | + KeyManager $keyManager, |
|
83 | + Crypt $crypt, |
|
84 | + Session $session, |
|
85 | + ISession $ocSession, |
|
86 | + Util $util |
|
87 | 87 | ) { |
88 | - parent::__construct($AppName, $request); |
|
89 | - $this->l = $l10n; |
|
90 | - $this->userSession = $userSession; |
|
91 | - $this->userManager = $userManager; |
|
92 | - $this->keyManager = $keyManager; |
|
93 | - $this->crypt = $crypt; |
|
94 | - $this->session = $session; |
|
95 | - $this->ocSession = $ocSession; |
|
96 | - $this->util = $util; |
|
97 | - } |
|
98 | - |
|
99 | - |
|
100 | - /** |
|
101 | - * @NoAdminRequired |
|
102 | - * @UseSession |
|
103 | - * |
|
104 | - * @param string $oldPassword |
|
105 | - * @param string $newPassword |
|
106 | - * @return DataResponse |
|
107 | - */ |
|
108 | - public function updatePrivateKeyPassword($oldPassword, $newPassword) { |
|
109 | - $result = false; |
|
110 | - $uid = $this->userSession->getUser()->getUID(); |
|
111 | - $errorMessage = $this->l->t('Could not update the private key password.'); |
|
112 | - |
|
113 | - //check if password is correct |
|
114 | - $passwordCorrect = $this->userManager->checkPassword($uid, $newPassword); |
|
115 | - if ($passwordCorrect === false) { |
|
116 | - // if check with uid fails we need to check the password with the login name |
|
117 | - // e.g. in the ldap case. For local user we need to check the password with |
|
118 | - // the uid because in this case the login name is case insensitive |
|
119 | - $loginName = $this->ocSession->get('loginname'); |
|
120 | - $passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword); |
|
121 | - } |
|
122 | - |
|
123 | - if ($passwordCorrect !== false) { |
|
124 | - $encryptedKey = $this->keyManager->getPrivateKey($uid); |
|
125 | - $decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid); |
|
126 | - |
|
127 | - if ($decryptedKey) { |
|
128 | - $encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid); |
|
129 | - $header = $this->crypt->generateHeader(); |
|
130 | - if ($encryptedKey) { |
|
131 | - $this->keyManager->setPrivateKey($uid, $header . $encryptedKey); |
|
132 | - $this->session->setPrivateKey($decryptedKey); |
|
133 | - $result = true; |
|
134 | - } |
|
135 | - } else { |
|
136 | - $errorMessage = $this->l->t('The old password was not correct, please try again.'); |
|
137 | - } |
|
138 | - } else { |
|
139 | - $errorMessage = $this->l->t('The current log-in password was not correct, please try again.'); |
|
140 | - } |
|
141 | - |
|
142 | - if ($result === true) { |
|
143 | - $this->session->setStatus(Session::INIT_SUCCESSFUL); |
|
144 | - return new DataResponse( |
|
145 | - ['message' => (string) $this->l->t('Private key password successfully updated.')] |
|
146 | - ); |
|
147 | - } else { |
|
148 | - return new DataResponse( |
|
149 | - ['message' => (string) $errorMessage], |
|
150 | - Http::STATUS_BAD_REQUEST |
|
151 | - ); |
|
152 | - } |
|
153 | - |
|
154 | - } |
|
155 | - |
|
156 | - /** |
|
157 | - * @UseSession |
|
158 | - * |
|
159 | - * @param bool $encryptHomeStorage |
|
160 | - * @return DataResponse |
|
161 | - */ |
|
162 | - public function setEncryptHomeStorage($encryptHomeStorage) { |
|
163 | - $this->util->setEncryptHomeStorage($encryptHomeStorage); |
|
164 | - return new DataResponse(); |
|
165 | - } |
|
88 | + parent::__construct($AppName, $request); |
|
89 | + $this->l = $l10n; |
|
90 | + $this->userSession = $userSession; |
|
91 | + $this->userManager = $userManager; |
|
92 | + $this->keyManager = $keyManager; |
|
93 | + $this->crypt = $crypt; |
|
94 | + $this->session = $session; |
|
95 | + $this->ocSession = $ocSession; |
|
96 | + $this->util = $util; |
|
97 | + } |
|
98 | + |
|
99 | + |
|
100 | + /** |
|
101 | + * @NoAdminRequired |
|
102 | + * @UseSession |
|
103 | + * |
|
104 | + * @param string $oldPassword |
|
105 | + * @param string $newPassword |
|
106 | + * @return DataResponse |
|
107 | + */ |
|
108 | + public function updatePrivateKeyPassword($oldPassword, $newPassword) { |
|
109 | + $result = false; |
|
110 | + $uid = $this->userSession->getUser()->getUID(); |
|
111 | + $errorMessage = $this->l->t('Could not update the private key password.'); |
|
112 | + |
|
113 | + //check if password is correct |
|
114 | + $passwordCorrect = $this->userManager->checkPassword($uid, $newPassword); |
|
115 | + if ($passwordCorrect === false) { |
|
116 | + // if check with uid fails we need to check the password with the login name |
|
117 | + // e.g. in the ldap case. For local user we need to check the password with |
|
118 | + // the uid because in this case the login name is case insensitive |
|
119 | + $loginName = $this->ocSession->get('loginname'); |
|
120 | + $passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword); |
|
121 | + } |
|
122 | + |
|
123 | + if ($passwordCorrect !== false) { |
|
124 | + $encryptedKey = $this->keyManager->getPrivateKey($uid); |
|
125 | + $decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid); |
|
126 | + |
|
127 | + if ($decryptedKey) { |
|
128 | + $encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid); |
|
129 | + $header = $this->crypt->generateHeader(); |
|
130 | + if ($encryptedKey) { |
|
131 | + $this->keyManager->setPrivateKey($uid, $header . $encryptedKey); |
|
132 | + $this->session->setPrivateKey($decryptedKey); |
|
133 | + $result = true; |
|
134 | + } |
|
135 | + } else { |
|
136 | + $errorMessage = $this->l->t('The old password was not correct, please try again.'); |
|
137 | + } |
|
138 | + } else { |
|
139 | + $errorMessage = $this->l->t('The current log-in password was not correct, please try again.'); |
|
140 | + } |
|
141 | + |
|
142 | + if ($result === true) { |
|
143 | + $this->session->setStatus(Session::INIT_SUCCESSFUL); |
|
144 | + return new DataResponse( |
|
145 | + ['message' => (string) $this->l->t('Private key password successfully updated.')] |
|
146 | + ); |
|
147 | + } else { |
|
148 | + return new DataResponse( |
|
149 | + ['message' => (string) $errorMessage], |
|
150 | + Http::STATUS_BAD_REQUEST |
|
151 | + ); |
|
152 | + } |
|
153 | + |
|
154 | + } |
|
155 | + |
|
156 | + /** |
|
157 | + * @UseSession |
|
158 | + * |
|
159 | + * @param bool $encryptHomeStorage |
|
160 | + * @return DataResponse |
|
161 | + */ |
|
162 | + public function setEncryptHomeStorage($encryptHomeStorage) { |
|
163 | + $this->util->setEncryptHomeStorage($encryptHomeStorage); |
|
164 | + return new DataResponse(); |
|
165 | + } |
|
166 | 166 | } |
@@ -128,7 +128,7 @@ |
||
128 | 128 | $encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid); |
129 | 129 | $header = $this->crypt->generateHeader(); |
130 | 130 | if ($encryptedKey) { |
131 | - $this->keyManager->setPrivateKey($uid, $header . $encryptedKey); |
|
131 | + $this->keyManager->setPrivateKey($uid, $header.$encryptedKey); |
|
132 | 132 | $this->session->setPrivateKey($decryptedKey); |
133 | 133 | $result = true; |
134 | 134 | } |