@@ -140,7 +140,7 @@ |
||
140 | 140 | * @return bool |
141 | 141 | */ |
142 | 142 | public function isFlagSet($flag) { |
143 | - return (bool)($this->flags & $flag); |
|
143 | + return (bool) ($this->flags & $flag); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | /** |
@@ -27,189 +27,189 @@ |
||
27 | 27 | * Parameter for an external storage definition |
28 | 28 | */ |
29 | 29 | class DefinitionParameter implements \JsonSerializable { |
30 | - // placeholder value for password fields, when the client updates a storage configuration |
|
31 | - // placeholder values are ignored and the field is left unmodified |
|
32 | - public const UNMODIFIED_PLACEHOLDER = '__unmodified__'; |
|
33 | - |
|
34 | - /** Value constants */ |
|
35 | - public const VALUE_TEXT = 0; |
|
36 | - public const VALUE_BOOLEAN = 1; |
|
37 | - public const VALUE_PASSWORD = 2; |
|
38 | - public const VALUE_HIDDEN = 3; |
|
39 | - |
|
40 | - /** Flag constants */ |
|
41 | - public const FLAG_NONE = 0; |
|
42 | - public const FLAG_OPTIONAL = 1; |
|
43 | - public const FLAG_USER_PROVIDED = 2; |
|
44 | - |
|
45 | - /** @var string name of parameter */ |
|
46 | - private $name; |
|
47 | - |
|
48 | - /** @var string human-readable parameter text */ |
|
49 | - private $text; |
|
50 | - |
|
51 | - /** @var string human-readable parameter tooltip */ |
|
52 | - private $tooltip = ''; |
|
53 | - |
|
54 | - /** @var int value type, see self::VALUE_* constants */ |
|
55 | - private $type = self::VALUE_TEXT; |
|
56 | - |
|
57 | - /** @var int flags, see self::FLAG_* constants */ |
|
58 | - private $flags = self::FLAG_NONE; |
|
59 | - |
|
60 | - /** |
|
61 | - * @param string $name |
|
62 | - * @param string $text |
|
63 | - */ |
|
64 | - public function __construct($name, $text) { |
|
65 | - $this->name = $name; |
|
66 | - $this->text = $text; |
|
67 | - } |
|
68 | - |
|
69 | - /** |
|
70 | - * @return string |
|
71 | - */ |
|
72 | - public function getName() { |
|
73 | - return $this->name; |
|
74 | - } |
|
75 | - |
|
76 | - /** |
|
77 | - * @return string |
|
78 | - */ |
|
79 | - public function getText() { |
|
80 | - return $this->text; |
|
81 | - } |
|
82 | - |
|
83 | - /** |
|
84 | - * Get value type |
|
85 | - * |
|
86 | - * @return int |
|
87 | - */ |
|
88 | - public function getType() { |
|
89 | - return $this->type; |
|
90 | - } |
|
91 | - |
|
92 | - /** |
|
93 | - * Set value type |
|
94 | - * |
|
95 | - * @param int $type |
|
96 | - * @return self |
|
97 | - */ |
|
98 | - public function setType($type) { |
|
99 | - $this->type = $type; |
|
100 | - return $this; |
|
101 | - } |
|
102 | - |
|
103 | - /** |
|
104 | - * @return string |
|
105 | - */ |
|
106 | - public function getTypeName() { |
|
107 | - switch ($this->type) { |
|
108 | - case self::VALUE_BOOLEAN: |
|
109 | - return 'boolean'; |
|
110 | - case self::VALUE_TEXT: |
|
111 | - return 'text'; |
|
112 | - case self::VALUE_PASSWORD: |
|
113 | - return 'password'; |
|
114 | - default: |
|
115 | - return 'unknown'; |
|
116 | - } |
|
117 | - } |
|
118 | - |
|
119 | - /** |
|
120 | - * @return int |
|
121 | - */ |
|
122 | - public function getFlags() { |
|
123 | - return $this->flags; |
|
124 | - } |
|
125 | - |
|
126 | - /** |
|
127 | - * @param int $flags |
|
128 | - * @return self |
|
129 | - */ |
|
130 | - public function setFlags($flags) { |
|
131 | - $this->flags = $flags; |
|
132 | - return $this; |
|
133 | - } |
|
134 | - |
|
135 | - /** |
|
136 | - * @param int $flag |
|
137 | - * @return self |
|
138 | - */ |
|
139 | - public function setFlag($flag) { |
|
140 | - $this->flags |= $flag; |
|
141 | - return $this; |
|
142 | - } |
|
143 | - |
|
144 | - /** |
|
145 | - * @param int $flag |
|
146 | - * @return bool |
|
147 | - */ |
|
148 | - public function isFlagSet($flag) { |
|
149 | - return (bool)($this->flags & $flag); |
|
150 | - } |
|
151 | - |
|
152 | - /** |
|
153 | - * @return string |
|
154 | - */ |
|
155 | - public function getTooltip(): string { |
|
156 | - return $this->tooltip; |
|
157 | - } |
|
158 | - |
|
159 | - /** |
|
160 | - * @param string $tooltip |
|
161 | - * @return self |
|
162 | - */ |
|
163 | - public function setTooltip(string $tooltip) { |
|
164 | - $this->tooltip = $tooltip; |
|
165 | - return $this; |
|
166 | - } |
|
167 | - |
|
168 | - /** |
|
169 | - * Serialize into JSON for client-side JS |
|
170 | - */ |
|
171 | - public function jsonSerialize(): array { |
|
172 | - return [ |
|
173 | - 'value' => $this->getText(), |
|
174 | - 'flags' => $this->getFlags(), |
|
175 | - 'type' => $this->getType(), |
|
176 | - 'tooltip' => $this->getTooltip(), |
|
177 | - ]; |
|
178 | - } |
|
179 | - |
|
180 | - public function isOptional() { |
|
181 | - return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED); |
|
182 | - } |
|
183 | - |
|
184 | - /** |
|
185 | - * Validate a parameter value against this |
|
186 | - * Convert type as necessary |
|
187 | - * |
|
188 | - * @param mixed $value Value to check |
|
189 | - * @return bool success |
|
190 | - */ |
|
191 | - public function validateValue(&$value) { |
|
192 | - switch ($this->getType()) { |
|
193 | - case self::VALUE_BOOLEAN: |
|
194 | - if (!is_bool($value)) { |
|
195 | - switch ($value) { |
|
196 | - case 'true': |
|
197 | - $value = true; |
|
198 | - break; |
|
199 | - case 'false': |
|
200 | - $value = false; |
|
201 | - break; |
|
202 | - default: |
|
203 | - return false; |
|
204 | - } |
|
205 | - } |
|
206 | - break; |
|
207 | - default: |
|
208 | - if (!$value && !$this->isOptional()) { |
|
209 | - return false; |
|
210 | - } |
|
211 | - break; |
|
212 | - } |
|
213 | - return true; |
|
214 | - } |
|
30 | + // placeholder value for password fields, when the client updates a storage configuration |
|
31 | + // placeholder values are ignored and the field is left unmodified |
|
32 | + public const UNMODIFIED_PLACEHOLDER = '__unmodified__'; |
|
33 | + |
|
34 | + /** Value constants */ |
|
35 | + public const VALUE_TEXT = 0; |
|
36 | + public const VALUE_BOOLEAN = 1; |
|
37 | + public const VALUE_PASSWORD = 2; |
|
38 | + public const VALUE_HIDDEN = 3; |
|
39 | + |
|
40 | + /** Flag constants */ |
|
41 | + public const FLAG_NONE = 0; |
|
42 | + public const FLAG_OPTIONAL = 1; |
|
43 | + public const FLAG_USER_PROVIDED = 2; |
|
44 | + |
|
45 | + /** @var string name of parameter */ |
|
46 | + private $name; |
|
47 | + |
|
48 | + /** @var string human-readable parameter text */ |
|
49 | + private $text; |
|
50 | + |
|
51 | + /** @var string human-readable parameter tooltip */ |
|
52 | + private $tooltip = ''; |
|
53 | + |
|
54 | + /** @var int value type, see self::VALUE_* constants */ |
|
55 | + private $type = self::VALUE_TEXT; |
|
56 | + |
|
57 | + /** @var int flags, see self::FLAG_* constants */ |
|
58 | + private $flags = self::FLAG_NONE; |
|
59 | + |
|
60 | + /** |
|
61 | + * @param string $name |
|
62 | + * @param string $text |
|
63 | + */ |
|
64 | + public function __construct($name, $text) { |
|
65 | + $this->name = $name; |
|
66 | + $this->text = $text; |
|
67 | + } |
|
68 | + |
|
69 | + /** |
|
70 | + * @return string |
|
71 | + */ |
|
72 | + public function getName() { |
|
73 | + return $this->name; |
|
74 | + } |
|
75 | + |
|
76 | + /** |
|
77 | + * @return string |
|
78 | + */ |
|
79 | + public function getText() { |
|
80 | + return $this->text; |
|
81 | + } |
|
82 | + |
|
83 | + /** |
|
84 | + * Get value type |
|
85 | + * |
|
86 | + * @return int |
|
87 | + */ |
|
88 | + public function getType() { |
|
89 | + return $this->type; |
|
90 | + } |
|
91 | + |
|
92 | + /** |
|
93 | + * Set value type |
|
94 | + * |
|
95 | + * @param int $type |
|
96 | + * @return self |
|
97 | + */ |
|
98 | + public function setType($type) { |
|
99 | + $this->type = $type; |
|
100 | + return $this; |
|
101 | + } |
|
102 | + |
|
103 | + /** |
|
104 | + * @return string |
|
105 | + */ |
|
106 | + public function getTypeName() { |
|
107 | + switch ($this->type) { |
|
108 | + case self::VALUE_BOOLEAN: |
|
109 | + return 'boolean'; |
|
110 | + case self::VALUE_TEXT: |
|
111 | + return 'text'; |
|
112 | + case self::VALUE_PASSWORD: |
|
113 | + return 'password'; |
|
114 | + default: |
|
115 | + return 'unknown'; |
|
116 | + } |
|
117 | + } |
|
118 | + |
|
119 | + /** |
|
120 | + * @return int |
|
121 | + */ |
|
122 | + public function getFlags() { |
|
123 | + return $this->flags; |
|
124 | + } |
|
125 | + |
|
126 | + /** |
|
127 | + * @param int $flags |
|
128 | + * @return self |
|
129 | + */ |
|
130 | + public function setFlags($flags) { |
|
131 | + $this->flags = $flags; |
|
132 | + return $this; |
|
133 | + } |
|
134 | + |
|
135 | + /** |
|
136 | + * @param int $flag |
|
137 | + * @return self |
|
138 | + */ |
|
139 | + public function setFlag($flag) { |
|
140 | + $this->flags |= $flag; |
|
141 | + return $this; |
|
142 | + } |
|
143 | + |
|
144 | + /** |
|
145 | + * @param int $flag |
|
146 | + * @return bool |
|
147 | + */ |
|
148 | + public function isFlagSet($flag) { |
|
149 | + return (bool)($this->flags & $flag); |
|
150 | + } |
|
151 | + |
|
152 | + /** |
|
153 | + * @return string |
|
154 | + */ |
|
155 | + public function getTooltip(): string { |
|
156 | + return $this->tooltip; |
|
157 | + } |
|
158 | + |
|
159 | + /** |
|
160 | + * @param string $tooltip |
|
161 | + * @return self |
|
162 | + */ |
|
163 | + public function setTooltip(string $tooltip) { |
|
164 | + $this->tooltip = $tooltip; |
|
165 | + return $this; |
|
166 | + } |
|
167 | + |
|
168 | + /** |
|
169 | + * Serialize into JSON for client-side JS |
|
170 | + */ |
|
171 | + public function jsonSerialize(): array { |
|
172 | + return [ |
|
173 | + 'value' => $this->getText(), |
|
174 | + 'flags' => $this->getFlags(), |
|
175 | + 'type' => $this->getType(), |
|
176 | + 'tooltip' => $this->getTooltip(), |
|
177 | + ]; |
|
178 | + } |
|
179 | + |
|
180 | + public function isOptional() { |
|
181 | + return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED); |
|
182 | + } |
|
183 | + |
|
184 | + /** |
|
185 | + * Validate a parameter value against this |
|
186 | + * Convert type as necessary |
|
187 | + * |
|
188 | + * @param mixed $value Value to check |
|
189 | + * @return bool success |
|
190 | + */ |
|
191 | + public function validateValue(&$value) { |
|
192 | + switch ($this->getType()) { |
|
193 | + case self::VALUE_BOOLEAN: |
|
194 | + if (!is_bool($value)) { |
|
195 | + switch ($value) { |
|
196 | + case 'true': |
|
197 | + $value = true; |
|
198 | + break; |
|
199 | + case 'false': |
|
200 | + $value = false; |
|
201 | + break; |
|
202 | + default: |
|
203 | + return false; |
|
204 | + } |
|
205 | + } |
|
206 | + break; |
|
207 | + default: |
|
208 | + if (!$value && !$this->isOptional()) { |
|
209 | + return false; |
|
210 | + } |
|
211 | + break; |
|
212 | + } |
|
213 | + return true; |
|
214 | + } |
|
215 | 215 | } |
@@ -39,31 +39,31 @@ |
||
39 | 39 | */ |
40 | 40 | class SessionCredentials extends AuthMechanism { |
41 | 41 | |
42 | - /** @var CredentialsStore */ |
|
43 | - private $credentialsStore; |
|
42 | + /** @var CredentialsStore */ |
|
43 | + private $credentialsStore; |
|
44 | 44 | |
45 | - public function __construct(IL10N $l, CredentialsStore $credentialsStore) { |
|
46 | - $this->credentialsStore = $credentialsStore; |
|
45 | + public function __construct(IL10N $l, CredentialsStore $credentialsStore) { |
|
46 | + $this->credentialsStore = $credentialsStore; |
|
47 | 47 | |
48 | - $this->setIdentifier('password::sessioncredentials') |
|
49 | - ->setScheme(self::SCHEME_PASSWORD) |
|
50 | - ->setText($l->t('Log-in credentials, save in session')) |
|
51 | - ->addParameters([]); |
|
52 | - } |
|
48 | + $this->setIdentifier('password::sessioncredentials') |
|
49 | + ->setScheme(self::SCHEME_PASSWORD) |
|
50 | + ->setText($l->t('Log-in credentials, save in session')) |
|
51 | + ->addParameters([]); |
|
52 | + } |
|
53 | 53 | |
54 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
55 | - try { |
|
56 | - $credentials = $this->credentialsStore->getLoginCredentials(); |
|
57 | - } catch (CredentialsUnavailableException $e) { |
|
58 | - throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved'); |
|
59 | - } |
|
54 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
55 | + try { |
|
56 | + $credentials = $this->credentialsStore->getLoginCredentials(); |
|
57 | + } catch (CredentialsUnavailableException $e) { |
|
58 | + throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved'); |
|
59 | + } |
|
60 | 60 | |
61 | - $storage->setBackendOption('user', $credentials->getLoginName()); |
|
62 | - $storage->setBackendOption('password', $credentials->getPassword()); |
|
63 | - } |
|
61 | + $storage->setBackendOption('user', $credentials->getLoginName()); |
|
62 | + $storage->setBackendOption('password', $credentials->getPassword()); |
|
63 | + } |
|
64 | 64 | |
65 | - public function wrapStorage(Storage $storage) { |
|
66 | - return new SessionStorageWrapper(['storage' => $storage]); |
|
67 | - } |
|
65 | + public function wrapStorage(Storage $storage) { |
|
66 | + return new SessionStorageWrapper(['storage' => $storage]); |
|
67 | + } |
|
68 | 68 | |
69 | 69 | } |
@@ -51,7 +51,7 @@ |
||
51 | 51 | ->addParameters([]); |
52 | 52 | } |
53 | 53 | |
54 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
54 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
55 | 55 | try { |
56 | 56 | $credentials = $this->credentialsStore->getLoginCredentials(); |
57 | 57 | } catch (CredentialsUnavailableException $e) { |
@@ -70,7 +70,7 @@ |
||
70 | 70 | ]); |
71 | 71 | } |
72 | 72 | |
73 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
73 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
74 | 74 | if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) { |
75 | 75 | $uid = ''; |
76 | 76 | } elseif (is_null($user)) { |
@@ -36,53 +36,53 @@ |
||
36 | 36 | * Global Username and Password |
37 | 37 | */ |
38 | 38 | class GlobalAuth extends AuthMechanism { |
39 | - public const CREDENTIALS_IDENTIFIER = 'password::global'; |
|
39 | + public const CREDENTIALS_IDENTIFIER = 'password::global'; |
|
40 | 40 | |
41 | - /** @var ICredentialsManager */ |
|
42 | - protected $credentialsManager; |
|
41 | + /** @var ICredentialsManager */ |
|
42 | + protected $credentialsManager; |
|
43 | 43 | |
44 | - public function __construct(IL10N $l, ICredentialsManager $credentialsManager) { |
|
45 | - $this->credentialsManager = $credentialsManager; |
|
44 | + public function __construct(IL10N $l, ICredentialsManager $credentialsManager) { |
|
45 | + $this->credentialsManager = $credentialsManager; |
|
46 | 46 | |
47 | - $this |
|
48 | - ->setIdentifier('password::global') |
|
49 | - ->setVisibility(BackendService::VISIBILITY_DEFAULT) |
|
50 | - ->setScheme(self::SCHEME_PASSWORD) |
|
51 | - ->setText($l->t('Global credentials')); |
|
52 | - } |
|
47 | + $this |
|
48 | + ->setIdentifier('password::global') |
|
49 | + ->setVisibility(BackendService::VISIBILITY_DEFAULT) |
|
50 | + ->setScheme(self::SCHEME_PASSWORD) |
|
51 | + ->setText($l->t('Global credentials')); |
|
52 | + } |
|
53 | 53 | |
54 | - public function getAuth($uid) { |
|
55 | - $auth = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER); |
|
56 | - if (!is_array($auth)) { |
|
57 | - return [ |
|
58 | - 'user' => '', |
|
59 | - 'password' => '' |
|
60 | - ]; |
|
61 | - } else { |
|
62 | - return $auth; |
|
63 | - } |
|
64 | - } |
|
54 | + public function getAuth($uid) { |
|
55 | + $auth = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER); |
|
56 | + if (!is_array($auth)) { |
|
57 | + return [ |
|
58 | + 'user' => '', |
|
59 | + 'password' => '' |
|
60 | + ]; |
|
61 | + } else { |
|
62 | + return $auth; |
|
63 | + } |
|
64 | + } |
|
65 | 65 | |
66 | - public function saveAuth($uid, $user, $password) { |
|
67 | - $this->credentialsManager->store($uid, self::CREDENTIALS_IDENTIFIER, [ |
|
68 | - 'user' => $user, |
|
69 | - 'password' => $password |
|
70 | - ]); |
|
71 | - } |
|
66 | + public function saveAuth($uid, $user, $password) { |
|
67 | + $this->credentialsManager->store($uid, self::CREDENTIALS_IDENTIFIER, [ |
|
68 | + 'user' => $user, |
|
69 | + 'password' => $password |
|
70 | + ]); |
|
71 | + } |
|
72 | 72 | |
73 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
74 | - if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) { |
|
75 | - $uid = ''; |
|
76 | - } elseif (is_null($user)) { |
|
77 | - throw new InsufficientDataForMeaningfulAnswerException('No credentials saved'); |
|
78 | - } else { |
|
79 | - $uid = $user->getUID(); |
|
80 | - } |
|
81 | - $credentials = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER); |
|
73 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
74 | + if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) { |
|
75 | + $uid = ''; |
|
76 | + } elseif (is_null($user)) { |
|
77 | + throw new InsufficientDataForMeaningfulAnswerException('No credentials saved'); |
|
78 | + } else { |
|
79 | + $uid = $user->getUID(); |
|
80 | + } |
|
81 | + $credentials = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER); |
|
82 | 82 | |
83 | - if (is_array($credentials)) { |
|
84 | - $storage->setBackendOption('user', $credentials['user']); |
|
85 | - $storage->setBackendOption('password', $credentials['password']); |
|
86 | - } |
|
87 | - } |
|
83 | + if (is_array($credentials)) { |
|
84 | + $storage->setBackendOption('user', $credentials['user']); |
|
85 | + $storage->setBackendOption('password', $credentials['password']); |
|
86 | + } |
|
87 | + } |
|
88 | 88 | } |
@@ -28,10 +28,10 @@ |
||
28 | 28 | * For auth mechanisms where the user needs to provide credentials |
29 | 29 | */ |
30 | 30 | interface IUserProvided { |
31 | - /** |
|
32 | - * @param IUser $user the user for which to save the user provided options |
|
33 | - * @param int $mountId the mount id to save the options for |
|
34 | - * @param array $options the user provided options |
|
35 | - */ |
|
36 | - public function saveBackendOptions(IUser $user, $mountId, array $options); |
|
31 | + /** |
|
32 | + * @param IUser $user the user for which to save the user provided options |
|
33 | + * @param int $mountId the mount id to save the options for |
|
34 | + * @param array $options the user provided options |
|
35 | + */ |
|
36 | + public function saveBackendOptions(IUser $user, $mountId, array $options); |
|
37 | 37 | } |
@@ -57,7 +57,7 @@ |
||
57 | 57 | ; |
58 | 58 | } |
59 | 59 | |
60 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
60 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
61 | 61 | $auth = new RSACrypt(); |
62 | 62 | $auth->setPassword($this->config->getSystemValue('secret', '')); |
63 | 63 | if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
@@ -36,51 +36,51 @@ |
||
36 | 36 | */ |
37 | 37 | class RSA extends AuthMechanism { |
38 | 38 | |
39 | - /** @var IConfig */ |
|
40 | - private $config; |
|
39 | + /** @var IConfig */ |
|
40 | + private $config; |
|
41 | 41 | |
42 | - public function __construct(IL10N $l, IConfig $config) { |
|
43 | - $this->config = $config; |
|
42 | + public function __construct(IL10N $l, IConfig $config) { |
|
43 | + $this->config = $config; |
|
44 | 44 | |
45 | - $this |
|
46 | - ->setIdentifier('publickey::rsa') |
|
47 | - ->setScheme(self::SCHEME_PUBLICKEY) |
|
48 | - ->setText($l->t('RSA public key')) |
|
49 | - ->addParameters([ |
|
50 | - new DefinitionParameter('user', $l->t('Username')), |
|
51 | - new DefinitionParameter('public_key', $l->t('Public key')), |
|
52 | - (new DefinitionParameter('private_key', 'private_key')) |
|
53 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
54 | - ]) |
|
55 | - ->addCustomJs('public_key') |
|
56 | - ; |
|
57 | - } |
|
45 | + $this |
|
46 | + ->setIdentifier('publickey::rsa') |
|
47 | + ->setScheme(self::SCHEME_PUBLICKEY) |
|
48 | + ->setText($l->t('RSA public key')) |
|
49 | + ->addParameters([ |
|
50 | + new DefinitionParameter('user', $l->t('Username')), |
|
51 | + new DefinitionParameter('public_key', $l->t('Public key')), |
|
52 | + (new DefinitionParameter('private_key', 'private_key')) |
|
53 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
54 | + ]) |
|
55 | + ->addCustomJs('public_key') |
|
56 | + ; |
|
57 | + } |
|
58 | 58 | |
59 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
60 | - $auth = new RSACrypt(); |
|
61 | - $auth->setPassword($this->config->getSystemValue('secret', '')); |
|
62 | - if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
|
63 | - throw new \RuntimeException('unable to load private key'); |
|
64 | - } |
|
65 | - $storage->setBackendOption('public_key_auth', $auth); |
|
66 | - } |
|
59 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
60 | + $auth = new RSACrypt(); |
|
61 | + $auth->setPassword($this->config->getSystemValue('secret', '')); |
|
62 | + if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
|
63 | + throw new \RuntimeException('unable to load private key'); |
|
64 | + } |
|
65 | + $storage->setBackendOption('public_key_auth', $auth); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * Generate a keypair |
|
70 | - * |
|
71 | - * @param int $keyLenth |
|
72 | - * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey] |
|
73 | - */ |
|
74 | - public function createKey($keyLength) { |
|
75 | - $rsa = new RSACrypt(); |
|
76 | - $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH); |
|
77 | - $rsa->setPassword($this->config->getSystemValue('secret', '')); |
|
68 | + /** |
|
69 | + * Generate a keypair |
|
70 | + * |
|
71 | + * @param int $keyLenth |
|
72 | + * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey] |
|
73 | + */ |
|
74 | + public function createKey($keyLength) { |
|
75 | + $rsa = new RSACrypt(); |
|
76 | + $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH); |
|
77 | + $rsa->setPassword($this->config->getSystemValue('secret', '')); |
|
78 | 78 | |
79 | - if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) { |
|
80 | - $keyLength = 1024; |
|
81 | - } |
|
79 | + if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) { |
|
80 | + $keyLength = 1024; |
|
81 | + } |
|
82 | 82 | |
83 | - return $rsa->createKey($keyLength); |
|
84 | - } |
|
83 | + return $rsa->createKey($keyLength); |
|
84 | + } |
|
85 | 85 | |
86 | 86 | } |
@@ -30,10 +30,10 @@ |
||
30 | 30 | */ |
31 | 31 | interface IBackendProvider { |
32 | 32 | |
33 | - /** |
|
34 | - * @since 9.1.0 |
|
35 | - * @return Backend[] |
|
36 | - */ |
|
37 | - public function getBackends(); |
|
33 | + /** |
|
34 | + * @since 9.1.0 |
|
35 | + * @return Backend[] |
|
36 | + */ |
|
37 | + public function getBackends(); |
|
38 | 38 | |
39 | 39 | } |
@@ -30,10 +30,10 @@ |
||
30 | 30 | */ |
31 | 31 | interface IAuthMechanismProvider { |
32 | 32 | |
33 | - /** |
|
34 | - * @since 9.1.0 |
|
35 | - * @return AuthMechanism[] |
|
36 | - */ |
|
37 | - public function getAuthMechanisms(); |
|
33 | + /** |
|
34 | + * @since 9.1.0 |
|
35 | + * @return AuthMechanism[] |
|
36 | + */ |
|
37 | + public function getAuthMechanisms(); |
|
38 | 38 | |
39 | 39 | } |
@@ -31,14 +31,14 @@ |
||
31 | 31 | */ |
32 | 32 | class SessionStorageWrapper extends PermissionsMask { |
33 | 33 | |
34 | - /** |
|
35 | - * @param array $arguments ['storage' => $storage] |
|
36 | - */ |
|
37 | - public function __construct($arguments) { |
|
38 | - // disable sharing permission |
|
39 | - $arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE; |
|
40 | - parent::__construct($arguments); |
|
41 | - } |
|
34 | + /** |
|
35 | + * @param array $arguments ['storage' => $storage] |
|
36 | + */ |
|
37 | + public function __construct($arguments) { |
|
38 | + // disable sharing permission |
|
39 | + $arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE; |
|
40 | + parent::__construct($arguments); |
|
41 | + } |
|
42 | 42 | |
43 | 43 | } |
44 | 44 |
@@ -47,10 +47,10 @@ |
||
47 | 47 | return false; |
48 | 48 | } |
49 | 49 | while (($file = readdir($dh)) !== false) { |
50 | - if ($this->is_dir($path . '/' . $file)) { |
|
51 | - $this->rmdir($path . '/' . $file); |
|
50 | + if ($this->is_dir($path.'/'.$file)) { |
|
51 | + $this->rmdir($path.'/'.$file); |
|
52 | 52 | } else { |
53 | - $this->unlink($path . '/' . $file); |
|
53 | + $this->unlink($path.'/'.$file); |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | $url = $this->constructUrl($path); |
@@ -28,100 +28,100 @@ |
||
28 | 28 | |
29 | 29 | abstract class StreamWrapper extends \OC\Files\Storage\Common { |
30 | 30 | |
31 | - /** |
|
32 | - * @param string $path |
|
33 | - * @return string|null |
|
34 | - */ |
|
35 | - abstract public function constructUrl($path); |
|
31 | + /** |
|
32 | + * @param string $path |
|
33 | + * @return string|null |
|
34 | + */ |
|
35 | + abstract public function constructUrl($path); |
|
36 | 36 | |
37 | - public function mkdir($path) { |
|
38 | - return mkdir($this->constructUrl($path)); |
|
39 | - } |
|
37 | + public function mkdir($path) { |
|
38 | + return mkdir($this->constructUrl($path)); |
|
39 | + } |
|
40 | 40 | |
41 | - public function rmdir($path) { |
|
42 | - if ($this->is_dir($path) && $this->isDeletable($path)) { |
|
43 | - $dh = $this->opendir($path); |
|
44 | - if (!is_resource($dh)) { |
|
45 | - return false; |
|
46 | - } |
|
47 | - while (($file = readdir($dh)) !== false) { |
|
48 | - if ($this->is_dir($path . '/' . $file)) { |
|
49 | - $this->rmdir($path . '/' . $file); |
|
50 | - } else { |
|
51 | - $this->unlink($path . '/' . $file); |
|
52 | - } |
|
53 | - } |
|
54 | - $url = $this->constructUrl($path); |
|
55 | - $success = rmdir($url); |
|
56 | - clearstatcache(false, $url); |
|
57 | - return $success; |
|
58 | - } else { |
|
59 | - return false; |
|
60 | - } |
|
61 | - } |
|
41 | + public function rmdir($path) { |
|
42 | + if ($this->is_dir($path) && $this->isDeletable($path)) { |
|
43 | + $dh = $this->opendir($path); |
|
44 | + if (!is_resource($dh)) { |
|
45 | + return false; |
|
46 | + } |
|
47 | + while (($file = readdir($dh)) !== false) { |
|
48 | + if ($this->is_dir($path . '/' . $file)) { |
|
49 | + $this->rmdir($path . '/' . $file); |
|
50 | + } else { |
|
51 | + $this->unlink($path . '/' . $file); |
|
52 | + } |
|
53 | + } |
|
54 | + $url = $this->constructUrl($path); |
|
55 | + $success = rmdir($url); |
|
56 | + clearstatcache(false, $url); |
|
57 | + return $success; |
|
58 | + } else { |
|
59 | + return false; |
|
60 | + } |
|
61 | + } |
|
62 | 62 | |
63 | - public function opendir($path) { |
|
64 | - return opendir($this->constructUrl($path)); |
|
65 | - } |
|
63 | + public function opendir($path) { |
|
64 | + return opendir($this->constructUrl($path)); |
|
65 | + } |
|
66 | 66 | |
67 | - public function filetype($path) { |
|
68 | - return @filetype($this->constructUrl($path)); |
|
69 | - } |
|
67 | + public function filetype($path) { |
|
68 | + return @filetype($this->constructUrl($path)); |
|
69 | + } |
|
70 | 70 | |
71 | - public function file_exists($path) { |
|
72 | - return file_exists($this->constructUrl($path)); |
|
73 | - } |
|
71 | + public function file_exists($path) { |
|
72 | + return file_exists($this->constructUrl($path)); |
|
73 | + } |
|
74 | 74 | |
75 | - public function unlink($path) { |
|
76 | - $url = $this->constructUrl($path); |
|
77 | - $success = unlink($url); |
|
78 | - // normally unlink() is supposed to do this implicitly, |
|
79 | - // but doing it anyway just to be sure |
|
80 | - clearstatcache(false, $url); |
|
81 | - return $success; |
|
82 | - } |
|
75 | + public function unlink($path) { |
|
76 | + $url = $this->constructUrl($path); |
|
77 | + $success = unlink($url); |
|
78 | + // normally unlink() is supposed to do this implicitly, |
|
79 | + // but doing it anyway just to be sure |
|
80 | + clearstatcache(false, $url); |
|
81 | + return $success; |
|
82 | + } |
|
83 | 83 | |
84 | - public function fopen($path, $mode) { |
|
85 | - return fopen($this->constructUrl($path), $mode); |
|
86 | - } |
|
84 | + public function fopen($path, $mode) { |
|
85 | + return fopen($this->constructUrl($path), $mode); |
|
86 | + } |
|
87 | 87 | |
88 | - public function touch($path, $mtime = null) { |
|
89 | - if ($this->file_exists($path)) { |
|
90 | - if (is_null($mtime)) { |
|
91 | - $fh = $this->fopen($path, 'a'); |
|
92 | - fwrite($fh, ''); |
|
93 | - fclose($fh); |
|
88 | + public function touch($path, $mtime = null) { |
|
89 | + if ($this->file_exists($path)) { |
|
90 | + if (is_null($mtime)) { |
|
91 | + $fh = $this->fopen($path, 'a'); |
|
92 | + fwrite($fh, ''); |
|
93 | + fclose($fh); |
|
94 | 94 | |
95 | - return true; |
|
96 | - } else { |
|
97 | - return false; //not supported |
|
98 | - } |
|
99 | - } else { |
|
100 | - $this->file_put_contents($path, ''); |
|
101 | - return true; |
|
102 | - } |
|
103 | - } |
|
95 | + return true; |
|
96 | + } else { |
|
97 | + return false; //not supported |
|
98 | + } |
|
99 | + } else { |
|
100 | + $this->file_put_contents($path, ''); |
|
101 | + return true; |
|
102 | + } |
|
103 | + } |
|
104 | 104 | |
105 | - /** |
|
106 | - * @param string $path |
|
107 | - * @param string $target |
|
108 | - */ |
|
109 | - public function getFile($path, $target) { |
|
110 | - return copy($this->constructUrl($path), $target); |
|
111 | - } |
|
105 | + /** |
|
106 | + * @param string $path |
|
107 | + * @param string $target |
|
108 | + */ |
|
109 | + public function getFile($path, $target) { |
|
110 | + return copy($this->constructUrl($path), $target); |
|
111 | + } |
|
112 | 112 | |
113 | - /** |
|
114 | - * @param string $target |
|
115 | - */ |
|
116 | - public function uploadFile($path, $target) { |
|
117 | - return copy($path, $this->constructUrl($target)); |
|
118 | - } |
|
113 | + /** |
|
114 | + * @param string $target |
|
115 | + */ |
|
116 | + public function uploadFile($path, $target) { |
|
117 | + return copy($path, $this->constructUrl($target)); |
|
118 | + } |
|
119 | 119 | |
120 | - public function rename($source, $target) { |
|
121 | - return rename($this->constructUrl($source), $this->constructUrl($target)); |
|
122 | - } |
|
120 | + public function rename($source, $target) { |
|
121 | + return rename($this->constructUrl($source), $this->constructUrl($target)); |
|
122 | + } |
|
123 | 123 | |
124 | - public function stat($path) { |
|
125 | - return stat($this->constructUrl($path)); |
|
126 | - } |
|
124 | + public function stat($path) { |
|
125 | + return stat($this->constructUrl($path)); |
|
126 | + } |
|
127 | 127 | } |