@@ -50,7 +50,7 @@ |
||
50 | 50 | ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
51 | 51 | ]) |
52 | 52 | ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK) |
53 | - ->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) { |
|
53 | + ->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) { |
|
54 | 54 | if (isset($params['options']['key']) && $params['options']['key']) { |
55 | 55 | return $rackspaceAuth; |
56 | 56 | } |
@@ -33,29 +33,29 @@ |
||
33 | 33 | use OCP\IL10N; |
34 | 34 | |
35 | 35 | class Swift extends Backend { |
36 | - use LegacyDependencyCheckPolyfill; |
|
36 | + use LegacyDependencyCheckPolyfill; |
|
37 | 37 | |
38 | - public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rackspaceAuth) { |
|
39 | - $this |
|
40 | - ->setIdentifier('swift') |
|
41 | - ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat |
|
42 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift') |
|
43 | - ->setText($l->t('OpenStack Object Storage')) |
|
44 | - ->addParameters([ |
|
45 | - (new DefinitionParameter('service_name', $l->t('Service name'))) |
|
46 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
47 | - new DefinitionParameter('region', $l->t('Region')), |
|
48 | - new DefinitionParameter('bucket', $l->t('Bucket')), |
|
49 | - (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)'))) |
|
50 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
51 | - ]) |
|
52 | - ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK) |
|
53 | - ->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) { |
|
54 | - if (isset($params['options']['key']) && $params['options']['key']) { |
|
55 | - return $rackspaceAuth; |
|
56 | - } |
|
57 | - return $openstackAuth; |
|
58 | - }) |
|
59 | - ; |
|
60 | - } |
|
38 | + public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rackspaceAuth) { |
|
39 | + $this |
|
40 | + ->setIdentifier('swift') |
|
41 | + ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat |
|
42 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift') |
|
43 | + ->setText($l->t('OpenStack Object Storage')) |
|
44 | + ->addParameters([ |
|
45 | + (new DefinitionParameter('service_name', $l->t('Service name'))) |
|
46 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
47 | + new DefinitionParameter('region', $l->t('Region')), |
|
48 | + new DefinitionParameter('bucket', $l->t('Bucket')), |
|
49 | + (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)'))) |
|
50 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
51 | + ]) |
|
52 | + ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK) |
|
53 | + ->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) { |
|
54 | + if (isset($params['options']['key']) && $params['options']['key']) { |
|
55 | + return $rackspaceAuth; |
|
56 | + } |
|
57 | + return $openstackAuth; |
|
58 | + }) |
|
59 | + ; |
|
60 | + } |
|
61 | 61 | } |
@@ -36,101 +36,101 @@ |
||
36 | 36 | */ |
37 | 37 | trait VisibilityTrait { |
38 | 38 | |
39 | - /** @var int visibility */ |
|
40 | - protected $visibility = BackendService::VISIBILITY_DEFAULT; |
|
39 | + /** @var int visibility */ |
|
40 | + protected $visibility = BackendService::VISIBILITY_DEFAULT; |
|
41 | 41 | |
42 | - /** @var int allowed visibilities */ |
|
43 | - protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT; |
|
42 | + /** @var int allowed visibilities */ |
|
43 | + protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT; |
|
44 | 44 | |
45 | - /** |
|
46 | - * @return int |
|
47 | - */ |
|
48 | - public function getVisibility() { |
|
49 | - return $this->visibility; |
|
50 | - } |
|
45 | + /** |
|
46 | + * @return int |
|
47 | + */ |
|
48 | + public function getVisibility() { |
|
49 | + return $this->visibility; |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * Check if the backend is visible for a user type |
|
54 | - * |
|
55 | - * @param int $visibility |
|
56 | - * @return bool |
|
57 | - */ |
|
58 | - public function isVisibleFor($visibility) { |
|
59 | - if ($this->visibility & $visibility) { |
|
60 | - return true; |
|
61 | - } |
|
62 | - return false; |
|
63 | - } |
|
52 | + /** |
|
53 | + * Check if the backend is visible for a user type |
|
54 | + * |
|
55 | + * @param int $visibility |
|
56 | + * @return bool |
|
57 | + */ |
|
58 | + public function isVisibleFor($visibility) { |
|
59 | + if ($this->visibility & $visibility) { |
|
60 | + return true; |
|
61 | + } |
|
62 | + return false; |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @param int $visibility |
|
67 | - * @return self |
|
68 | - */ |
|
69 | - public function setVisibility($visibility) { |
|
70 | - $this->visibility = $visibility; |
|
71 | - $this->allowedVisibility |= $visibility; |
|
72 | - return $this; |
|
73 | - } |
|
65 | + /** |
|
66 | + * @param int $visibility |
|
67 | + * @return self |
|
68 | + */ |
|
69 | + public function setVisibility($visibility) { |
|
70 | + $this->visibility = $visibility; |
|
71 | + $this->allowedVisibility |= $visibility; |
|
72 | + return $this; |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * @param int $visibility |
|
77 | - * @return self |
|
78 | - */ |
|
79 | - public function addVisibility($visibility) { |
|
80 | - return $this->setVisibility($this->visibility | $visibility); |
|
81 | - } |
|
75 | + /** |
|
76 | + * @param int $visibility |
|
77 | + * @return self |
|
78 | + */ |
|
79 | + public function addVisibility($visibility) { |
|
80 | + return $this->setVisibility($this->visibility | $visibility); |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * @param int $visibility |
|
85 | - * @return self |
|
86 | - */ |
|
87 | - public function removeVisibility($visibility) { |
|
88 | - return $this->setVisibility($this->visibility & ~$visibility); |
|
89 | - } |
|
83 | + /** |
|
84 | + * @param int $visibility |
|
85 | + * @return self |
|
86 | + */ |
|
87 | + public function removeVisibility($visibility) { |
|
88 | + return $this->setVisibility($this->visibility & ~$visibility); |
|
89 | + } |
|
90 | 90 | |
91 | - /** |
|
92 | - * @return int |
|
93 | - */ |
|
94 | - public function getAllowedVisibility() { |
|
95 | - return $this->allowedVisibility; |
|
96 | - } |
|
91 | + /** |
|
92 | + * @return int |
|
93 | + */ |
|
94 | + public function getAllowedVisibility() { |
|
95 | + return $this->allowedVisibility; |
|
96 | + } |
|
97 | 97 | |
98 | - /** |
|
99 | - * Check if the backend is allowed to be visible for a user type |
|
100 | - * |
|
101 | - * @param int $allowedVisibility |
|
102 | - * @return bool |
|
103 | - */ |
|
104 | - public function isAllowedVisibleFor($allowedVisibility) { |
|
105 | - if ($this->allowedVisibility & $allowedVisibility) { |
|
106 | - return true; |
|
107 | - } |
|
108 | - return false; |
|
109 | - } |
|
98 | + /** |
|
99 | + * Check if the backend is allowed to be visible for a user type |
|
100 | + * |
|
101 | + * @param int $allowedVisibility |
|
102 | + * @return bool |
|
103 | + */ |
|
104 | + public function isAllowedVisibleFor($allowedVisibility) { |
|
105 | + if ($this->allowedVisibility & $allowedVisibility) { |
|
106 | + return true; |
|
107 | + } |
|
108 | + return false; |
|
109 | + } |
|
110 | 110 | |
111 | - /** |
|
112 | - * @param int $allowedVisibility |
|
113 | - * @return self |
|
114 | - */ |
|
115 | - public function setAllowedVisibility($allowedVisibility) { |
|
116 | - $this->allowedVisibility = $allowedVisibility; |
|
117 | - $this->visibility &= $allowedVisibility; |
|
118 | - return $this; |
|
119 | - } |
|
111 | + /** |
|
112 | + * @param int $allowedVisibility |
|
113 | + * @return self |
|
114 | + */ |
|
115 | + public function setAllowedVisibility($allowedVisibility) { |
|
116 | + $this->allowedVisibility = $allowedVisibility; |
|
117 | + $this->visibility &= $allowedVisibility; |
|
118 | + return $this; |
|
119 | + } |
|
120 | 120 | |
121 | - /** |
|
122 | - * @param int $allowedVisibility |
|
123 | - * @return self |
|
124 | - */ |
|
125 | - public function addAllowedVisibility($allowedVisibility) { |
|
126 | - return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility); |
|
127 | - } |
|
121 | + /** |
|
122 | + * @param int $allowedVisibility |
|
123 | + * @return self |
|
124 | + */ |
|
125 | + public function addAllowedVisibility($allowedVisibility) { |
|
126 | + return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility); |
|
127 | + } |
|
128 | 128 | |
129 | - /** |
|
130 | - * @param int $allowedVisibility |
|
131 | - * @return self |
|
132 | - */ |
|
133 | - public function removeAllowedVisibility($allowedVisibility) { |
|
134 | - return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility); |
|
135 | - } |
|
129 | + /** |
|
130 | + * @param int $allowedVisibility |
|
131 | + * @return self |
|
132 | + */ |
|
133 | + public function removeAllowedVisibility($allowedVisibility) { |
|
134 | + return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility); |
|
135 | + } |
|
136 | 136 | } |
@@ -28,11 +28,11 @@ |
||
28 | 28 | * Builtin authentication mechanism, for legacy backends |
29 | 29 | */ |
30 | 30 | class Builtin extends AuthMechanism { |
31 | - public function __construct(IL10N $l) { |
|
32 | - $this |
|
33 | - ->setIdentifier('builtin::builtin') |
|
34 | - ->setScheme(self::SCHEME_BUILTIN) |
|
35 | - ->setText($l->t('Builtin')) |
|
36 | - ; |
|
37 | - } |
|
31 | + public function __construct(IL10N $l) { |
|
32 | + $this |
|
33 | + ->setIdentifier('builtin::builtin') |
|
34 | + ->setScheme(self::SCHEME_BUILTIN) |
|
35 | + ->setText($l->t('Builtin')) |
|
36 | + ; |
|
37 | + } |
|
38 | 38 | } |
@@ -28,11 +28,11 @@ |
||
28 | 28 | * Null authentication mechanism |
29 | 29 | */ |
30 | 30 | class NullMechanism extends AuthMechanism { |
31 | - public function __construct(IL10N $l) { |
|
32 | - $this |
|
33 | - ->setIdentifier('null::null') |
|
34 | - ->setScheme(self::SCHEME_NULL) |
|
35 | - ->setText($l->t('None')) |
|
36 | - ; |
|
37 | - } |
|
31 | + public function __construct(IL10N $l) { |
|
32 | + $this |
|
33 | + ->setIdentifier('null::null') |
|
34 | + ->setScheme(self::SCHEME_NULL) |
|
35 | + ->setText($l->t('None')) |
|
36 | + ; |
|
37 | + } |
|
38 | 38 | } |
@@ -90,7 +90,7 @@ |
||
90 | 90 | $notification |
91 | 91 | ->setApp('comments') |
92 | 92 | ->setObject('comment', $comment->getId()) |
93 | - ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ]) |
|
93 | + ->setSubject('mention', [$comment->getObjectType(), $comment->getObjectId()]) |
|
94 | 94 | ->setDateTime($comment->getCreationDateTime()); |
95 | 95 | |
96 | 96 | return $notification; |
@@ -14,71 +14,71 @@ |
||
14 | 14 | use OCP\Notification\INotification; |
15 | 15 | |
16 | 16 | class Listener { |
17 | - public function __construct( |
|
18 | - protected IManager $notificationManager, |
|
19 | - protected IUserManager $userManager, |
|
20 | - ) { |
|
21 | - } |
|
17 | + public function __construct( |
|
18 | + protected IManager $notificationManager, |
|
19 | + protected IUserManager $userManager, |
|
20 | + ) { |
|
21 | + } |
|
22 | 22 | |
23 | - public function evaluate(CommentsEvent $event): void { |
|
24 | - $comment = $event->getComment(); |
|
23 | + public function evaluate(CommentsEvent $event): void { |
|
24 | + $comment = $event->getComment(); |
|
25 | 25 | |
26 | - $mentions = $this->extractMentions($comment->getMentions()); |
|
27 | - if (empty($mentions)) { |
|
28 | - // no one to notify |
|
29 | - return; |
|
30 | - } |
|
26 | + $mentions = $this->extractMentions($comment->getMentions()); |
|
27 | + if (empty($mentions)) { |
|
28 | + // no one to notify |
|
29 | + return; |
|
30 | + } |
|
31 | 31 | |
32 | - $notification = $this->instantiateNotification($comment); |
|
32 | + $notification = $this->instantiateNotification($comment); |
|
33 | 33 | |
34 | - foreach ($mentions as $uid) { |
|
35 | - if (($comment->getActorType() === 'users' && $uid === $comment->getActorId()) |
|
36 | - || !$this->userManager->userExists($uid) |
|
37 | - ) { |
|
38 | - // do not notify unknown users or yourself |
|
39 | - continue; |
|
40 | - } |
|
34 | + foreach ($mentions as $uid) { |
|
35 | + if (($comment->getActorType() === 'users' && $uid === $comment->getActorId()) |
|
36 | + || !$this->userManager->userExists($uid) |
|
37 | + ) { |
|
38 | + // do not notify unknown users or yourself |
|
39 | + continue; |
|
40 | + } |
|
41 | 41 | |
42 | - $notification->setUser($uid); |
|
43 | - if ($event->getEvent() === CommentsEvent::EVENT_DELETE |
|
44 | - || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE) { |
|
45 | - $this->notificationManager->markProcessed($notification); |
|
46 | - } else { |
|
47 | - $this->notificationManager->notify($notification); |
|
48 | - } |
|
49 | - } |
|
50 | - } |
|
42 | + $notification->setUser($uid); |
|
43 | + if ($event->getEvent() === CommentsEvent::EVENT_DELETE |
|
44 | + || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE) { |
|
45 | + $this->notificationManager->markProcessed($notification); |
|
46 | + } else { |
|
47 | + $this->notificationManager->notify($notification); |
|
48 | + } |
|
49 | + } |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * Creates a notification instance and fills it with comment data |
|
54 | - */ |
|
55 | - public function instantiateNotification(IComment $comment): INotification { |
|
56 | - $notification = $this->notificationManager->createNotification(); |
|
57 | - $notification |
|
58 | - ->setApp('comments') |
|
59 | - ->setObject('comment', $comment->getId()) |
|
60 | - ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ]) |
|
61 | - ->setDateTime($comment->getCreationDateTime()); |
|
52 | + /** |
|
53 | + * Creates a notification instance and fills it with comment data |
|
54 | + */ |
|
55 | + public function instantiateNotification(IComment $comment): INotification { |
|
56 | + $notification = $this->notificationManager->createNotification(); |
|
57 | + $notification |
|
58 | + ->setApp('comments') |
|
59 | + ->setObject('comment', $comment->getId()) |
|
60 | + ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ]) |
|
61 | + ->setDateTime($comment->getCreationDateTime()); |
|
62 | 62 | |
63 | - return $notification; |
|
64 | - } |
|
63 | + return $notification; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * Flattens the mention array returned from comments to a list of user ids. |
|
68 | - * |
|
69 | - * @param array $mentions |
|
70 | - * @return list<string> containing the mentions, e.g. ['alice', 'bob'] |
|
71 | - */ |
|
72 | - public function extractMentions(array $mentions): array { |
|
73 | - if (empty($mentions)) { |
|
74 | - return []; |
|
75 | - } |
|
76 | - $uids = []; |
|
77 | - foreach ($mentions as $mention) { |
|
78 | - if ($mention['type'] === 'user') { |
|
79 | - $uids[] = $mention['id']; |
|
80 | - } |
|
81 | - } |
|
82 | - return $uids; |
|
83 | - } |
|
66 | + /** |
|
67 | + * Flattens the mention array returned from comments to a list of user ids. |
|
68 | + * |
|
69 | + * @param array $mentions |
|
70 | + * @return list<string> containing the mentions, e.g. ['alice', 'bob'] |
|
71 | + */ |
|
72 | + public function extractMentions(array $mentions): array { |
|
73 | + if (empty($mentions)) { |
|
74 | + return []; |
|
75 | + } |
|
76 | + $uids = []; |
|
77 | + foreach ($mentions as $mention) { |
|
78 | + if ($mention['type'] === 'user') { |
|
79 | + $uids[] = $mention['id']; |
|
80 | + } |
|
81 | + } |
|
82 | + return $uids; |
|
83 | + } |
|
84 | 84 | } |
@@ -99,7 +99,7 @@ |
||
99 | 99 | if ($useLoginPassword) { |
100 | 100 | $question = new Question('Please enter the user\'s login password: '); |
101 | 101 | } elseif ($this->util->isRecoveryEnabledForUser($user) === false) { |
102 | - $output->writeln('No recovery key available for user ' . $user); |
|
102 | + $output->writeln('No recovery key available for user '.$user); |
|
103 | 103 | return false; |
104 | 104 | } else { |
105 | 105 | $user = $recoveryKeyId; |
@@ -19,106 +19,106 @@ |
||
19 | 19 | |
20 | 20 | class DecryptAll { |
21 | 21 | |
22 | - /** |
|
23 | - * @param Util $util |
|
24 | - * @param KeyManager $keyManager |
|
25 | - * @param Crypt $crypt |
|
26 | - * @param Session $session |
|
27 | - * @param QuestionHelper $questionHelper |
|
28 | - */ |
|
29 | - public function __construct( |
|
30 | - protected Util $util, |
|
31 | - protected KeyManager $keyManager, |
|
32 | - protected Crypt $crypt, |
|
33 | - protected Session $session, |
|
34 | - protected QuestionHelper $questionHelper, |
|
35 | - ) { |
|
36 | - } |
|
22 | + /** |
|
23 | + * @param Util $util |
|
24 | + * @param KeyManager $keyManager |
|
25 | + * @param Crypt $crypt |
|
26 | + * @param Session $session |
|
27 | + * @param QuestionHelper $questionHelper |
|
28 | + */ |
|
29 | + public function __construct( |
|
30 | + protected Util $util, |
|
31 | + protected KeyManager $keyManager, |
|
32 | + protected Crypt $crypt, |
|
33 | + protected Session $session, |
|
34 | + protected QuestionHelper $questionHelper, |
|
35 | + ) { |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * prepare encryption module to decrypt all files |
|
40 | - * |
|
41 | - * @param InputInterface $input |
|
42 | - * @param OutputInterface $output |
|
43 | - * @param $user |
|
44 | - * @return bool |
|
45 | - */ |
|
46 | - public function prepare(InputInterface $input, OutputInterface $output, $user) { |
|
47 | - $question = new Question('Please enter the recovery key password: '); |
|
38 | + /** |
|
39 | + * prepare encryption module to decrypt all files |
|
40 | + * |
|
41 | + * @param InputInterface $input |
|
42 | + * @param OutputInterface $output |
|
43 | + * @param $user |
|
44 | + * @return bool |
|
45 | + */ |
|
46 | + public function prepare(InputInterface $input, OutputInterface $output, $user) { |
|
47 | + $question = new Question('Please enter the recovery key password: '); |
|
48 | 48 | |
49 | - if ($this->util->isMasterKeyEnabled()) { |
|
50 | - $output->writeln('Use master key to decrypt all files'); |
|
51 | - $user = $this->keyManager->getMasterKeyId(); |
|
52 | - $password = $this->keyManager->getMasterKeyPassword(); |
|
53 | - } else { |
|
54 | - $recoveryKeyId = $this->keyManager->getRecoveryKeyId(); |
|
55 | - if (!empty($user)) { |
|
56 | - $output->writeln('You can only decrypt the users files if you know'); |
|
57 | - $output->writeln('the users password or if they activated the recovery key.'); |
|
58 | - $output->writeln(''); |
|
59 | - $questionUseLoginPassword = new ConfirmationQuestion( |
|
60 | - 'Do you want to use the users login password to decrypt all files? (y/n) ', |
|
61 | - false |
|
62 | - ); |
|
63 | - $useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword); |
|
64 | - if ($useLoginPassword) { |
|
65 | - $question = new Question('Please enter the user\'s login password: '); |
|
66 | - } elseif ($this->util->isRecoveryEnabledForUser($user) === false) { |
|
67 | - $output->writeln('No recovery key available for user ' . $user); |
|
68 | - return false; |
|
69 | - } else { |
|
70 | - $user = $recoveryKeyId; |
|
71 | - } |
|
72 | - } else { |
|
73 | - $output->writeln('You can only decrypt the files of all users if the'); |
|
74 | - $output->writeln('recovery key is enabled by the admin and activated by the users.'); |
|
75 | - $output->writeln(''); |
|
76 | - $user = $recoveryKeyId; |
|
77 | - } |
|
49 | + if ($this->util->isMasterKeyEnabled()) { |
|
50 | + $output->writeln('Use master key to decrypt all files'); |
|
51 | + $user = $this->keyManager->getMasterKeyId(); |
|
52 | + $password = $this->keyManager->getMasterKeyPassword(); |
|
53 | + } else { |
|
54 | + $recoveryKeyId = $this->keyManager->getRecoveryKeyId(); |
|
55 | + if (!empty($user)) { |
|
56 | + $output->writeln('You can only decrypt the users files if you know'); |
|
57 | + $output->writeln('the users password or if they activated the recovery key.'); |
|
58 | + $output->writeln(''); |
|
59 | + $questionUseLoginPassword = new ConfirmationQuestion( |
|
60 | + 'Do you want to use the users login password to decrypt all files? (y/n) ', |
|
61 | + false |
|
62 | + ); |
|
63 | + $useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword); |
|
64 | + if ($useLoginPassword) { |
|
65 | + $question = new Question('Please enter the user\'s login password: '); |
|
66 | + } elseif ($this->util->isRecoveryEnabledForUser($user) === false) { |
|
67 | + $output->writeln('No recovery key available for user ' . $user); |
|
68 | + return false; |
|
69 | + } else { |
|
70 | + $user = $recoveryKeyId; |
|
71 | + } |
|
72 | + } else { |
|
73 | + $output->writeln('You can only decrypt the files of all users if the'); |
|
74 | + $output->writeln('recovery key is enabled by the admin and activated by the users.'); |
|
75 | + $output->writeln(''); |
|
76 | + $user = $recoveryKeyId; |
|
77 | + } |
|
78 | 78 | |
79 | - $question->setHidden(true); |
|
80 | - $question->setHiddenFallback(false); |
|
81 | - $password = $this->questionHelper->ask($input, $output, $question); |
|
82 | - } |
|
79 | + $question->setHidden(true); |
|
80 | + $question->setHiddenFallback(false); |
|
81 | + $password = $this->questionHelper->ask($input, $output, $question); |
|
82 | + } |
|
83 | 83 | |
84 | - $privateKey = $this->getPrivateKey($user, $password); |
|
85 | - if ($privateKey !== false) { |
|
86 | - $this->updateSession($user, $privateKey); |
|
87 | - return true; |
|
88 | - } else { |
|
89 | - $output->writeln('Could not decrypt private key, maybe you entered the wrong password?'); |
|
90 | - } |
|
84 | + $privateKey = $this->getPrivateKey($user, $password); |
|
85 | + if ($privateKey !== false) { |
|
86 | + $this->updateSession($user, $privateKey); |
|
87 | + return true; |
|
88 | + } else { |
|
89 | + $output->writeln('Could not decrypt private key, maybe you entered the wrong password?'); |
|
90 | + } |
|
91 | 91 | |
92 | 92 | |
93 | - return false; |
|
94 | - } |
|
93 | + return false; |
|
94 | + } |
|
95 | 95 | |
96 | - /** |
|
97 | - * get the private key which will be used to decrypt all files |
|
98 | - * |
|
99 | - * @param string $user |
|
100 | - * @param string $password |
|
101 | - * @return bool|string |
|
102 | - * @throws PrivateKeyMissingException |
|
103 | - */ |
|
104 | - protected function getPrivateKey($user, $password) { |
|
105 | - $recoveryKeyId = $this->keyManager->getRecoveryKeyId(); |
|
106 | - $masterKeyId = $this->keyManager->getMasterKeyId(); |
|
107 | - if ($user === $recoveryKeyId) { |
|
108 | - $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId); |
|
109 | - $privateKey = $this->crypt->decryptPrivateKey($recoveryKey, $password); |
|
110 | - } elseif ($user === $masterKeyId) { |
|
111 | - $masterKey = $this->keyManager->getSystemPrivateKey($masterKeyId); |
|
112 | - $privateKey = $this->crypt->decryptPrivateKey($masterKey, $password, $masterKeyId); |
|
113 | - } else { |
|
114 | - $userKey = $this->keyManager->getPrivateKey($user); |
|
115 | - $privateKey = $this->crypt->decryptPrivateKey($userKey, $password, $user); |
|
116 | - } |
|
96 | + /** |
|
97 | + * get the private key which will be used to decrypt all files |
|
98 | + * |
|
99 | + * @param string $user |
|
100 | + * @param string $password |
|
101 | + * @return bool|string |
|
102 | + * @throws PrivateKeyMissingException |
|
103 | + */ |
|
104 | + protected function getPrivateKey($user, $password) { |
|
105 | + $recoveryKeyId = $this->keyManager->getRecoveryKeyId(); |
|
106 | + $masterKeyId = $this->keyManager->getMasterKeyId(); |
|
107 | + if ($user === $recoveryKeyId) { |
|
108 | + $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId); |
|
109 | + $privateKey = $this->crypt->decryptPrivateKey($recoveryKey, $password); |
|
110 | + } elseif ($user === $masterKeyId) { |
|
111 | + $masterKey = $this->keyManager->getSystemPrivateKey($masterKeyId); |
|
112 | + $privateKey = $this->crypt->decryptPrivateKey($masterKey, $password, $masterKeyId); |
|
113 | + } else { |
|
114 | + $userKey = $this->keyManager->getPrivateKey($user); |
|
115 | + $privateKey = $this->crypt->decryptPrivateKey($userKey, $password, $user); |
|
116 | + } |
|
117 | 117 | |
118 | - return $privateKey; |
|
119 | - } |
|
118 | + return $privateKey; |
|
119 | + } |
|
120 | 120 | |
121 | - protected function updateSession($user, $privateKey) { |
|
122 | - $this->session->prepareDecryptAll($user, $privateKey); |
|
123 | - } |
|
121 | + protected function updateSession($user, $privateKey) { |
|
122 | + $this->session->prepareDecryptAll($user, $privateKey); |
|
123 | + } |
|
124 | 124 | } |
@@ -69,10 +69,10 @@ |
||
69 | 69 | return $this->url; |
70 | 70 | } |
71 | 71 | |
72 | - $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
73 | - $this->url .= $this->request->getServerHost();// E.g. localhost |
|
74 | - $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
75 | - $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
72 | + $this->url = $this->request->getServerProtocol().'://'; // E.g. http(s) + :// |
|
73 | + $this->url .= $this->request->getServerHost(); // E.g. localhost |
|
74 | + $this->url .= $this->request->getScriptName(); // E.g. /nextcloud/index.php |
|
75 | + $this->url .= $this->request->getPathInfo(); // E.g. /apps/files_texteditor/ajax/loadfile |
|
76 | 76 | |
77 | 77 | return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
78 | 78 | } |
@@ -9,71 +9,71 @@ |
||
9 | 9 | use OCP\IRequest; |
10 | 10 | |
11 | 11 | class RequestURL extends AbstractStringCheck { |
12 | - public const CLI = 'cli'; |
|
12 | + public const CLI = 'cli'; |
|
13 | 13 | |
14 | - /** @var ?string */ |
|
15 | - protected $url; |
|
14 | + /** @var ?string */ |
|
15 | + protected $url; |
|
16 | 16 | |
17 | - /** |
|
18 | - * @param IL10N $l |
|
19 | - * @param IRequest $request |
|
20 | - */ |
|
21 | - public function __construct( |
|
22 | - IL10N $l, |
|
23 | - protected IRequest $request, |
|
24 | - ) { |
|
25 | - parent::__construct($l); |
|
26 | - } |
|
17 | + /** |
|
18 | + * @param IL10N $l |
|
19 | + * @param IRequest $request |
|
20 | + */ |
|
21 | + public function __construct( |
|
22 | + IL10N $l, |
|
23 | + protected IRequest $request, |
|
24 | + ) { |
|
25 | + parent::__construct($l); |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * @param string $operator |
|
30 | - * @param string $value |
|
31 | - * @return bool |
|
32 | - */ |
|
33 | - public function executeCheck($operator, $value) { |
|
34 | - if (\OC::$CLI) { |
|
35 | - $actualValue = $this->url = RequestURL::CLI; |
|
36 | - } else { |
|
37 | - $actualValue = $this->getActualValue(); |
|
38 | - } |
|
39 | - if (in_array($operator, ['is', '!is'])) { |
|
40 | - switch ($value) { |
|
41 | - case 'webdav': |
|
42 | - if ($operator === 'is') { |
|
43 | - return $this->isWebDAVRequest(); |
|
44 | - } else { |
|
45 | - return !$this->isWebDAVRequest(); |
|
46 | - } |
|
47 | - } |
|
48 | - } |
|
49 | - return $this->executeStringCheck($operator, $value, $actualValue); |
|
50 | - } |
|
28 | + /** |
|
29 | + * @param string $operator |
|
30 | + * @param string $value |
|
31 | + * @return bool |
|
32 | + */ |
|
33 | + public function executeCheck($operator, $value) { |
|
34 | + if (\OC::$CLI) { |
|
35 | + $actualValue = $this->url = RequestURL::CLI; |
|
36 | + } else { |
|
37 | + $actualValue = $this->getActualValue(); |
|
38 | + } |
|
39 | + if (in_array($operator, ['is', '!is'])) { |
|
40 | + switch ($value) { |
|
41 | + case 'webdav': |
|
42 | + if ($operator === 'is') { |
|
43 | + return $this->isWebDAVRequest(); |
|
44 | + } else { |
|
45 | + return !$this->isWebDAVRequest(); |
|
46 | + } |
|
47 | + } |
|
48 | + } |
|
49 | + return $this->executeStringCheck($operator, $value, $actualValue); |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * @return string |
|
54 | - */ |
|
55 | - protected function getActualValue() { |
|
56 | - if ($this->url !== null) { |
|
57 | - return $this->url; |
|
58 | - } |
|
52 | + /** |
|
53 | + * @return string |
|
54 | + */ |
|
55 | + protected function getActualValue() { |
|
56 | + if ($this->url !== null) { |
|
57 | + return $this->url; |
|
58 | + } |
|
59 | 59 | |
60 | - $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
61 | - $this->url .= $this->request->getServerHost();// E.g. localhost |
|
62 | - $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
63 | - $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
60 | + $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
61 | + $this->url .= $this->request->getServerHost();// E.g. localhost |
|
62 | + $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
63 | + $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
64 | 64 | |
65 | - return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
|
66 | - } |
|
65 | + return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
|
66 | + } |
|
67 | 67 | |
68 | - protected function isWebDAVRequest(): bool { |
|
69 | - if ($this->url === RequestURL::CLI) { |
|
70 | - return false; |
|
71 | - } |
|
72 | - return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && ( |
|
73 | - $this->request->getPathInfo() === '/webdav' || |
|
74 | - str_starts_with($this->request->getPathInfo() ?? '', '/webdav/') || |
|
75 | - $this->request->getPathInfo() === '/dav/files' || |
|
76 | - str_starts_with($this->request->getPathInfo() ?? '', '/dav/files/') |
|
77 | - ); |
|
78 | - } |
|
68 | + protected function isWebDAVRequest(): bool { |
|
69 | + if ($this->url === RequestURL::CLI) { |
|
70 | + return false; |
|
71 | + } |
|
72 | + return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && ( |
|
73 | + $this->request->getPathInfo() === '/webdav' || |
|
74 | + str_starts_with($this->request->getPathInfo() ?? '', '/webdav/') || |
|
75 | + $this->request->getPathInfo() === '/dav/files' || |
|
76 | + str_starts_with($this->request->getPathInfo() ?? '', '/dav/files/') |
|
77 | + ); |
|
78 | + } |
|
79 | 79 | } |
@@ -99,7 +99,7 @@ |
||
99 | 99 | $this->checker->writeCoreSignature($x509, $rsa, $path); |
100 | 100 | $output->writeln('Successfully signed "core"'); |
101 | 101 | } catch (\Exception $e) { |
102 | - $output->writeln('Error: ' . $e->getMessage()); |
|
102 | + $output->writeln('Error: '.$e->getMessage()); |
|
103 | 103 | return 1; |
104 | 104 | } |
105 | 105 | return 0; |
@@ -22,60 +22,60 @@ |
||
22 | 22 | * @package OC\Core\Command\Integrity |
23 | 23 | */ |
24 | 24 | class SignCore extends Command { |
25 | - public function __construct( |
|
26 | - private Checker $checker, |
|
27 | - private FileAccessHelper $fileAccessHelper, |
|
28 | - ) { |
|
29 | - parent::__construct(null); |
|
30 | - } |
|
25 | + public function __construct( |
|
26 | + private Checker $checker, |
|
27 | + private FileAccessHelper $fileAccessHelper, |
|
28 | + ) { |
|
29 | + parent::__construct(null); |
|
30 | + } |
|
31 | 31 | |
32 | - protected function configure() { |
|
33 | - $this |
|
34 | - ->setName('integrity:sign-core') |
|
35 | - ->setDescription('Sign core using a private key.') |
|
36 | - ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing') |
|
37 | - ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing') |
|
38 | - ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign'); |
|
39 | - } |
|
32 | + protected function configure() { |
|
33 | + $this |
|
34 | + ->setName('integrity:sign-core') |
|
35 | + ->setDescription('Sign core using a private key.') |
|
36 | + ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing') |
|
37 | + ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing') |
|
38 | + ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign'); |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * {@inheritdoc } |
|
43 | - */ |
|
44 | - protected function execute(InputInterface $input, OutputInterface $output): int { |
|
45 | - $privateKeyPath = $input->getOption('privateKey'); |
|
46 | - $keyBundlePath = $input->getOption('certificate'); |
|
47 | - $path = $input->getOption('path'); |
|
48 | - if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) { |
|
49 | - $output->writeln('--privateKey, --certificate and --path are required.'); |
|
50 | - return 1; |
|
51 | - } |
|
41 | + /** |
|
42 | + * {@inheritdoc } |
|
43 | + */ |
|
44 | + protected function execute(InputInterface $input, OutputInterface $output): int { |
|
45 | + $privateKeyPath = $input->getOption('privateKey'); |
|
46 | + $keyBundlePath = $input->getOption('certificate'); |
|
47 | + $path = $input->getOption('path'); |
|
48 | + if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) { |
|
49 | + $output->writeln('--privateKey, --certificate and --path are required.'); |
|
50 | + return 1; |
|
51 | + } |
|
52 | 52 | |
53 | - $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); |
|
54 | - $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath); |
|
53 | + $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); |
|
54 | + $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath); |
|
55 | 55 | |
56 | - if ($privateKey === false) { |
|
57 | - $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); |
|
58 | - return 1; |
|
59 | - } |
|
56 | + if ($privateKey === false) { |
|
57 | + $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); |
|
58 | + return 1; |
|
59 | + } |
|
60 | 60 | |
61 | - if ($keyBundle === false) { |
|
62 | - $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); |
|
63 | - return 1; |
|
64 | - } |
|
61 | + if ($keyBundle === false) { |
|
62 | + $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); |
|
63 | + return 1; |
|
64 | + } |
|
65 | 65 | |
66 | - $rsa = new RSA(); |
|
67 | - $rsa->loadKey($privateKey); |
|
68 | - $x509 = new X509(); |
|
69 | - $x509->loadX509($keyBundle); |
|
70 | - $x509->setPrivateKey($rsa); |
|
66 | + $rsa = new RSA(); |
|
67 | + $rsa->loadKey($privateKey); |
|
68 | + $x509 = new X509(); |
|
69 | + $x509->loadX509($keyBundle); |
|
70 | + $x509->setPrivateKey($rsa); |
|
71 | 71 | |
72 | - try { |
|
73 | - $this->checker->writeCoreSignature($x509, $rsa, $path); |
|
74 | - $output->writeln('Successfully signed "core"'); |
|
75 | - } catch (\Exception $e) { |
|
76 | - $output->writeln('Error: ' . $e->getMessage()); |
|
77 | - return 1; |
|
78 | - } |
|
79 | - return 0; |
|
80 | - } |
|
72 | + try { |
|
73 | + $this->checker->writeCoreSignature($x509, $rsa, $path); |
|
74 | + $output->writeln('Successfully signed "core"'); |
|
75 | + } catch (\Exception $e) { |
|
76 | + $output->writeln('Error: ' . $e->getMessage()); |
|
77 | + return 1; |
|
78 | + } |
|
79 | + return 0; |
|
80 | + } |
|
81 | 81 | } |
@@ -51,7 +51,7 @@ |
||
51 | 51 | */ |
52 | 52 | public function completeArgumentValues($argumentName, CompletionContext $context) { |
53 | 53 | if ($argumentName === 'uid') { |
54 | - return array_map(function (IUser $user) { |
|
54 | + return array_map(function(IUser $user) { |
|
55 | 55 | return $user->getUID(); |
56 | 56 | }, $this->userManager->search($context->getCurrentWord(), 100)); |
57 | 57 | } |
@@ -10,37 +10,37 @@ |
||
10 | 10 | use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; |
11 | 11 | |
12 | 12 | class Base extends \OC\Core\Command\Base { |
13 | - public function __construct( |
|
14 | - ?string $name, |
|
15 | - protected IUserManager $userManager, |
|
16 | - ) { |
|
17 | - parent::__construct($name); |
|
18 | - } |
|
13 | + public function __construct( |
|
14 | + ?string $name, |
|
15 | + protected IUserManager $userManager, |
|
16 | + ) { |
|
17 | + parent::__construct($name); |
|
18 | + } |
|
19 | 19 | |
20 | - /** |
|
21 | - * Return possible values for the named option |
|
22 | - * |
|
23 | - * @param string $optionName |
|
24 | - * @param CompletionContext $context |
|
25 | - * @return string[] |
|
26 | - */ |
|
27 | - public function completeOptionValues($optionName, CompletionContext $context) { |
|
28 | - return []; |
|
29 | - } |
|
20 | + /** |
|
21 | + * Return possible values for the named option |
|
22 | + * |
|
23 | + * @param string $optionName |
|
24 | + * @param CompletionContext $context |
|
25 | + * @return string[] |
|
26 | + */ |
|
27 | + public function completeOptionValues($optionName, CompletionContext $context) { |
|
28 | + return []; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * Return possible values for the named argument |
|
33 | - * |
|
34 | - * @param string $argumentName |
|
35 | - * @param CompletionContext $context |
|
36 | - * @return string[] |
|
37 | - */ |
|
38 | - public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
39 | - if ($argumentName === 'uid') { |
|
40 | - return array_map(function (IUser $user) { |
|
41 | - return $user->getUID(); |
|
42 | - }, $this->userManager->search($context->getCurrentWord(), 100)); |
|
43 | - } |
|
44 | - return []; |
|
45 | - } |
|
31 | + /** |
|
32 | + * Return possible values for the named argument |
|
33 | + * |
|
34 | + * @param string $argumentName |
|
35 | + * @param CompletionContext $context |
|
36 | + * @return string[] |
|
37 | + */ |
|
38 | + public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
39 | + if ($argumentName === 'uid') { |
|
40 | + return array_map(function (IUser $user) { |
|
41 | + return $user->getUID(); |
|
42 | + }, $this->userManager->search($context->getCurrentWord(), 100)); |
|
43 | + } |
|
44 | + return []; |
|
45 | + } |
|
46 | 46 | } |