Passed
Push — master ( aa003d...f49ccd )
by Joas
13:35 queued 12s
created
apps/cloud_federation_api/lib/Capabilities.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -28,38 +28,38 @@
 block discarded – undo
28 28
 
29 29
 class Capabilities implements ICapability {
30 30
 
31
-	/** @var IURLGenerator */
32
-	private $urlGenerator;
31
+    /** @var IURLGenerator */
32
+    private $urlGenerator;
33 33
 
34
-	public function __construct(IURLGenerator $urlGenerator) {
35
-		$this->urlGenerator = $urlGenerator;
36
-	}
34
+    public function __construct(IURLGenerator $urlGenerator) {
35
+        $this->urlGenerator = $urlGenerator;
36
+    }
37 37
 
38
-	/**
39
-	 * Function an app uses to return the capabilities
40
-	 *
41
-	 * @return array Array containing the apps capabilities
42
-	 * @since 8.2.0
43
-	 */
44
-	public function getCapabilities() {
45
-		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
46
-		$capabilities = ['ocm' =>
47
-			[
48
-				'enabled' => true,
49
-				'apiVersion' => '1.0-proposal1',
50
-				'endPoint' => substr($url, 0, strrpos($url, '/')),
51
-				'resourceTypes' => [
52
-					[
53
-						'name' => 'file',
54
-						'shareTypes' => ['user', 'group'],
55
-						'protocols' => [
56
-							'webdav' => '/public.php/webdav/',
57
-						]
58
-					],
59
-				]
60
-			]
61
-		];
38
+    /**
39
+     * Function an app uses to return the capabilities
40
+     *
41
+     * @return array Array containing the apps capabilities
42
+     * @since 8.2.0
43
+     */
44
+    public function getCapabilities() {
45
+        $url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
46
+        $capabilities = ['ocm' =>
47
+            [
48
+                'enabled' => true,
49
+                'apiVersion' => '1.0-proposal1',
50
+                'endPoint' => substr($url, 0, strrpos($url, '/')),
51
+                'resourceTypes' => [
52
+                    [
53
+                        'name' => 'file',
54
+                        'shareTypes' => ['user', 'group'],
55
+                        'protocols' => [
56
+                            'webdav' => '/public.php/webdav/',
57
+                        ]
58
+                    ],
59
+                ]
60
+            ]
61
+        ];
62 62
 
63
-		return $capabilities;
64
-	}
63
+        return $capabilities;
64
+    }
65 65
 }
Please login to merge, or discard this patch.
lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -31,19 +31,19 @@
 block discarded – undo
31 31
 
32 32
 class AddClenupLoginFlowV2BackgroundJob implements IRepairStep {
33 33
 
34
-	/** @var IJobList */
35
-	private $jobList;
34
+    /** @var IJobList */
35
+    private $jobList;
36 36
 
37
-	public function __construct(IJobList $jobList) {
38
-		$this->jobList = $jobList;
39
-	}
37
+    public function __construct(IJobList $jobList) {
38
+        $this->jobList = $jobList;
39
+    }
40 40
 
41
-	public function getName(): string {
42
-		return 'Add background job to cleanup login flow v2 tokens';
43
-	}
41
+    public function getName(): string {
42
+        return 'Add background job to cleanup login flow v2 tokens';
43
+    }
44 44
 
45
-	public function run(IOutput $output) {
46
-		$this->jobList->add(CleanupLoginFlowV2::class);
47
-	}
45
+    public function run(IOutput $output) {
46
+        $this->jobList->add(CleanupLoginFlowV2::class);
47
+    }
48 48
 
49 49
 }
Please login to merge, or discard this patch.
core/Data/LoginFlowV2Credentials.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -25,47 +25,47 @@
 block discarded – undo
25 25
 namespace OC\Core\Data;
26 26
 
27 27
 class LoginFlowV2Credentials implements \JsonSerializable {
28
-	/** @var string */
29
-	private $server;
30
-	/** @var string */
31
-	private $loginName;
32
-	/** @var string */
33
-	private $appPassword;
28
+    /** @var string */
29
+    private $server;
30
+    /** @var string */
31
+    private $loginName;
32
+    /** @var string */
33
+    private $appPassword;
34 34
 
35
-	public function __construct(string $server, string $loginName, string $appPassword) {
36
-		$this->server = $server;
37
-		$this->loginName = $loginName;
38
-		$this->appPassword = $appPassword;
39
-	}
35
+    public function __construct(string $server, string $loginName, string $appPassword) {
36
+        $this->server = $server;
37
+        $this->loginName = $loginName;
38
+        $this->appPassword = $appPassword;
39
+    }
40 40
 
41
-	/**
42
-	 * @return string
43
-	 */
44
-	public function getServer(): string {
45
-		return $this->server;
46
-	}
41
+    /**
42
+     * @return string
43
+     */
44
+    public function getServer(): string {
45
+        return $this->server;
46
+    }
47 47
 
48
-	/**
49
-	 * @return string
50
-	 */
51
-	public function getLoginName(): string {
52
-		return $this->loginName;
53
-	}
48
+    /**
49
+     * @return string
50
+     */
51
+    public function getLoginName(): string {
52
+        return $this->loginName;
53
+    }
54 54
 
55
-	/**
56
-	 * @return string
57
-	 */
58
-	public function getAppPassword(): string {
59
-		return $this->appPassword;
60
-	}
55
+    /**
56
+     * @return string
57
+     */
58
+    public function getAppPassword(): string {
59
+        return $this->appPassword;
60
+    }
61 61
 
62
-	public function jsonSerialize(): array {
63
-		return [
64
-			'server' => $this->server,
65
-			'loginName' => $this->loginName,
66
-			'appPassword' => $this->appPassword,
67
-		];
68
-	}
62
+    public function jsonSerialize(): array {
63
+        return [
64
+            'server' => $this->server,
65
+            'loginName' => $this->loginName,
66
+            'appPassword' => $this->appPassword,
67
+        ];
68
+    }
69 69
 
70 70
 
71 71
 }
Please login to merge, or discard this patch.
core/Service/LoginFlowV2Service.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 
212 212
 	private function hashToken(string $token): string {
213 213
 		$secret = $this->config->getSystemValue('secret');
214
-		return hash('sha512', $token . $secret);
214
+		return hash('sha512', $token.$secret);
215 215
 	}
216 216
 
217 217
 	private function getKeyPair(): array {
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 		while ($error = openssl_error_string()) {
242 242
 			$errors[] = $error;
243 243
 		}
244
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
244
+		$this->logger->critical('Something is wrong with your openssl setup: '.implode(', ', $errors));
245 245
 	}
246 246
 
247 247
 	private function encryptPassword(string $password, string $publicKey): string {
Please login to merge, or discard this patch.
Indentation   +224 added lines, -224 removed lines patch added patch discarded remove patch
@@ -43,228 +43,228 @@
 block discarded – undo
43 43
 use Psr\Log\LoggerInterface;
44 44
 
45 45
 class LoginFlowV2Service {
46
-	private LoginFlowV2Mapper $mapper;
47
-	private ISecureRandom $random;
48
-	private ITimeFactory $time;
49
-	private IConfig $config;
50
-	private ICrypto $crypto;
51
-	private LoggerInterface $logger;
52
-	private IProvider $tokenProvider;
53
-
54
-	public function __construct(LoginFlowV2Mapper $mapper,
55
-								ISecureRandom $random,
56
-								ITimeFactory $time,
57
-								IConfig $config,
58
-								ICrypto $crypto,
59
-								LoggerInterface $logger,
60
-								IProvider $tokenProvider) {
61
-		$this->mapper = $mapper;
62
-		$this->random = $random;
63
-		$this->time = $time;
64
-		$this->config = $config;
65
-		$this->crypto = $crypto;
66
-		$this->logger = $logger;
67
-		$this->tokenProvider = $tokenProvider;
68
-	}
69
-
70
-	/**
71
-	 * @param string $pollToken
72
-	 * @return LoginFlowV2Credentials
73
-	 * @throws LoginFlowV2NotFoundException
74
-	 */
75
-	public function poll(string $pollToken): LoginFlowV2Credentials {
76
-		try {
77
-			$data = $this->mapper->getByPollToken($this->hashToken($pollToken));
78
-		} catch (DoesNotExistException $e) {
79
-			throw new LoginFlowV2NotFoundException('Invalid token');
80
-		}
81
-
82
-		$loginName = $data->getLoginName();
83
-		$server = $data->getServer();
84
-		$appPassword = $data->getAppPassword();
85
-
86
-		if ($loginName === null || $server === null || $appPassword === null) {
87
-			throw new LoginFlowV2NotFoundException('Token not yet ready');
88
-		}
89
-
90
-		// Remove the data from the DB
91
-		$this->mapper->delete($data);
92
-
93
-		try {
94
-			// Decrypt the apptoken
95
-			$privateKey = $this->crypto->decrypt($data->getPrivateKey(), $pollToken);
96
-			$appPassword = $this->decryptPassword($data->getAppPassword(), $privateKey);
97
-		} catch (\Exception $e) {
98
-			throw new LoginFlowV2NotFoundException('Apptoken could not be decrypted');
99
-		}
100
-
101
-		return new LoginFlowV2Credentials($server, $loginName, $appPassword);
102
-	}
103
-
104
-	/**
105
-	 * @param string $loginToken
106
-	 * @return LoginFlowV2
107
-	 * @throws LoginFlowV2NotFoundException
108
-	 */
109
-	public function getByLoginToken(string $loginToken): LoginFlowV2 {
110
-		try {
111
-			return $this->mapper->getByLoginToken($loginToken);
112
-		} catch (DoesNotExistException $e) {
113
-			throw new LoginFlowV2NotFoundException('Login token invalid');
114
-		}
115
-	}
116
-
117
-	/**
118
-	 * @param string $loginToken
119
-	 * @return bool returns true if the start was successfull. False if not.
120
-	 */
121
-	public function startLoginFlow(string $loginToken): bool {
122
-		try {
123
-			$data = $this->mapper->getByLoginToken($loginToken);
124
-		} catch (DoesNotExistException $e) {
125
-			return false;
126
-		}
127
-
128
-		$data->setStarted(1);
129
-		$this->mapper->update($data);
130
-
131
-		return true;
132
-	}
133
-
134
-	/**
135
-	 * @param string $loginToken
136
-	 * @param string $sessionId
137
-	 * @param string $server
138
-	 * @param string $userId
139
-	 * @return bool true if the flow was successfully completed false otherwise
140
-	 */
141
-	public function flowDone(string $loginToken, string $sessionId, string $server, string $userId): bool {
142
-		try {
143
-			$data = $this->mapper->getByLoginToken($loginToken);
144
-		} catch (DoesNotExistException $e) {
145
-			return false;
146
-		}
147
-
148
-		try {
149
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
150
-			$loginName = $sessionToken->getLoginName();
151
-			try {
152
-				$password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
153
-			} catch (PasswordlessTokenException $ex) {
154
-				$password = null;
155
-			}
156
-		} catch (InvalidTokenException $ex) {
157
-			return false;
158
-		}
159
-
160
-		$appPassword = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
161
-		$this->tokenProvider->generateToken(
162
-			$appPassword,
163
-			$userId,
164
-			$loginName,
165
-			$password,
166
-			$data->getClientName(),
167
-			IToken::PERMANENT_TOKEN,
168
-			IToken::DO_NOT_REMEMBER
169
-		);
170
-
171
-		$data->setLoginName($loginName);
172
-		$data->setServer($server);
173
-
174
-		// Properly encrypt
175
-		$data->setAppPassword($this->encryptPassword($appPassword, $data->getPublicKey()));
176
-
177
-		$this->mapper->update($data);
178
-		return true;
179
-	}
180
-
181
-	public function flowDoneWithAppPassword(string $loginToken, string $server, string $loginName, string $appPassword): bool {
182
-		try {
183
-			$data = $this->mapper->getByLoginToken($loginToken);
184
-		} catch (DoesNotExistException $e) {
185
-			return false;
186
-		}
187
-
188
-		$data->setLoginName($loginName);
189
-		$data->setServer($server);
190
-
191
-		// Properly encrypt
192
-		$data->setAppPassword($this->encryptPassword($appPassword, $data->getPublicKey()));
193
-
194
-		$this->mapper->update($data);
195
-		return true;
196
-	}
197
-
198
-	public function createTokens(string $userAgent): LoginFlowV2Tokens {
199
-		$flow = new LoginFlowV2();
200
-		$pollToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
201
-		$loginToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
202
-		$flow->setPollToken($this->hashToken($pollToken));
203
-		$flow->setLoginToken($loginToken);
204
-		$flow->setStarted(0);
205
-		$flow->setTimestamp($this->time->getTime());
206
-		$flow->setClientName($userAgent);
207
-
208
-		[$publicKey, $privateKey] = $this->getKeyPair();
209
-		$privateKey = $this->crypto->encrypt($privateKey, $pollToken);
210
-
211
-		$flow->setPublicKey($publicKey);
212
-		$flow->setPrivateKey($privateKey);
213
-
214
-		$this->mapper->insert($flow);
215
-
216
-		return new LoginFlowV2Tokens($loginToken, $pollToken);
217
-	}
218
-
219
-	private function hashToken(string $token): string {
220
-		$secret = $this->config->getSystemValue('secret');
221
-		return hash('sha512', $token . $secret);
222
-	}
223
-
224
-	private function getKeyPair(): array {
225
-		$config = array_merge([
226
-			'digest_alg' => 'sha512',
227
-			'private_key_bits' => 2048,
228
-		], $this->config->getSystemValue('openssl', []));
229
-
230
-		// Generate new key
231
-		$res = openssl_pkey_new($config);
232
-		if ($res === false) {
233
-			$this->logOpensslError();
234
-			throw new \RuntimeException('Could not initialize keys');
235
-		}
236
-
237
-		if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
238
-			$this->logOpensslError();
239
-			throw new \RuntimeException('OpenSSL reported a problem');
240
-		}
241
-
242
-		// Extract the public key from $res to $pubKey
243
-		$publicKey = openssl_pkey_get_details($res);
244
-		$publicKey = $publicKey['key'];
245
-
246
-		return [$publicKey, $privateKey];
247
-	}
248
-
249
-	private function logOpensslError(): void {
250
-		$errors = [];
251
-		while ($error = openssl_error_string()) {
252
-			$errors[] = $error;
253
-		}
254
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
255
-	}
256
-
257
-	private function encryptPassword(string $password, string $publicKey): string {
258
-		openssl_public_encrypt($password, $encryptedPassword, $publicKey, OPENSSL_PKCS1_OAEP_PADDING);
259
-		$encryptedPassword = base64_encode($encryptedPassword);
260
-
261
-		return $encryptedPassword;
262
-	}
263
-
264
-	private function decryptPassword(string $encryptedPassword, string $privateKey): string {
265
-		$encryptedPassword = base64_decode($encryptedPassword);
266
-		openssl_private_decrypt($encryptedPassword, $password, $privateKey, OPENSSL_PKCS1_OAEP_PADDING);
267
-
268
-		return $password;
269
-	}
46
+    private LoginFlowV2Mapper $mapper;
47
+    private ISecureRandom $random;
48
+    private ITimeFactory $time;
49
+    private IConfig $config;
50
+    private ICrypto $crypto;
51
+    private LoggerInterface $logger;
52
+    private IProvider $tokenProvider;
53
+
54
+    public function __construct(LoginFlowV2Mapper $mapper,
55
+                                ISecureRandom $random,
56
+                                ITimeFactory $time,
57
+                                IConfig $config,
58
+                                ICrypto $crypto,
59
+                                LoggerInterface $logger,
60
+                                IProvider $tokenProvider) {
61
+        $this->mapper = $mapper;
62
+        $this->random = $random;
63
+        $this->time = $time;
64
+        $this->config = $config;
65
+        $this->crypto = $crypto;
66
+        $this->logger = $logger;
67
+        $this->tokenProvider = $tokenProvider;
68
+    }
69
+
70
+    /**
71
+     * @param string $pollToken
72
+     * @return LoginFlowV2Credentials
73
+     * @throws LoginFlowV2NotFoundException
74
+     */
75
+    public function poll(string $pollToken): LoginFlowV2Credentials {
76
+        try {
77
+            $data = $this->mapper->getByPollToken($this->hashToken($pollToken));
78
+        } catch (DoesNotExistException $e) {
79
+            throw new LoginFlowV2NotFoundException('Invalid token');
80
+        }
81
+
82
+        $loginName = $data->getLoginName();
83
+        $server = $data->getServer();
84
+        $appPassword = $data->getAppPassword();
85
+
86
+        if ($loginName === null || $server === null || $appPassword === null) {
87
+            throw new LoginFlowV2NotFoundException('Token not yet ready');
88
+        }
89
+
90
+        // Remove the data from the DB
91
+        $this->mapper->delete($data);
92
+
93
+        try {
94
+            // Decrypt the apptoken
95
+            $privateKey = $this->crypto->decrypt($data->getPrivateKey(), $pollToken);
96
+            $appPassword = $this->decryptPassword($data->getAppPassword(), $privateKey);
97
+        } catch (\Exception $e) {
98
+            throw new LoginFlowV2NotFoundException('Apptoken could not be decrypted');
99
+        }
100
+
101
+        return new LoginFlowV2Credentials($server, $loginName, $appPassword);
102
+    }
103
+
104
+    /**
105
+     * @param string $loginToken
106
+     * @return LoginFlowV2
107
+     * @throws LoginFlowV2NotFoundException
108
+     */
109
+    public function getByLoginToken(string $loginToken): LoginFlowV2 {
110
+        try {
111
+            return $this->mapper->getByLoginToken($loginToken);
112
+        } catch (DoesNotExistException $e) {
113
+            throw new LoginFlowV2NotFoundException('Login token invalid');
114
+        }
115
+    }
116
+
117
+    /**
118
+     * @param string $loginToken
119
+     * @return bool returns true if the start was successfull. False if not.
120
+     */
121
+    public function startLoginFlow(string $loginToken): bool {
122
+        try {
123
+            $data = $this->mapper->getByLoginToken($loginToken);
124
+        } catch (DoesNotExistException $e) {
125
+            return false;
126
+        }
127
+
128
+        $data->setStarted(1);
129
+        $this->mapper->update($data);
130
+
131
+        return true;
132
+    }
133
+
134
+    /**
135
+     * @param string $loginToken
136
+     * @param string $sessionId
137
+     * @param string $server
138
+     * @param string $userId
139
+     * @return bool true if the flow was successfully completed false otherwise
140
+     */
141
+    public function flowDone(string $loginToken, string $sessionId, string $server, string $userId): bool {
142
+        try {
143
+            $data = $this->mapper->getByLoginToken($loginToken);
144
+        } catch (DoesNotExistException $e) {
145
+            return false;
146
+        }
147
+
148
+        try {
149
+            $sessionToken = $this->tokenProvider->getToken($sessionId);
150
+            $loginName = $sessionToken->getLoginName();
151
+            try {
152
+                $password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
153
+            } catch (PasswordlessTokenException $ex) {
154
+                $password = null;
155
+            }
156
+        } catch (InvalidTokenException $ex) {
157
+            return false;
158
+        }
159
+
160
+        $appPassword = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
161
+        $this->tokenProvider->generateToken(
162
+            $appPassword,
163
+            $userId,
164
+            $loginName,
165
+            $password,
166
+            $data->getClientName(),
167
+            IToken::PERMANENT_TOKEN,
168
+            IToken::DO_NOT_REMEMBER
169
+        );
170
+
171
+        $data->setLoginName($loginName);
172
+        $data->setServer($server);
173
+
174
+        // Properly encrypt
175
+        $data->setAppPassword($this->encryptPassword($appPassword, $data->getPublicKey()));
176
+
177
+        $this->mapper->update($data);
178
+        return true;
179
+    }
180
+
181
+    public function flowDoneWithAppPassword(string $loginToken, string $server, string $loginName, string $appPassword): bool {
182
+        try {
183
+            $data = $this->mapper->getByLoginToken($loginToken);
184
+        } catch (DoesNotExistException $e) {
185
+            return false;
186
+        }
187
+
188
+        $data->setLoginName($loginName);
189
+        $data->setServer($server);
190
+
191
+        // Properly encrypt
192
+        $data->setAppPassword($this->encryptPassword($appPassword, $data->getPublicKey()));
193
+
194
+        $this->mapper->update($data);
195
+        return true;
196
+    }
197
+
198
+    public function createTokens(string $userAgent): LoginFlowV2Tokens {
199
+        $flow = new LoginFlowV2();
200
+        $pollToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
201
+        $loginToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
202
+        $flow->setPollToken($this->hashToken($pollToken));
203
+        $flow->setLoginToken($loginToken);
204
+        $flow->setStarted(0);
205
+        $flow->setTimestamp($this->time->getTime());
206
+        $flow->setClientName($userAgent);
207
+
208
+        [$publicKey, $privateKey] = $this->getKeyPair();
209
+        $privateKey = $this->crypto->encrypt($privateKey, $pollToken);
210
+
211
+        $flow->setPublicKey($publicKey);
212
+        $flow->setPrivateKey($privateKey);
213
+
214
+        $this->mapper->insert($flow);
215
+
216
+        return new LoginFlowV2Tokens($loginToken, $pollToken);
217
+    }
218
+
219
+    private function hashToken(string $token): string {
220
+        $secret = $this->config->getSystemValue('secret');
221
+        return hash('sha512', $token . $secret);
222
+    }
223
+
224
+    private function getKeyPair(): array {
225
+        $config = array_merge([
226
+            'digest_alg' => 'sha512',
227
+            'private_key_bits' => 2048,
228
+        ], $this->config->getSystemValue('openssl', []));
229
+
230
+        // Generate new key
231
+        $res = openssl_pkey_new($config);
232
+        if ($res === false) {
233
+            $this->logOpensslError();
234
+            throw new \RuntimeException('Could not initialize keys');
235
+        }
236
+
237
+        if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
238
+            $this->logOpensslError();
239
+            throw new \RuntimeException('OpenSSL reported a problem');
240
+        }
241
+
242
+        // Extract the public key from $res to $pubKey
243
+        $publicKey = openssl_pkey_get_details($res);
244
+        $publicKey = $publicKey['key'];
245
+
246
+        return [$publicKey, $privateKey];
247
+    }
248
+
249
+    private function logOpensslError(): void {
250
+        $errors = [];
251
+        while ($error = openssl_error_string()) {
252
+            $errors[] = $error;
253
+        }
254
+        $this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
255
+    }
256
+
257
+    private function encryptPassword(string $password, string $publicKey): string {
258
+        openssl_public_encrypt($password, $encryptedPassword, $publicKey, OPENSSL_PKCS1_OAEP_PADDING);
259
+        $encryptedPassword = base64_encode($encryptedPassword);
260
+
261
+        return $encryptedPassword;
262
+    }
263
+
264
+    private function decryptPassword(string $encryptedPassword, string $privateKey): string {
265
+        $encryptedPassword = base64_decode($encryptedPassword);
266
+        openssl_private_decrypt($encryptedPassword, $password, $privateKey, OPENSSL_PKCS1_OAEP_PADDING);
267
+
268
+        return $password;
269
+    }
270 270
 }
Please login to merge, or discard this patch.
core/Db/LoginFlowV2.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -49,37 +49,37 @@
 block discarded – undo
49 49
  * @method void setAppPassword(string $appPassword)
50 50
  */
51 51
 class LoginFlowV2 extends Entity {
52
-	/** @var int */
53
-	protected $timestamp;
54
-	/** @var int */
55
-	protected $started;
56
-	/** @var string */
57
-	protected $pollToken;
58
-	/** @var string */
59
-	protected $loginToken;
60
-	/** @var string */
61
-	protected $publicKey;
62
-	/** @var string */
63
-	protected $privateKey;
64
-	/** @var string */
65
-	protected $clientName;
66
-	/** @var string */
67
-	protected $loginName;
68
-	/** @var string */
69
-	protected $server;
70
-	/** @var string */
71
-	protected $appPassword;
52
+    /** @var int */
53
+    protected $timestamp;
54
+    /** @var int */
55
+    protected $started;
56
+    /** @var string */
57
+    protected $pollToken;
58
+    /** @var string */
59
+    protected $loginToken;
60
+    /** @var string */
61
+    protected $publicKey;
62
+    /** @var string */
63
+    protected $privateKey;
64
+    /** @var string */
65
+    protected $clientName;
66
+    /** @var string */
67
+    protected $loginName;
68
+    /** @var string */
69
+    protected $server;
70
+    /** @var string */
71
+    protected $appPassword;
72 72
 
73
-	public function __construct() {
74
-		$this->addType('timestamp', 'int');
75
-		$this->addType('started', 'int');
76
-		$this->addType('pollToken', 'string');
77
-		$this->addType('loginToken', 'string');
78
-		$this->addType('publicKey', 'string');
79
-		$this->addType('privateKey', 'string');
80
-		$this->addType('clientName', 'string');
81
-		$this->addType('loginName', 'string');
82
-		$this->addType('server', 'string');
83
-		$this->addType('appPassword', 'string');
84
-	}
73
+    public function __construct() {
74
+        $this->addType('timestamp', 'int');
75
+        $this->addType('started', 'int');
76
+        $this->addType('pollToken', 'string');
77
+        $this->addType('loginToken', 'string');
78
+        $this->addType('publicKey', 'string');
79
+        $this->addType('privateKey', 'string');
80
+        $this->addType('clientName', 'string');
81
+        $this->addType('loginName', 'string');
82
+        $this->addType('server', 'string');
83
+        $this->addType('appPassword', 'string');
84
+    }
85 85
 }
Please login to merge, or discard this patch.
core/Db/LoginFlowV2Mapper.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -30,71 +30,71 @@
 block discarded – undo
30 30
 use OCP\IDBConnection;
31 31
 
32 32
 class LoginFlowV2Mapper extends QBMapper {
33
-	private const lifetime = 1200;
33
+    private const lifetime = 1200;
34 34
 
35
-	/** @var ITimeFactory */
36
-	private $timeFactory;
35
+    /** @var ITimeFactory */
36
+    private $timeFactory;
37 37
 
38
-	public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
39
-		parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
40
-		$this->timeFactory = $timeFactory;
41
-	}
38
+    public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
39
+        parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
40
+        $this->timeFactory = $timeFactory;
41
+    }
42 42
 
43
-	/**
44
-	 * @param string $pollToken
45
-	 * @return LoginFlowV2
46
-	 * @throws DoesNotExistException
47
-	 */
48
-	public function getByPollToken(string $pollToken): LoginFlowV2 {
49
-		$qb = $this->db->getQueryBuilder();
50
-		$qb->select('*')
51
-			->from($this->getTableName())
52
-			->where(
53
-				$qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
54
-			);
43
+    /**
44
+     * @param string $pollToken
45
+     * @return LoginFlowV2
46
+     * @throws DoesNotExistException
47
+     */
48
+    public function getByPollToken(string $pollToken): LoginFlowV2 {
49
+        $qb = $this->db->getQueryBuilder();
50
+        $qb->select('*')
51
+            ->from($this->getTableName())
52
+            ->where(
53
+                $qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
54
+            );
55 55
 
56
-		$entity = $this->findEntity($qb);
57
-		return $this->validateTimestamp($entity);
58
-	}
56
+        $entity = $this->findEntity($qb);
57
+        return $this->validateTimestamp($entity);
58
+    }
59 59
 
60
-	/**
61
-	 * @param string $loginToken
62
-	 * @return LoginFlowV2
63
-	 * @throws DoesNotExistException
64
-	 */
65
-	public function getByLoginToken(string $loginToken): LoginFlowV2 {
66
-		$qb = $this->db->getQueryBuilder();
67
-		$qb->select('*')
68
-			->from($this->getTableName())
69
-			->where(
70
-				$qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
71
-			);
60
+    /**
61
+     * @param string $loginToken
62
+     * @return LoginFlowV2
63
+     * @throws DoesNotExistException
64
+     */
65
+    public function getByLoginToken(string $loginToken): LoginFlowV2 {
66
+        $qb = $this->db->getQueryBuilder();
67
+        $qb->select('*')
68
+            ->from($this->getTableName())
69
+            ->where(
70
+                $qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
71
+            );
72 72
 
73
-		$entity = $this->findEntity($qb);
74
-		return $this->validateTimestamp($entity);
75
-	}
73
+        $entity = $this->findEntity($qb);
74
+        return $this->validateTimestamp($entity);
75
+    }
76 76
 
77
-	public function cleanup(): void {
78
-		$qb = $this->db->getQueryBuilder();
79
-		$qb->delete($this->getTableName())
80
-			->where(
81
-				$qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
82
-			);
77
+    public function cleanup(): void {
78
+        $qb = $this->db->getQueryBuilder();
79
+        $qb->delete($this->getTableName())
80
+            ->where(
81
+                $qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
82
+            );
83 83
 
84
-		$qb->execute();
85
-	}
84
+        $qb->execute();
85
+    }
86 86
 
87
-	/**
88
-	 * @param LoginFlowV2 $flowV2
89
-	 * @return LoginFlowV2
90
-	 * @throws DoesNotExistException
91
-	 */
92
-	private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
93
-		if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
94
-			$this->delete($flowV2);
95
-			throw new DoesNotExistException('Token expired');
96
-		}
87
+    /**
88
+     * @param LoginFlowV2 $flowV2
89
+     * @return LoginFlowV2
90
+     * @throws DoesNotExistException
91
+     */
92
+    private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
93
+        if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
94
+            $this->delete($flowV2);
95
+            throw new DoesNotExistException('Token expired');
96
+        }
97 97
 
98
-		return $flowV2;
99
-	}
98
+        return $flowV2;
99
+    }
100 100
 }
Please login to merge, or discard this patch.
lib/public/Group/Backend/IHideFromCollaborationBackend.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@
 block discarded – undo
27 27
  * Allow the backend to mark groups to be excluded from being shown in search dialogs
28 28
  */
29 29
 interface IHideFromCollaborationBackend {
30
-	/**
31
-	 * Check if a group should be hidden from search dialogs
32
-	 *
33
-	 * @param string $groupId
34
-	 * @return bool
35
-	 * @since 16.0.0
36
-	 */
37
-	public function hideGroup(string $groupId): bool;
30
+    /**
31
+     * Check if a group should be hidden from search dialogs
32
+     *
33
+     * @param string $groupId
34
+     * @return bool
35
+     * @since 16.0.0
36
+     */
37
+    public function hideGroup(string $groupId): bool;
38 38
 }
Please login to merge, or discard this patch.
lib/public/Collaboration/AutoComplete/AutoCompleteEvent.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -30,70 +30,70 @@
 block discarded – undo
30 30
  */
31 31
 class AutoCompleteEvent extends GenericEvent {
32 32
 
33
-	/**
34
-	 * @param array $arguments
35
-	 * @since 16.0.0
36
-	 */
37
-	public function __construct(array $arguments) {
38
-		parent::__construct(null, $arguments);
39
-	}
33
+    /**
34
+     * @param array $arguments
35
+     * @since 16.0.0
36
+     */
37
+    public function __construct(array $arguments) {
38
+        parent::__construct(null, $arguments);
39
+    }
40 40
 
41
-	/**
42
-	 * @since 16.0.0
43
-	 */
44
-	public function getResults(): array {
45
-		return $this->getArgument('results');
46
-	}
41
+    /**
42
+     * @since 16.0.0
43
+     */
44
+    public function getResults(): array {
45
+        return $this->getArgument('results');
46
+    }
47 47
 
48
-	/**
49
-	 * @param array $results
50
-	 * @since 16.0.0
51
-	 */
52
-	public function setResults(array $results): void {
53
-		$this->setArgument('results', $results);
54
-	}
48
+    /**
49
+     * @param array $results
50
+     * @since 16.0.0
51
+     */
52
+    public function setResults(array $results): void {
53
+        $this->setArgument('results', $results);
54
+    }
55 55
 
56
-	/**
57
-	 * @since 16.0.0
58
-	 */
59
-	public function getSearchTerm(): string {
60
-		return $this->getArgument('search');
61
-	}
56
+    /**
57
+     * @since 16.0.0
58
+     */
59
+    public function getSearchTerm(): string {
60
+        return $this->getArgument('search');
61
+    }
62 62
 
63
-	/**
64
-	 * @return int[]
65
-	 * @since 16.0.0
66
-	 */
67
-	public function getShareTypes(): array {
68
-		return $this->getArgument('shareTypes');
69
-	}
63
+    /**
64
+     * @return int[]
65
+     * @since 16.0.0
66
+     */
67
+    public function getShareTypes(): array {
68
+        return $this->getArgument('shareTypes');
69
+    }
70 70
 
71
-	/**
72
-	 * @since 16.0.0
73
-	 */
74
-	public function getItemType(): string {
75
-		return $this->getArgument('itemType');
76
-	}
71
+    /**
72
+     * @since 16.0.0
73
+     */
74
+    public function getItemType(): string {
75
+        return $this->getArgument('itemType');
76
+    }
77 77
 
78
-	/**
79
-	 * @since 16.0.0
80
-	 */
81
-	public function getItemId(): string {
82
-		return $this->getArgument('itemId');
83
-	}
78
+    /**
79
+     * @since 16.0.0
80
+     */
81
+    public function getItemId(): string {
82
+        return $this->getArgument('itemId');
83
+    }
84 84
 
85
-	/**
86
-	 * @since 16.0.0
87
-	 */
88
-	public function getSorter(): string {
89
-		return $this->getArgument('sorter');
90
-	}
85
+    /**
86
+     * @since 16.0.0
87
+     */
88
+    public function getSorter(): string {
89
+        return $this->getArgument('sorter');
90
+    }
91 91
 
92
-	/**
93
-	 * @since 16.0.0
94
-	 */
95
-	public function getLimit(): int {
96
-		return $this->getArgument('limit');
97
-	}
92
+    /**
93
+     * @since 16.0.0
94
+     */
95
+    public function getLimit(): int {
96
+        return $this->getArgument('limit');
97
+    }
98 98
 
99 99
 }
Please login to merge, or discard this patch.
lib/private/Files/Node/NonExistingFile.php 1 patch
Indentation   +115 added lines, -115 removed lines patch added patch discarded remove patch
@@ -26,119 +26,119 @@
 block discarded – undo
26 26
 use OCP\Files\NotFoundException;
27 27
 
28 28
 class NonExistingFile extends File {
29
-	/**
30
-	 * @param string $newPath
31
-	 * @throws \OCP\Files\NotFoundException
32
-	 */
33
-	public function rename($newPath) {
34
-		throw new NotFoundException();
35
-	}
36
-
37
-	public function delete() {
38
-		throw new NotFoundException();
39
-	}
40
-
41
-	public function copy($newPath) {
42
-		throw new NotFoundException();
43
-	}
44
-
45
-	public function touch($mtime = null) {
46
-		throw new NotFoundException();
47
-	}
48
-
49
-	public function getId() {
50
-		if ($this->fileInfo) {
51
-			return parent::getId();
52
-		} else {
53
-			throw new NotFoundException();
54
-		}
55
-	}
56
-
57
-	public function stat() {
58
-		throw new NotFoundException();
59
-	}
60
-
61
-	public function getMTime() {
62
-		if ($this->fileInfo) {
63
-			return parent::getMTime();
64
-		} else {
65
-			throw new NotFoundException();
66
-		}
67
-	}
68
-
69
-	public function getSize($includeMounts = true) {
70
-		if ($this->fileInfo) {
71
-			return parent::getSize($includeMounts);
72
-		} else {
73
-			throw new NotFoundException();
74
-		}
75
-	}
76
-
77
-	public function getEtag() {
78
-		if ($this->fileInfo) {
79
-			return parent::getEtag();
80
-		} else {
81
-			throw new NotFoundException();
82
-		}
83
-	}
84
-
85
-	public function getPermissions() {
86
-		if ($this->fileInfo) {
87
-			return parent::getPermissions();
88
-		} else {
89
-			throw new NotFoundException();
90
-		}
91
-	}
92
-
93
-	public function isReadable() {
94
-		if ($this->fileInfo) {
95
-			return parent::isReadable();
96
-		} else {
97
-			throw new NotFoundException();
98
-		}
99
-	}
100
-
101
-	public function isUpdateable() {
102
-		if ($this->fileInfo) {
103
-			return parent::isUpdateable();
104
-		} else {
105
-			throw new NotFoundException();
106
-		}
107
-	}
108
-
109
-	public function isDeletable() {
110
-		if ($this->fileInfo) {
111
-			return parent::isDeletable();
112
-		} else {
113
-			throw new NotFoundException();
114
-		}
115
-	}
116
-
117
-	public function isShareable() {
118
-		if ($this->fileInfo) {
119
-			return parent::isShareable();
120
-		} else {
121
-			throw new NotFoundException();
122
-		}
123
-	}
124
-
125
-	public function getContent() {
126
-		throw new NotFoundException();
127
-	}
128
-
129
-	public function putContent($data) {
130
-		throw new NotFoundException();
131
-	}
132
-
133
-	public function getMimeType() {
134
-		if ($this->fileInfo) {
135
-			return parent::getMimeType();
136
-		} else {
137
-			throw new NotFoundException();
138
-		}
139
-	}
140
-
141
-	public function fopen($mode) {
142
-		throw new NotFoundException();
143
-	}
29
+    /**
30
+     * @param string $newPath
31
+     * @throws \OCP\Files\NotFoundException
32
+     */
33
+    public function rename($newPath) {
34
+        throw new NotFoundException();
35
+    }
36
+
37
+    public function delete() {
38
+        throw new NotFoundException();
39
+    }
40
+
41
+    public function copy($newPath) {
42
+        throw new NotFoundException();
43
+    }
44
+
45
+    public function touch($mtime = null) {
46
+        throw new NotFoundException();
47
+    }
48
+
49
+    public function getId() {
50
+        if ($this->fileInfo) {
51
+            return parent::getId();
52
+        } else {
53
+            throw new NotFoundException();
54
+        }
55
+    }
56
+
57
+    public function stat() {
58
+        throw new NotFoundException();
59
+    }
60
+
61
+    public function getMTime() {
62
+        if ($this->fileInfo) {
63
+            return parent::getMTime();
64
+        } else {
65
+            throw new NotFoundException();
66
+        }
67
+    }
68
+
69
+    public function getSize($includeMounts = true) {
70
+        if ($this->fileInfo) {
71
+            return parent::getSize($includeMounts);
72
+        } else {
73
+            throw new NotFoundException();
74
+        }
75
+    }
76
+
77
+    public function getEtag() {
78
+        if ($this->fileInfo) {
79
+            return parent::getEtag();
80
+        } else {
81
+            throw new NotFoundException();
82
+        }
83
+    }
84
+
85
+    public function getPermissions() {
86
+        if ($this->fileInfo) {
87
+            return parent::getPermissions();
88
+        } else {
89
+            throw new NotFoundException();
90
+        }
91
+    }
92
+
93
+    public function isReadable() {
94
+        if ($this->fileInfo) {
95
+            return parent::isReadable();
96
+        } else {
97
+            throw new NotFoundException();
98
+        }
99
+    }
100
+
101
+    public function isUpdateable() {
102
+        if ($this->fileInfo) {
103
+            return parent::isUpdateable();
104
+        } else {
105
+            throw new NotFoundException();
106
+        }
107
+    }
108
+
109
+    public function isDeletable() {
110
+        if ($this->fileInfo) {
111
+            return parent::isDeletable();
112
+        } else {
113
+            throw new NotFoundException();
114
+        }
115
+    }
116
+
117
+    public function isShareable() {
118
+        if ($this->fileInfo) {
119
+            return parent::isShareable();
120
+        } else {
121
+            throw new NotFoundException();
122
+        }
123
+    }
124
+
125
+    public function getContent() {
126
+        throw new NotFoundException();
127
+    }
128
+
129
+    public function putContent($data) {
130
+        throw new NotFoundException();
131
+    }
132
+
133
+    public function getMimeType() {
134
+        if ($this->fileInfo) {
135
+            return parent::getMimeType();
136
+        } else {
137
+            throw new NotFoundException();
138
+        }
139
+    }
140
+
141
+    public function fopen($mode) {
142
+        throw new NotFoundException();
143
+    }
144 144
 }
Please login to merge, or discard this patch.