@@ -27,12 +27,12 @@ |
||
27 | 27 | |
28 | 28 | class ModuleAlreadyExistsException extends GenericEncryptionException { |
29 | 29 | |
30 | - /** |
|
31 | - * @param string $id |
|
32 | - * @param string $name |
|
33 | - */ |
|
34 | - public function __construct($id, $name) { |
|
35 | - parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"'); |
|
36 | - } |
|
30 | + /** |
|
31 | + * @param string $id |
|
32 | + * @param string $name |
|
33 | + */ |
|
34 | + public function __construct($id, $name) { |
|
35 | + parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"'); |
|
36 | + } |
|
37 | 37 | |
38 | 38 | } |
@@ -28,8 +28,8 @@ |
||
28 | 28 | |
29 | 29 | class EncryptionHeaderToLargeException extends GenericEncryptionException { |
30 | 30 | |
31 | - public function __construct() { |
|
32 | - parent::__construct('max header size exceeded'); |
|
33 | - } |
|
31 | + public function __construct() { |
|
32 | + parent::__construct('max header size exceeded'); |
|
33 | + } |
|
34 | 34 | |
35 | 35 | } |
@@ -27,10 +27,10 @@ |
||
27 | 27 | |
28 | 28 | class EncryptionHeaderKeyExistsException extends GenericEncryptionException { |
29 | 29 | |
30 | - /** |
|
31 | - * @param string $key |
|
32 | - */ |
|
33 | - public function __construct($key) { |
|
34 | - parent::__construct('header key "'. $key . '" already reserved by ownCloud'); |
|
35 | - } |
|
30 | + /** |
|
31 | + * @param string $key |
|
32 | + */ |
|
33 | + public function __construct($key) { |
|
34 | + parent::__construct('header key "'. $key . '" already reserved by ownCloud'); |
|
35 | + } |
|
36 | 36 | } |
@@ -36,255 +36,255 @@ |
||
36 | 36 | |
37 | 37 | class DecryptAll { |
38 | 38 | |
39 | - /** @var OutputInterface */ |
|
40 | - protected $output; |
|
41 | - |
|
42 | - /** @var InputInterface */ |
|
43 | - protected $input; |
|
44 | - |
|
45 | - /** @var Manager */ |
|
46 | - protected $encryptionManager; |
|
47 | - |
|
48 | - /** @var IUserManager */ |
|
49 | - protected $userManager; |
|
50 | - |
|
51 | - /** @var View */ |
|
52 | - protected $rootView; |
|
53 | - |
|
54 | - /** @var array files which couldn't be decrypted */ |
|
55 | - protected $failed; |
|
56 | - |
|
57 | - /** |
|
58 | - * @param Manager $encryptionManager |
|
59 | - * @param IUserManager $userManager |
|
60 | - * @param View $rootView |
|
61 | - */ |
|
62 | - public function __construct( |
|
63 | - Manager $encryptionManager, |
|
64 | - IUserManager $userManager, |
|
65 | - View $rootView |
|
66 | - ) { |
|
67 | - $this->encryptionManager = $encryptionManager; |
|
68 | - $this->userManager = $userManager; |
|
69 | - $this->rootView = $rootView; |
|
70 | - $this->failed = []; |
|
71 | - } |
|
72 | - |
|
73 | - /** |
|
74 | - * start to decrypt all files |
|
75 | - * |
|
76 | - * @param InputInterface $input |
|
77 | - * @param OutputInterface $output |
|
78 | - * @param string $user which users data folder should be decrypted, default = all users |
|
79 | - * @return bool |
|
80 | - * @throws \Exception |
|
81 | - */ |
|
82 | - public function decryptAll(InputInterface $input, OutputInterface $output, $user = '') { |
|
83 | - |
|
84 | - $this->input = $input; |
|
85 | - $this->output = $output; |
|
86 | - |
|
87 | - if ($user !== '' && $this->userManager->userExists($user) === false) { |
|
88 | - $this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again'); |
|
89 | - return false; |
|
90 | - } |
|
91 | - |
|
92 | - $this->output->writeln('prepare encryption modules...'); |
|
93 | - if ($this->prepareEncryptionModules($user) === false) { |
|
94 | - return false; |
|
95 | - } |
|
96 | - $this->output->writeln(' done.'); |
|
97 | - |
|
98 | - $this->decryptAllUsersFiles($user); |
|
99 | - |
|
100 | - if (empty($this->failed)) { |
|
101 | - $this->output->writeln('all files could be decrypted successfully!'); |
|
102 | - } else { |
|
103 | - $this->output->writeln('Files for following users couldn\'t be decrypted, '); |
|
104 | - $this->output->writeln('maybe the user is not set up in a way that supports this operation: '); |
|
105 | - foreach ($this->failed as $uid => $paths) { |
|
106 | - $this->output->writeln(' ' . $uid); |
|
107 | - } |
|
108 | - $this->output->writeln(''); |
|
109 | - } |
|
110 | - |
|
111 | - return true; |
|
112 | - } |
|
113 | - |
|
114 | - /** |
|
115 | - * prepare encryption modules to perform the decrypt all function |
|
116 | - * |
|
117 | - * @param $user |
|
118 | - * @return bool |
|
119 | - */ |
|
120 | - protected function prepareEncryptionModules($user) { |
|
121 | - // prepare all encryption modules for decrypt all |
|
122 | - $encryptionModules = $this->encryptionManager->getEncryptionModules(); |
|
123 | - foreach ($encryptionModules as $moduleDesc) { |
|
124 | - /** @var IEncryptionModule $module */ |
|
125 | - $module = call_user_func($moduleDesc['callback']); |
|
126 | - $this->output->writeln(''); |
|
127 | - $this->output->writeln('Prepare "' . $module->getDisplayName() . '"'); |
|
128 | - $this->output->writeln(''); |
|
129 | - if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) { |
|
130 | - $this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!'); |
|
131 | - return false; |
|
132 | - } |
|
133 | - } |
|
134 | - |
|
135 | - return true; |
|
136 | - } |
|
137 | - |
|
138 | - /** |
|
139 | - * iterate over all user and encrypt their files |
|
140 | - * |
|
141 | - * @param string $user which users files should be decrypted, default = all users |
|
142 | - */ |
|
143 | - protected function decryptAllUsersFiles($user = '') { |
|
144 | - |
|
145 | - $this->output->writeln("\n"); |
|
146 | - |
|
147 | - $userList = []; |
|
148 | - if ($user === '') { |
|
149 | - |
|
150 | - $fetchUsersProgress = new ProgressBar($this->output); |
|
151 | - $fetchUsersProgress->setFormat(" %message% \n [%bar%]"); |
|
152 | - $fetchUsersProgress->start(); |
|
153 | - $fetchUsersProgress->setMessage("Fetch list of users..."); |
|
154 | - $fetchUsersProgress->advance(); |
|
155 | - |
|
156 | - foreach ($this->userManager->getBackends() as $backend) { |
|
157 | - $limit = 500; |
|
158 | - $offset = 0; |
|
159 | - do { |
|
160 | - $users = $backend->getUsers('', $limit, $offset); |
|
161 | - foreach ($users as $user) { |
|
162 | - $userList[] = $user; |
|
163 | - } |
|
164 | - $offset += $limit; |
|
165 | - $fetchUsersProgress->advance(); |
|
166 | - } while (count($users) >= $limit); |
|
167 | - $fetchUsersProgress->setMessage("Fetch list of users... finished"); |
|
168 | - $fetchUsersProgress->finish(); |
|
169 | - } |
|
170 | - } else { |
|
171 | - $userList[] = $user; |
|
172 | - } |
|
173 | - |
|
174 | - $this->output->writeln("\n\n"); |
|
175 | - |
|
176 | - $progress = new ProgressBar($this->output); |
|
177 | - $progress->setFormat(" %message% \n [%bar%]"); |
|
178 | - $progress->start(); |
|
179 | - $progress->setMessage("starting to decrypt files..."); |
|
180 | - $progress->advance(); |
|
181 | - |
|
182 | - $numberOfUsers = count($userList); |
|
183 | - $userNo = 1; |
|
184 | - foreach ($userList as $uid) { |
|
185 | - $userCount = "$uid ($userNo of $numberOfUsers)"; |
|
186 | - $this->decryptUsersFiles($uid, $progress, $userCount); |
|
187 | - $userNo++; |
|
188 | - } |
|
189 | - |
|
190 | - $progress->setMessage("starting to decrypt files... finished"); |
|
191 | - $progress->finish(); |
|
192 | - |
|
193 | - $this->output->writeln("\n\n"); |
|
194 | - |
|
195 | - } |
|
196 | - |
|
197 | - /** |
|
198 | - * encrypt files from the given user |
|
199 | - * |
|
200 | - * @param string $uid |
|
201 | - * @param ProgressBar $progress |
|
202 | - * @param string $userCount |
|
203 | - */ |
|
204 | - protected function decryptUsersFiles($uid, ProgressBar $progress, $userCount) { |
|
205 | - |
|
206 | - $this->setupUserFS($uid); |
|
207 | - $directories = array(); |
|
208 | - $directories[] = '/' . $uid . '/files'; |
|
209 | - |
|
210 | - while ($root = array_pop($directories)) { |
|
211 | - $content = $this->rootView->getDirectoryContent($root); |
|
212 | - foreach ($content as $file) { |
|
213 | - // only decrypt files owned by the user |
|
214 | - if($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) { |
|
215 | - continue; |
|
216 | - } |
|
217 | - $path = $root . '/' . $file['name']; |
|
218 | - if ($this->rootView->is_dir($path)) { |
|
219 | - $directories[] = $path; |
|
220 | - continue; |
|
221 | - } else { |
|
222 | - try { |
|
223 | - $progress->setMessage("decrypt files for user $userCount: $path"); |
|
224 | - $progress->advance(); |
|
225 | - if ($file->isEncrypted() === false) { |
|
226 | - $progress->setMessage("decrypt files for user $userCount: $path (already decrypted)"); |
|
227 | - $progress->advance(); |
|
228 | - } else { |
|
229 | - if ($this->decryptFile($path) === false) { |
|
230 | - $progress->setMessage("decrypt files for user $userCount: $path (already decrypted)"); |
|
231 | - $progress->advance(); |
|
232 | - } |
|
233 | - } |
|
234 | - } catch (\Exception $e) { |
|
235 | - if (isset($this->failed[$uid])) { |
|
236 | - $this->failed[$uid][] = $path; |
|
237 | - } else { |
|
238 | - $this->failed[$uid] = [$path]; |
|
239 | - } |
|
240 | - } |
|
241 | - } |
|
242 | - } |
|
243 | - } |
|
244 | - } |
|
245 | - |
|
246 | - /** |
|
247 | - * encrypt file |
|
248 | - * |
|
249 | - * @param string $path |
|
250 | - * @return bool |
|
251 | - */ |
|
252 | - protected function decryptFile($path) { |
|
253 | - |
|
254 | - $source = $path; |
|
255 | - $target = $path . '.decrypted.' . $this->getTimestamp(); |
|
256 | - |
|
257 | - try { |
|
258 | - $this->rootView->copy($source, $target); |
|
259 | - $this->rootView->rename($target, $source); |
|
260 | - } catch (DecryptionFailedException $e) { |
|
261 | - if ($this->rootView->file_exists($target)) { |
|
262 | - $this->rootView->unlink($target); |
|
263 | - } |
|
264 | - return false; |
|
265 | - } |
|
266 | - |
|
267 | - return true; |
|
268 | - } |
|
269 | - |
|
270 | - /** |
|
271 | - * get current timestamp |
|
272 | - * |
|
273 | - * @return int |
|
274 | - */ |
|
275 | - protected function getTimestamp() { |
|
276 | - return time(); |
|
277 | - } |
|
278 | - |
|
279 | - |
|
280 | - /** |
|
281 | - * setup user file system |
|
282 | - * |
|
283 | - * @param string $uid |
|
284 | - */ |
|
285 | - protected function setupUserFS($uid) { |
|
286 | - \OC_Util::tearDownFS(); |
|
287 | - \OC_Util::setupFS($uid); |
|
288 | - } |
|
39 | + /** @var OutputInterface */ |
|
40 | + protected $output; |
|
41 | + |
|
42 | + /** @var InputInterface */ |
|
43 | + protected $input; |
|
44 | + |
|
45 | + /** @var Manager */ |
|
46 | + protected $encryptionManager; |
|
47 | + |
|
48 | + /** @var IUserManager */ |
|
49 | + protected $userManager; |
|
50 | + |
|
51 | + /** @var View */ |
|
52 | + protected $rootView; |
|
53 | + |
|
54 | + /** @var array files which couldn't be decrypted */ |
|
55 | + protected $failed; |
|
56 | + |
|
57 | + /** |
|
58 | + * @param Manager $encryptionManager |
|
59 | + * @param IUserManager $userManager |
|
60 | + * @param View $rootView |
|
61 | + */ |
|
62 | + public function __construct( |
|
63 | + Manager $encryptionManager, |
|
64 | + IUserManager $userManager, |
|
65 | + View $rootView |
|
66 | + ) { |
|
67 | + $this->encryptionManager = $encryptionManager; |
|
68 | + $this->userManager = $userManager; |
|
69 | + $this->rootView = $rootView; |
|
70 | + $this->failed = []; |
|
71 | + } |
|
72 | + |
|
73 | + /** |
|
74 | + * start to decrypt all files |
|
75 | + * |
|
76 | + * @param InputInterface $input |
|
77 | + * @param OutputInterface $output |
|
78 | + * @param string $user which users data folder should be decrypted, default = all users |
|
79 | + * @return bool |
|
80 | + * @throws \Exception |
|
81 | + */ |
|
82 | + public function decryptAll(InputInterface $input, OutputInterface $output, $user = '') { |
|
83 | + |
|
84 | + $this->input = $input; |
|
85 | + $this->output = $output; |
|
86 | + |
|
87 | + if ($user !== '' && $this->userManager->userExists($user) === false) { |
|
88 | + $this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again'); |
|
89 | + return false; |
|
90 | + } |
|
91 | + |
|
92 | + $this->output->writeln('prepare encryption modules...'); |
|
93 | + if ($this->prepareEncryptionModules($user) === false) { |
|
94 | + return false; |
|
95 | + } |
|
96 | + $this->output->writeln(' done.'); |
|
97 | + |
|
98 | + $this->decryptAllUsersFiles($user); |
|
99 | + |
|
100 | + if (empty($this->failed)) { |
|
101 | + $this->output->writeln('all files could be decrypted successfully!'); |
|
102 | + } else { |
|
103 | + $this->output->writeln('Files for following users couldn\'t be decrypted, '); |
|
104 | + $this->output->writeln('maybe the user is not set up in a way that supports this operation: '); |
|
105 | + foreach ($this->failed as $uid => $paths) { |
|
106 | + $this->output->writeln(' ' . $uid); |
|
107 | + } |
|
108 | + $this->output->writeln(''); |
|
109 | + } |
|
110 | + |
|
111 | + return true; |
|
112 | + } |
|
113 | + |
|
114 | + /** |
|
115 | + * prepare encryption modules to perform the decrypt all function |
|
116 | + * |
|
117 | + * @param $user |
|
118 | + * @return bool |
|
119 | + */ |
|
120 | + protected function prepareEncryptionModules($user) { |
|
121 | + // prepare all encryption modules for decrypt all |
|
122 | + $encryptionModules = $this->encryptionManager->getEncryptionModules(); |
|
123 | + foreach ($encryptionModules as $moduleDesc) { |
|
124 | + /** @var IEncryptionModule $module */ |
|
125 | + $module = call_user_func($moduleDesc['callback']); |
|
126 | + $this->output->writeln(''); |
|
127 | + $this->output->writeln('Prepare "' . $module->getDisplayName() . '"'); |
|
128 | + $this->output->writeln(''); |
|
129 | + if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) { |
|
130 | + $this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!'); |
|
131 | + return false; |
|
132 | + } |
|
133 | + } |
|
134 | + |
|
135 | + return true; |
|
136 | + } |
|
137 | + |
|
138 | + /** |
|
139 | + * iterate over all user and encrypt their files |
|
140 | + * |
|
141 | + * @param string $user which users files should be decrypted, default = all users |
|
142 | + */ |
|
143 | + protected function decryptAllUsersFiles($user = '') { |
|
144 | + |
|
145 | + $this->output->writeln("\n"); |
|
146 | + |
|
147 | + $userList = []; |
|
148 | + if ($user === '') { |
|
149 | + |
|
150 | + $fetchUsersProgress = new ProgressBar($this->output); |
|
151 | + $fetchUsersProgress->setFormat(" %message% \n [%bar%]"); |
|
152 | + $fetchUsersProgress->start(); |
|
153 | + $fetchUsersProgress->setMessage("Fetch list of users..."); |
|
154 | + $fetchUsersProgress->advance(); |
|
155 | + |
|
156 | + foreach ($this->userManager->getBackends() as $backend) { |
|
157 | + $limit = 500; |
|
158 | + $offset = 0; |
|
159 | + do { |
|
160 | + $users = $backend->getUsers('', $limit, $offset); |
|
161 | + foreach ($users as $user) { |
|
162 | + $userList[] = $user; |
|
163 | + } |
|
164 | + $offset += $limit; |
|
165 | + $fetchUsersProgress->advance(); |
|
166 | + } while (count($users) >= $limit); |
|
167 | + $fetchUsersProgress->setMessage("Fetch list of users... finished"); |
|
168 | + $fetchUsersProgress->finish(); |
|
169 | + } |
|
170 | + } else { |
|
171 | + $userList[] = $user; |
|
172 | + } |
|
173 | + |
|
174 | + $this->output->writeln("\n\n"); |
|
175 | + |
|
176 | + $progress = new ProgressBar($this->output); |
|
177 | + $progress->setFormat(" %message% \n [%bar%]"); |
|
178 | + $progress->start(); |
|
179 | + $progress->setMessage("starting to decrypt files..."); |
|
180 | + $progress->advance(); |
|
181 | + |
|
182 | + $numberOfUsers = count($userList); |
|
183 | + $userNo = 1; |
|
184 | + foreach ($userList as $uid) { |
|
185 | + $userCount = "$uid ($userNo of $numberOfUsers)"; |
|
186 | + $this->decryptUsersFiles($uid, $progress, $userCount); |
|
187 | + $userNo++; |
|
188 | + } |
|
189 | + |
|
190 | + $progress->setMessage("starting to decrypt files... finished"); |
|
191 | + $progress->finish(); |
|
192 | + |
|
193 | + $this->output->writeln("\n\n"); |
|
194 | + |
|
195 | + } |
|
196 | + |
|
197 | + /** |
|
198 | + * encrypt files from the given user |
|
199 | + * |
|
200 | + * @param string $uid |
|
201 | + * @param ProgressBar $progress |
|
202 | + * @param string $userCount |
|
203 | + */ |
|
204 | + protected function decryptUsersFiles($uid, ProgressBar $progress, $userCount) { |
|
205 | + |
|
206 | + $this->setupUserFS($uid); |
|
207 | + $directories = array(); |
|
208 | + $directories[] = '/' . $uid . '/files'; |
|
209 | + |
|
210 | + while ($root = array_pop($directories)) { |
|
211 | + $content = $this->rootView->getDirectoryContent($root); |
|
212 | + foreach ($content as $file) { |
|
213 | + // only decrypt files owned by the user |
|
214 | + if($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) { |
|
215 | + continue; |
|
216 | + } |
|
217 | + $path = $root . '/' . $file['name']; |
|
218 | + if ($this->rootView->is_dir($path)) { |
|
219 | + $directories[] = $path; |
|
220 | + continue; |
|
221 | + } else { |
|
222 | + try { |
|
223 | + $progress->setMessage("decrypt files for user $userCount: $path"); |
|
224 | + $progress->advance(); |
|
225 | + if ($file->isEncrypted() === false) { |
|
226 | + $progress->setMessage("decrypt files for user $userCount: $path (already decrypted)"); |
|
227 | + $progress->advance(); |
|
228 | + } else { |
|
229 | + if ($this->decryptFile($path) === false) { |
|
230 | + $progress->setMessage("decrypt files for user $userCount: $path (already decrypted)"); |
|
231 | + $progress->advance(); |
|
232 | + } |
|
233 | + } |
|
234 | + } catch (\Exception $e) { |
|
235 | + if (isset($this->failed[$uid])) { |
|
236 | + $this->failed[$uid][] = $path; |
|
237 | + } else { |
|
238 | + $this->failed[$uid] = [$path]; |
|
239 | + } |
|
240 | + } |
|
241 | + } |
|
242 | + } |
|
243 | + } |
|
244 | + } |
|
245 | + |
|
246 | + /** |
|
247 | + * encrypt file |
|
248 | + * |
|
249 | + * @param string $path |
|
250 | + * @return bool |
|
251 | + */ |
|
252 | + protected function decryptFile($path) { |
|
253 | + |
|
254 | + $source = $path; |
|
255 | + $target = $path . '.decrypted.' . $this->getTimestamp(); |
|
256 | + |
|
257 | + try { |
|
258 | + $this->rootView->copy($source, $target); |
|
259 | + $this->rootView->rename($target, $source); |
|
260 | + } catch (DecryptionFailedException $e) { |
|
261 | + if ($this->rootView->file_exists($target)) { |
|
262 | + $this->rootView->unlink($target); |
|
263 | + } |
|
264 | + return false; |
|
265 | + } |
|
266 | + |
|
267 | + return true; |
|
268 | + } |
|
269 | + |
|
270 | + /** |
|
271 | + * get current timestamp |
|
272 | + * |
|
273 | + * @return int |
|
274 | + */ |
|
275 | + protected function getTimestamp() { |
|
276 | + return time(); |
|
277 | + } |
|
278 | + |
|
279 | + |
|
280 | + /** |
|
281 | + * setup user file system |
|
282 | + * |
|
283 | + * @param string $uid |
|
284 | + */ |
|
285 | + protected function setupUserFS($uid) { |
|
286 | + \OC_Util::tearDownFS(); |
|
287 | + \OC_Util::setupFS($uid); |
|
288 | + } |
|
289 | 289 | |
290 | 290 | } |
@@ -41,85 +41,85 @@ |
||
41 | 41 | */ |
42 | 42 | class EncryptionWrapper { |
43 | 43 | |
44 | - /** @var ArrayCache */ |
|
45 | - private $arrayCache; |
|
44 | + /** @var ArrayCache */ |
|
45 | + private $arrayCache; |
|
46 | 46 | |
47 | - /** @var Manager */ |
|
48 | - private $manager; |
|
47 | + /** @var Manager */ |
|
48 | + private $manager; |
|
49 | 49 | |
50 | - /** @var ILogger */ |
|
51 | - private $logger; |
|
50 | + /** @var ILogger */ |
|
51 | + private $logger; |
|
52 | 52 | |
53 | - /** |
|
54 | - * EncryptionWrapper constructor. |
|
55 | - * |
|
56 | - * @param ArrayCache $arrayCache |
|
57 | - * @param Manager $manager |
|
58 | - * @param ILogger $logger |
|
59 | - */ |
|
60 | - public function __construct(ArrayCache $arrayCache, |
|
61 | - Manager $manager, |
|
62 | - ILogger $logger |
|
63 | - ) { |
|
64 | - $this->arrayCache = $arrayCache; |
|
65 | - $this->manager = $manager; |
|
66 | - $this->logger = $logger; |
|
67 | - } |
|
53 | + /** |
|
54 | + * EncryptionWrapper constructor. |
|
55 | + * |
|
56 | + * @param ArrayCache $arrayCache |
|
57 | + * @param Manager $manager |
|
58 | + * @param ILogger $logger |
|
59 | + */ |
|
60 | + public function __construct(ArrayCache $arrayCache, |
|
61 | + Manager $manager, |
|
62 | + ILogger $logger |
|
63 | + ) { |
|
64 | + $this->arrayCache = $arrayCache; |
|
65 | + $this->manager = $manager; |
|
66 | + $this->logger = $logger; |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * Wraps the given storage when it is not a shared storage |
|
71 | - * |
|
72 | - * @param string $mountPoint |
|
73 | - * @param Storage $storage |
|
74 | - * @param IMountPoint $mount |
|
75 | - * @return Encryption|Storage |
|
76 | - */ |
|
77 | - public function wrapStorage($mountPoint, Storage $storage, IMountPoint $mount) { |
|
78 | - $parameters = [ |
|
79 | - 'storage' => $storage, |
|
80 | - 'mountPoint' => $mountPoint, |
|
81 | - 'mount' => $mount |
|
82 | - ]; |
|
69 | + /** |
|
70 | + * Wraps the given storage when it is not a shared storage |
|
71 | + * |
|
72 | + * @param string $mountPoint |
|
73 | + * @param Storage $storage |
|
74 | + * @param IMountPoint $mount |
|
75 | + * @return Encryption|Storage |
|
76 | + */ |
|
77 | + public function wrapStorage($mountPoint, Storage $storage, IMountPoint $mount) { |
|
78 | + $parameters = [ |
|
79 | + 'storage' => $storage, |
|
80 | + 'mountPoint' => $mountPoint, |
|
81 | + 'mount' => $mount |
|
82 | + ]; |
|
83 | 83 | |
84 | - if (!$storage->instanceOfStorage('OCA\Files_Sharing\SharedStorage') |
|
85 | - && !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') |
|
86 | - && !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) { |
|
84 | + if (!$storage->instanceOfStorage('OCA\Files_Sharing\SharedStorage') |
|
85 | + && !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') |
|
86 | + && !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud')) { |
|
87 | 87 | |
88 | - $user = \OC::$server->getUserSession()->getUser(); |
|
89 | - $mountManager = Filesystem::getMountManager(); |
|
90 | - $uid = $user ? $user->getUID() : null; |
|
91 | - $fileHelper = \OC::$server->getEncryptionFilesHelper(); |
|
92 | - $keyStorage = \OC::$server->getEncryptionKeyStorage(); |
|
88 | + $user = \OC::$server->getUserSession()->getUser(); |
|
89 | + $mountManager = Filesystem::getMountManager(); |
|
90 | + $uid = $user ? $user->getUID() : null; |
|
91 | + $fileHelper = \OC::$server->getEncryptionFilesHelper(); |
|
92 | + $keyStorage = \OC::$server->getEncryptionKeyStorage(); |
|
93 | 93 | |
94 | - $util = new Util( |
|
95 | - new View(), |
|
96 | - \OC::$server->getUserManager(), |
|
97 | - \OC::$server->getGroupManager(), |
|
98 | - \OC::$server->getConfig() |
|
99 | - ); |
|
100 | - $update = new Update( |
|
101 | - new View(), |
|
102 | - $util, |
|
103 | - Filesystem::getMountManager(), |
|
104 | - $this->manager, |
|
105 | - $fileHelper, |
|
106 | - $uid |
|
107 | - ); |
|
108 | - return new Encryption( |
|
109 | - $parameters, |
|
110 | - $this->manager, |
|
111 | - $util, |
|
112 | - $this->logger, |
|
113 | - $fileHelper, |
|
114 | - $uid, |
|
115 | - $keyStorage, |
|
116 | - $update, |
|
117 | - $mountManager, |
|
118 | - $this->arrayCache |
|
119 | - ); |
|
120 | - } else { |
|
121 | - return $storage; |
|
122 | - } |
|
123 | - } |
|
94 | + $util = new Util( |
|
95 | + new View(), |
|
96 | + \OC::$server->getUserManager(), |
|
97 | + \OC::$server->getGroupManager(), |
|
98 | + \OC::$server->getConfig() |
|
99 | + ); |
|
100 | + $update = new Update( |
|
101 | + new View(), |
|
102 | + $util, |
|
103 | + Filesystem::getMountManager(), |
|
104 | + $this->manager, |
|
105 | + $fileHelper, |
|
106 | + $uid |
|
107 | + ); |
|
108 | + return new Encryption( |
|
109 | + $parameters, |
|
110 | + $this->manager, |
|
111 | + $util, |
|
112 | + $this->logger, |
|
113 | + $fileHelper, |
|
114 | + $uid, |
|
115 | + $keyStorage, |
|
116 | + $update, |
|
117 | + $mountManager, |
|
118 | + $this->arrayCache |
|
119 | + ); |
|
120 | + } else { |
|
121 | + return $storage; |
|
122 | + } |
|
123 | + } |
|
124 | 124 | |
125 | 125 | } |
@@ -27,50 +27,50 @@ |
||
27 | 27 | use OC\Files\View; |
28 | 28 | |
29 | 29 | class HookManager { |
30 | - /** |
|
31 | - * @var Update |
|
32 | - */ |
|
33 | - private static $updater; |
|
30 | + /** |
|
31 | + * @var Update |
|
32 | + */ |
|
33 | + private static $updater; |
|
34 | 34 | |
35 | - public static function postShared($params) { |
|
36 | - self::getUpdate()->postShared($params); |
|
37 | - } |
|
38 | - public static function postUnshared($params) { |
|
39 | - self::getUpdate()->postUnshared($params); |
|
40 | - } |
|
35 | + public static function postShared($params) { |
|
36 | + self::getUpdate()->postShared($params); |
|
37 | + } |
|
38 | + public static function postUnshared($params) { |
|
39 | + self::getUpdate()->postUnshared($params); |
|
40 | + } |
|
41 | 41 | |
42 | - public static function postRename($params) { |
|
43 | - self::getUpdate()->postRename($params); |
|
44 | - } |
|
42 | + public static function postRename($params) { |
|
43 | + self::getUpdate()->postRename($params); |
|
44 | + } |
|
45 | 45 | |
46 | - public static function postRestore($params) { |
|
47 | - self::getUpdate()->postRestore($params); |
|
48 | - } |
|
46 | + public static function postRestore($params) { |
|
47 | + self::getUpdate()->postRestore($params); |
|
48 | + } |
|
49 | 49 | |
50 | - /** |
|
51 | - * @return Update |
|
52 | - */ |
|
53 | - private static function getUpdate() { |
|
54 | - if (is_null(self::$updater)) { |
|
55 | - $user = \OC::$server->getUserSession()->getUser(); |
|
56 | - $uid = ''; |
|
57 | - if ($user) { |
|
58 | - $uid = $user->getUID(); |
|
59 | - } |
|
60 | - self::$updater = new Update( |
|
61 | - new View(), |
|
62 | - new Util( |
|
63 | - new View(), |
|
64 | - \OC::$server->getUserManager(), |
|
65 | - \OC::$server->getGroupManager(), |
|
66 | - \OC::$server->getConfig()), |
|
67 | - Filesystem::getMountManager(), |
|
68 | - \OC::$server->getEncryptionManager(), |
|
69 | - \OC::$server->getEncryptionFilesHelper(), |
|
70 | - $uid |
|
71 | - ); |
|
72 | - } |
|
50 | + /** |
|
51 | + * @return Update |
|
52 | + */ |
|
53 | + private static function getUpdate() { |
|
54 | + if (is_null(self::$updater)) { |
|
55 | + $user = \OC::$server->getUserSession()->getUser(); |
|
56 | + $uid = ''; |
|
57 | + if ($user) { |
|
58 | + $uid = $user->getUID(); |
|
59 | + } |
|
60 | + self::$updater = new Update( |
|
61 | + new View(), |
|
62 | + new Util( |
|
63 | + new View(), |
|
64 | + \OC::$server->getUserManager(), |
|
65 | + \OC::$server->getGroupManager(), |
|
66 | + \OC::$server->getConfig()), |
|
67 | + Filesystem::getMountManager(), |
|
68 | + \OC::$server->getEncryptionManager(), |
|
69 | + \OC::$server->getEncryptionFilesHelper(), |
|
70 | + $uid |
|
71 | + ); |
|
72 | + } |
|
73 | 73 | |
74 | - return self::$updater; |
|
75 | - } |
|
74 | + return self::$updater; |
|
75 | + } |
|
76 | 76 | } |
@@ -26,8 +26,8 @@ |
||
26 | 26 | $server = \OC::$server; |
27 | 27 | |
28 | 28 | $controller = new \OC\OCS\Provider( |
29 | - 'ocs_provider', |
|
30 | - $server->getRequest(), |
|
31 | - $server->getAppManager() |
|
29 | + 'ocs_provider', |
|
30 | + $server->getRequest(), |
|
31 | + $server->getAppManager() |
|
32 | 32 | ); |
33 | 33 | echo $controller->buildProviderList()->render(); |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | - /** @var array $_ */ |
|
3 | - /** @var \OCP\IL10N $l */ |
|
2 | + /** @var array $_ */ |
|
3 | + /** @var \OCP\IL10N $l */ |
|
4 | 4 | |
5 | 5 | style('core', ['styles', 'header']); |
6 | 6 | ?> |
@@ -29,46 +29,46 @@ |
||
29 | 29 | use \OCP\IUserManager; |
30 | 30 | |
31 | 31 | class UserController extends Controller { |
32 | - /** |
|
33 | - * @var IUserManager |
|
34 | - */ |
|
35 | - protected $userManager; |
|
32 | + /** |
|
33 | + * @var IUserManager |
|
34 | + */ |
|
35 | + protected $userManager; |
|
36 | 36 | |
37 | - public function __construct($appName, |
|
38 | - IRequest $request, |
|
39 | - IUserManager $userManager |
|
40 | - ) { |
|
41 | - parent::__construct($appName, $request); |
|
42 | - $this->userManager = $userManager; |
|
43 | - } |
|
37 | + public function __construct($appName, |
|
38 | + IRequest $request, |
|
39 | + IUserManager $userManager |
|
40 | + ) { |
|
41 | + parent::__construct($appName, $request); |
|
42 | + $this->userManager = $userManager; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * Lookup user display names |
|
47 | - * |
|
48 | - * @NoAdminRequired |
|
49 | - * |
|
50 | - * @param array $users |
|
51 | - * |
|
52 | - * @return JSONResponse |
|
53 | - */ |
|
54 | - public function getDisplayNames($users) { |
|
55 | - $result = array(); |
|
45 | + /** |
|
46 | + * Lookup user display names |
|
47 | + * |
|
48 | + * @NoAdminRequired |
|
49 | + * |
|
50 | + * @param array $users |
|
51 | + * |
|
52 | + * @return JSONResponse |
|
53 | + */ |
|
54 | + public function getDisplayNames($users) { |
|
55 | + $result = array(); |
|
56 | 56 | |
57 | - foreach ($users as $user) { |
|
58 | - $userObject = $this->userManager->get($user); |
|
59 | - if (is_object($userObject)) { |
|
60 | - $result[$user] = $userObject->getDisplayName(); |
|
61 | - } else { |
|
62 | - $result[$user] = $user; |
|
63 | - } |
|
64 | - } |
|
57 | + foreach ($users as $user) { |
|
58 | + $userObject = $this->userManager->get($user); |
|
59 | + if (is_object($userObject)) { |
|
60 | + $result[$user] = $userObject->getDisplayName(); |
|
61 | + } else { |
|
62 | + $result[$user] = $user; |
|
63 | + } |
|
64 | + } |
|
65 | 65 | |
66 | - $json = array( |
|
67 | - 'users' => $result, |
|
68 | - 'status' => 'success' |
|
69 | - ); |
|
66 | + $json = array( |
|
67 | + 'users' => $result, |
|
68 | + 'status' => 'success' |
|
69 | + ); |
|
70 | 70 | |
71 | - return new JSONResponse($json); |
|
71 | + return new JSONResponse($json); |
|
72 | 72 | |
73 | - } |
|
73 | + } |
|
74 | 74 | } |