@@ -32,23 +32,23 @@ |
||
32 | 32 | * @package OC\Security\CSRF |
33 | 33 | */ |
34 | 34 | class CsrfTokenGenerator { |
35 | - /** @var ISecureRandom */ |
|
36 | - private $random; |
|
35 | + /** @var ISecureRandom */ |
|
36 | + private $random; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param ISecureRandom $random |
|
40 | - */ |
|
41 | - public function __construct(ISecureRandom $random) { |
|
42 | - $this->random = $random; |
|
43 | - } |
|
38 | + /** |
|
39 | + * @param ISecureRandom $random |
|
40 | + */ |
|
41 | + public function __construct(ISecureRandom $random) { |
|
42 | + $this->random = $random; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * Generate a new CSRF token. |
|
47 | - * |
|
48 | - * @param int $length Length of the token in characters. |
|
49 | - * @return string |
|
50 | - */ |
|
51 | - public function generateToken(int $length = 32): string { |
|
52 | - return $this->random->generate($length); |
|
53 | - } |
|
45 | + /** |
|
46 | + * Generate a new CSRF token. |
|
47 | + * |
|
48 | + * @param int $length Length of the token in characters. |
|
49 | + * @return string |
|
50 | + */ |
|
51 | + public function generateToken(int $length = 32): string { |
|
52 | + return $this->random->generate($length); |
|
53 | + } |
|
54 | 54 | } |
@@ -25,25 +25,25 @@ |
||
25 | 25 | namespace OC\Security\IdentityProof; |
26 | 26 | |
27 | 27 | class Key { |
28 | - /** @var string */ |
|
29 | - private $publicKey; |
|
30 | - /** @var string */ |
|
31 | - private $privateKey; |
|
28 | + /** @var string */ |
|
29 | + private $publicKey; |
|
30 | + /** @var string */ |
|
31 | + private $privateKey; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param string $publicKey |
|
35 | - * @param string $privateKey |
|
36 | - */ |
|
37 | - public function __construct(string $publicKey, string $privateKey) { |
|
38 | - $this->publicKey = $publicKey; |
|
39 | - $this->privateKey = $privateKey; |
|
40 | - } |
|
33 | + /** |
|
34 | + * @param string $publicKey |
|
35 | + * @param string $privateKey |
|
36 | + */ |
|
37 | + public function __construct(string $publicKey, string $privateKey) { |
|
38 | + $this->publicKey = $publicKey; |
|
39 | + $this->privateKey = $privateKey; |
|
40 | + } |
|
41 | 41 | |
42 | - public function getPrivate(): string { |
|
43 | - return $this->privateKey; |
|
44 | - } |
|
42 | + public function getPrivate(): string { |
|
43 | + return $this->privateKey; |
|
44 | + } |
|
45 | 45 | |
46 | - public function getPublic(): string { |
|
47 | - return $this->publicKey; |
|
48 | - } |
|
46 | + public function getPublic(): string { |
|
47 | + return $this->publicKey; |
|
48 | + } |
|
49 | 49 | } |
@@ -100,7 +100,7 @@ |
||
100 | 100 | |
101 | 101 | // casted to string because cast to float cause equality for non equal numbers |
102 | 102 | // and integer has the problem of limited size on 32 bit systems |
103 | - if ((string)$expectedSize !== (string)$actualSize) { |
|
103 | + if ((string) $expectedSize !== (string) $actualSize) { |
|
104 | 104 | throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes"); |
105 | 105 | } |
106 | 106 | } |
@@ -35,97 +35,97 @@ |
||
35 | 35 | |
36 | 36 | class ChunkingPlugin extends ServerPlugin { |
37 | 37 | |
38 | - /** @var Server */ |
|
39 | - private $server; |
|
40 | - /** @var FutureFile */ |
|
41 | - private $sourceNode; |
|
38 | + /** @var Server */ |
|
39 | + private $server; |
|
40 | + /** @var FutureFile */ |
|
41 | + private $sourceNode; |
|
42 | 42 | |
43 | - /** |
|
44 | - * @inheritdoc |
|
45 | - */ |
|
46 | - public function initialize(Server $server) { |
|
47 | - $server->on('beforeMove', [$this, 'beforeMove']); |
|
48 | - $this->server = $server; |
|
49 | - } |
|
43 | + /** |
|
44 | + * @inheritdoc |
|
45 | + */ |
|
46 | + public function initialize(Server $server) { |
|
47 | + $server->on('beforeMove', [$this, 'beforeMove']); |
|
48 | + $this->server = $server; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @param string $sourcePath source path |
|
53 | - * @param string $destination destination path |
|
54 | - * @return bool|void |
|
55 | - * @throws BadRequest |
|
56 | - * @throws NotFound |
|
57 | - */ |
|
58 | - public function beforeMove($sourcePath, $destination) { |
|
59 | - $this->sourceNode = $this->server->tree->getNodeForPath($sourcePath); |
|
60 | - if (!$this->sourceNode instanceof FutureFile) { |
|
61 | - // skip handling as the source is not a chunked FutureFile |
|
62 | - return; |
|
63 | - } |
|
51 | + /** |
|
52 | + * @param string $sourcePath source path |
|
53 | + * @param string $destination destination path |
|
54 | + * @return bool|void |
|
55 | + * @throws BadRequest |
|
56 | + * @throws NotFound |
|
57 | + */ |
|
58 | + public function beforeMove($sourcePath, $destination) { |
|
59 | + $this->sourceNode = $this->server->tree->getNodeForPath($sourcePath); |
|
60 | + if (!$this->sourceNode instanceof FutureFile) { |
|
61 | + // skip handling as the source is not a chunked FutureFile |
|
62 | + return; |
|
63 | + } |
|
64 | 64 | |
65 | - try { |
|
66 | - /** @var INode $destinationNode */ |
|
67 | - $destinationNode = $this->server->tree->getNodeForPath($destination); |
|
68 | - if ($destinationNode instanceof Directory) { |
|
69 | - throw new BadRequest("The given destination $destination is a directory."); |
|
70 | - } |
|
71 | - } catch (NotFound $e) { |
|
72 | - // If the destination does not exist yet it's not a directory either ;) |
|
73 | - } |
|
65 | + try { |
|
66 | + /** @var INode $destinationNode */ |
|
67 | + $destinationNode = $this->server->tree->getNodeForPath($destination); |
|
68 | + if ($destinationNode instanceof Directory) { |
|
69 | + throw new BadRequest("The given destination $destination is a directory."); |
|
70 | + } |
|
71 | + } catch (NotFound $e) { |
|
72 | + // If the destination does not exist yet it's not a directory either ;) |
|
73 | + } |
|
74 | 74 | |
75 | - $this->verifySize(); |
|
76 | - return $this->performMove($sourcePath, $destination); |
|
77 | - } |
|
75 | + $this->verifySize(); |
|
76 | + return $this->performMove($sourcePath, $destination); |
|
77 | + } |
|
78 | 78 | |
79 | - /** |
|
80 | - * Move handler for future file. |
|
81 | - * |
|
82 | - * This overrides the default move behavior to prevent Sabre |
|
83 | - * to delete the target file before moving. Because deleting would |
|
84 | - * lose the file id and metadata. |
|
85 | - * |
|
86 | - * @param string $path source path |
|
87 | - * @param string $destination destination path |
|
88 | - * @return bool|void false to stop handling, void to skip this handler |
|
89 | - */ |
|
90 | - public function performMove($path, $destination) { |
|
91 | - $fileExists = $this->server->tree->nodeExists($destination); |
|
92 | - // do a move manually, skipping Sabre's default "delete" for existing nodes |
|
93 | - try { |
|
94 | - $this->server->tree->move($path, $destination); |
|
95 | - } catch (Forbidden $e) { |
|
96 | - $sourceNode = $this->server->tree->getNodeForPath($path); |
|
97 | - if ($sourceNode instanceof FutureFile) { |
|
98 | - $sourceNode->delete(); |
|
99 | - } |
|
100 | - throw $e; |
|
101 | - } |
|
79 | + /** |
|
80 | + * Move handler for future file. |
|
81 | + * |
|
82 | + * This overrides the default move behavior to prevent Sabre |
|
83 | + * to delete the target file before moving. Because deleting would |
|
84 | + * lose the file id and metadata. |
|
85 | + * |
|
86 | + * @param string $path source path |
|
87 | + * @param string $destination destination path |
|
88 | + * @return bool|void false to stop handling, void to skip this handler |
|
89 | + */ |
|
90 | + public function performMove($path, $destination) { |
|
91 | + $fileExists = $this->server->tree->nodeExists($destination); |
|
92 | + // do a move manually, skipping Sabre's default "delete" for existing nodes |
|
93 | + try { |
|
94 | + $this->server->tree->move($path, $destination); |
|
95 | + } catch (Forbidden $e) { |
|
96 | + $sourceNode = $this->server->tree->getNodeForPath($path); |
|
97 | + if ($sourceNode instanceof FutureFile) { |
|
98 | + $sourceNode->delete(); |
|
99 | + } |
|
100 | + throw $e; |
|
101 | + } |
|
102 | 102 | |
103 | - // trigger all default events (copied from CorePlugin::move) |
|
104 | - $this->server->emit('afterMove', [$path, $destination]); |
|
105 | - $this->server->emit('afterUnbind', [$path]); |
|
106 | - $this->server->emit('afterBind', [$destination]); |
|
103 | + // trigger all default events (copied from CorePlugin::move) |
|
104 | + $this->server->emit('afterMove', [$path, $destination]); |
|
105 | + $this->server->emit('afterUnbind', [$path]); |
|
106 | + $this->server->emit('afterBind', [$destination]); |
|
107 | 107 | |
108 | - $response = $this->server->httpResponse; |
|
109 | - $response->setHeader('Content-Length', '0'); |
|
110 | - $response->setStatus($fileExists ? 204 : 201); |
|
108 | + $response = $this->server->httpResponse; |
|
109 | + $response->setHeader('Content-Length', '0'); |
|
110 | + $response->setStatus($fileExists ? 204 : 201); |
|
111 | 111 | |
112 | - return false; |
|
113 | - } |
|
112 | + return false; |
|
113 | + } |
|
114 | 114 | |
115 | - /** |
|
116 | - * @throws BadRequest |
|
117 | - */ |
|
118 | - private function verifySize() { |
|
119 | - $expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length'); |
|
120 | - if ($expectedSize === null) { |
|
121 | - return; |
|
122 | - } |
|
123 | - $actualSize = $this->sourceNode->getSize(); |
|
115 | + /** |
|
116 | + * @throws BadRequest |
|
117 | + */ |
|
118 | + private function verifySize() { |
|
119 | + $expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length'); |
|
120 | + if ($expectedSize === null) { |
|
121 | + return; |
|
122 | + } |
|
123 | + $actualSize = $this->sourceNode->getSize(); |
|
124 | 124 | |
125 | - // casted to string because cast to float cause equality for non equal numbers |
|
126 | - // and integer has the problem of limited size on 32 bit systems |
|
127 | - if ((string)$expectedSize !== (string)$actualSize) { |
|
128 | - throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes"); |
|
129 | - } |
|
130 | - } |
|
125 | + // casted to string because cast to float cause equality for non equal numbers |
|
126 | + // and integer has the problem of limited size on 32 bit systems |
|
127 | + if ((string)$expectedSize !== (string)$actualSize) { |
|
128 | + throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes"); |
|
129 | + } |
|
130 | + } |
|
131 | 131 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | \OC_JSON::checkAppEnabled('user_ldap'); |
30 | 30 | \OC_JSON::callCheck(); |
31 | 31 | |
32 | -$prefix = (string)$_POST['ldap_serverconfig_chooser']; |
|
32 | +$prefix = (string) $_POST['ldap_serverconfig_chooser']; |
|
33 | 33 | $ldapWrapper = new OCA\User_LDAP\LDAP(); |
34 | 34 | $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
35 | 35 | $configuration = $connection->getConfiguration(); |
@@ -35,7 +35,7 @@ |
||
35 | 35 | $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
36 | 36 | $configuration = $connection->getConfiguration(); |
37 | 37 | if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') { |
38 | - // hide password |
|
39 | - $configuration['ldap_agent_password'] = '**PASSWORD SET**'; |
|
38 | + // hide password |
|
39 | + $configuration['ldap_agent_password'] = '**PASSWORD SET**'; |
|
40 | 40 | } |
41 | 41 | \OC_JSON::success(['configuration' => $configuration]); |
@@ -29,12 +29,12 @@ |
||
29 | 29 | */ |
30 | 30 | interface ISetPasswordBackend { |
31 | 31 | |
32 | - /** |
|
33 | - * @since 14.0.0 |
|
34 | - * |
|
35 | - * @param string $uid The username |
|
36 | - * @param string $password The new password |
|
37 | - * @return bool |
|
38 | - */ |
|
39 | - public function setPassword(string $uid, string $password): bool; |
|
32 | + /** |
|
33 | + * @since 14.0.0 |
|
34 | + * |
|
35 | + * @param string $uid The username |
|
36 | + * @param string $password The new password |
|
37 | + * @return bool |
|
38 | + */ |
|
39 | + public function setPassword(string $uid, string $password): bool; |
|
40 | 40 | } |
@@ -33,40 +33,40 @@ |
||
33 | 33 | */ |
34 | 34 | abstract class ABackend implements IUserBackend, UserInterface { |
35 | 35 | |
36 | - /** |
|
37 | - * @deprecated 14.0.0 |
|
38 | - * |
|
39 | - * @param int $actions The action to check for |
|
40 | - * @return bool |
|
41 | - */ |
|
42 | - public function implementsActions($actions): bool { |
|
43 | - $implements = 0; |
|
36 | + /** |
|
37 | + * @deprecated 14.0.0 |
|
38 | + * |
|
39 | + * @param int $actions The action to check for |
|
40 | + * @return bool |
|
41 | + */ |
|
42 | + public function implementsActions($actions): bool { |
|
43 | + $implements = 0; |
|
44 | 44 | |
45 | - if ($this instanceof ICreateUserBackend) { |
|
46 | - $implements |= Backend::CREATE_USER; |
|
47 | - } |
|
48 | - if ($this instanceof ISetPasswordBackend) { |
|
49 | - $implements |= Backend::SET_PASSWORD; |
|
50 | - } |
|
51 | - if ($this instanceof ICheckPasswordBackend) { |
|
52 | - $implements |= Backend::CHECK_PASSWORD; |
|
53 | - } |
|
54 | - if ($this instanceof IGetHomeBackend) { |
|
55 | - $implements |= Backend::GET_HOME; |
|
56 | - } |
|
57 | - if ($this instanceof IGetDisplayNameBackend) { |
|
58 | - $implements |= Backend::GET_DISPLAYNAME; |
|
59 | - } |
|
60 | - if ($this instanceof ISetDisplayNameBackend) { |
|
61 | - $implements |= Backend::SET_DISPLAYNAME; |
|
62 | - } |
|
63 | - if ($this instanceof IProvideAvatarBackend) { |
|
64 | - $implements |= Backend::PROVIDE_AVATAR; |
|
65 | - } |
|
66 | - if ($this instanceof ICountUsersBackend) { |
|
67 | - $implements |= Backend::COUNT_USERS; |
|
68 | - } |
|
45 | + if ($this instanceof ICreateUserBackend) { |
|
46 | + $implements |= Backend::CREATE_USER; |
|
47 | + } |
|
48 | + if ($this instanceof ISetPasswordBackend) { |
|
49 | + $implements |= Backend::SET_PASSWORD; |
|
50 | + } |
|
51 | + if ($this instanceof ICheckPasswordBackend) { |
|
52 | + $implements |= Backend::CHECK_PASSWORD; |
|
53 | + } |
|
54 | + if ($this instanceof IGetHomeBackend) { |
|
55 | + $implements |= Backend::GET_HOME; |
|
56 | + } |
|
57 | + if ($this instanceof IGetDisplayNameBackend) { |
|
58 | + $implements |= Backend::GET_DISPLAYNAME; |
|
59 | + } |
|
60 | + if ($this instanceof ISetDisplayNameBackend) { |
|
61 | + $implements |= Backend::SET_DISPLAYNAME; |
|
62 | + } |
|
63 | + if ($this instanceof IProvideAvatarBackend) { |
|
64 | + $implements |= Backend::PROVIDE_AVATAR; |
|
65 | + } |
|
66 | + if ($this instanceof ICountUsersBackend) { |
|
67 | + $implements |= Backend::COUNT_USERS; |
|
68 | + } |
|
69 | 69 | |
70 | - return (bool)($actions & $implements); |
|
71 | - } |
|
70 | + return (bool)($actions & $implements); |
|
71 | + } |
|
72 | 72 | } |
@@ -67,6 +67,6 @@ |
||
67 | 67 | $implements |= Backend::COUNT_USERS; |
68 | 68 | } |
69 | 69 | |
70 | - return (bool)($actions & $implements); |
|
70 | + return (bool) ($actions & $implements); |
|
71 | 71 | } |
72 | 72 | } |
@@ -29,10 +29,10 @@ |
||
29 | 29 | */ |
30 | 30 | interface ICountUsersBackend { |
31 | 31 | |
32 | - /** |
|
33 | - * @since 14.0.0 |
|
34 | - * |
|
35 | - * @return int|bool The number of users on success false on failure |
|
36 | - */ |
|
37 | - public function countUsers(); |
|
32 | + /** |
|
33 | + * @since 14.0.0 |
|
34 | + * |
|
35 | + * @return int|bool The number of users on success false on failure |
|
36 | + */ |
|
37 | + public function countUsers(); |
|
38 | 38 | } |
@@ -29,11 +29,11 @@ |
||
29 | 29 | */ |
30 | 30 | interface IGetHomeBackend { |
31 | 31 | |
32 | - /** |
|
33 | - * @since 14.0.0 |
|
34 | - * |
|
35 | - * @param string $uid the username |
|
36 | - * @return string|bool Datadir on success false on failure |
|
37 | - */ |
|
38 | - public function getHome(string $uid); |
|
32 | + /** |
|
33 | + * @since 14.0.0 |
|
34 | + * |
|
35 | + * @param string $uid the username |
|
36 | + * @return string|bool Datadir on success false on failure |
|
37 | + */ |
|
38 | + public function getHome(string $uid); |
|
39 | 39 | } |
@@ -29,12 +29,12 @@ |
||
29 | 29 | */ |
30 | 30 | interface ICreateUserBackend { |
31 | 31 | |
32 | - /** |
|
33 | - * @since 14.0.0 |
|
34 | - * |
|
35 | - * @param string $uid The username of the user to create |
|
36 | - * @param string $password The password of the new user |
|
37 | - * @return bool |
|
38 | - */ |
|
39 | - public function createUser(string $uid, string $password): bool; |
|
32 | + /** |
|
33 | + * @since 14.0.0 |
|
34 | + * |
|
35 | + * @param string $uid The username of the user to create |
|
36 | + * @param string $password The password of the new user |
|
37 | + * @return bool |
|
38 | + */ |
|
39 | + public function createUser(string $uid, string $password): bool; |
|
40 | 40 | } |