nextcloud / server

lib/private/Files/Search/SearchComparison.php

Indentation +36 added lines, -36 removed lines

@@ -24,44 +24,44 @@
 use OCP\Files\Search\ISearchComparison;
 
 class SearchComparison implements ISearchComparison {
-	/** @var string */
-	private $type;
-	/** @var string */
-	private $field;
-	/** @var string|integer|\DateTime */
-	private $value;
+    /** @var string */
+    private $type;
+    /** @var string */
+    private $field;
+    /** @var string|integer|\DateTime */
+    private $value;
 
-	/**
-	 * SearchComparison constructor.
-	 *
-	 * @param string $type
-	 * @param string $field
-	 * @param \DateTime|int|string $value
-	 */
-	public function __construct($type, $field, $value) {
-		$this->type = $type;
-		$this->field = $field;
-		$this->value = $value;
-	}
+    /**
+     * SearchComparison constructor.
+     *
+     * @param string $type
+     * @param string $field
+     * @param \DateTime|int|string $value
+     */
+    public function __construct($type, $field, $value) {
+        $this->type = $type;
+        $this->field = $field;
+        $this->value = $value;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getField() {
-		return $this->field;
-	}
+    /**
+     * @return string
+     */
+    public function getField() {
+        return $this->field;
+    }
 
-	/**
-	 * @return \DateTime|int|string
-	 */
-	public function getValue() {
-		return $this->value;
-	}
+    /**
+     * @return \DateTime|int|string
+     */
+    public function getValue() {
+        return $this->value;
+    }
 }

lib/private/Files/Search/SearchOrder.php

Indentation +26 added lines, -26 removed lines

@@ -25,33 +25,33 @@
 use OCP\Files\Search\ISearchOrder;
 
 class SearchOrder implements ISearchOrder {
-	/** @var  string */
-	private $direction;
-	/** @var  string */
-	private $field;
+    /** @var  string */
+    private $direction;
+    /** @var  string */
+    private $field;
 
-	/**
-	 * SearchOrder constructor.
-	 *
-	 * @param string $direction
-	 * @param string $field
-	 */
-	public function __construct($direction, $field) {
-		$this->direction = $direction;
-		$this->field = $field;
-	}
+    /**
+     * SearchOrder constructor.
+     *
+     * @param string $direction
+     * @param string $field
+     */
+    public function __construct($direction, $field) {
+        $this->direction = $direction;
+        $this->field = $field;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getDirection() {
-		return $this->direction;
-	}
+    /**
+     * @return string
+     */
+    public function getDirection() {
+        return $this->direction;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getField() {
-		return $this->field;
-	}
+    /**
+     * @return string
+     */
+    public function getField() {
+        return $this->field;
+    }
 }

lib/private/Files/Search/SearchBinaryOperator.php

Indentation +26 added lines, -26 removed lines

@@ -25,33 +25,33 @@
 use OCP\Files\Search\ISearchOperator;
 
 class SearchBinaryOperator implements ISearchBinaryOperator {
-	/** @var string */
-	private $type;
-	/** @var ISearchOperator[] */
-	private $arguments;
+    /** @var string */
+    private $type;
+    /** @var ISearchOperator[] */
+    private $arguments;
 
-	/**
-	 * SearchBinaryOperator constructor.
-	 *
-	 * @param string $type
-	 * @param ISearchOperator[] $arguments
-	 */
-	public function __construct($type, array $arguments) {
-		$this->type = $type;
-		$this->arguments = $arguments;
-	}
+    /**
+     * SearchBinaryOperator constructor.
+     *
+     * @param string $type
+     * @param ISearchOperator[] $arguments
+     */
+    public function __construct($type, array $arguments) {
+        $this->type = $type;
+        $this->arguments = $arguments;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * @return ISearchOperator[]
-	 */
-	public function getArguments() {
-		return $this->arguments;
-	}
+    /**
+     * @return ISearchOperator[]
+     */
+    public function getArguments() {
+        return $this->arguments;
+    }
 }

apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php

Indentation +99 added lines, -99 removed lines

@@ -45,114 +45,114 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class FakeLockerPlugin extends ServerPlugin {
-	/** @var \Sabre\DAV\Server */
-	private $server;
+    /** @var \Sabre\DAV\Server */
+    private $server;
 
-	/** {@inheritDoc} */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
-		$this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
-		$server->on('propFind', [$this, 'propFind']);
-		$server->on('validateTokens', [$this, 'validateTokens']);
-	}
+    /** {@inheritDoc} */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
+        $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
+        $server->on('propFind', [$this, 'propFind']);
+        $server->on('validateTokens', [$this, 'validateTokens']);
+    }
 
-	/**
-	 * Indicate that we support LOCK and UNLOCK
-	 *
-	 * @param string $path
-	 * @return string[]
-	 */
-	public function getHTTPMethods($path) {
-		return [
-			'LOCK',
-			'UNLOCK',
-		];
-	}
+    /**
+     * Indicate that we support LOCK and UNLOCK
+     *
+     * @param string $path
+     * @return string[]
+     */
+    public function getHTTPMethods($path) {
+        return [
+            'LOCK',
+            'UNLOCK',
+        ];
+    }
 
-	/**
-	 * Indicate that we support locking
-	 *
-	 * @return integer[]
-	 */
-	function getFeatures() {
-		return [2];
-	}
+    /**
+     * Indicate that we support locking
+     *
+     * @return integer[]
+     */
+    function getFeatures() {
+        return [2];
+    }
 
-	/**
-	 * Return some dummy response for PROPFIND requests with regard to locking
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function() {
-			return new SupportedLock(true);
-		});
-		$propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
-			return new LockDiscovery([]);
-		});
-	}
+    /**
+     * Return some dummy response for PROPFIND requests with regard to locking
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFind(PropFind $propFind, INode $node) {
+        $propFind->handle('{DAV:}supportedlock', function() {
+            return new SupportedLock(true);
+        });
+        $propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
+            return new LockDiscovery([]);
+        });
+    }
 
-	/**
-	 * Mark a locking token always as valid
-	 *
-	 * @param RequestInterface $request
-	 * @param array $conditions
-	 */
-	public function validateTokens(RequestInterface $request, &$conditions) {
-		foreach($conditions as &$fileCondition) {
-			if(isset($fileCondition['tokens'])) {
-				foreach($fileCondition['tokens'] as &$token) {
-					if(isset($token['token'])) {
-						if(substr($token['token'], 0, 16) === 'opaquelocktoken:') {
-							$token['validToken'] = true;
-						}
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Mark a locking token always as valid
+     *
+     * @param RequestInterface $request
+     * @param array $conditions
+     */
+    public function validateTokens(RequestInterface $request, &$conditions) {
+        foreach($conditions as &$fileCondition) {
+            if(isset($fileCondition['tokens'])) {
+                foreach($fileCondition['tokens'] as &$token) {
+                    if(isset($token['token'])) {
+                        if(substr($token['token'], 0, 16) === 'opaquelocktoken:') {
+                            $token['validToken'] = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeLockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeLockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
 
-		$lockInfo = new LockInfo();
-		$lockInfo->token = md5($request->getPath());
-		$lockInfo->uri = $request->getPath();
-		$lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
-		$lockInfo->timeout = 1800;
+        $lockInfo = new LockInfo();
+        $lockInfo->token = md5($request->getPath());
+        $lockInfo->uri = $request->getPath();
+        $lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
+        $lockInfo->timeout = 1800;
 
-		$body = $this->server->xml->write('{DAV:}prop', [
-				'{DAV:}lockdiscovery' =>
-						new LockDiscovery([$lockInfo])
-		]);
+        $body = $this->server->xml->write('{DAV:}prop', [
+                '{DAV:}lockdiscovery' =>
+                        new LockDiscovery([$lockInfo])
+        ]);
 
-		$response->setStatus(200);
-		$response->setBody($body);
+        $response->setStatus(200);
+        $response->setBody($body);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeUnlockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
-		$response->setStatus(204);
-		$response->setHeader('Content-Length', '0');
-		return false;
-	}
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeUnlockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
+        $response->setStatus(204);
+        $response->setHeader('Content-Length', '0');
+        return false;
+    }
 }

lib/private/OCS/Provider.php

Indentation +81 added lines, -81 removed lines

@@ -24,92 +24,92 @@
 namespace OC\OCS;
 
 class Provider extends \OCP\AppFramework\Controller {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param \OCP\IRequest $request
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($appName,
-								\OCP\IRequest $request,
-								\OCP\App\IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $appName
+     * @param \OCP\IRequest $request
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($appName,
+                                \OCP\IRequest $request,
+                                \OCP\App\IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @return \OCP\AppFramework\Http\JSONResponse
-	 */
-	public function buildProviderList() {
-		$services = [
-			'PRIVATE_DATA' => [
-				'version' => 1,
-				'endpoints' => [
-					'store' => '/ocs/v2.php/privatedata/setattribute',
-					'read' => '/ocs/v2.php/privatedata/getattribute',
-					'delete' => '/ocs/v2.php/privatedata/deleteattribute',
-				],
-			],
-		];
+    /**
+     * @return \OCP\AppFramework\Http\JSONResponse
+     */
+    public function buildProviderList() {
+        $services = [
+            'PRIVATE_DATA' => [
+                'version' => 1,
+                'endpoints' => [
+                    'store' => '/ocs/v2.php/privatedata/setattribute',
+                    'read' => '/ocs/v2.php/privatedata/getattribute',
+                    'delete' => '/ocs/v2.php/privatedata/deleteattribute',
+                ],
+            ],
+        ];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
-			$services['SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
-				],
-			];
-			$services['FEDERATED_SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/cloud/shares',
-					'webdav' => '/public.php/webdav/',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('files_sharing')) {
+            $services['SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
+                ],
+            ];
+            $services['FEDERATED_SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/cloud/shares',
+                    'webdav' => '/public.php/webdav/',
+                ],
+            ];
+        }
 
-		if ($this->appManager->isEnabledForUser('federation')) {
-			if (isset($services['FEDERATED_SHARING'])) {
-				$services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
-				$services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
-				$services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
-			} else {
-				$services['FEDERATED_SHARING'] = [
-					'version' => 1,
-					'endpoints' => [
-						'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
-						'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
-						'carddav-user' => 'system'
-					],
-				];
-			}
-		}
+        if ($this->appManager->isEnabledForUser('federation')) {
+            if (isset($services['FEDERATED_SHARING'])) {
+                $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
+                $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
+                $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
+            } else {
+                $services['FEDERATED_SHARING'] = [
+                    'version' => 1,
+                    'endpoints' => [
+                        'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
+                        'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
+                        'carddav-user' => 'system'
+                    ],
+                ];
+            }
+        }
 
-		if($this->appManager->isEnabledForUser('activity')) {
-			$services['ACTIVITY'] = [
-				'version' => 1,
-				'endpoints' => [
-					'list' => '/ocs/v2.php/cloud/activity',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('activity')) {
+            $services['ACTIVITY'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'list' => '/ocs/v2.php/cloud/activity',
+                ],
+            ];
+        }
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
-			$services['PROVISIONING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'user' => '/ocs/v2.php/cloud/users',
-					'groups' => '/ocs/v2.php/cloud/groups',
-					'apps' => '/ocs/v2.php/cloud/apps',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('provisioning_api')) {
+            $services['PROVISIONING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'user' => '/ocs/v2.php/cloud/users',
+                    'groups' => '/ocs/v2.php/cloud/groups',
+                    'apps' => '/ocs/v2.php/cloud/apps',
+                ],
+            ];
+        }
 
-		return new \OCP\AppFramework\Http\JSONResponse([
-			'version' => 2,
-			'services' => $services,
-		]);
-	}
+        return new \OCP\AppFramework\Http\JSONResponse([
+            'version' => 2,
+            'services' => $services,
+        ]);
+    }
 }

apps/federatedfilesharing/appinfo/routes.php

Indentation +14 added lines, -14 removed lines

@@ -23,18 +23,18 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
-		['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
-	],
+    'routes' => [
+        ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
+        ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
+    ],
 ];

apps/dav/appinfo/v2/remote.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 

apps/federation/lib/SyncFederationAddressBooks.php

Indentation +53 added lines, -53 removed lines

@@ -30,64 +30,64 @@
 
 class SyncFederationAddressBooks {
 
-	/** @var DbHandler */
-	protected $dbHandler;
+    /** @var DbHandler */
+    protected $dbHandler;
 
-	/** @var SyncService */
-	private $syncService;
+    /** @var SyncService */
+    private $syncService;
 
-	/** @var  DiscoveryService */
-	private $ocsDiscoveryService;
+    /** @var  DiscoveryService */
+    private $ocsDiscoveryService;
 
-	/**
-	 * @param DbHandler $dbHandler
-	 * @param SyncService $syncService
-	 * @param IDiscoveryService $ocsDiscoveryService
-	 */
-	public function __construct(DbHandler $dbHandler,
-								SyncService $syncService,
-								IDiscoveryService $ocsDiscoveryService
-	) {
-		$this->syncService = $syncService;
-		$this->dbHandler = $dbHandler;
-		$this->ocsDiscoveryService = $ocsDiscoveryService;
-	}
+    /**
+     * @param DbHandler $dbHandler
+     * @param SyncService $syncService
+     * @param IDiscoveryService $ocsDiscoveryService
+     */
+    public function __construct(DbHandler $dbHandler,
+                                SyncService $syncService,
+                                IDiscoveryService $ocsDiscoveryService
+    ) {
+        $this->syncService = $syncService;
+        $this->dbHandler = $dbHandler;
+        $this->ocsDiscoveryService = $ocsDiscoveryService;
+    }
 
-	/**
-	 * @param \Closure $callback
-	 */
-	public function syncThemAll(\Closure $callback) {
+    /**
+     * @param \Closure $callback
+     */
+    public function syncThemAll(\Closure $callback) {
 
-		$trustedServers = $this->dbHandler->getAllServer();
-		foreach ($trustedServers as $trustedServer) {
-			$url = $trustedServer['url'];
-			$callback($url, null);
-			$sharedSecret = $trustedServer['shared_secret'];
-			$syncToken = $trustedServer['sync_token'];
+        $trustedServers = $this->dbHandler->getAllServer();
+        foreach ($trustedServers as $trustedServer) {
+            $url = $trustedServer['url'];
+            $callback($url, null);
+            $sharedSecret = $trustedServer['shared_secret'];
+            $syncToken = $trustedServer['sync_token'];
 
-			$endPoints = $this->ocsDiscoveryService->discover($url, 'FEDERATED_SHARING');
-			$cardDavUser = isset($endPoints['carddav-user']) ? $endPoints['carddav-user'] : 'system';
-			$addressBookUrl = isset($endPoints['system-address-book']) ? trim($endPoints['system-address-book'], '/') : 'remote.php/dav/addressbooks/system/system/system';
+            $endPoints = $this->ocsDiscoveryService->discover($url, 'FEDERATED_SHARING');
+            $cardDavUser = isset($endPoints['carddav-user']) ? $endPoints['carddav-user'] : 'system';
+            $addressBookUrl = isset($endPoints['system-address-book']) ? trim($endPoints['system-address-book'], '/') : 'remote.php/dav/addressbooks/system/system/system';
 
-			if (is_null($sharedSecret)) {
-				continue;
-			}
-			$targetBookId = $trustedServer['url_hash'];
-			$targetPrincipal = "principals/system/system";
-			$targetBookProperties = [
-					'{DAV:}displayname' => $url
-			];
-			try {
-				$newToken = $this->syncService->syncRemoteAddressBook($url, $cardDavUser, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetBookProperties);
-				if ($newToken !== $syncToken) {
-					$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
-				}
-			} catch (\Exception $ex) {
-				if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
-					$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_ACCESS_REVOKED);
-				}
-				$callback($url, $ex);
-			}
-		}
-	}
+            if (is_null($sharedSecret)) {
+                continue;
+            }
+            $targetBookId = $trustedServer['url_hash'];
+            $targetPrincipal = "principals/system/system";
+            $targetBookProperties = [
+                    '{DAV:}displayname' => $url
+            ];
+            try {
+                $newToken = $this->syncService->syncRemoteAddressBook($url, $cardDavUser, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetBookProperties);
+                if ($newToken !== $syncToken) {
+                    $this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
+                }
+            } catch (\Exception $ex) {
+                if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
+                    $this->dbHandler->setServerStatus($url, TrustedServers::STATUS_ACCESS_REVOKED);
+                }
+                $callback($url, $ex);
+            }
+        }
+    }
 }

lib/private/Encryption/Keys/Storage.php

Indentation +340 added lines, -340 removed lines

@@ -32,345 +32,345 @@
 
 class Storage implements IStorage {
 
-	// hidden file which indicate that the folder is a valid key storage
-	const KEY_STORAGE_MARKER = '.oc_key_storage';
-
-	/** @var View */
-	private $view;
-
-	/** @var Util */
-	private $util;
-
-	// base dir where all the file related keys are stored
-	/** @var string */
-	private $keys_base_dir;
-
-	// root of the key storage default is empty which means that we use the data folder
-	/** @var string */
-	private $root_dir;
-
-	/** @var string */
-	private $encryption_base_dir;
-
-	/** @var string */
-	private $backup_base_dir;
-
-	/** @var array */
-	private $keyCache = [];
-
-	/**
-	 * @param View $view
-	 * @param Util $util
-	 */
-	public function __construct(View $view, Util $util) {
-		$this->view = $view;
-		$this->util = $util;
-
-		$this->encryption_base_dir = '/files_encryption';
-		$this->keys_base_dir = $this->encryption_base_dir .'/keys';
-		$this->backup_base_dir = $this->encryption_base_dir .'/backup';
-		$this->root_dir = $this->util->getKeyStorageRoot();
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getUserKey($uid, $keyId, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
-		return $this->getKey($path);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getFileKey($path, $keyId, $encryptionModuleId) {
-		$realFile = $this->util->stripPartialFileExtension($path);
-		$keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
-		$key = $this->getKey($keyDir . $keyId);
-
-		if ($key === '' && $realFile !== $path) {
-			// Check if the part file has keys and use them, if no normal keys
-			// exist. This is required to fix copyBetweenStorage() when we
-			// rename a .part file over storage borders.
-			$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-			$key = $this->getKey($keyDir . $keyId);
-		}
-
-		return $key;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSystemUserKey($keyId, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
-		return $this->getKey($path);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setUserKey($uid, $keyId, $key, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
-		return $this->setKey($path, $key);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
-		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return $this->setKey($keyDir . $keyId, $key);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSystemUserKey($keyId, $key, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
-		return $this->setKey($path, $key);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteUserKey($uid, $keyId, $encryptionModuleId) {
-		try {
-			$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
-			return !$this->view->file_exists($path) || $this->view->unlink($path);
-		} catch (NoUserException $e) {
-			// this exception can come from initMountPoints() from setupUserMounts()
-			// for a deleted user.
-			//
-			// It means, that:
-			// - we are not running in alternative storage mode because we don't call
-			// initMountPoints() in that mode
-			// - the keys were in the user's home but since the user was deleted, the
-			// user's home is gone and so are the keys
-			//
-			// So there is nothing to do, just ignore.
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteFileKey($path, $keyId, $encryptionModuleId) {
-		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteAllFileKeys($path) {
-		$keyDir = $this->getFileKeyDir('', $path);
-		return !$this->view->file_exists($keyDir) || $this->view->deleteAll($keyDir);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteSystemUserKey($keyId, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
-		return !$this->view->file_exists($path) || $this->view->unlink($path);
-	}
-
-	/**
-	 * construct path to users key
-	 *
-	 * @param string $encryptionModuleId
-	 * @param string $keyId
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
-
-		if ($uid === null) {
-			$path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
-		} else {
-			$path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
-				. $encryptionModuleId . '/' . $uid . '.' . $keyId;
-		}
-
-		return \OC\Files\Filesystem::normalizePath($path);
-	}
-
-	/**
-	 * read key from hard disk
-	 *
-	 * @param string $path to key
-	 * @return string
-	 */
-	private function getKey($path) {
-
-		$key = '';
-
-		if ($this->view->file_exists($path)) {
-			if (isset($this->keyCache[$path])) {
-				$key =  $this->keyCache[$path];
-			} else {
-				$key = $this->view->file_get_contents($path);
-				$this->keyCache[$path] = $key;
-			}
-		}
-
-		return $key;
-	}
-
-	/**
-	 * write key to disk
-	 *
-	 *
-	 * @param string $path path to key directory
-	 * @param string $key key
-	 * @return bool
-	 */
-	private function setKey($path, $key) {
-		$this->keySetPreparation(dirname($path));
-
-		$result = $this->view->file_put_contents($path, $key);
-
-		if (is_int($result) && $result > 0) {
-			$this->keyCache[$path] = $key;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * get path to key folder for a given file
-	 *
-	 * @param string $encryptionModuleId
-	 * @param string $path path to the file, relative to data/
-	 * @return string
-	 */
-	private function getFileKeyDir($encryptionModuleId, $path) {
-
-		list($owner, $filename) = $this->util->getUidAndFilename($path);
-
-		// in case of system wide mount points the keys are stored directly in the data directory
-		if ($this->util->isSystemWideMountPoint($filename, $owner)) {
-			$keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
-		} else {
-			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
-		}
-
-		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
-	}
-
-	/**
-	 * move keys if a file was renamed
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @return boolean
-	 */
-	public function renameKeys($source, $target) {
-
-		$sourcePath = $this->getPathToKeys($source);
-		$targetPath = $this->getPathToKeys($target);
-
-		if ($this->view->file_exists($sourcePath)) {
-			$this->keySetPreparation(dirname($targetPath));
-			$this->view->rename($sourcePath, $targetPath);
-
-			return true;
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * copy keys if a file was renamed
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @return boolean
-	 */
-	public function copyKeys($source, $target) {
-
-		$sourcePath = $this->getPathToKeys($source);
-		$targetPath = $this->getPathToKeys($target);
-
-		if ($this->view->file_exists($sourcePath)) {
-			$this->keySetPreparation(dirname($targetPath));
-			$this->view->copy($sourcePath, $targetPath);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * backup keys of a given encryption module
-	 *
-	 * @param string $encryptionModuleId
-	 * @param string $purpose
-	 * @param string $uid
-	 * @return bool
-	 * @since 12.0.0
-	 */
-	public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
-		$source = $uid . $this->encryption_base_dir . '/' . $encryptionModuleId;
-		$backupDir = $uid . $this->backup_base_dir;
-		if (!$this->view->file_exists($backupDir)) {
-			$this->view->mkdir($backupDir);
-		}
-
-		$backupDir = $backupDir . '/' . $purpose . '.' . $encryptionModuleId . '.' . $this->getTimestamp();
-		$this->view->mkdir($backupDir);
-
-		return $this->view->copy($source, $backupDir);
-	}
-
-	/**
-	 * get the current timestamp
-	 *
-	 * @return int
-	 */
-	protected function getTimestamp() {
-		return time();
-	}
-
-	/**
-	 * get system wide path and detect mount points
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	protected function getPathToKeys($path) {
-		list($owner, $relativePath) = $this->util->getUidAndFilename($path);
-		$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
-
-		if ($systemWideMountPoint) {
-			$systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
-		} else {
-			$systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
-		}
-
-		return  Filesystem::normalizePath($systemPath, false);
-	}
-
-	/**
-	 * Make preparations to filesystem for saving a key file
-	 *
-	 * @param string $path relative to the views root
-	 */
-	protected function keySetPreparation($path) {
-		// If the file resides within a subdirectory, create it
-		if (!$this->view->file_exists($path)) {
-			$sub_dirs = explode('/', ltrim($path, '/'));
-			$dir = '';
-			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
-				if (!$this->view->is_dir($dir)) {
-					$this->view->mkdir($dir);
-				}
-			}
-		}
-	}
+    // hidden file which indicate that the folder is a valid key storage
+    const KEY_STORAGE_MARKER = '.oc_key_storage';
+
+    /** @var View */
+    private $view;
+
+    /** @var Util */
+    private $util;
+
+    // base dir where all the file related keys are stored
+    /** @var string */
+    private $keys_base_dir;
+
+    // root of the key storage default is empty which means that we use the data folder
+    /** @var string */
+    private $root_dir;
+
+    /** @var string */
+    private $encryption_base_dir;
+
+    /** @var string */
+    private $backup_base_dir;
+
+    /** @var array */
+    private $keyCache = [];
+
+    /**
+     * @param View $view
+     * @param Util $util
+     */
+    public function __construct(View $view, Util $util) {
+        $this->view = $view;
+        $this->util = $util;
+
+        $this->encryption_base_dir = '/files_encryption';
+        $this->keys_base_dir = $this->encryption_base_dir .'/keys';
+        $this->backup_base_dir = $this->encryption_base_dir .'/backup';
+        $this->root_dir = $this->util->getKeyStorageRoot();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getUserKey($uid, $keyId, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
+        return $this->getKey($path);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFileKey($path, $keyId, $encryptionModuleId) {
+        $realFile = $this->util->stripPartialFileExtension($path);
+        $keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
+        $key = $this->getKey($keyDir . $keyId);
+
+        if ($key === '' && $realFile !== $path) {
+            // Check if the part file has keys and use them, if no normal keys
+            // exist. This is required to fix copyBetweenStorage() when we
+            // rename a .part file over storage borders.
+            $keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
+            $key = $this->getKey($keyDir . $keyId);
+        }
+
+        return $key;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSystemUserKey($keyId, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
+        return $this->getKey($path);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setUserKey($uid, $keyId, $key, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
+        return $this->setKey($path, $key);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
+        $keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
+        return $this->setKey($keyDir . $keyId, $key);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSystemUserKey($keyId, $key, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
+        return $this->setKey($path, $key);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteUserKey($uid, $keyId, $encryptionModuleId) {
+        try {
+            $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
+            return !$this->view->file_exists($path) || $this->view->unlink($path);
+        } catch (NoUserException $e) {
+            // this exception can come from initMountPoints() from setupUserMounts()
+            // for a deleted user.
+            //
+            // It means, that:
+            // - we are not running in alternative storage mode because we don't call
+            // initMountPoints() in that mode
+            // - the keys were in the user's home but since the user was deleted, the
+            // user's home is gone and so are the keys
+            //
+            // So there is nothing to do, just ignore.
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteFileKey($path, $keyId, $encryptionModuleId) {
+        $keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
+        return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteAllFileKeys($path) {
+        $keyDir = $this->getFileKeyDir('', $path);
+        return !$this->view->file_exists($keyDir) || $this->view->deleteAll($keyDir);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteSystemUserKey($keyId, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
+        return !$this->view->file_exists($path) || $this->view->unlink($path);
+    }
+
+    /**
+     * construct path to users key
+     *
+     * @param string $encryptionModuleId
+     * @param string $keyId
+     * @param string $uid
+     * @return string
+     */
+    protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
+
+        if ($uid === null) {
+            $path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
+        } else {
+            $path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
+                . $encryptionModuleId . '/' . $uid . '.' . $keyId;
+        }
+
+        return \OC\Files\Filesystem::normalizePath($path);
+    }
+
+    /**
+     * read key from hard disk
+     *
+     * @param string $path to key
+     * @return string
+     */
+    private function getKey($path) {
+
+        $key = '';
+
+        if ($this->view->file_exists($path)) {
+            if (isset($this->keyCache[$path])) {
+                $key =  $this->keyCache[$path];
+            } else {
+                $key = $this->view->file_get_contents($path);
+                $this->keyCache[$path] = $key;
+            }
+        }
+
+        return $key;
+    }
+
+    /**
+     * write key to disk
+     *
+     *
+     * @param string $path path to key directory
+     * @param string $key key
+     * @return bool
+     */
+    private function setKey($path, $key) {
+        $this->keySetPreparation(dirname($path));
+
+        $result = $this->view->file_put_contents($path, $key);
+
+        if (is_int($result) && $result > 0) {
+            $this->keyCache[$path] = $key;
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * get path to key folder for a given file
+     *
+     * @param string $encryptionModuleId
+     * @param string $path path to the file, relative to data/
+     * @return string
+     */
+    private function getFileKeyDir($encryptionModuleId, $path) {
+
+        list($owner, $filename) = $this->util->getUidAndFilename($path);
+
+        // in case of system wide mount points the keys are stored directly in the data directory
+        if ($this->util->isSystemWideMountPoint($filename, $owner)) {
+            $keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
+        } else {
+            $keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
+        }
+
+        return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
+    }
+
+    /**
+     * move keys if a file was renamed
+     *
+     * @param string $source
+     * @param string $target
+     * @return boolean
+     */
+    public function renameKeys($source, $target) {
+
+        $sourcePath = $this->getPathToKeys($source);
+        $targetPath = $this->getPathToKeys($target);
+
+        if ($this->view->file_exists($sourcePath)) {
+            $this->keySetPreparation(dirname($targetPath));
+            $this->view->rename($sourcePath, $targetPath);
+
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * copy keys if a file was renamed
+     *
+     * @param string $source
+     * @param string $target
+     * @return boolean
+     */
+    public function copyKeys($source, $target) {
+
+        $sourcePath = $this->getPathToKeys($source);
+        $targetPath = $this->getPathToKeys($target);
+
+        if ($this->view->file_exists($sourcePath)) {
+            $this->keySetPreparation(dirname($targetPath));
+            $this->view->copy($sourcePath, $targetPath);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * backup keys of a given encryption module
+     *
+     * @param string $encryptionModuleId
+     * @param string $purpose
+     * @param string $uid
+     * @return bool
+     * @since 12.0.0
+     */
+    public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
+        $source = $uid . $this->encryption_base_dir . '/' . $encryptionModuleId;
+        $backupDir = $uid . $this->backup_base_dir;
+        if (!$this->view->file_exists($backupDir)) {
+            $this->view->mkdir($backupDir);
+        }
+
+        $backupDir = $backupDir . '/' . $purpose . '.' . $encryptionModuleId . '.' . $this->getTimestamp();
+        $this->view->mkdir($backupDir);
+
+        return $this->view->copy($source, $backupDir);
+    }
+
+    /**
+     * get the current timestamp
+     *
+     * @return int
+     */
+    protected function getTimestamp() {
+        return time();
+    }
+
+    /**
+     * get system wide path and detect mount points
+     *
+     * @param string $path
+     * @return string
+     */
+    protected function getPathToKeys($path) {
+        list($owner, $relativePath) = $this->util->getUidAndFilename($path);
+        $systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
+
+        if ($systemWideMountPoint) {
+            $systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
+        } else {
+            $systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
+        }
+
+        return  Filesystem::normalizePath($systemPath, false);
+    }
+
+    /**
+     * Make preparations to filesystem for saving a key file
+     *
+     * @param string $path relative to the views root
+     */
+    protected function keySetPreparation($path) {
+        // If the file resides within a subdirectory, create it
+        if (!$this->view->file_exists($path)) {
+            $sub_dirs = explode('/', ltrim($path, '/'));
+            $dir = '';
+            foreach ($sub_dirs as $sub_dir) {
+                $dir .= '/' . $sub_dir;
+                if (!$this->view->is_dir($dir)) {
+                    $this->view->mkdir($dir);
+                }
+            }
+        }
+    }
 
 }