nextcloud / server

lib/private/Federation/CloudFederationShare.php

Indentation +298 added lines, -298 removed lines

@@ -25,328 +25,328 @@
 
 class CloudFederationShare implements ICloudFederationShare {
 
-	private $share = [
-		'shareWith' => '',
-		'shareType' => '',
-		'name' => '',
-		'resourceType' => '',
-		'description' => '',
-		'providerId' => '',
-		'owner' => '',
-		'ownerDisplayName' => '',
-		'sharedBy' => '',
-		'sharedByDisplayName' => '',
-		'protocol' => []
-	];
+    private $share = [
+        'shareWith' => '',
+        'shareType' => '',
+        'name' => '',
+        'resourceType' => '',
+        'description' => '',
+        'providerId' => '',
+        'owner' => '',
+        'ownerDisplayName' => '',
+        'sharedBy' => '',
+        'sharedByDisplayName' => '',
+        'protocol' => []
+    ];
 
-	/**
-	 * get a CloudFederationShare Object to prepare a share you want to send
-	 *
-	 * @param string $shareWith
-	 * @param string $name resource name (e.g. document.odt)
-	 * @param string $description share description (optional)
-	 * @param string $providerId resource UID on the provider side
-	 * @param string $owner provider specific UID of the user who owns the resource
-	 * @param string $ownerDisplayName display name of the user who shared the item
-	 * @param string $sharedBy provider specific UID of the user who shared the resource
-	 * @param string $sharedByDisplayName display name of the user who shared the resource
-	 * @param string $shareType ('group' or 'user' share)
-	 * @param string $resourceType ('file', 'calendar',...)
-	 * @param string $sharedSecret
-	 */
-	public function __construct($shareWith = '',
-								$name = '',
-								$description = '',
-								$providerId = '',
-								$owner = '',
-								$ownerDisplayName = '',
-								$sharedBy = '',
-								$sharedByDisplayName = '',
-								$shareType = '',
-								$resourceType = '',
-								$sharedSecret = ''
-	) {
-		$this->setShareWith($shareWith);
-		$this->setResourceName($name);
-		$this->setDescription($description);
-		$this->setProviderId($providerId);
-		$this->setOwner($owner);
-		$this->setOwnerDisplayName($ownerDisplayName);
-		$this->setSharedBy($sharedBy);
-		$this->setSharedByDisplayName($sharedByDisplayName);
-		$this->setProtocol([
-			'name' => 'webdav',
-			'options' => [
-				'sharedSecret' => $sharedSecret,
-				'permissions' => '{http://open-collaboration-services.org/ns}share-permissions'
-			]
-		]);
-		$this->setShareType($shareType);
-		$this->setResourceType($resourceType);
+    /**
+     * get a CloudFederationShare Object to prepare a share you want to send
+     *
+     * @param string $shareWith
+     * @param string $name resource name (e.g. document.odt)
+     * @param string $description share description (optional)
+     * @param string $providerId resource UID on the provider side
+     * @param string $owner provider specific UID of the user who owns the resource
+     * @param string $ownerDisplayName display name of the user who shared the item
+     * @param string $sharedBy provider specific UID of the user who shared the resource
+     * @param string $sharedByDisplayName display name of the user who shared the resource
+     * @param string $shareType ('group' or 'user' share)
+     * @param string $resourceType ('file', 'calendar',...)
+     * @param string $sharedSecret
+     */
+    public function __construct($shareWith = '',
+                                $name = '',
+                                $description = '',
+                                $providerId = '',
+                                $owner = '',
+                                $ownerDisplayName = '',
+                                $sharedBy = '',
+                                $sharedByDisplayName = '',
+                                $shareType = '',
+                                $resourceType = '',
+                                $sharedSecret = ''
+    ) {
+        $this->setShareWith($shareWith);
+        $this->setResourceName($name);
+        $this->setDescription($description);
+        $this->setProviderId($providerId);
+        $this->setOwner($owner);
+        $this->setOwnerDisplayName($ownerDisplayName);
+        $this->setSharedBy($sharedBy);
+        $this->setSharedByDisplayName($sharedByDisplayName);
+        $this->setProtocol([
+            'name' => 'webdav',
+            'options' => [
+                'sharedSecret' => $sharedSecret,
+                'permissions' => '{http://open-collaboration-services.org/ns}share-permissions'
+            ]
+        ]);
+        $this->setShareType($shareType);
+        $this->setResourceType($resourceType);
 
-	}
+    }
 
-	/**
-	 * set uid of the recipient
-	 *
-	 * @param string $user
-	 *
-	 * @since 14.0.0
-	 */
-	public function setShareWith($user) {
-		$this->share['shareWith'] = $user;
-	}
+    /**
+     * set uid of the recipient
+     *
+     * @param string $user
+     *
+     * @since 14.0.0
+     */
+    public function setShareWith($user) {
+        $this->share['shareWith'] = $user;
+    }
 
-	/**
-	 * set resource name (e.g. document.odt)
-	 *
-	 * @param string $name
-	 *
-	 * @since 14.0.0
-	 */
-	public function setResourceName($name) {
-		$this->share['name'] = $name;
-	}
+    /**
+     * set resource name (e.g. document.odt)
+     *
+     * @param string $name
+     *
+     * @since 14.0.0
+     */
+    public function setResourceName($name) {
+        $this->share['name'] = $name;
+    }
 
-	/**
-	 * set resource type (e.g. file, calendar, contact,...)
-	 *
-	 * @param string $resourceType
-	 *
-	 * @since 14.0.0
-	 */
-	public function setResourceType($resourceType) {
-		$this->share['resourceType'] = $resourceType;
-	}
+    /**
+     * set resource type (e.g. file, calendar, contact,...)
+     *
+     * @param string $resourceType
+     *
+     * @since 14.0.0
+     */
+    public function setResourceType($resourceType) {
+        $this->share['resourceType'] = $resourceType;
+    }
 
-	/**
-	 * set resource description (optional)
-	 *
-	 * @param string $description
-	 *
-	 * @since 14.0.0
-	 */
-	public function setDescription($description) {
-		$this->share['description'] = $description;
-	}
+    /**
+     * set resource description (optional)
+     *
+     * @param string $description
+     *
+     * @since 14.0.0
+     */
+    public function setDescription($description) {
+        $this->share['description'] = $description;
+    }
 
-	/**
-	 * set provider ID (e.g. file ID)
-	 *
-	 * @param string $providerId
-	 *
-	 * @since 14.0.0
-	 */
-	public function setProviderId($providerId) {
-		$this->share['providerId'] = $providerId;
-	}
+    /**
+     * set provider ID (e.g. file ID)
+     *
+     * @param string $providerId
+     *
+     * @since 14.0.0
+     */
+    public function setProviderId($providerId) {
+        $this->share['providerId'] = $providerId;
+    }
 
-	/**
-	 * set owner UID
-	 *
-	 * @param string $owner
-	 *
-	 * @since 14.0.0
-	 */
-	public function setOwner($owner) {
-		$this->share['owner'] = $owner;
-	}
+    /**
+     * set owner UID
+     *
+     * @param string $owner
+     *
+     * @since 14.0.0
+     */
+    public function setOwner($owner) {
+        $this->share['owner'] = $owner;
+    }
 
-	/**
-	 * set owner display name
-	 *
-	 * @param string $ownerDisplayName
-	 *
-	 * @since 14.0.0
-	 */
-	public function setOwnerDisplayName($ownerDisplayName) {
-		$this->share['ownerDisplayName'] = $ownerDisplayName;
-	}
+    /**
+     * set owner display name
+     *
+     * @param string $ownerDisplayName
+     *
+     * @since 14.0.0
+     */
+    public function setOwnerDisplayName($ownerDisplayName) {
+        $this->share['ownerDisplayName'] = $ownerDisplayName;
+    }
 
-	/**
-	 * set UID of the user who sends the share
-	 *
-	 * @param string $sharedBy
-	 *
-	 * @since 14.0.0
-	 */
-	public function setSharedBy($sharedBy) {
-		$this->share['sharedBy'] = $sharedBy;
-	}
+    /**
+     * set UID of the user who sends the share
+     *
+     * @param string $sharedBy
+     *
+     * @since 14.0.0
+     */
+    public function setSharedBy($sharedBy) {
+        $this->share['sharedBy'] = $sharedBy;
+    }
 
-	/**
-	 * set display name of the user who sends the share
-	 *
-	 * @param $sharedByDisplayName
-	 *
-	 * @since 14.0.0
-	 */
-	public function setSharedByDisplayName($sharedByDisplayName) {
-		$this->share['sharedByDisplayName'] = $sharedByDisplayName;
-	}
+    /**
+     * set display name of the user who sends the share
+     *
+     * @param $sharedByDisplayName
+     *
+     * @since 14.0.0
+     */
+    public function setSharedByDisplayName($sharedByDisplayName) {
+        $this->share['sharedByDisplayName'] = $sharedByDisplayName;
+    }
 
-	/**
-	 * set protocol specification
-	 *
-	 * @param array $protocol
-	 *
-	 * @since 14.0.0
-	 */
-	public function setProtocol(array $protocol) {
-		$this->share['protocol'] = $protocol;
-	}
+    /**
+     * set protocol specification
+     *
+     * @param array $protocol
+     *
+     * @since 14.0.0
+     */
+    public function setProtocol(array $protocol) {
+        $this->share['protocol'] = $protocol;
+    }
 
-	/**
-	 * share type (group or user)
-	 *
-	 * @param string $shareType
-	 *
-	 * @since 14.0.0
-	 */
-	public function setShareType($shareType) {
-		$this->share['shareType'] = $shareType;
-	}
+    /**
+     * share type (group or user)
+     *
+     * @param string $shareType
+     *
+     * @since 14.0.0
+     */
+    public function setShareType($shareType) {
+        $this->share['shareType'] = $shareType;
+    }
 
-	/**
-	 * get the whole share, ready to send out
-	 *
-	 * @return array
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShare() {
-		return $this->share;
-	}
+    /**
+     * get the whole share, ready to send out
+     *
+     * @return array
+     *
+     * @since 14.0.0
+     */
+    public function getShare() {
+        return $this->share;
+    }
 
-	/**
-	 * get uid of the recipient
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShareWith() {
-		return $this->share['shareWith'];
-	}
+    /**
+     * get uid of the recipient
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getShareWith() {
+        return $this->share['shareWith'];
+    }
 
-	/**
-	 * get resource name (e.g. file, calendar, contact,...)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getResourceName() {
-		return $this->share['name'];
-	}
+    /**
+     * get resource name (e.g. file, calendar, contact,...)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getResourceName() {
+        return $this->share['name'];
+    }
 
-	/**
-	 * get resource type (e.g. file, calendar, contact,...)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getResourceType() {
-		return $this->share['resourceType'];
-	}
+    /**
+     * get resource type (e.g. file, calendar, contact,...)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getResourceType() {
+        return $this->share['resourceType'];
+    }
 
-	/**
-	 * get resource description (optional)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getDescription() {
-		return $this->share['description'];
-	}
+    /**
+     * get resource description (optional)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getDescription() {
+        return $this->share['description'];
+    }
 
-	/**
-	 * get provider ID (e.g. file ID)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getProviderId() {
-		return $this->share['providerId'];
-	}
+    /**
+     * get provider ID (e.g. file ID)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getProviderId() {
+        return $this->share['providerId'];
+    }
 
-	/**
-	 * get owner UID
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getOwner() {
-		return $this->share['owner'];
-	}
+    /**
+     * get owner UID
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getOwner() {
+        return $this->share['owner'];
+    }
 
-	/**
-	 * get owner display name
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getOwnerDisplayName() {
-		return $this->share['ownerDisplayName'];
-	}
+    /**
+     * get owner display name
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getOwnerDisplayName() {
+        return $this->share['ownerDisplayName'];
+    }
 
-	/**
-	 * get UID of the user who sends the share
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getSharedBy() {
-		return $this->share['sharedBy'];
-	}
+    /**
+     * get UID of the user who sends the share
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getSharedBy() {
+        return $this->share['sharedBy'];
+    }
 
-	/**
-	 * get display name of the user who sends the share
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getSharedByDisplayName() {
-		return $this->share['sharedByDisplayName'];
-	}
+    /**
+     * get display name of the user who sends the share
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getSharedByDisplayName() {
+        return $this->share['sharedByDisplayName'];
+    }
 
-	/**
-	 * get share type (group or user)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShareType() {
-		return $this->share['shareType'];
-	}
+    /**
+     * get share type (group or user)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getShareType() {
+        return $this->share['shareType'];
+    }
 
-	/**
-	 * get share Secret
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShareSecret() {
-		return $this->share['protocol']['options']['sharedSecret'];
-	}
+    /**
+     * get share Secret
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getShareSecret() {
+        return $this->share['protocol']['options']['sharedSecret'];
+    }
 
-	/**
-	 * get protocol specification
-	 *
-	 * @return array
-	 *
-	 * @since 14.0.0
-	 */
-	public function getProtocol() {
-		return $this->share['protocol'];
-	}
+    /**
+     * get protocol specification
+     *
+     * @return array
+     *
+     * @since 14.0.0
+     */
+    public function getProtocol() {
+        return $this->share['protocol'];
+    }
 }

lib/private/Federation/CloudFederationFactory.php

Indentation +32 added lines, -32 removed lines

@@ -27,37 +27,37 @@
 
 class CloudFederationFactory implements ICloudFederationFactory {
 
-	/**
-	 * get a CloudFederationShare Object to prepare a share you want to send
-	 *
-	 * @param string $shareWith
-	 * @param string $name resource name (e.g. document.odt)
-	 * @param string $description share description (optional)
-	 * @param string $providerId resource UID on the provider side
-	 * @param string $owner provider specific UID of the user who owns the resource
-	 * @param string $ownerDisplayName display name of the user who shared the item
-	 * @param string $sharedBy provider specific UID of the user who shared the resource
-	 * @param string $sharedByDisplayName display name of the user who shared the resource
-	 * @param string $sharedSecret used to authenticate requests across servers
-	 * @param string $shareType ('group' or 'user' share)
-	 * @param $resourceType ('file', 'calendar',...)
-	 * @return ICloudFederationShare
-	 *
-	 * @since 14.0.0
-	 */
-	public function getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $sharedSecret, $shareType, $resourceType) {
-		return new CloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $shareType, $resourceType, $sharedSecret);
-	}
+    /**
+     * get a CloudFederationShare Object to prepare a share you want to send
+     *
+     * @param string $shareWith
+     * @param string $name resource name (e.g. document.odt)
+     * @param string $description share description (optional)
+     * @param string $providerId resource UID on the provider side
+     * @param string $owner provider specific UID of the user who owns the resource
+     * @param string $ownerDisplayName display name of the user who shared the item
+     * @param string $sharedBy provider specific UID of the user who shared the resource
+     * @param string $sharedByDisplayName display name of the user who shared the resource
+     * @param string $sharedSecret used to authenticate requests across servers
+     * @param string $shareType ('group' or 'user' share)
+     * @param $resourceType ('file', 'calendar',...)
+     * @return ICloudFederationShare
+     *
+     * @since 14.0.0
+     */
+    public function getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $sharedSecret, $shareType, $resourceType) {
+        return new CloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $shareType, $resourceType, $sharedSecret);
+    }
 
-	/**
-	 * get a Cloud FederationNotification object to prepare a notification you
-	 * want to send
-	 *
-	 * @return ICloudFederationNotification
-	 *
-	 * @since 14.0.0
-	 */
-	public function getCloudFederationNotification() {
-		return new CloudFederationNotification();
-	}
+    /**
+     * get a Cloud FederationNotification object to prepare a notification you
+     * want to send
+     *
+     * @return ICloudFederationNotification
+     *
+     * @since 14.0.0
+     */
+    public function getCloudFederationNotification() {
+        return new CloudFederationNotification();
+    }
 }

apps/cloud_federation_api/lib/Capabilities.php

Indentation +30 added lines, -30 removed lines

@@ -28,37 +28,37 @@
 
 class Capabilities implements ICapability {
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(IURLGenerator $urlGenerator) {
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(IURLGenerator $urlGenerator) {
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * Function an app uses to return the capabilities
-	 *
-	 * @return array Array containing the apps capabilities
-	 * @since 8.2.0
-	 */
-	public function getCapabilities() {
-		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
-		$capabilities = ['ocm' =>
-			[
-				'enabled' => true,
-				'apiVersion' => '1.0-proposal1',
-				'endPoint' => substr($url, 0, strrpos($url, '/')),
-				'shareTypes' => [
-					[
-						'name' => 'file',
-						'protocols' => [
-							'webdav' => '/public.php/webdav/',
-						]
-					],
-				]
-			]
-		];
+    /**
+     * Function an app uses to return the capabilities
+     *
+     * @return array Array containing the apps capabilities
+     * @since 8.2.0
+     */
+    public function getCapabilities() {
+        $url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
+        $capabilities = ['ocm' =>
+            [
+                'enabled' => true,
+                'apiVersion' => '1.0-proposal1',
+                'endPoint' => substr($url, 0, strrpos($url, '/')),
+                'shareTypes' => [
+                    [
+                        'name' => 'file',
+                        'protocols' => [
+                            'webdav' => '/public.php/webdav/',
+                        ]
+                    ],
+                ]
+            ]
+        ];
 
-		return $capabilities;
-	}
+        return $capabilities;
+    }
 }

apps/files_sharing/lib/External/Manager.php

Indentation +468 added lines, -468 removed lines

@@ -44,512 +44,512 @@
 use OCP\Share;
 
 class Manager {
-	const STORAGE = '\OCA\Files_Sharing\External\Storage';
-
-	/**
-	 * @var string
-	 */
-	private $uid;
-
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
-
-	/**
-	 * @var \OC\Files\Mount\Manager
-	 */
-	private $mountManager;
-
-	/**
-	 * @var IStorageFactory
-	 */
-	private $storageLoader;
-
-	/**
-	 * @var IClientService
-	 */
-	private $clientService;
-
-	/**
-	 * @var IManager
-	 */
-	private $notificationManager;
-
-	/**
-	 * @var IDiscoveryService
-	 */
-	private $discoveryService;
-
-	/** @var ICloudFederationProviderManager */
-	private $cloudFederationProviderManager;
-
-	/** @var ICloudFederationFactory */
-	private $cloudFederationFactory;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param \OC\Files\Mount\Manager $mountManager
-	 * @param IStorageFactory $storageLoader
-	 * @param IClientService $clientService
-	 * @param IManager $notificationManager
-	 * @param IDiscoveryService $discoveryService
-	 * @param ICloudFederationProviderManager $cloudFederationProviderManager
-	 * @param ICloudFederationFactory $cloudFederationFactory
-	 * @param string $uid
-	 */
-	public function __construct(IDBConnection $connection,
-								\OC\Files\Mount\Manager $mountManager,
-								IStorageFactory $storageLoader,
-								IClientService $clientService,
-								IManager $notificationManager,
-								IDiscoveryService $discoveryService,
-								ICloudFederationProviderManager $cloudFederationProviderManager,
-								ICloudFederationFactory $cloudFederationFactory,
-								$uid) {
-		$this->connection = $connection;
-		$this->mountManager = $mountManager;
-		$this->storageLoader = $storageLoader;
-		$this->clientService = $clientService;
-		$this->uid = $uid;
-		$this->notificationManager = $notificationManager;
-		$this->discoveryService = $discoveryService;
-		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
-		$this->cloudFederationFactory = $cloudFederationFactory;
-	}
-
-	/**
-	 * add new server-to-server share
-	 *
-	 * @param string $remote
-	 * @param string $token
-	 * @param string $password
-	 * @param string $name
-	 * @param string $owner
-	 * @param boolean $accepted
-	 * @param string $user
-	 * @param int $remoteId
-	 * @return Mount|null
-	 */
-	public function addShare($remote, $token, $password, $name, $owner, $accepted=false, $user = null, $remoteId = -1) {
-
-		$user = $user ? $user : $this->uid;
-		$accepted = $accepted ? 1 : 0;
-		$name = Filesystem::normalizePath('/' . $name);
-
-		if (!$accepted) {
-			// To avoid conflicts with the mount point generation later,
-			// we only use a temporary mount point name here. The real
-			// mount point name will be generated when accepting the share,
-			// using the original share item name.
-			$tmpMountPointName = '{{TemporaryMountPointName#' . $name . '}}';
-			$mountPoint = $tmpMountPointName;
-			$hash = md5($tmpMountPointName);
-			$data = [
-				'remote'		=> $remote,
-				'share_token'	=> $token,
-				'password'		=> $password,
-				'name'			=> $name,
-				'owner'			=> $owner,
-				'user'			=> $user,
-				'mountpoint'	=> $mountPoint,
-				'mountpoint_hash'	=> $hash,
-				'accepted'		=> $accepted,
-				'remote_id'		=> $remoteId,
-			];
-
-			$i = 1;
-			while (!$this->connection->insertIfNotExist('*PREFIX*share_external', $data, ['user', 'mountpoint_hash'])) {
-				// The external share already exists for the user
-				$data['mountpoint'] = $tmpMountPointName . '-' . $i;
-				$data['mountpoint_hash'] = md5($data['mountpoint']);
-				$i++;
-			}
-			return null;
-		}
-
-		$mountPoint = Files::buildNotExistingFileName('/', $name);
-		$mountPoint = Filesystem::normalizePath('/' . $mountPoint);
-		$hash = md5($mountPoint);
-
-		$query = $this->connection->prepare('
+    const STORAGE = '\OCA\Files_Sharing\External\Storage';
+
+    /**
+     * @var string
+     */
+    private $uid;
+
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
+
+    /**
+     * @var \OC\Files\Mount\Manager
+     */
+    private $mountManager;
+
+    /**
+     * @var IStorageFactory
+     */
+    private $storageLoader;
+
+    /**
+     * @var IClientService
+     */
+    private $clientService;
+
+    /**
+     * @var IManager
+     */
+    private $notificationManager;
+
+    /**
+     * @var IDiscoveryService
+     */
+    private $discoveryService;
+
+    /** @var ICloudFederationProviderManager */
+    private $cloudFederationProviderManager;
+
+    /** @var ICloudFederationFactory */
+    private $cloudFederationFactory;
+
+    /**
+     * @param IDBConnection $connection
+     * @param \OC\Files\Mount\Manager $mountManager
+     * @param IStorageFactory $storageLoader
+     * @param IClientService $clientService
+     * @param IManager $notificationManager
+     * @param IDiscoveryService $discoveryService
+     * @param ICloudFederationProviderManager $cloudFederationProviderManager
+     * @param ICloudFederationFactory $cloudFederationFactory
+     * @param string $uid
+     */
+    public function __construct(IDBConnection $connection,
+                                \OC\Files\Mount\Manager $mountManager,
+                                IStorageFactory $storageLoader,
+                                IClientService $clientService,
+                                IManager $notificationManager,
+                                IDiscoveryService $discoveryService,
+                                ICloudFederationProviderManager $cloudFederationProviderManager,
+                                ICloudFederationFactory $cloudFederationFactory,
+                                $uid) {
+        $this->connection = $connection;
+        $this->mountManager = $mountManager;
+        $this->storageLoader = $storageLoader;
+        $this->clientService = $clientService;
+        $this->uid = $uid;
+        $this->notificationManager = $notificationManager;
+        $this->discoveryService = $discoveryService;
+        $this->cloudFederationProviderManager = $cloudFederationProviderManager;
+        $this->cloudFederationFactory = $cloudFederationFactory;
+    }
+
+    /**
+     * add new server-to-server share
+     *
+     * @param string $remote
+     * @param string $token
+     * @param string $password
+     * @param string $name
+     * @param string $owner
+     * @param boolean $accepted
+     * @param string $user
+     * @param int $remoteId
+     * @return Mount|null
+     */
+    public function addShare($remote, $token, $password, $name, $owner, $accepted=false, $user = null, $remoteId = -1) {
+
+        $user = $user ? $user : $this->uid;
+        $accepted = $accepted ? 1 : 0;
+        $name = Filesystem::normalizePath('/' . $name);
+
+        if (!$accepted) {
+            // To avoid conflicts with the mount point generation later,
+            // we only use a temporary mount point name here. The real
+            // mount point name will be generated when accepting the share,
+            // using the original share item name.
+            $tmpMountPointName = '{{TemporaryMountPointName#' . $name . '}}';
+            $mountPoint = $tmpMountPointName;
+            $hash = md5($tmpMountPointName);
+            $data = [
+                'remote'		=> $remote,
+                'share_token'	=> $token,
+                'password'		=> $password,
+                'name'			=> $name,
+                'owner'			=> $owner,
+                'user'			=> $user,
+                'mountpoint'	=> $mountPoint,
+                'mountpoint_hash'	=> $hash,
+                'accepted'		=> $accepted,
+                'remote_id'		=> $remoteId,
+            ];
+
+            $i = 1;
+            while (!$this->connection->insertIfNotExist('*PREFIX*share_external', $data, ['user', 'mountpoint_hash'])) {
+                // The external share already exists for the user
+                $data['mountpoint'] = $tmpMountPointName . '-' . $i;
+                $data['mountpoint_hash'] = md5($data['mountpoint']);
+                $i++;
+            }
+            return null;
+        }
+
+        $mountPoint = Files::buildNotExistingFileName('/', $name);
+        $mountPoint = Filesystem::normalizePath('/' . $mountPoint);
+        $hash = md5($mountPoint);
+
+        $query = $this->connection->prepare('
 				INSERT INTO `*PREFIX*share_external`
 					(`remote`, `share_token`, `password`, `name`, `owner`, `user`, `mountpoint`, `mountpoint_hash`, `accepted`, `remote_id`)
 				VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 			');
-		$query->execute(array($remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId));
-
-		$options = array(
-			'remote'	=> $remote,
-			'token'		=> $token,
-			'password'	=> $password,
-			'mountpoint'	=> $mountPoint,
-			'owner'		=> $owner
-		);
-		return $this->mountShare($options);
-	}
-
-	/**
-	 * get share
-	 *
-	 * @param int $id share id
-	 * @return mixed share of false
-	 */
-	public function getShare($id) {
-		$getShare = $this->connection->prepare('
+        $query->execute(array($remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId));
+
+        $options = array(
+            'remote'	=> $remote,
+            'token'		=> $token,
+            'password'	=> $password,
+            'mountpoint'	=> $mountPoint,
+            'owner'		=> $owner
+        );
+        return $this->mountShare($options);
+    }
+
+    /**
+     * get share
+     *
+     * @param int $id share id
+     * @return mixed share of false
+     */
+    public function getShare($id) {
+        $getShare = $this->connection->prepare('
 			SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
 			FROM  `*PREFIX*share_external`
 			WHERE `id` = ? AND `user` = ?');
-		$result = $getShare->execute(array($id, $this->uid));
-
-		return $result ? $getShare->fetch() : false;
-	}
-
-	/**
-	 * accept server-to-server share
-	 *
-	 * @param int $id
-	 * @return bool True if the share could be accepted, false otherwise
-	 */
-	public function acceptShare($id) {
-
-		$share = $this->getShare($id);
-		$result = false;
-
-		if ($share) {
-			\OC_Util::setupFS($this->uid);
-			$shareFolder = Helper::getShareFolder();
-			$mountPoint = Files::buildNotExistingFileName($shareFolder, $share['name']);
-			$mountPoint = Filesystem::normalizePath($mountPoint);
-			$hash = md5($mountPoint);
-
-			$acceptShare = $this->connection->prepare('
+        $result = $getShare->execute(array($id, $this->uid));
+
+        return $result ? $getShare->fetch() : false;
+    }
+
+    /**
+     * accept server-to-server share
+     *
+     * @param int $id
+     * @return bool True if the share could be accepted, false otherwise
+     */
+    public function acceptShare($id) {
+
+        $share = $this->getShare($id);
+        $result = false;
+
+        if ($share) {
+            \OC_Util::setupFS($this->uid);
+            $shareFolder = Helper::getShareFolder();
+            $mountPoint = Files::buildNotExistingFileName($shareFolder, $share['name']);
+            $mountPoint = Filesystem::normalizePath($mountPoint);
+            $hash = md5($mountPoint);
+
+            $acceptShare = $this->connection->prepare('
 				UPDATE `*PREFIX*share_external`
 				SET `accepted` = ?,
 					`mountpoint` = ?,
 					`mountpoint_hash` = ?
 				WHERE `id` = ? AND `user` = ?');
-			$updated = $acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid));
-			if ($updated === true) {
-				$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
-				\OC_Hook::emit(Share::class, 'federated_share_added', ['server' => $share['remote']]);
-				$result = true;
-			}
-		}
-
-		// Make sure the user has no notification for something that does not exist anymore.
-		$this->processNotification($id);
-
-		return $result;
-	}
-
-	/**
-	 * decline server-to-server share
-	 *
-	 * @param int $id
-	 * @return bool True if the share could be declined, false otherwise
-	 */
-	public function declineShare($id) {
-
-		$share = $this->getShare($id);
-
-		if ($share) {
-			$removeShare = $this->connection->prepare('
+            $updated = $acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid));
+            if ($updated === true) {
+                $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
+                \OC_Hook::emit(Share::class, 'federated_share_added', ['server' => $share['remote']]);
+                $result = true;
+            }
+        }
+
+        // Make sure the user has no notification for something that does not exist anymore.
+        $this->processNotification($id);
+
+        return $result;
+    }
+
+    /**
+     * decline server-to-server share
+     *
+     * @param int $id
+     * @return bool True if the share could be declined, false otherwise
+     */
+    public function declineShare($id) {
+
+        $share = $this->getShare($id);
+
+        if ($share) {
+            $removeShare = $this->connection->prepare('
 				DELETE FROM `*PREFIX*share_external` WHERE `id` = ? AND `user` = ?');
-			$removeShare->execute(array($id, $this->uid));
-			$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
-
-			$this->processNotification($id);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param int $remoteShare
-	 */
-	public function processNotification($remoteShare) {
-		$filter = $this->notificationManager->createNotification();
-		$filter->setApp('files_sharing')
-			->setUser($this->uid)
-			->setObject('remote_share', (int) $remoteShare);
-		$this->notificationManager->markProcessed($filter);
-	}
-
-	/**
-	 * inform remote server whether server-to-server share was accepted/declined
-	 *
-	 * @param string $remote
-	 * @param string $token
-	 * @param int $remoteId Share id on the remote host
-	 * @param string $feedback
-	 * @return boolean
-	 */
-	private function sendFeedbackToRemote($remote, $token, $remoteId, $feedback) {
-
-		$result = $this->tryOCMEndPoint($remote, $token, $remoteId, $feedback);
-
-		if($result === true) {
-			return true;
-		}
-
-		$federationEndpoints = $this->discoveryService->discover($remote, 'FEDERATED_SHARING');
-		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
-
-		$url = rtrim($remote, '/') . $endpoint . '/' . $remoteId . '/' . $feedback . '?format=' . \OCP\Share::RESPONSE_FORMAT;
-		$fields = array('token' => $token);
-
-		$client = $this->clientService->newClient();
-
-		try {
-			$response = $client->post(
-				$url,
-				[
-					'body' => $fields,
-					'connect_timeout' => 10,
-				]
-			);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		$status = json_decode($response->getBody(), true);
-
-		return ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
-	}
-
-	/**
-	 * try send accept message to ocm end-point
-	 *
-	 * @param string $remoteDomain
-	 * @param string $token
-	 * @param $remoteId id of the share
-	 * @param string $feedback
-	 * @return bool
-	 */
-	protected function tryOCMEndPoint($remoteDomain, $token, $remoteId, $feedback) {
-		switch ($feedback) {
-			case 'accept':
-				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-				$notification->setMessage(
-					'SHARE_ACCEPTED',
-					'file',
-					$remoteId,
-					[
-						'sharedSecret' => $token,
-						'message' => 'Recipient accept the share'
-					]
-
-				);
-				return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
-			case 'decline':
-				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-				$notification->setMessage(
-					'SHARE_DECLINED',
-					'file',
-					$remoteId,
-					[
-						'sharedSecret' => $token,
-						'message' => 'Recipient declined the share'
-					]
-
-				);
-				return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
-		}
-
-		return false;
-
-	}
-
-
-	/**
-	 * remove '/user/files' from the path and trailing slashes
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	protected function stripPath($path) {
-		$prefix = '/' . $this->uid . '/files';
-		return rtrim(substr($path, strlen($prefix)), '/');
-	}
-
-	public function getMount($data) {
-		$data['manager'] = $this;
-		$mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
-		$data['mountpoint'] = $mountPoint;
-		$data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
-		return new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
-	}
-
-	/**
-	 * @param array $data
-	 * @return Mount
-	 */
-	protected function mountShare($data) {
-		$mount = $this->getMount($data);
-		$this->mountManager->addMount($mount);
-		return $mount;
-	}
-
-	/**
-	 * @return \OC\Files\Mount\Manager
-	 */
-	public function getMountManager() {
-		return $this->mountManager;
-	}
-
-	/**
-	 * @param string $source
-	 * @param string $target
-	 * @return bool
-	 */
-	public function setMountPoint($source, $target) {
-		$source = $this->stripPath($source);
-		$target = $this->stripPath($target);
-		$sourceHash = md5($source);
-		$targetHash = md5($target);
-
-		$query = $this->connection->prepare('
+            $removeShare->execute(array($id, $this->uid));
+            $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
+
+            $this->processNotification($id);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param int $remoteShare
+     */
+    public function processNotification($remoteShare) {
+        $filter = $this->notificationManager->createNotification();
+        $filter->setApp('files_sharing')
+            ->setUser($this->uid)
+            ->setObject('remote_share', (int) $remoteShare);
+        $this->notificationManager->markProcessed($filter);
+    }
+
+    /**
+     * inform remote server whether server-to-server share was accepted/declined
+     *
+     * @param string $remote
+     * @param string $token
+     * @param int $remoteId Share id on the remote host
+     * @param string $feedback
+     * @return boolean
+     */
+    private function sendFeedbackToRemote($remote, $token, $remoteId, $feedback) {
+
+        $result = $this->tryOCMEndPoint($remote, $token, $remoteId, $feedback);
+
+        if($result === true) {
+            return true;
+        }
+
+        $federationEndpoints = $this->discoveryService->discover($remote, 'FEDERATED_SHARING');
+        $endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
+
+        $url = rtrim($remote, '/') . $endpoint . '/' . $remoteId . '/' . $feedback . '?format=' . \OCP\Share::RESPONSE_FORMAT;
+        $fields = array('token' => $token);
+
+        $client = $this->clientService->newClient();
+
+        try {
+            $response = $client->post(
+                $url,
+                [
+                    'body' => $fields,
+                    'connect_timeout' => 10,
+                ]
+            );
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        $status = json_decode($response->getBody(), true);
+
+        return ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
+    }
+
+    /**
+     * try send accept message to ocm end-point
+     *
+     * @param string $remoteDomain
+     * @param string $token
+     * @param $remoteId id of the share
+     * @param string $feedback
+     * @return bool
+     */
+    protected function tryOCMEndPoint($remoteDomain, $token, $remoteId, $feedback) {
+        switch ($feedback) {
+            case 'accept':
+                $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+                $notification->setMessage(
+                    'SHARE_ACCEPTED',
+                    'file',
+                    $remoteId,
+                    [
+                        'sharedSecret' => $token,
+                        'message' => 'Recipient accept the share'
+                    ]
+
+                );
+                return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
+            case 'decline':
+                $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+                $notification->setMessage(
+                    'SHARE_DECLINED',
+                    'file',
+                    $remoteId,
+                    [
+                        'sharedSecret' => $token,
+                        'message' => 'Recipient declined the share'
+                    ]
+
+                );
+                return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
+        }
+
+        return false;
+
+    }
+
+
+    /**
+     * remove '/user/files' from the path and trailing slashes
+     *
+     * @param string $path
+     * @return string
+     */
+    protected function stripPath($path) {
+        $prefix = '/' . $this->uid . '/files';
+        return rtrim(substr($path, strlen($prefix)), '/');
+    }
+
+    public function getMount($data) {
+        $data['manager'] = $this;
+        $mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
+        $data['mountpoint'] = $mountPoint;
+        $data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
+        return new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
+    }
+
+    /**
+     * @param array $data
+     * @return Mount
+     */
+    protected function mountShare($data) {
+        $mount = $this->getMount($data);
+        $this->mountManager->addMount($mount);
+        return $mount;
+    }
+
+    /**
+     * @return \OC\Files\Mount\Manager
+     */
+    public function getMountManager() {
+        return $this->mountManager;
+    }
+
+    /**
+     * @param string $source
+     * @param string $target
+     * @return bool
+     */
+    public function setMountPoint($source, $target) {
+        $source = $this->stripPath($source);
+        $target = $this->stripPath($target);
+        $sourceHash = md5($source);
+        $targetHash = md5($target);
+
+        $query = $this->connection->prepare('
 			UPDATE `*PREFIX*share_external`
 			SET `mountpoint` = ?, `mountpoint_hash` = ?
 			WHERE `mountpoint_hash` = ?
 			AND `user` = ?
 		');
-		$result = (bool)$query->execute(array($target, $targetHash, $sourceHash, $this->uid));
+        $result = (bool)$query->execute(array($target, $targetHash, $sourceHash, $this->uid));
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function removeShare($mountPoint) {
+    public function removeShare($mountPoint) {
 
-		$mountPointObj = $this->mountManager->find($mountPoint);
-		$id = $mountPointObj->getStorage()->getCache()->getId('');
+        $mountPointObj = $this->mountManager->find($mountPoint);
+        $id = $mountPointObj->getStorage()->getCache()->getId('');
 
-		$mountPoint = $this->stripPath($mountPoint);
-		$hash = md5($mountPoint);
+        $mountPoint = $this->stripPath($mountPoint);
+        $hash = md5($mountPoint);
 
-		$getShare = $this->connection->prepare('
+        $getShare = $this->connection->prepare('
 			SELECT `remote`, `share_token`, `remote_id`
 			FROM  `*PREFIX*share_external`
 			WHERE `mountpoint_hash` = ? AND `user` = ?');
-		$result = $getShare->execute(array($hash, $this->uid));
-
-		if ($result) {
-			try {
-				$share = $getShare->fetch();
-				$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
-			} catch (\Exception $e) {
-				// if we fail to notify the remote (probably cause the remote is down)
-				// we still want the share to be gone to prevent undeletable remotes
-			}
-		}
-		$getShare->closeCursor();
-
-		$query = $this->connection->prepare('
+        $result = $getShare->execute(array($hash, $this->uid));
+
+        if ($result) {
+            try {
+                $share = $getShare->fetch();
+                $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
+            } catch (\Exception $e) {
+                // if we fail to notify the remote (probably cause the remote is down)
+                // we still want the share to be gone to prevent undeletable remotes
+            }
+        }
+        $getShare->closeCursor();
+
+        $query = $this->connection->prepare('
 			DELETE FROM `*PREFIX*share_external`
 			WHERE `mountpoint_hash` = ?
 			AND `user` = ?
 		');
-		$result = (bool)$query->execute(array($hash, $this->uid));
-
-		if($result) {
-			$this->removeReShares($id);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * remove re-shares from share table and mapping in the federated_reshares table
-	 *
-	 * @param $mountPointId
-	 */
-	protected function removeReShares($mountPointId) {
-		$selectQuery = $this->connection->getQueryBuilder();
-		$query = $this->connection->getQueryBuilder();
-		$selectQuery->select('id')->from('share')
-			->where($selectQuery->expr()->eq('file_source', $query->createNamedParameter($mountPointId)));
-		$select = $selectQuery->getSQL();
-
-
-		$query->delete('federated_reshares')
-			->where($query->expr()->in('share_id', $query->createFunction('(' . $select . ')')));
-		$query->execute();
-
-		$deleteReShares = $this->connection->getQueryBuilder();
-		$deleteReShares->delete('share')
-			->where($deleteReShares->expr()->eq('file_source', $deleteReShares->createNamedParameter($mountPointId)));
-		$deleteReShares->execute();
-	}
-
-	/**
-	 * remove all shares for user $uid if the user was deleted
-	 *
-	 * @param string $uid
-	 * @return bool
-	 */
-	public function removeUserShares($uid) {
-		$getShare = $this->connection->prepare('
+        $result = (bool)$query->execute(array($hash, $this->uid));
+
+        if($result) {
+            $this->removeReShares($id);
+        }
+
+        return $result;
+    }
+
+    /**
+     * remove re-shares from share table and mapping in the federated_reshares table
+     *
+     * @param $mountPointId
+     */
+    protected function removeReShares($mountPointId) {
+        $selectQuery = $this->connection->getQueryBuilder();
+        $query = $this->connection->getQueryBuilder();
+        $selectQuery->select('id')->from('share')
+            ->where($selectQuery->expr()->eq('file_source', $query->createNamedParameter($mountPointId)));
+        $select = $selectQuery->getSQL();
+
+
+        $query->delete('federated_reshares')
+            ->where($query->expr()->in('share_id', $query->createFunction('(' . $select . ')')));
+        $query->execute();
+
+        $deleteReShares = $this->connection->getQueryBuilder();
+        $deleteReShares->delete('share')
+            ->where($deleteReShares->expr()->eq('file_source', $deleteReShares->createNamedParameter($mountPointId)));
+        $deleteReShares->execute();
+    }
+
+    /**
+     * remove all shares for user $uid if the user was deleted
+     *
+     * @param string $uid
+     * @return bool
+     */
+    public function removeUserShares($uid) {
+        $getShare = $this->connection->prepare('
 			SELECT `remote`, `share_token`, `remote_id`
 			FROM  `*PREFIX*share_external`
 			WHERE `user` = ?');
-		$result = $getShare->execute(array($uid));
+        $result = $getShare->execute(array($uid));
 
-		if ($result) {
-			$shares = $getShare->fetchAll();
-			foreach($shares as $share) {
-				$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
-			}
-		}
+        if ($result) {
+            $shares = $getShare->fetchAll();
+            foreach($shares as $share) {
+                $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
+            }
+        }
 
-		$query = $this->connection->prepare('
+        $query = $this->connection->prepare('
 			DELETE FROM `*PREFIX*share_external`
 			WHERE `user` = ?
 		');
-		return (bool)$query->execute(array($uid));
-	}
-
-	/**
-	 * return a list of shares which are not yet accepted by the user
-	 *
-	 * @return array list of open server-to-server shares
-	 */
-	public function getOpenShares() {
-		return $this->getShares(false);
-	}
-
-	/**
-	 * return a list of shares which are accepted by the user
-	 *
-	 * @return array list of accepted server-to-server shares
-	 */
-	public function getAcceptedShares() {
-		return $this->getShares(true);
-	}
-
-	/**
-	 * return a list of shares for the user
-	 *
-	 * @param bool|null $accepted True for accepted only,
-	 *                            false for not accepted,
-	 *                            null for all shares of the user
-	 * @return array list of open server-to-server shares
-	 */
-	private function getShares($accepted) {
-		$query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
+        return (bool)$query->execute(array($uid));
+    }
+
+    /**
+     * return a list of shares which are not yet accepted by the user
+     *
+     * @return array list of open server-to-server shares
+     */
+    public function getOpenShares() {
+        return $this->getShares(false);
+    }
+
+    /**
+     * return a list of shares which are accepted by the user
+     *
+     * @return array list of accepted server-to-server shares
+     */
+    public function getAcceptedShares() {
+        return $this->getShares(true);
+    }
+
+    /**
+     * return a list of shares for the user
+     *
+     * @param bool|null $accepted True for accepted only,
+     *                            false for not accepted,
+     *                            null for all shares of the user
+     * @return array list of open server-to-server shares
+     */
+    private function getShares($accepted) {
+        $query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
 		          FROM `*PREFIX*share_external` 
 				  WHERE `user` = ?';
-		$parameters = [$this->uid];
-		if (!is_null($accepted)) {
-			$query .= ' AND `accepted` = ?';
-			$parameters[] = (int) $accepted;
-		}
-		$query .= ' ORDER BY `id` ASC';
-
-		$shares = $this->connection->prepare($query);
-		$result = $shares->execute($parameters);
-
-		return $result ? $shares->fetchAll() : [];
-	}
+        $parameters = [$this->uid];
+        if (!is_null($accepted)) {
+            $query .= ' AND `accepted` = ?';
+            $parameters[] = (int) $accepted;
+        }
+        $query .= ' ORDER BY `id` ASC';
+
+        $shares = $this->connection->prepare($query);
+        $result = $shares->execute($parameters);
+
+        return $result ? $shares->fetchAll() : [];
+    }
 }

lib/public/Federation/ICloudFederationProviderManager.php

Indentation +64 added lines, -64 removed lines

@@ -32,76 +32,76 @@
  */
 interface ICloudFederationProviderManager {
 
-	/**
-	 * Registers an callback function which must return an cloud federation provider
-	 *
-	 * @param string $shareType which share type does the provider handles
-	 * @param string $displayName user facing name of the federated share provider
-	 * @param callable $callback
-	 * @throws Exceptions\ProviderAlreadyExistsException
-	 *
-	 * @since 14.0.0
-	 */
-	public function addCloudFederationProvider($shareType, $displayName, callable $callback);
+    /**
+     * Registers an callback function which must return an cloud federation provider
+     *
+     * @param string $shareType which share type does the provider handles
+     * @param string $displayName user facing name of the federated share provider
+     * @param callable $callback
+     * @throws Exceptions\ProviderAlreadyExistsException
+     *
+     * @since 14.0.0
+     */
+    public function addCloudFederationProvider($shareType, $displayName, callable $callback);
 
-	/**
-	 * remove cloud federation provider
-	 *
-	 * @param string $shareType
-	 *
-	 * @since 14.0.0
-	 */
-	public function removeCloudFederationProvider($shareType);
+    /**
+     * remove cloud federation provider
+     *
+     * @param string $shareType
+     *
+     * @since 14.0.0
+     */
+    public function removeCloudFederationProvider($shareType);
 
-	/**
-	 * get a list of all cloudFederationProviders
-	 *
-	 * @return array [id => ['id' => $id, 'displayName' => $displayName, 'callback' => callback]]
-	 *
-	 * @since 14.0.0
-	 */
-	public function getAllCloudFederationProviders();
+    /**
+     * get a list of all cloudFederationProviders
+     *
+     * @return array [id => ['id' => $id, 'displayName' => $displayName, 'callback' => callback]]
+     *
+     * @since 14.0.0
+     */
+    public function getAllCloudFederationProviders();
 
-	/**
-	 * get a specific cloud federation provider
-	 *
-	 * @param string $shareType
-	 * @return ICloudFederationProvider
-	 * @throws Exceptions\ProviderDoesNotExistsException;
-	 *
-	 * @since 14.0.0
-	 */
-	public function getCloudFederationProvider($shareType);
+    /**
+     * get a specific cloud federation provider
+     *
+     * @param string $shareType
+     * @return ICloudFederationProvider
+     * @throws Exceptions\ProviderDoesNotExistsException;
+     *
+     * @since 14.0.0
+     */
+    public function getCloudFederationProvider($shareType);
 
-	/**
-	 * send federated share
-	 *
-	 * @param ICloudFederationShare $share
-	 * @return bool
-	 *
-	 * @since 14.0.0
-	 */
-	public function sendShare(ICloudFederationShare $share);
+    /**
+     * send federated share
+     *
+     * @param ICloudFederationShare $share
+     * @return bool
+     *
+     * @since 14.0.0
+     */
+    public function sendShare(ICloudFederationShare $share);
 
-	/**
-	 * send notification about existing share
-	 *
-	 * @param string $url
-	 * @param ICloudFederationNotification $notification
-	 * @return mixed
-	 *
-	 * @since 14.0.0
-	 */
-	public function sendNotification($url, ICloudFederationNotification $notification);
+    /**
+     * send notification about existing share
+     *
+     * @param string $url
+     * @param ICloudFederationNotification $notification
+     * @return mixed
+     *
+     * @since 14.0.0
+     */
+    public function sendNotification($url, ICloudFederationNotification $notification);
 
-	/**
-	 * check if the new cloud federation API is ready to be used
-	 *
-	 * @return bool
-	 *
-	 * @since 14.0.0
-	 */
-	public function isReady();
+    /**
+     * check if the new cloud federation API is ready to be used
+     *
+     * @return bool
+     *
+     * @since 14.0.0
+     */
+    public function isReady();
 
 
 }

apps/federatedfilesharing/lib/AppInfo/Application.php

Indentation +102 added lines, -102 removed lines

@@ -39,114 +39,114 @@
 
 class Application extends App {
 
-	/** @var FederatedShareProvider */
-	protected $federatedShareProvider;
+    /** @var FederatedShareProvider */
+    protected $federatedShareProvider;
 
-	public function __construct() {
-		parent::__construct('federatedfilesharing');
+    public function __construct() {
+        parent::__construct('federatedfilesharing');
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		$cloudFederationManager = $server->getCloudFederationProviderManager();
-		$cloudFederationManager->addCloudFederationProvider('file',
-			'Federated Files Sharing',
-			function() use ($container) {
-				$server = $container->getServer();
-				return new CloudFederationProviderFiles(
-					$server->getAppManager(),
-					$server->query(FederatedShareProvider::class),
-					$server->query(AddressHandler::class),
-					$server->getLogger(),
-					$server->getUserManager(),
-					$server->getCloudIdManager(),
-					$server->getActivityManager(),
-					$server->getNotificationManager(),
-					$server->getURLGenerator(),
-					$server->getCloudFederationFactory(),
-					$server->getCloudFederationProviderManager(),
-					$server->getDatabaseConnection()
-				);
-			});
+        $cloudFederationManager = $server->getCloudFederationProviderManager();
+        $cloudFederationManager->addCloudFederationProvider('file',
+            'Federated Files Sharing',
+            function() use ($container) {
+                $server = $container->getServer();
+                return new CloudFederationProviderFiles(
+                    $server->getAppManager(),
+                    $server->query(FederatedShareProvider::class),
+                    $server->query(AddressHandler::class),
+                    $server->getLogger(),
+                    $server->getUserManager(),
+                    $server->getCloudIdManager(),
+                    $server->getActivityManager(),
+                    $server->getNotificationManager(),
+                    $server->getURLGenerator(),
+                    $server->getCloudFederationFactory(),
+                    $server->getCloudFederationProviderManager(),
+                    $server->getDatabaseConnection()
+                );
+            });
 
-		$container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
-			$addressHandler = new AddressHandler(
-				$server->getURLGenerator(),
-				$server->getL10N('federatedfilesharing'),
-				$server->getCloudIdManager()
-			);
-			$notification = new Notifications(
-				$addressHandler,
-				$server->getHTTPClientService(),
-				$server->query(\OCP\OCS\IDiscoveryService::class),
-				\OC::$server->getJobList(),
-				\OC::$server->getCloudFederationProviderManager(),
-				\OC::$server->getCloudFederationFactory()
-			);
-			return new RequestHandlerController(
-				$c->query('AppName'),
-				$server->getRequest(),
-				$this->getFederatedShareProvider(),
-				$server->getDatabaseConnection(),
-				$server->getShareManager(),
-				$notification,
-				$addressHandler,
-				$server->getUserManager(),
-				$server->getCloudIdManager(),
-				$server->getLogger(),
-				$server->getCloudFederationFactory(),
-				$server->getCloudFederationProviderManager()
-			);
-		});
-	}
+        $container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
+            $addressHandler = new AddressHandler(
+                $server->getURLGenerator(),
+                $server->getL10N('federatedfilesharing'),
+                $server->getCloudIdManager()
+            );
+            $notification = new Notifications(
+                $addressHandler,
+                $server->getHTTPClientService(),
+                $server->query(\OCP\OCS\IDiscoveryService::class),
+                \OC::$server->getJobList(),
+                \OC::$server->getCloudFederationProviderManager(),
+                \OC::$server->getCloudFederationFactory()
+            );
+            return new RequestHandlerController(
+                $c->query('AppName'),
+                $server->getRequest(),
+                $this->getFederatedShareProvider(),
+                $server->getDatabaseConnection(),
+                $server->getShareManager(),
+                $notification,
+                $addressHandler,
+                $server->getUserManager(),
+                $server->getCloudIdManager(),
+                $server->getLogger(),
+                $server->getCloudFederationFactory(),
+                $server->getCloudFederationProviderManager()
+            );
+        });
+    }
 
-	/**
-	 * get instance of federated share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	public function getFederatedShareProvider() {
-		if ($this->federatedShareProvider === null) {
-			$this->initFederatedShareProvider();
-		}
-		return $this->federatedShareProvider;
-	}
+    /**
+     * get instance of federated share provider
+     *
+     * @return FederatedShareProvider
+     */
+    public function getFederatedShareProvider() {
+        if ($this->federatedShareProvider === null) {
+            $this->initFederatedShareProvider();
+        }
+        return $this->federatedShareProvider;
+    }
 
-	/**
-	 * initialize federated share provider
-	 */
-	protected function initFederatedShareProvider() {
-		$c = $this->getContainer();
-		$addressHandler = new \OCA\FederatedFileSharing\AddressHandler(
-			\OC::$server->getURLGenerator(),
-			\OC::$server->getL10N('federatedfilesharing'),
-			\OC::$server->getCloudIdManager()
-		);
-		$notifications = new \OCA\FederatedFileSharing\Notifications(
-			$addressHandler,
-			\OC::$server->getHTTPClientService(),
-			\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
-			\OC::$server->getJobList(),
-			\OC::$server->getCloudFederationProviderManager(),
-			\OC::$server->getCloudFederationFactory()
-		);
-		$tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
-			\OC::$server->getSecureRandom()
-		);
+    /**
+     * initialize federated share provider
+     */
+    protected function initFederatedShareProvider() {
+        $c = $this->getContainer();
+        $addressHandler = new \OCA\FederatedFileSharing\AddressHandler(
+            \OC::$server->getURLGenerator(),
+            \OC::$server->getL10N('federatedfilesharing'),
+            \OC::$server->getCloudIdManager()
+        );
+        $notifications = new \OCA\FederatedFileSharing\Notifications(
+            $addressHandler,
+            \OC::$server->getHTTPClientService(),
+            \OC::$server->query(\OCP\OCS\IDiscoveryService::class),
+            \OC::$server->getJobList(),
+            \OC::$server->getCloudFederationProviderManager(),
+            \OC::$server->getCloudFederationFactory()
+        );
+        $tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
+            \OC::$server->getSecureRandom()
+        );
 
-		$this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider(
-			\OC::$server->getDatabaseConnection(),
-			$addressHandler,
-			$notifications,
-			$tokenHandler,
-			\OC::$server->getL10N('federatedfilesharing'),
-			\OC::$server->getLogger(),
-			\OC::$server->getLazyRootFolder(),
-			\OC::$server->getConfig(),
-			\OC::$server->getUserManager(),
-			\OC::$server->getCloudIdManager(),
-			$c->query(IConfig::class)
-		);
-	}
+        $this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider(
+            \OC::$server->getDatabaseConnection(),
+            $addressHandler,
+            $notifications,
+            $tokenHandler,
+            \OC::$server->getL10N('federatedfilesharing'),
+            \OC::$server->getLogger(),
+            \OC::$server->getLazyRootFolder(),
+            \OC::$server->getConfig(),
+            \OC::$server->getUserManager(),
+            \OC::$server->getCloudIdManager(),
+            $c->query(IConfig::class)
+        );
+    }
 
 }

apps/federatedfilesharing/lib/Notifications.php

Indentation +430 added lines, -430 removed lines

@@ -33,434 +33,434 @@
 use OCP\OCS\IDiscoveryService;
 
 class Notifications {
-	const RESPONSE_FORMAT = 'json'; // default response format for ocs calls
-
-	/** @var AddressHandler */
-	private $addressHandler;
-
-	/** @var IClientService */
-	private $httpClientService;
-
-	/** @var IDiscoveryService */
-	private $discoveryService;
-
-	/** @var IJobList  */
-	private $jobList;
-
-	/** @var ICloudFederationProviderManager */
-	private $federationProviderManager;
-
-	/** @var ICloudFederationFactory */
-	private $cloudFederationFactory;
-
-	/**
-	 * @param AddressHandler $addressHandler
-	 * @param IClientService $httpClientService
-	 * @param IDiscoveryService $discoveryService
-	 * @param IJobList $jobList
-	 * @param ICloudFederationProviderManager $federationProviderManager
-	 * @param ICloudFederationFactory $cloudFederationFactory
-	 */
-	public function __construct(
-		AddressHandler $addressHandler,
-		IClientService $httpClientService,
-		IDiscoveryService $discoveryService,
-		IJobList $jobList,
-		ICloudFederationProviderManager $federationProviderManager,
-		ICloudFederationFactory $cloudFederationFactory
-	) {
-		$this->addressHandler = $addressHandler;
-		$this->httpClientService = $httpClientService;
-		$this->discoveryService = $discoveryService;
-		$this->jobList = $jobList;
-		$this->federationProviderManager = $federationProviderManager;
-		$this->cloudFederationFactory = $cloudFederationFactory;
-	}
-
-	/**
-	 * send server-to-server share to remote server
-	 *
-	 * @param string $token
-	 * @param string $shareWith
-	 * @param string $name
-	 * @param int $remote_id
-	 * @param string $owner
-	 * @param string $ownerFederatedId
-	 * @param string $sharedBy
-	 * @param string $sharedByFederatedId
-	 * @return bool
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	public function sendRemoteShare($token, $shareWith, $name, $remote_id, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId) {
-
-		list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
-
-		if ($user && $remote) {
-			$local = $this->addressHandler->generateRemoteURL();
-
-			$fields = array(
-				'shareWith' => $user,
-				'token' => $token,
-				'name' => $name,
-				'remoteId' => $remote_id,
-				'owner' => $owner,
-				'ownerFederatedId' => $ownerFederatedId,
-				'sharedBy' => $sharedBy,
-				'sharedByFederatedId' => $sharedByFederatedId,
-				'remote' => $local,
-			);
-
-			$result = $this->tryHttpPostToShareEndpoint($remote, '', $fields);
-			$status = json_decode($result['result'], true);
-
-			$ocsStatus = isset($status['ocs']);
-			$ocsSuccess = $ocsStatus && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
-
-			if ($result['success'] && (!$ocsStatus ||$ocsSuccess)) {
-				\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
-				return true;
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * ask owner to re-share the file with the given user
-	 *
-	 * @param string $token
-	 * @param int $id remote Id
-	 * @param int $shareId internal share Id
-	 * @param string $remote remote address of the owner
-	 * @param string $shareWith
-	 * @param int $permission
-	 * @param string $filename
-	 * @return bool
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	public function requestReShare($token, $id, $shareId, $remote, $shareWith, $permission, $filename) {
-
-		$fields = array(
-			'shareWith' => $shareWith,
-			'token' => $token,
-			'permission' => $permission,
-			'remoteId' => $shareId,
-		);
-
-		$ocmFields = $fields;
-		$ocmFields['remoteId'] = $id;
-		$ocmFields['localId'] = $shareId;
-		$ocmFields['name'] = $filename;
-
-		$ocmResult = $this->tryOCMEndPoint($remote, $ocmFields, 'reshare');
-		if (is_array($ocmResult) && isset($ocmResult['token']) && isset($ocmResult['providerId'])) {
-			return [$ocmResult['token'], $ocmResult['providerId']];
-		}
-
-		$result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
-		$status = json_decode($result['result'], true);
-
-		$httpRequestSuccessful = $result['success'];
-		$ocsCallSuccessful = $status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200;
-		$validToken = isset($status['ocs']['data']['token']) && is_string($status['ocs']['data']['token']);
-		$validRemoteId = isset($status['ocs']['data']['remoteId']);
-
-		if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
-			return [
-				$status['ocs']['data']['token'],
-				(int)$status['ocs']['data']['remoteId']
-			];
-		}
-
-		return false;
-	}
-
-	/**
-	 * send server-to-server unshare to remote server
-	 *
-	 * @param string $remote url
-	 * @param int $id share id
-	 * @param string $token
-	 * @return bool
-	 */
-	public function sendRemoteUnShare($remote, $id, $token) {
-		$this->sendUpdateToRemote($remote, $id, $token, 'unshare');
-	}
-
-	/**
-	 * send server-to-server unshare to remote server
-	 *
-	 * @param string $remote url
-	 * @param int $id share id
-	 * @param string $token
-	 * @return bool
-	 */
-	public function sendRevokeShare($remote, $id, $token) {
-		$this->sendUpdateToRemote($remote, $id, $token, 'reshare_undo');
-	}
-
-	/**
-	 * send notification to remote server if the permissions was changed
-	 *
-	 * @param string $remote
-	 * @param int $remoteId
-	 * @param string $token
-	 * @param int $permissions
-	 * @return bool
-	 */
-	public function sendPermissionChange($remote, $remoteId, $token, $permissions) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
-	}
-
-	/**
-	 * forward accept reShare to remote server
-	 *
-	 * @param string $remote
-	 * @param int $remoteId
-	 * @param string $token
-	 */
-	public function sendAcceptShare($remote, $remoteId, $token) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'accept');
-	}
-
-	/**
-	 * forward decline reShare to remote server
-	 *
-	 * @param string $remote
-	 * @param int $remoteId
-	 * @param string $token
-	 */
-	public function sendDeclineShare($remote, $remoteId, $token) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'decline');
-	}
-
-	/**
-	 * inform remote server whether server-to-server share was accepted/declined
-	 *
-	 * @param string $remote
-	 * @param string $token
-	 * @param int $remoteId Share id on the remote host
-	 * @param string $action possible actions: accept, decline, unshare, revoke, permissions
-	 * @param array $data
-	 * @param int $try
-	 * @return boolean
-	 */
-	public function sendUpdateToRemote($remote, $remoteId, $token, $action, $data = [], $try = 0) {
-
-		$fields = [
-			'token' => $token,
-			'remoteId' => $remoteId
-			];
-		foreach ($data as $key => $value) {
-			$fields[$key] = $value;
-		}
-
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields, $action);
-		$status = json_decode($result['result'], true);
-
-		if ($result['success'] &&
-			($status['ocs']['meta']['statuscode'] === 100 ||
-				$status['ocs']['meta']['statuscode'] === 200
-			)
-		) {
-			return true;
-		} elseif ($try === 0) {
-			// only add new job on first try
-			$this->jobList->add('OCA\FederatedFileSharing\BackgroundJob\RetryJob',
-				[
-					'remote' => $remote,
-					'remoteId' => $remoteId,
-					'token' => $token,
-					'action' => $action,
-					'data' => json_encode($data),
-					'try' => $try,
-					'lastRun' => $this->getTimestamp()
-				]
-			);
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * return current timestamp
-	 *
-	 * @return int
-	 */
-	protected function getTimestamp() {
-		return time();
-	}
-
-	/**
-	 * try http post with the given protocol, if no protocol is given we pick
-	 * the secure one (https)
-	 *
-	 * @param string $remoteDomain
-	 * @param string $urlSuffix
-	 * @param array $fields post parameters
-	 * @param string $action define the action (possible values: share, reshare, accept, decline, unshare, revoke, permissions)
-	 * @return array
-	 * @throws \Exception
-	 */
-	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action="share") {
-
-		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
-			$remoteDomain = 'https://' . $remoteDomain;
-		}
-
-		$result = [
-			'success' => false,
-			'result' => '',
-		];
-
-		// if possible we use the new OCM API
-		$ocmResult = $this->tryOCMEndPoint($remoteDomain, $fields, $action);
-		if (is_array($ocmResult)) {
-			$result['success'] = true;
-			$result['result'] = json_encode([
-				'ocs' => ['meta' => ['statuscode' => 200]]]);
-			return $result;
-		}
-
-		return $this->tryLegacyEndPoint($remoteDomain, $urlSuffix, $fields);
-	}
-
-	/**
-	 * try old federated sharing API if the OCM api doesn't work
-	 *
-	 * @param $remoteDomain
-	 * @param $urlSuffix
-	 * @param array $fields
-	 * @return mixed
-	 * @throws \Exception
-	 */
-	protected function tryLegacyEndPoint($remoteDomain, $urlSuffix, array $fields) {
-
-		$result = [
-			'success' => false,
-			'result' => '',
-		];
-
-		// Fall back to old API
-		$client = $this->httpClientService->newClient();
-		$federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
-		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
-		try {
-			$response = $client->post($remoteDomain . $endpoint . $urlSuffix . '?format=' . self::RESPONSE_FORMAT, [
-				'body' => $fields,
-				'timeout' => 10,
-				'connect_timeout' => 10,
-			]);
-			$result['result'] = $response->getBody();
-			$result['success'] = true;
-		} catch (\Exception $e) {
-			// if flat re-sharing is not supported by the remote server
-			// we re-throw the exception and fall back to the old behaviour.
-			// (flat re-shares has been introduced in Nextcloud 9.1)
-			if ($e->getCode() === Http::STATUS_INTERNAL_SERVER_ERROR) {
-				throw $e;
-			}
-		}
-
-		return $result;
-
-	}
-
-	/**
-	 * check if server supports the new OCM api and ask for the correct end-point
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function getOCMEndPoint($url) {
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get($url, ['timeout' => 10, 'connect_timeout' => 10]);
-		} catch (\Exception $e) {
-			return '';
-		}
-
-		$result = $response->getBody();
-		$result = json_decode($result, true);
-
-		if (isset($result['end-point'])) {
-			return $result['end-point'];
-		}
-
-		return '';
-	}
-
-	/**
-	 * send action regarding federated sharing to the remote server using the OCM API
-	 *
-	 * @param $remoteDomain
-	 * @param $fields
-	 * @param $action
-	 *
-	 * @return bool
-	 */
-	protected function tryOCMEndPoint($remoteDomain, $fields, $action) {
-		switch ($action) {
-			case 'share':
-				$share = $this->cloudFederationFactory->getCloudFederationShare(
-					$fields['shareWith'] . '@' . $remoteDomain,
-					$fields['name'],
-					'',
-					$fields['remoteId'],
-					$fields['ownerFederatedId'],
-					$fields['owner'],
-					$fields['sharedByFederatedId'],
-					$fields['sharedBy'],
-					$fields['token'],
-					'user',
-					'file'
-				);
-				return $this->federationProviderManager->sendShare($share);
-			case 'reshare':
-				// ask owner to reshare a file
-				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-				$notification->setMessage('REQUEST_RESHARE',
-					'file',
-					$fields['remoteId'],
-					[
-						'sharedSecret' => $fields['token'],
-						'shareWith' => $fields['shareWith'],
-						'senderId' => $fields['localId'],
-						'message' => 'Ask owner to reshare the file'
-					]
-				);
-				return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
-			case 'unshare':
-				//owner unshares the file from the recipient again
-				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-				$notification->setMessage('SHARE_UNSHARED',
-					'file',
-					$fields['remoteId'],
-					[
-						'sharedSecret' => $fields['token'],
-						'messgage' => 'file is no longer shared with you'
-					]
-				);
-				return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
-			case 'reshare_undo':
-				// if a reshare was unshared we send the information to the initiator/owner
-				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-				$notification->setMessage('RESHARE_UNDO',
-					'file',
-					$fields['remoteId'],
-					[
-						'sharedSecret' => $fields['token'],
-						'message' => 'reshare was revoked'
-					]
-				);
-				return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
-		}
-
-		return false;
-
-	}
+    const RESPONSE_FORMAT = 'json'; // default response format for ocs calls
+
+    /** @var AddressHandler */
+    private $addressHandler;
+
+    /** @var IClientService */
+    private $httpClientService;
+
+    /** @var IDiscoveryService */
+    private $discoveryService;
+
+    /** @var IJobList  */
+    private $jobList;
+
+    /** @var ICloudFederationProviderManager */
+    private $federationProviderManager;
+
+    /** @var ICloudFederationFactory */
+    private $cloudFederationFactory;
+
+    /**
+     * @param AddressHandler $addressHandler
+     * @param IClientService $httpClientService
+     * @param IDiscoveryService $discoveryService
+     * @param IJobList $jobList
+     * @param ICloudFederationProviderManager $federationProviderManager
+     * @param ICloudFederationFactory $cloudFederationFactory
+     */
+    public function __construct(
+        AddressHandler $addressHandler,
+        IClientService $httpClientService,
+        IDiscoveryService $discoveryService,
+        IJobList $jobList,
+        ICloudFederationProviderManager $federationProviderManager,
+        ICloudFederationFactory $cloudFederationFactory
+    ) {
+        $this->addressHandler = $addressHandler;
+        $this->httpClientService = $httpClientService;
+        $this->discoveryService = $discoveryService;
+        $this->jobList = $jobList;
+        $this->federationProviderManager = $federationProviderManager;
+        $this->cloudFederationFactory = $cloudFederationFactory;
+    }
+
+    /**
+     * send server-to-server share to remote server
+     *
+     * @param string $token
+     * @param string $shareWith
+     * @param string $name
+     * @param int $remote_id
+     * @param string $owner
+     * @param string $ownerFederatedId
+     * @param string $sharedBy
+     * @param string $sharedByFederatedId
+     * @return bool
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException
+     */
+    public function sendRemoteShare($token, $shareWith, $name, $remote_id, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId) {
+
+        list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
+
+        if ($user && $remote) {
+            $local = $this->addressHandler->generateRemoteURL();
+
+            $fields = array(
+                'shareWith' => $user,
+                'token' => $token,
+                'name' => $name,
+                'remoteId' => $remote_id,
+                'owner' => $owner,
+                'ownerFederatedId' => $ownerFederatedId,
+                'sharedBy' => $sharedBy,
+                'sharedByFederatedId' => $sharedByFederatedId,
+                'remote' => $local,
+            );
+
+            $result = $this->tryHttpPostToShareEndpoint($remote, '', $fields);
+            $status = json_decode($result['result'], true);
+
+            $ocsStatus = isset($status['ocs']);
+            $ocsSuccess = $ocsStatus && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
+
+            if ($result['success'] && (!$ocsStatus ||$ocsSuccess)) {
+                \OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * ask owner to re-share the file with the given user
+     *
+     * @param string $token
+     * @param int $id remote Id
+     * @param int $shareId internal share Id
+     * @param string $remote remote address of the owner
+     * @param string $shareWith
+     * @param int $permission
+     * @param string $filename
+     * @return bool
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException
+     */
+    public function requestReShare($token, $id, $shareId, $remote, $shareWith, $permission, $filename) {
+
+        $fields = array(
+            'shareWith' => $shareWith,
+            'token' => $token,
+            'permission' => $permission,
+            'remoteId' => $shareId,
+        );
+
+        $ocmFields = $fields;
+        $ocmFields['remoteId'] = $id;
+        $ocmFields['localId'] = $shareId;
+        $ocmFields['name'] = $filename;
+
+        $ocmResult = $this->tryOCMEndPoint($remote, $ocmFields, 'reshare');
+        if (is_array($ocmResult) && isset($ocmResult['token']) && isset($ocmResult['providerId'])) {
+            return [$ocmResult['token'], $ocmResult['providerId']];
+        }
+
+        $result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
+        $status = json_decode($result['result'], true);
+
+        $httpRequestSuccessful = $result['success'];
+        $ocsCallSuccessful = $status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200;
+        $validToken = isset($status['ocs']['data']['token']) && is_string($status['ocs']['data']['token']);
+        $validRemoteId = isset($status['ocs']['data']['remoteId']);
+
+        if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
+            return [
+                $status['ocs']['data']['token'],
+                (int)$status['ocs']['data']['remoteId']
+            ];
+        }
+
+        return false;
+    }
+
+    /**
+     * send server-to-server unshare to remote server
+     *
+     * @param string $remote url
+     * @param int $id share id
+     * @param string $token
+     * @return bool
+     */
+    public function sendRemoteUnShare($remote, $id, $token) {
+        $this->sendUpdateToRemote($remote, $id, $token, 'unshare');
+    }
+
+    /**
+     * send server-to-server unshare to remote server
+     *
+     * @param string $remote url
+     * @param int $id share id
+     * @param string $token
+     * @return bool
+     */
+    public function sendRevokeShare($remote, $id, $token) {
+        $this->sendUpdateToRemote($remote, $id, $token, 'reshare_undo');
+    }
+
+    /**
+     * send notification to remote server if the permissions was changed
+     *
+     * @param string $remote
+     * @param int $remoteId
+     * @param string $token
+     * @param int $permissions
+     * @return bool
+     */
+    public function sendPermissionChange($remote, $remoteId, $token, $permissions) {
+        $this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
+    }
+
+    /**
+     * forward accept reShare to remote server
+     *
+     * @param string $remote
+     * @param int $remoteId
+     * @param string $token
+     */
+    public function sendAcceptShare($remote, $remoteId, $token) {
+        $this->sendUpdateToRemote($remote, $remoteId, $token, 'accept');
+    }
+
+    /**
+     * forward decline reShare to remote server
+     *
+     * @param string $remote
+     * @param int $remoteId
+     * @param string $token
+     */
+    public function sendDeclineShare($remote, $remoteId, $token) {
+        $this->sendUpdateToRemote($remote, $remoteId, $token, 'decline');
+    }
+
+    /**
+     * inform remote server whether server-to-server share was accepted/declined
+     *
+     * @param string $remote
+     * @param string $token
+     * @param int $remoteId Share id on the remote host
+     * @param string $action possible actions: accept, decline, unshare, revoke, permissions
+     * @param array $data
+     * @param int $try
+     * @return boolean
+     */
+    public function sendUpdateToRemote($remote, $remoteId, $token, $action, $data = [], $try = 0) {
+
+        $fields = [
+            'token' => $token,
+            'remoteId' => $remoteId
+            ];
+        foreach ($data as $key => $value) {
+            $fields[$key] = $value;
+        }
+
+        $result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields, $action);
+        $status = json_decode($result['result'], true);
+
+        if ($result['success'] &&
+            ($status['ocs']['meta']['statuscode'] === 100 ||
+                $status['ocs']['meta']['statuscode'] === 200
+            )
+        ) {
+            return true;
+        } elseif ($try === 0) {
+            // only add new job on first try
+            $this->jobList->add('OCA\FederatedFileSharing\BackgroundJob\RetryJob',
+                [
+                    'remote' => $remote,
+                    'remoteId' => $remoteId,
+                    'token' => $token,
+                    'action' => $action,
+                    'data' => json_encode($data),
+                    'try' => $try,
+                    'lastRun' => $this->getTimestamp()
+                ]
+            );
+        }
+
+        return false;
+    }
+
+
+    /**
+     * return current timestamp
+     *
+     * @return int
+     */
+    protected function getTimestamp() {
+        return time();
+    }
+
+    /**
+     * try http post with the given protocol, if no protocol is given we pick
+     * the secure one (https)
+     *
+     * @param string $remoteDomain
+     * @param string $urlSuffix
+     * @param array $fields post parameters
+     * @param string $action define the action (possible values: share, reshare, accept, decline, unshare, revoke, permissions)
+     * @return array
+     * @throws \Exception
+     */
+    protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action="share") {
+
+        if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
+            $remoteDomain = 'https://' . $remoteDomain;
+        }
+
+        $result = [
+            'success' => false,
+            'result' => '',
+        ];
+
+        // if possible we use the new OCM API
+        $ocmResult = $this->tryOCMEndPoint($remoteDomain, $fields, $action);
+        if (is_array($ocmResult)) {
+            $result['success'] = true;
+            $result['result'] = json_encode([
+                'ocs' => ['meta' => ['statuscode' => 200]]]);
+            return $result;
+        }
+
+        return $this->tryLegacyEndPoint($remoteDomain, $urlSuffix, $fields);
+    }
+
+    /**
+     * try old federated sharing API if the OCM api doesn't work
+     *
+     * @param $remoteDomain
+     * @param $urlSuffix
+     * @param array $fields
+     * @return mixed
+     * @throws \Exception
+     */
+    protected function tryLegacyEndPoint($remoteDomain, $urlSuffix, array $fields) {
+
+        $result = [
+            'success' => false,
+            'result' => '',
+        ];
+
+        // Fall back to old API
+        $client = $this->httpClientService->newClient();
+        $federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
+        $endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
+        try {
+            $response = $client->post($remoteDomain . $endpoint . $urlSuffix . '?format=' . self::RESPONSE_FORMAT, [
+                'body' => $fields,
+                'timeout' => 10,
+                'connect_timeout' => 10,
+            ]);
+            $result['result'] = $response->getBody();
+            $result['success'] = true;
+        } catch (\Exception $e) {
+            // if flat re-sharing is not supported by the remote server
+            // we re-throw the exception and fall back to the old behaviour.
+            // (flat re-shares has been introduced in Nextcloud 9.1)
+            if ($e->getCode() === Http::STATUS_INTERNAL_SERVER_ERROR) {
+                throw $e;
+            }
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * check if server supports the new OCM api and ask for the correct end-point
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function getOCMEndPoint($url) {
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get($url, ['timeout' => 10, 'connect_timeout' => 10]);
+        } catch (\Exception $e) {
+            return '';
+        }
+
+        $result = $response->getBody();
+        $result = json_decode($result, true);
+
+        if (isset($result['end-point'])) {
+            return $result['end-point'];
+        }
+
+        return '';
+    }
+
+    /**
+     * send action regarding federated sharing to the remote server using the OCM API
+     *
+     * @param $remoteDomain
+     * @param $fields
+     * @param $action
+     *
+     * @return bool
+     */
+    protected function tryOCMEndPoint($remoteDomain, $fields, $action) {
+        switch ($action) {
+            case 'share':
+                $share = $this->cloudFederationFactory->getCloudFederationShare(
+                    $fields['shareWith'] . '@' . $remoteDomain,
+                    $fields['name'],
+                    '',
+                    $fields['remoteId'],
+                    $fields['ownerFederatedId'],
+                    $fields['owner'],
+                    $fields['sharedByFederatedId'],
+                    $fields['sharedBy'],
+                    $fields['token'],
+                    'user',
+                    'file'
+                );
+                return $this->federationProviderManager->sendShare($share);
+            case 'reshare':
+                // ask owner to reshare a file
+                $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+                $notification->setMessage('REQUEST_RESHARE',
+                    'file',
+                    $fields['remoteId'],
+                    [
+                        'sharedSecret' => $fields['token'],
+                        'shareWith' => $fields['shareWith'],
+                        'senderId' => $fields['localId'],
+                        'message' => 'Ask owner to reshare the file'
+                    ]
+                );
+                return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
+            case 'unshare':
+                //owner unshares the file from the recipient again
+                $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+                $notification->setMessage('SHARE_UNSHARED',
+                    'file',
+                    $fields['remoteId'],
+                    [
+                        'sharedSecret' => $fields['token'],
+                        'messgage' => 'file is no longer shared with you'
+                    ]
+                );
+                return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
+            case 'reshare_undo':
+                // if a reshare was unshared we send the information to the initiator/owner
+                $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+                $notification->setMessage('RESHARE_UNDO',
+                    'file',
+                    $fields['remoteId'],
+                    [
+                        'sharedSecret' => $fields['token'],
+                        'message' => 'reshare was revoked'
+                    ]
+                );
+                return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
+        }
+
+        return false;
+
+    }
 }

lib/public/Federation/ICloudFederationProvider.php

Indentation +35 added lines, -35 removed lines

@@ -39,42 +39,42 @@
 
 interface ICloudFederationProvider {
 
-	/**
-	 * get the name of the share type, handled by this provider
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShareType();
+    /**
+     * get the name of the share type, handled by this provider
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getShareType();
 
-	/**
-	 * share received from another server
-	 *
-	 * @param ICloudFederationShare $share
-	 * @return string provider specific unique ID of the share
-	 *
-	 * @throws ProviderCouldNotAddShareException
-	 *
-	 * @since 14.0.0
-	 */
-	public function shareReceived(ICloudFederationShare $share);
+    /**
+     * share received from another server
+     *
+     * @param ICloudFederationShare $share
+     * @return string provider specific unique ID of the share
+     *
+     * @throws ProviderCouldNotAddShareException
+     *
+     * @since 14.0.0
+     */
+    public function shareReceived(ICloudFederationShare $share);
 
-	/**
-	 * notification received from another server
-	 *
-	 * @param string $notificationType (e.g SHARE_ACCEPTED)
-	 * @param string $providerId share ID
-	 * @param array $notification provider specific notification
-	 * @return array $data send back to sender
-	 *
-	 * @throws ShareNotFound
-	 * @throws ActionNotSupportedException
-	 * @throws BadRequestException
-	 * @throws AuthenticationFailedException
-	 *
-	 * @since 14.0.0
-	 */
-	public function notificationReceived($notificationType, $providerId, array $notification);
+    /**
+     * notification received from another server
+     *
+     * @param string $notificationType (e.g SHARE_ACCEPTED)
+     * @param string $providerId share ID
+     * @param array $notification provider specific notification
+     * @return array $data send back to sender
+     *
+     * @throws ShareNotFound
+     * @throws ActionNotSupportedException
+     * @throws BadRequestException
+     * @throws AuthenticationFailedException
+     *
+     * @since 14.0.0
+     */
+    public function notificationReceived($notificationType, $providerId, array $notification);
 
 }

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

Indentation +202 added lines, -202 removed lines

@@ -51,232 +51,232 @@
  */
 class RequestHandlerController extends Controller {
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var ICloudFederationProviderManager */
-	private $cloudFederationProviderManager;
+    /** @var ICloudFederationProviderManager */
+    private $cloudFederationProviderManager;
 
-	/** @var Config */
-	private $config;
+    /** @var Config */
+    private $config;
 
-	/** @var ICloudFederationFactory */
-	private $factory;
+    /** @var ICloudFederationFactory */
+    private $factory;
 
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
 
-	public function __construct($appName,
-								IRequest $request,
-								ILogger $logger,
-								IUserManager $userManager,
-								IURLGenerator $urlGenerator,
-								ICloudFederationProviderManager $cloudFederationProviderManager,
-								Config $config,
-								ICloudFederationFactory $factory,
-								ICloudIdManager $cloudIdManager
-	) {
-		parent::__construct($appName, $request);
+    public function __construct($appName,
+                                IRequest $request,
+                                ILogger $logger,
+                                IUserManager $userManager,
+                                IURLGenerator $urlGenerator,
+                                ICloudFederationProviderManager $cloudFederationProviderManager,
+                                Config $config,
+                                ICloudFederationFactory $factory,
+                                ICloudIdManager $cloudIdManager
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
-		$this->config = $config;
-		$this->factory = $factory;
-		$this->cloudIdManager = $cloudIdManager;
-	}
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->cloudFederationProviderManager = $cloudFederationProviderManager;
+        $this->config = $config;
+        $this->factory = $factory;
+        $this->cloudIdManager = $cloudIdManager;
+    }
 
-	/**
-	 * add share
-	 *
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @BruteForceProtection(action=receiveFederatedShare)
-	 *
-	 * @param string $shareWith
-	 * @param string $name resource name (e.g. document.odt)
-	 * @param string $description share description (optional)
-	 * @param string $providerId resource UID on the provider side
-	 * @param string $owner provider specific UID of the user who owns the resource
-	 * @param string $ownerDisplayName display name of the user who shared the item
-	 * @param string $sharedBy provider specific UID of the user who shared the resource
-	 * @param string $sharedByDisplayName display name of the user who shared the resource
-	 * @param array $protocol (e,.g. ['name' => 'webdav', 'options' => ['username' => 'john', 'permissions' => 31]])
-	 * @param string $shareType ('group' or 'user' share)
-	 * @param $resourceType ('file', 'calendar',...)
-	 * @return Http\DataResponse|JSONResponse
-	 *
-	 * Example: curl -H "Content-Type: application/json" -X POST -d '{"shareWith":"admin1@serve1","name":"welcome server2.txt","description":"desc","providerId":"2","owner":"admin2@http://localhost/server2","ownerDisplayName":"admin2 display","shareType":"user","resourceType":"file","protocol":{"name":"webdav","options":{"sharedSecret":"secret","permissions":"webdav-property"}}}' http://localhost/server/index.php/ocm/shares
-	 */
-	public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
+    /**
+     * add share
+     *
+     * @NoCSRFRequired
+     * @PublicPage
+     * @BruteForceProtection(action=receiveFederatedShare)
+     *
+     * @param string $shareWith
+     * @param string $name resource name (e.g. document.odt)
+     * @param string $description share description (optional)
+     * @param string $providerId resource UID on the provider side
+     * @param string $owner provider specific UID of the user who owns the resource
+     * @param string $ownerDisplayName display name of the user who shared the item
+     * @param string $sharedBy provider specific UID of the user who shared the resource
+     * @param string $sharedByDisplayName display name of the user who shared the resource
+     * @param array $protocol (e,.g. ['name' => 'webdav', 'options' => ['username' => 'john', 'permissions' => 31]])
+     * @param string $shareType ('group' or 'user' share)
+     * @param $resourceType ('file', 'calendar',...)
+     * @return Http\DataResponse|JSONResponse
+     *
+     * Example: curl -H "Content-Type: application/json" -X POST -d '{"shareWith":"admin1@serve1","name":"welcome server2.txt","description":"desc","providerId":"2","owner":"admin2@http://localhost/server2","ownerDisplayName":"admin2 display","shareType":"user","resourceType":"file","protocol":{"name":"webdav","options":{"sharedSecret":"secret","permissions":"webdav-property"}}}' http://localhost/server/index.php/ocm/shares
+     */
+    public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
 
-		if (!$this->config->incomingRequestsEnabled()) {
-			return new JSONResponse(
-				['message' => 'This server doesn\'t support outgoing federated shares'],
-			Http::STATUS_NOT_IMPLEMENTED
-			);
-		}
+        if (!$this->config->incomingRequestsEnabled()) {
+            return new JSONResponse(
+                ['message' => 'This server doesn\'t support outgoing federated shares'],
+            Http::STATUS_NOT_IMPLEMENTED
+            );
+        }
 
-		// check if all required parameters are set
-		if ($shareWith === null ||
-			$name === null ||
-			$providerId === null ||
-			$owner === null ||
-			$resourceType === null ||
-			$shareType === null ||
-			!is_array($protocol) ||
-			!isset($protocol['name']) ||
-			!isset ($protocol['options']) ||
-			!is_array($protocol['options']) ||
-			!isset($protocol['options']['sharedSecret'])
-		) {
-			return new JSONResponse(
-				['message' => 'Missing arguments'],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
+        // check if all required parameters are set
+        if ($shareWith === null ||
+            $name === null ||
+            $providerId === null ||
+            $owner === null ||
+            $resourceType === null ||
+            $shareType === null ||
+            !is_array($protocol) ||
+            !isset($protocol['name']) ||
+            !isset ($protocol['options']) ||
+            !is_array($protocol['options']) ||
+            !isset($protocol['options']['sharedSecret'])
+        ) {
+            return new JSONResponse(
+                ['message' => 'Missing arguments'],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
 
-		$cloudId = $this->cloudIdManager->resolveCloudId($shareWith);
-		$shareWithLocalId = $cloudId->getUser();
-		$shareWith = $this->mapUid($shareWithLocalId);
+        $cloudId = $this->cloudIdManager->resolveCloudId($shareWith);
+        $shareWithLocalId = $cloudId->getUser();
+        $shareWith = $this->mapUid($shareWithLocalId);
 
-		if (!$this->userManager->userExists($shareWith)) {
-			return new JSONResponse(
-				['message' => 'User "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
+        if (!$this->userManager->userExists($shareWith)) {
+            return new JSONResponse(
+                ['message' => 'User "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
 
-		// if no explicit display name is given, we use the uid as display name
-		$ownerDisplayName = $ownerDisplayName === null ? $owner : $ownerDisplayName;
-		$sharedByDisplayName = $sharedByDisplayName === null ? $sharedBy : $sharedByDisplayName;
+        // if no explicit display name is given, we use the uid as display name
+        $ownerDisplayName = $ownerDisplayName === null ? $owner : $ownerDisplayName;
+        $sharedByDisplayName = $sharedByDisplayName === null ? $sharedBy : $sharedByDisplayName;
 
-		// sharedBy* parameter is optional, if nothing is set we assume that it is the same user as the owner
-		if ($sharedBy === null) {
-			$sharedBy = $owner;
-			$sharedByDisplayName = $ownerDisplayName;
-		}
+        // sharedBy* parameter is optional, if nothing is set we assume that it is the same user as the owner
+        if ($sharedBy === null) {
+            $sharedBy = $owner;
+            $sharedByDisplayName = $ownerDisplayName;
+        }
 
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
-			$share = $this->factory->getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, '', $shareType, $resourceType);
-			$share->setProtocol($protocol);
-			$id = $provider->shareReceived($share);
-		} catch (ProviderDoesNotExistsException $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				Http::STATUS_NOT_IMPLEMENTED
-			);
-		} catch (ProviderCouldNotAddShareException $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				$e->getCode()
-			);
-		} catch (\Exception $e) {
-			return new JSONResponse(
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
+            $share = $this->factory->getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, '', $shareType, $resourceType);
+            $share->setProtocol($protocol);
+            $id = $provider->shareReceived($share);
+        } catch (ProviderDoesNotExistsException $e) {
+            return new JSONResponse(
+                ['message' => $e->getMessage()],
+                Http::STATUS_NOT_IMPLEMENTED
+            );
+        } catch (ProviderCouldNotAddShareException $e) {
+            return new JSONResponse(
+                ['message' => $e->getMessage()],
+                $e->getCode()
+            );
+        } catch (\Exception $e) {
+            return new JSONResponse(
+                ['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
 
-		return new JSONResponse(
-			['id' => $id, 'createdAt' => time()],
-			Http::STATUS_CREATED);
+        return new JSONResponse(
+            ['id' => $id, 'createdAt' => time()],
+            Http::STATUS_CREATED);
 
-	}
+    }
 
-	/**
-	 * receive notification about existing share
-	 *
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @BruteForceProtection(action=receiveFederatedShareNotification)
-	 *
-	 * @param string $notificationType (notification type, e.g. SHARE_ACCEPTED)
-	 * @param string $resourceType (calendar, file, contact,...)
-	 * @param string $providerId id of the share
-	 * @param array $notification the actual payload of the notification
-	 * @return JSONResponse
-	 */
-	public function receiveNotification($notificationType, $resourceType, $providerId, array $notification) {
-		if (!$this->config->incomingRequestsEnabled()) {
-			return new JSONResponse(
-				['message' => 'This server doesn\'t support outgoing federated shares'],
-				Http::STATUS_NOT_IMPLEMENTED
-			);
-		}
+    /**
+     * receive notification about existing share
+     *
+     * @NoCSRFRequired
+     * @PublicPage
+     * @BruteForceProtection(action=receiveFederatedShareNotification)
+     *
+     * @param string $notificationType (notification type, e.g. SHARE_ACCEPTED)
+     * @param string $resourceType (calendar, file, contact,...)
+     * @param string $providerId id of the share
+     * @param array $notification the actual payload of the notification
+     * @return JSONResponse
+     */
+    public function receiveNotification($notificationType, $resourceType, $providerId, array $notification) {
+        if (!$this->config->incomingRequestsEnabled()) {
+            return new JSONResponse(
+                ['message' => 'This server doesn\'t support outgoing federated shares'],
+                Http::STATUS_NOT_IMPLEMENTED
+            );
+        }
 
-		// check if all required parameters are set
-		if ($notificationType === null ||
-			$resourceType === null ||
-			$providerId === null ||
-			!is_array($notification)
-		) {
-			return new JSONResponse(
-				['message' => 'Missing arguments'],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
+        // check if all required parameters are set
+        if ($notificationType === null ||
+            $resourceType === null ||
+            $providerId === null ||
+            !is_array($notification)
+        ) {
+            return new JSONResponse(
+                ['message' => 'Missing arguments'],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
 
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
-			$result = $provider->notificationReceived($notificationType, $providerId, $notification);
-		} catch (ProviderDoesNotExistsException $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				Http::STATUS_BAD_REQUEST
-			);
-		} catch (ShareNotFound $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				Http::STATUS_BAD_REQUEST
-			);
-		} catch (ActionNotSupportedException $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				Http::STATUS_NOT_IMPLEMENTED
-			);
-		} catch (BadRequestException $e) {
-			return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST);
-		} catch (AuthenticationFailedException $e) {
-			return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN);
-		}
-		catch (\Exception $e) {
-			return new JSONResponse(
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
+            $result = $provider->notificationReceived($notificationType, $providerId, $notification);
+        } catch (ProviderDoesNotExistsException $e) {
+            return new JSONResponse(
+                ['message' => $e->getMessage()],
+                Http::STATUS_BAD_REQUEST
+            );
+        } catch (ShareNotFound $e) {
+            return new JSONResponse(
+                ['message' => $e->getMessage()],
+                Http::STATUS_BAD_REQUEST
+            );
+        } catch (ActionNotSupportedException $e) {
+            return new JSONResponse(
+                ['message' => $e->getMessage()],
+                Http::STATUS_NOT_IMPLEMENTED
+            );
+        } catch (BadRequestException $e) {
+            return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST);
+        } catch (AuthenticationFailedException $e) {
+            return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN);
+        }
+        catch (\Exception $e) {
+            return new JSONResponse(
+                ['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
 
-		return new JSONResponse($result,Http::STATUS_CREATED);
+        return new JSONResponse($result,Http::STATUS_CREATED);
 
-	}
+    }
 
-	/**
-	 * map login name to internal LDAP UID if a LDAP backend is in use
-	 *
-	 * @param string $uid
-	 * @return string mixed
-	 */
-	private function mapUid($uid) {
-		\OC::$server->getURLGenerator()->linkToDocs('key');
-		// FIXME this should be a method in the user management instead
-		$this->logger->debug('shareWith before, ' . $uid, ['app' => $this->appName]);
-		\OCP\Util::emitHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			array('uid' => &$uid)
-		);
-		$this->logger->debug('shareWith after, ' . $uid, ['app' => $this->appName]);
+    /**
+     * map login name to internal LDAP UID if a LDAP backend is in use
+     *
+     * @param string $uid
+     * @return string mixed
+     */
+    private function mapUid($uid) {
+        \OC::$server->getURLGenerator()->linkToDocs('key');
+        // FIXME this should be a method in the user management instead
+        $this->logger->debug('shareWith before, ' . $uid, ['app' => $this->appName]);
+        \OCP\Util::emitHook(
+            '\OCA\Files_Sharing\API\Server2Server',
+            'preLoginNameUsedAsUserName',
+            array('uid' => &$uid)
+        );
+        $this->logger->debug('shareWith after, ' . $uid, ['app' => $this->appName]);
 
-		return $uid;
-	}
+        return $uid;
+    }
 
 }