nextcloud / server

lib/private/Authentication/Token/PublicKeyTokenMapper.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 		$data = $result->fetchAll();
 		$result->closeCursor();
 
-		$entities = array_map(function ($row) {
+		$entities = array_map(function($row) {
 			return PublicKeyToken::fromRow($row);
 		}, $data);
 

Indentation +154 added lines, -154 removed lines

@@ -33,158 +33,158 @@
 use OCP\IDBConnection;
 
 class PublicKeyTokenMapper extends QBMapper {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'authtoken');
-	}
-
-	/**
-	 * Invalidate (delete) a given token
-	 *
-	 * @param string $token
-	 */
-	public function invalidate(string $token) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-	}
-
-	/**
-	 * @param int $olderThan
-	 * @param int $remember
-	 */
-	public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REMEMBER) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->lt('last_activity', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-	}
-
-	/**
-	 * Get the user UID for the given token
-	 *
-	 * @throws DoesNotExistException
-	 */
-	public function getToken(string $token): PublicKeyToken {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('*')
-			->from('authtoken')
-			->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-
-		$data = $result->fetch();
-		$result->closeCursor();
-		if ($data === false) {
-			throw new DoesNotExistException('token does not exist');
-		}
-		return PublicKeyToken::fromRow($data);
-	}
-
-	/**
-	 * Get the token for $id
-	 *
-	 * @throws DoesNotExistException
-	 */
-	public function getTokenById(int $id): PublicKeyToken {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('*')
-			->from('authtoken')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
-
-		$data = $result->fetch();
-		$result->closeCursor();
-		if ($data === false) {
-			throw new DoesNotExistException('token does not exist');
-		}
-		return PublicKeyToken::fromRow($data);
-	}
-
-	/**
-	 * Get all tokens of a user
-	 *
-	 * The provider may limit the number of result rows in case of an abuse
-	 * where a high number of (session) tokens is generated
-	 *
-	 * @param string $uid
-	 * @return PublicKeyToken[]
-	 */
-	public function getTokenByUser(string $uid): array {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from('authtoken')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->setMaxResults(1000);
-		$result = $qb->execute();
-		$data = $result->fetchAll();
-		$result->closeCursor();
-
-		$entities = array_map(function ($row) {
-			return PublicKeyToken::fromRow($row);
-		}, $data);
-
-		return $entities;
-	}
-
-	public function deleteById(string $uid, int $id) {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
-	}
-
-	/**
-	 * delete all auth token which belong to a specific client if the client was deleted
-	 *
-	 * @param string $name
-	 */
-	public function deleteByName(string $name) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
-	}
-
-	public function deleteTempToken(PublicKeyToken $except) {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->delete('authtoken')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($except->getUID())))
-			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN)))
-			->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($except->getId())))
-			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
-
-		$qb->execute();
-	}
-
-	public function hasExpiredTokens(string $uid): bool {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from('authtoken')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->andWhere($qb->expr()->eq('password_invalid', $qb->createNamedParameter(true), IQueryBuilder::PARAM_BOOL))
-			->setMaxResults(1);
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetchAll();
-		$cursor->closeCursor();
-
-		return count($data) === 1;
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'authtoken');
+    }
+
+    /**
+     * Invalidate (delete) a given token
+     *
+     * @param string $token
+     */
+    public function invalidate(string $token) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+    }
+
+    /**
+     * @param int $olderThan
+     * @param int $remember
+     */
+    public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REMEMBER) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->lt('last_activity', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+    }
+
+    /**
+     * Get the user UID for the given token
+     *
+     * @throws DoesNotExistException
+     */
+    public function getToken(string $token): PublicKeyToken {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('*')
+            ->from('authtoken')
+            ->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+
+        $data = $result->fetch();
+        $result->closeCursor();
+        if ($data === false) {
+            throw new DoesNotExistException('token does not exist');
+        }
+        return PublicKeyToken::fromRow($data);
+    }
+
+    /**
+     * Get the token for $id
+     *
+     * @throws DoesNotExistException
+     */
+    public function getTokenById(int $id): PublicKeyToken {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('*')
+            ->from('authtoken')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->execute();
+
+        $data = $result->fetch();
+        $result->closeCursor();
+        if ($data === false) {
+            throw new DoesNotExistException('token does not exist');
+        }
+        return PublicKeyToken::fromRow($data);
+    }
+
+    /**
+     * Get all tokens of a user
+     *
+     * The provider may limit the number of result rows in case of an abuse
+     * where a high number of (session) tokens is generated
+     *
+     * @param string $uid
+     * @return PublicKeyToken[]
+     */
+    public function getTokenByUser(string $uid): array {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from('authtoken')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
+            ->setMaxResults(1000);
+        $result = $qb->execute();
+        $data = $result->fetchAll();
+        $result->closeCursor();
+
+        $entities = array_map(function ($row) {
+            return PublicKeyToken::fromRow($row);
+        }, $data);
+
+        return $entities;
+    }
+
+    public function deleteById(string $uid, int $id) {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
+        $qb->execute();
+    }
+
+    /**
+     * delete all auth token which belong to a specific client if the client was deleted
+     *
+     * @param string $name
+     */
+    public function deleteByName(string $name) {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete('authtoken')
+            ->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
+        $qb->execute();
+    }
+
+    public function deleteTempToken(PublicKeyToken $except) {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->delete('authtoken')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($except->getUID())))
+            ->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN)))
+            ->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($except->getId())))
+            ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
+
+        $qb->execute();
+    }
+
+    public function hasExpiredTokens(string $uid): bool {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from('authtoken')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->andWhere($qb->expr()->eq('password_invalid', $qb->createNamedParameter(true), IQueryBuilder::PARAM_BOOL))
+            ->setMaxResults(1);
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetchAll();
+        $cursor->closeCursor();
+
+        return count($data) === 1;
+    }
 }

lib/public/Federation/Exceptions/BadRequestException.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 		$l = \OC::$server->getL10N('federation');
 		$this->parameterList = $missingParameters;
 		$parameterList = implode(',', $missingParameters);
-		$message = 'Parameters missing in order to complete the request. Missing Parameters: ' . $parameterList;
+		$message = 'Parameters missing in order to complete the request. Missing Parameters: '.$parameterList;
 		$hint = $l->t('Parameters missing in order to complete the request. Missing Parameters: "%s"', [$parameterList]);
 		parent::__construct($message, $hint);
 	}

Indentation +37 added lines, -37 removed lines

@@ -33,45 +33,45 @@
  * @since 14.0.0
  */
 class BadRequestException extends HintException {
-	private $parameterList;
+    private $parameterList;
 
-	/**
-	 * BadRequestException constructor.
-	 *
-	 * @since 14.0.0
-	 *
-	 * @param array $missingParameters
-	 */
-	public function __construct(array $missingParameters) {
-		$l = \OC::$server->getL10N('federation');
-		$this->parameterList = $missingParameters;
-		$parameterList = implode(',', $missingParameters);
-		$message = 'Parameters missing in order to complete the request. Missing Parameters: ' . $parameterList;
-		$hint = $l->t('Parameters missing in order to complete the request. Missing Parameters: "%s"', [$parameterList]);
-		parent::__construct($message, $hint);
-	}
+    /**
+     * BadRequestException constructor.
+     *
+     * @since 14.0.0
+     *
+     * @param array $missingParameters
+     */
+    public function __construct(array $missingParameters) {
+        $l = \OC::$server->getL10N('federation');
+        $this->parameterList = $missingParameters;
+        $parameterList = implode(',', $missingParameters);
+        $message = 'Parameters missing in order to complete the request. Missing Parameters: ' . $parameterList;
+        $hint = $l->t('Parameters missing in order to complete the request. Missing Parameters: "%s"', [$parameterList]);
+        parent::__construct($message, $hint);
+    }
 
-	/**
-	 * get array with the return message as defined in the OCM API
-	 *
-	 * @since 14.0.0
-	 *
-	 * @return array
-	 */
-	public function getReturnMessage() {
-		$result = [
-			'message' => 'RESOURCE_NOT_FOUND',
-			'validationErrors' =>[
-			]
-		];
+    /**
+     * get array with the return message as defined in the OCM API
+     *
+     * @since 14.0.0
+     *
+     * @return array
+     */
+    public function getReturnMessage() {
+        $result = [
+            'message' => 'RESOURCE_NOT_FOUND',
+            'validationErrors' =>[
+            ]
+        ];
 
-		foreach ($this->parameterList as $missingParameter) {
-			$result['validationErrors'] = [
-				'name' => $missingParameter,
-				'message' => 'NOT_FOUND'
-			];
-		}
+        foreach ($this->parameterList as $missingParameter) {
+            $result['validationErrors'] = [
+                'name' => $missingParameter,
+                'message' => 'NOT_FOUND'
+            ];
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 }

lib/public/Migration/SimpleMigrationStep.php

Indentation +44 added lines, -44 removed lines

@@ -29,52 +29,52 @@
  * @since 13.0.0
  */
 abstract class SimpleMigrationStep implements IMigrationStep {
-	/**
-	 * Human readable name of the migration step
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function name(): string {
-		return '';
-	}
+    /**
+     * Human readable name of the migration step
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function name(): string {
+        return '';
+    }
 
-	/**
-	 * Human readable description of the migration step
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function description(): string {
-		return '';
-	}
+    /**
+     * Human readable description of the migration step
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function description(): string {
+        return '';
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		return null;
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        return null;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 }

lib/private/Files/ObjectStore/Azure.php

Spacing +3 added lines, -3 removed lines

@@ -59,9 +59,9 @@ 
 	private function getBlobClient() {
 		if (!$this->blobClient) {
 			$protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
-			$connectionString = "DefaultEndpointsProtocol=" . $protocol . ";AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
+			$connectionString = "DefaultEndpointsProtocol=".$protocol.";AccountName=".$this->accountName.";AccountKey=".$this->accountKey;
 			if ($this->endpoint) {
-				$connectionString .= ';BlobEndpoint=' . $this->endpoint;
+				$connectionString .= ';BlobEndpoint='.$this->endpoint;
 			}
 			$this->blobClient = BlobRestProxy::createBlobService($connectionString);
 
@@ -76,7 +76,7 @@ 
 	 * @return string the container or bucket name where objects are stored
 	 */
 	public function getStorageId() {
-		return 'azure::blob::' . $this->containerName;
+		return 'azure::blob::'.$this->containerName;
 	}
 
 	/**

Indentation +94 added lines, -94 removed lines

@@ -26,106 +26,106 @@
 use OCP\Files\ObjectStore\IObjectStore;
 
 class Azure implements IObjectStore {
-	/** @var string */
-	private $containerName;
-	/** @var string */
-	private $accountName;
-	/** @var string */
-	private $accountKey;
-	/** @var BlobRestProxy|null */
-	private $blobClient = null;
-	/** @var string|null */
-	private $endpoint = null;
-	/** @var bool  */
-	private $autoCreate = false;
+    /** @var string */
+    private $containerName;
+    /** @var string */
+    private $accountName;
+    /** @var string */
+    private $accountKey;
+    /** @var BlobRestProxy|null */
+    private $blobClient = null;
+    /** @var string|null */
+    private $endpoint = null;
+    /** @var bool  */
+    private $autoCreate = false;
 
-	/**
-	 * @param array $parameters
-	 */
-	public function __construct($parameters) {
-		$this->containerName = $parameters['container'];
-		$this->accountName = $parameters['account_name'];
-		$this->accountKey = $parameters['account_key'];
-		if (isset($parameters['endpoint'])) {
-			$this->endpoint = $parameters['endpoint'];
-		}
-		if (isset($parameters['autocreate'])) {
-			$this->autoCreate = $parameters['autocreate'];
-		}
-	}
+    /**
+     * @param array $parameters
+     */
+    public function __construct($parameters) {
+        $this->containerName = $parameters['container'];
+        $this->accountName = $parameters['account_name'];
+        $this->accountKey = $parameters['account_key'];
+        if (isset($parameters['endpoint'])) {
+            $this->endpoint = $parameters['endpoint'];
+        }
+        if (isset($parameters['autocreate'])) {
+            $this->autoCreate = $parameters['autocreate'];
+        }
+    }
 
-	/**
-	 * @return BlobRestProxy
-	 */
-	private function getBlobClient() {
-		if (!$this->blobClient) {
-			$protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
-			$connectionString = "DefaultEndpointsProtocol=" . $protocol . ";AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
-			if ($this->endpoint) {
-				$connectionString .= ';BlobEndpoint=' . $this->endpoint;
-			}
-			$this->blobClient = BlobRestProxy::createBlobService($connectionString);
+    /**
+     * @return BlobRestProxy
+     */
+    private function getBlobClient() {
+        if (!$this->blobClient) {
+            $protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
+            $connectionString = "DefaultEndpointsProtocol=" . $protocol . ";AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
+            if ($this->endpoint) {
+                $connectionString .= ';BlobEndpoint=' . $this->endpoint;
+            }
+            $this->blobClient = BlobRestProxy::createBlobService($connectionString);
 
-			if ($this->autoCreate) {
-				try {
-					$this->blobClient->createContainer($this->containerName);
-				} catch (ServiceException $e) {
-					if ($e->getCode() === 409) {
-						// already exists
-					} else {
-						throw $e;
-					}
-				}
-			}
-		}
-		return $this->blobClient;
-	}
+            if ($this->autoCreate) {
+                try {
+                    $this->blobClient->createContainer($this->containerName);
+                } catch (ServiceException $e) {
+                    if ($e->getCode() === 409) {
+                        // already exists
+                    } else {
+                        throw $e;
+                    }
+                }
+            }
+        }
+        return $this->blobClient;
+    }
 
-	/**
-	 * @return string the container or bucket name where objects are stored
-	 */
-	public function getStorageId() {
-		return 'azure::blob::' . $this->containerName;
-	}
+    /**
+     * @return string the container or bucket name where objects are stored
+     */
+    public function getStorageId() {
+        return 'azure::blob::' . $this->containerName;
+    }
 
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return resource stream with the read data
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	public function readObject($urn) {
-		$blob = $this->getBlobClient()->getBlob($this->containerName, $urn);
-		return $blob->getContentStream();
-	}
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return resource stream with the read data
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    public function readObject($urn) {
+        $blob = $this->getBlobClient()->getBlob($this->containerName, $urn);
+        return $blob->getContentStream();
+    }
 
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @param resource $stream stream with the data to write
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	public function writeObject($urn, $stream) {
-		$this->getBlobClient()->createBlockBlob($this->containerName, $urn, $stream);
-	}
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @param resource $stream stream with the data to write
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    public function writeObject($urn, $stream) {
+        $this->getBlobClient()->createBlockBlob($this->containerName, $urn, $stream);
+    }
 
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return void
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	public function deleteObject($urn) {
-		$this->getBlobClient()->deleteBlob($this->containerName, $urn);
-	}
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return void
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    public function deleteObject($urn) {
+        $this->getBlobClient()->deleteBlob($this->containerName, $urn);
+    }
 
-	public function objectExists($urn) {
-		try {
-			$this->getBlobClient()->getBlobMetadata($this->containerName, $urn);
-			return true;
-		} catch (ServiceException $e) {
-			if ($e->getCode() === 404) {
-				return false;
-			} else {
-				throw $e;
-			}
-		}
-	}
+    public function objectExists($urn) {
+        try {
+            $this->getBlobClient()->getBlobMetadata($this->containerName, $urn);
+            return true;
+        } catch (ServiceException $e) {
+            if ($e->getCode() === 404) {
+                return false;
+            } else {
+                throw $e;
+            }
+        }
+    }
 }

apps/federatedfilesharing/lib/Notifications.php

Spacing +8 added lines, -8 removed lines

@@ -117,7 +117,7 @@ 
 			$ocsStatus = isset($status['ocs']);
 			$ocsSuccess = $ocsStatus && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
 
-			if ($result['success'] && (!$ocsStatus ||$ocsSuccess)) {
+			if ($result['success'] && (!$ocsStatus || $ocsSuccess)) {
 				\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
 				return true;
 			}
@@ -160,7 +160,7 @@ 
 			return [$ocmResult['token'], $ocmResult['providerId']];
 		}
 
-		$result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
+		$result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/'.$id.'/reshare', $fields);
 		$status = json_decode($result['result'], true);
 
 		$httpRequestSuccessful = $result['success'];
@@ -171,7 +171,7 @@ 
 		if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
 			return [
 				$status['ocs']['data']['token'],
-				(int)$status['ocs']['data']['remoteId']
+				(int) $status['ocs']['data']['remoteId']
 			];
 		}
 
@@ -258,7 +258,7 @@ 
 			$fields[$key] = $value;
 		}
 
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields, $action);
+		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/'.$remoteId.'/'.$action, $fields, $action);
 		$status = json_decode($result['result'], true);
 
 		if ($result['success'] &&
@@ -306,10 +306,10 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action="share") {
+	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action = "share") {
 
 		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
-			$remoteDomain = 'https://' . $remoteDomain;
+			$remoteDomain = 'https://'.$remoteDomain;
 		}
 
 		$result = [
@@ -348,7 +348,7 @@ 
 		$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, [
+			$response = $client->post($remoteDomain.$endpoint.$urlSuffix.'?format='.self::RESPONSE_FORMAT, [
 				'body' => $fields,
 				'timeout' => 10,
 				'connect_timeout' => 10,
@@ -405,7 +405,7 @@ 
 		switch ($action) {
 			case 'share':
 				$share = $this->cloudFederationFactory->getCloudFederationShare(
-					$fields['shareWith'] . '@' . $remoteDomain,
+					$fields['shareWith'].'@'.$remoteDomain,
 					$fields['name'],
 					'',
 					$fields['remoteId'],

Indentation +401 added lines, -401 removed lines

@@ -33,405 +33,405 @@
 use OCP\OCS\IDiscoveryService;
 
 class Notifications {
-	public 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
-	 * @param int $shareType (can be a remote user or group share)
-	 * @return bool
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	public function sendRemoteShare($token, $shareWith, $name, $remote_id, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId, $shareType) {
-		list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
-
-		if ($user && $remote) {
-			$local = $this->addressHandler->generateRemoteURL();
-
-			$fields = [
-				'shareWith' => $user,
-				'token' => $token,
-				'name' => $name,
-				'remoteId' => $remote_id,
-				'owner' => $owner,
-				'ownerFederatedId' => $ownerFederatedId,
-				'sharedBy' => $sharedBy,
-				'sharedByFederatedId' => $sharedByFederatedId,
-				'remote' => $local,
-				'shareType' => $shareType
-			];
-
-			$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 = [
-			'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;
-	}
-
-	/**
-	 * 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'],
-					$fields['shareType'],
-					'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'],
-						'shareType' => $fields['shareType'],
-						'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;
-	}
+    public 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
+     * @param int $shareType (can be a remote user or group share)
+     * @return bool
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException
+     */
+    public function sendRemoteShare($token, $shareWith, $name, $remote_id, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId, $shareType) {
+        list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
+
+        if ($user && $remote) {
+            $local = $this->addressHandler->generateRemoteURL();
+
+            $fields = [
+                'shareWith' => $user,
+                'token' => $token,
+                'name' => $name,
+                'remoteId' => $remote_id,
+                'owner' => $owner,
+                'ownerFederatedId' => $ownerFederatedId,
+                'sharedBy' => $sharedBy,
+                'sharedByFederatedId' => $sharedByFederatedId,
+                'remote' => $local,
+                'shareType' => $shareType
+            ];
+
+            $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 = [
+            '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;
+    }
+
+    /**
+     * 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'],
+                    $fields['shareType'],
+                    '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'],
+                        'shareType' => $fields['shareType'],
+                        '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;
+    }
 }

apps/theming/lib/Settings/Admin.php

Indentation +64 added lines, -64 removed lines

@@ -38,75 +38,75 @@
 use OCP\Settings\ISettings;
 
 class Admin implements ISettings {
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	private $l;
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var ImageManager */
-	private $imageManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    private $l;
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var ImageManager */
+    private $imageManager;
 
-	public function __construct(IConfig $config,
-								IL10N $l,
-								ThemingDefaults $themingDefaults,
-								IURLGenerator $urlGenerator,
-								ImageManager $imageManager) {
-		$this->config = $config;
-		$this->l = $l;
-		$this->themingDefaults = $themingDefaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->imageManager = $imageManager;
-	}
+    public function __construct(IConfig $config,
+                                IL10N $l,
+                                ThemingDefaults $themingDefaults,
+                                IURLGenerator $urlGenerator,
+                                ImageManager $imageManager) {
+        $this->config = $config;
+        $this->l = $l;
+        $this->themingDefaults = $themingDefaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->imageManager = $imageManager;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm(): TemplateResponse {
-		$themable = true;
-		$errorMessage = '';
-		$theme = $this->config->getSystemValue('theme', '');
-		if ($theme !== '') {
-			$themable = false;
-			$errorMessage = $this->l->t('You are already using a custom theme. Theming app settings might be overwritten by that.');
-		}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm(): TemplateResponse {
+        $themable = true;
+        $errorMessage = '';
+        $theme = $this->config->getSystemValue('theme', '');
+        if ($theme !== '') {
+            $themable = false;
+            $errorMessage = $this->l->t('You are already using a custom theme. Theming app settings might be overwritten by that.');
+        }
 
-		$parameters = [
-			'themable'        => $themable,
-			'errorMessage'    => $errorMessage,
-			'name'            => $this->themingDefaults->getEntity(),
-			'url'             => $this->themingDefaults->getBaseUrl(),
-			'slogan'          => $this->themingDefaults->getSlogan(),
-			'color'           => $this->themingDefaults->getColorPrimary(),
-			'uploadLogoRoute' => $this->urlGenerator->linkToRoute('theming.Theming.uploadImage'),
-			'canThemeIcons'   => $this->imageManager->shouldReplaceIcons(),
-			'iconDocs'        => $this->urlGenerator->linkToDocs('admin-theming-icons'),
-			'images'		  => $this->imageManager->getCustomImages(),
-			'imprintUrl'      => $this->themingDefaults->getImprintUrl(),
-			'privacyUrl'      => $this->themingDefaults->getPrivacyUrl(),
-		];
+        $parameters = [
+            'themable'        => $themable,
+            'errorMessage'    => $errorMessage,
+            'name'            => $this->themingDefaults->getEntity(),
+            'url'             => $this->themingDefaults->getBaseUrl(),
+            'slogan'          => $this->themingDefaults->getSlogan(),
+            'color'           => $this->themingDefaults->getColorPrimary(),
+            'uploadLogoRoute' => $this->urlGenerator->linkToRoute('theming.Theming.uploadImage'),
+            'canThemeIcons'   => $this->imageManager->shouldReplaceIcons(),
+            'iconDocs'        => $this->urlGenerator->linkToDocs('admin-theming-icons'),
+            'images'		  => $this->imageManager->getCustomImages(),
+            'imprintUrl'      => $this->themingDefaults->getImprintUrl(),
+            'privacyUrl'      => $this->themingDefaults->getPrivacyUrl(),
+        ];
 
-		return new TemplateResponse('theming', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('theming', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection(): string {
-		return 'theming';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection(): string {
+        return 'theming';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority(): int {
-		return 5;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority(): int {
+        return 5;
+    }
 
 }

lib/public/Log/ILogFactory.php

Indentation +12 added lines, -12 removed lines

@@ -33,17 +33,17 @@
  * @since 14.0.0
  */
 interface ILogFactory {
-	/**
-	 * @param string $type - one of: file, errorlog, syslog, systemd
-	 * @return IWriter
-	 * @since 14.0.0
-	 */
-	public function get(string $type): IWriter;
+    /**
+     * @param string $type - one of: file, errorlog, syslog, systemd
+     * @return IWriter
+     * @since 14.0.0
+     */
+    public function get(string $type): IWriter;
 
-	/**
-	 * @param string $path
-	 * @return ILogger
-	 * @since 14.0.0
-	 */
-	public function getCustomLogger(string $path): ILogger;
+    /**
+     * @param string $path
+     * @return ILogger
+     * @since 14.0.0
+     */
+    public function getCustomLogger(string $path): ILogger;
 }

apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php

Indentation +24 added lines, -24 removed lines

@@ -35,31 +35,31 @@
  */
 class RSAPrivateKey extends AuthMechanism {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IL10N $l, IConfig $config) {
-		$this->config = $config;
+    public function __construct(IL10N $l, IConfig $config) {
+        $this->config = $config;
 
-		$this
-			->setIdentifier('publickey::rsa_private')
-			->setScheme(self::SCHEME_PUBLICKEY)
-			->setText($l->t('RSA private key'))
-			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
-				(new DefinitionParameter('password', $l->t('Password')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL)
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-				new DefinitionParameter('private_key', $l->t('Private key')),
-			]);
-	}
+        $this
+            ->setIdentifier('publickey::rsa_private')
+            ->setScheme(self::SCHEME_PUBLICKEY)
+            ->setText($l->t('RSA private key'))
+            ->addParameters([
+                new DefinitionParameter('user', $l->t('Username')),
+                (new DefinitionParameter('password', $l->t('Password')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL)
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+                new DefinitionParameter('private_key', $l->t('Private key')),
+            ]);
+    }
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		$auth = new RSACrypt();
-		$auth->setPassword($this->config->getSystemValue('secret', ''));
-		if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
-			throw new \RuntimeException('unable to load private key');
-		}
-		$storage->setBackendOption('public_key_auth', $auth);
-	}
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        $auth = new RSACrypt();
+        $auth->setPassword($this->config->getSystemValue('secret', ''));
+        if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
+            throw new \RuntimeException('unable to load private key');
+        }
+        $storage->setBackendOption('public_key_auth', $auth);
+    }
 }

lib/public/Federation/ICloudFederationNotification.php

Indentation +19 added lines, -19 removed lines

@@ -30,24 +30,24 @@
  */
 interface ICloudFederationNotification {
 
-	/**
-	 * add a message to the notification
-	 *
-	 * @param string $notificationType (e.g. SHARE_ACCEPTED)
-	 * @param string $resourceType (e.g. file, calendar, contact,...)
-	 * @param $providerId id of the share
-	 * @param array $notification , payload of the notification
-	 *
-	 * @since 14.0.0
-	 */
-	public function setMessage($notificationType, $resourceType, $providerId, array $notification);
+    /**
+     * add a message to the notification
+     *
+     * @param string $notificationType (e.g. SHARE_ACCEPTED)
+     * @param string $resourceType (e.g. file, calendar, contact,...)
+     * @param $providerId id of the share
+     * @param array $notification , payload of the notification
+     *
+     * @since 14.0.0
+     */
+    public function setMessage($notificationType, $resourceType, $providerId, array $notification);
 
-	/**
-	 * get message, ready to send out
-	 *
-	 * @return array
-	 *
-	 * @since 14.0.0
-	 */
-	public function getMessage();
+    /**
+     * get message, ready to send out
+     *
+     * @return array
+     *
+     * @since 14.0.0
+     */
+    public function getMessage();
 }