@@ -68,7 +68,7 @@ |
||
| 68 | 68 | |
| 69 | 69 | $query = $this->connection->getQueryBuilder(); |
| 70 | 70 | $query->update('share') |
| 71 | - ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST)) |
|
| 71 | + ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST)) |
|
| 72 | 72 | ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL))); |
| 73 | 73 | $query->execute(); |
| 74 | 74 | } |
@@ -54,6 +54,6 @@ |
||
| 54 | 54 | </fieldset> |
| 55 | 55 | </div> |
| 56 | 56 | |
| 57 | -<?php if(empty($_['oauthState'])): ?> |
|
| 57 | +<?php if (empty($_['oauthState'])): ?> |
|
| 58 | 58 | <a id="app-token-login" class="warning" href="#"><?php p($l->t('Alternative login using app token')) ?></a> |
| 59 | 59 | <?php endif; ?> |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | private function isValidToken($stateToken) { |
| 121 | 121 | $currentToken = $this->session->get(self::stateName); |
| 122 | - if(!is_string($stateToken) || !is_string($currentToken)) { |
|
| 122 | + if (!is_string($stateToken) || !is_string($currentToken)) { |
|
| 123 | 123 | return false; |
| 124 | 124 | } |
| 125 | 125 | return hash_equals($currentToken, $stateToken); |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | public function showAuthPickerPage($clientIdentifier = '') { |
| 154 | 154 | $clientName = $this->getClientName(); |
| 155 | 155 | $client = null; |
| 156 | - if($clientIdentifier !== '') { |
|
| 156 | + if ($clientIdentifier !== '') { |
|
| 157 | 157 | $client = $this->clientMapper->getByIdentifier($clientIdentifier); |
| 158 | 158 | $clientName = $client->getName(); |
| 159 | 159 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | */ |
| 210 | 210 | public function redirectPage($stateToken = '', |
| 211 | 211 | $clientIdentifier = '') { |
| 212 | - if(!$this->isValidToken($stateToken)) { |
|
| 212 | + if (!$this->isValidToken($stateToken)) { |
|
| 213 | 213 | return $this->stateTokenForbiddenResponse(); |
| 214 | 214 | } |
| 215 | 215 | |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | */ |
| 237 | 237 | public function generateAppPassword($stateToken, |
| 238 | 238 | $clientIdentifier = '') { |
| 239 | - if(!$this->isValidToken($stateToken)) { |
|
| 239 | + if (!$this->isValidToken($stateToken)) { |
|
| 240 | 240 | $this->session->remove(self::stateName); |
| 241 | 241 | return $this->stateTokenForbiddenResponse(); |
| 242 | 242 | } |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | $clientName = $this->getClientName(); |
| 269 | 269 | $client = false; |
| 270 | - if($clientIdentifier !== '') { |
|
| 270 | + if ($clientIdentifier !== '') { |
|
| 271 | 271 | $client = $this->clientMapper->getByIdentifier($clientIdentifier); |
| 272 | 272 | $clientName = $client->getName(); |
| 273 | 273 | } |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | IToken::DO_NOT_REMEMBER |
| 285 | 285 | ); |
| 286 | 286 | |
| 287 | - if($client) { |
|
| 287 | + if ($client) { |
|
| 288 | 288 | $code = $this->random->generate(128); |
| 289 | 289 | $accessToken = new AccessToken(); |
| 290 | 290 | $accessToken->setClientId($client->getId()); |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | ); |
| 302 | 302 | $this->session->remove('oauth.state'); |
| 303 | 303 | } else { |
| 304 | - $redirectUri = 'nc://login/server:' . $this->request->getServerHost() . '&user:' . urlencode($loginName) . '&password:' . urlencode($token); |
|
| 304 | + $redirectUri = 'nc://login/server:'.$this->request->getServerHost().'&user:'.urlencode($loginName).'&password:'.urlencode($token); |
|
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | return new Http\RedirectResponse($redirectUri); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $result = $qb->execute(); |
| 50 | 50 | $row = $result->fetch(); |
| 51 | 51 | $result->closeCursor(); |
| 52 | - if($row === false) { |
|
| 52 | + if ($row === false) { |
|
| 53 | 53 | throw new ClientNotFoundException(); |
| 54 | 54 | } |
| 55 | 55 | return Client::fromRow($row); |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $result = $qb->execute(); |
| 70 | 70 | $row = $result->fetch(); |
| 71 | 71 | $result->closeCursor(); |
| 72 | - if($row === false) { |
|
| 72 | + if ($row === false) { |
|
| 73 | 73 | throw new ClientNotFoundException(); |
| 74 | 74 | } |
| 75 | 75 | return Client::fromRow($row); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | $result = $qb->execute(); |
| 50 | 50 | $row = $result->fetch(); |
| 51 | 51 | $result->closeCursor(); |
| 52 | - if($row === false) { |
|
| 52 | + if ($row === false) { |
|
| 53 | 53 | throw new AccessTokenNotFoundException(); |
| 54 | 54 | } |
| 55 | 55 | return AccessToken::fromRow($row); |
@@ -170,12 +170,12 @@ discard block |
||
| 170 | 170 | */ |
| 171 | 171 | private function requiresCSRFCheck() { |
| 172 | 172 | // GET requires no check at all |
| 173 | - if($this->request->getMethod() === 'GET') { |
|
| 173 | + if ($this->request->getMethod() === 'GET') { |
|
| 174 | 174 | return false; |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | // Official Nextcloud clients require no checks |
| 178 | - if($this->request->isUserAgent([ |
|
| 178 | + if ($this->request->isUserAgent([ |
|
| 179 | 179 | IRequest::USER_AGENT_CLIENT_DESKTOP, |
| 180 | 180 | IRequest::USER_AGENT_CLIENT_ANDROID, |
| 181 | 181 | IRequest::USER_AGENT_CLIENT_IOS, |
@@ -184,17 +184,17 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | // If not logged-in no check is required |
| 187 | - if(!$this->userSession->isLoggedIn()) { |
|
| 187 | + if (!$this->userSession->isLoggedIn()) { |
|
| 188 | 188 | return false; |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | // POST always requires a check |
| 192 | - if($this->request->getMethod() === 'POST') { |
|
| 192 | + if ($this->request->getMethod() === 'POST') { |
|
| 193 | 193 | return true; |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | // If logged-in AND DAV authenticated no check is required |
| 197 | - if($this->userSession->isLoggedIn() && |
|
| 197 | + if ($this->userSession->isLoggedIn() && |
|
| 198 | 198 | $this->isDavAuthenticated($this->userSession->getUser()->getUID())) { |
| 199 | 199 | return false; |
| 200 | 200 | } |
@@ -211,10 +211,10 @@ discard block |
||
| 211 | 211 | private function auth(RequestInterface $request, ResponseInterface $response) { |
| 212 | 212 | $forcedLogout = false; |
| 213 | 213 | |
| 214 | - if(!$this->request->passesCSRFCheck() && |
|
| 214 | + if (!$this->request->passesCSRFCheck() && |
|
| 215 | 215 | $this->requiresCSRFCheck()) { |
| 216 | 216 | // In case of a fail with POST we need to recheck the credentials |
| 217 | - if($this->request->getMethod() === 'POST') { |
|
| 217 | + if ($this->request->getMethod() === 'POST') { |
|
| 218 | 218 | $forcedLogout = true; |
| 219 | 219 | } else { |
| 220 | 220 | $response->setStatus(401); |
@@ -222,10 +222,10 @@ discard block |
||
| 222 | 222 | } |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | - if($forcedLogout) { |
|
| 225 | + if ($forcedLogout) { |
|
| 226 | 226 | $this->userSession->logout(); |
| 227 | 227 | } else { |
| 228 | - if($this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) { |
|
| 228 | + if ($this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) { |
|
| 229 | 229 | throw new \Sabre\DAV\Exception\NotAuthenticated('2FA challenge not passed.'); |
| 230 | 230 | } |
| 231 | 231 | if (\OC_User::handleApacheAuth() || |
@@ -238,19 +238,19 @@ discard block |
||
| 238 | 238 | \OC_Util::setupFS($user); |
| 239 | 239 | $this->currentUser = $user; |
| 240 | 240 | $this->session->close(); |
| 241 | - return [true, $this->principalPrefix . $user]; |
|
| 241 | + return [true, $this->principalPrefix.$user]; |
|
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | if (!$this->userSession->isLoggedIn() && in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With')))) { |
| 246 | 246 | // do not re-authenticate over ajax, use dummy auth name to prevent browser popup |
| 247 | - $response->addHeader('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"'); |
|
| 247 | + $response->addHeader('WWW-Authenticate', 'DummyBasic realm="'.$this->realm.'"'); |
|
| 248 | 248 | $response->setStatus(401); |
| 249 | 249 | throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls'); |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | $data = parent::check($request, $response); |
| 253 | - if($data[0] === true) { |
|
| 253 | + if ($data[0] === true) { |
|
| 254 | 254 | $startPos = strrpos($data[1], '/') + 1; |
| 255 | 255 | $user = $this->userSession->getUser()->getUID(); |
| 256 | 256 | $data[1] = substr_replace($data[1], $user, $startPos); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | private function setupUserFs($userId) { |
| 56 | 56 | \OC_Util::setupFS($userId); |
| 57 | 57 | $this->session->close(); |
| 58 | - return $this->principalPrefix . $userId; |
|
| 58 | + return $this->principalPrefix.$userId; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -64,10 +64,10 @@ discard block |
||
| 64 | 64 | public function validateBearerToken($bearerToken) { |
| 65 | 65 | \OC_Util::setupFS(); |
| 66 | 66 | |
| 67 | - if(!$this->userSession->isLoggedIn()) { |
|
| 67 | + if (!$this->userSession->isLoggedIn()) { |
|
| 68 | 68 | $this->userSession->tryTokenLogin($this->request); |
| 69 | 69 | } |
| 70 | - if($this->userSession->isLoggedIn()) { |
|
| 70 | + if ($this->userSession->isLoggedIn()) { |
|
| 71 | 71 | return $this->setupUserFs($this->userSession->getUser()->getUID()); |
| 72 | 72 | } |
| 73 | 73 | |