nextcloud / server

apps/files_sharing/lib/External/MountProvider.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 		$managerProvider = $this->managerProvider;
 		$manager = $managerProvider();
 		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+		$mountPoint = '/'.$user->getUID().'/files/'.ltrim($data['mountpoint'], '/');
 		$data['mountpoint'] = $mountPoint;
 		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
 		$data['certificateManager'] = \OC::$server->getCertificateManager();

Indentation +44 added lines, -44 removed lines

@@ -16,52 +16,52 @@
 use OCP\Server;
 
 class MountProvider implements IMountProvider {
-	public const STORAGE = '\OCA\Files_Sharing\External\Storage';
+    public const STORAGE = '\OCA\Files_Sharing\External\Storage';
 
-	/**
-	 * @var callable
-	 */
-	private $managerProvider;
+    /**
+     * @var callable
+     */
+    private $managerProvider;
 
-	/**
-	 * @param IDBConnection $connection
-	 * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(
-		private IDBConnection $connection,
-		callable $managerProvider,
-		private ICloudIdManager $cloudIdManager,
-	) {
-		$this->managerProvider = $managerProvider;
-	}
+    /**
+     * @param IDBConnection $connection
+     * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(
+        private IDBConnection $connection,
+        callable $managerProvider,
+        private ICloudIdManager $cloudIdManager,
+    ) {
+        $this->managerProvider = $managerProvider;
+    }
 
-	public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
-		$managerProvider = $this->managerProvider;
-		$manager = $managerProvider();
-		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
-		$data['mountpoint'] = $mountPoint;
-		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
-		$data['certificateManager'] = \OC::$server->getCertificateManager();
-		$data['HttpClientService'] = Server::get(IClientService::class);
-		return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
-	}
+    public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
+        $managerProvider = $this->managerProvider;
+        $manager = $managerProvider();
+        $data['manager'] = $manager;
+        $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+        $data['mountpoint'] = $mountPoint;
+        $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
+        $data['certificateManager'] = \OC::$server->getCertificateManager();
+        $data['HttpClientService'] = Server::get(IClientService::class);
+        return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
+    }
 
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('remote', 'share_token', 'password', 'mountpoint', 'owner')
-			->from('share_external')
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
-			->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
-		$result = $qb->executeQuery();
-		$mounts = [];
-		while ($row = $result->fetch()) {
-			$row['manager'] = $this;
-			$row['token'] = $row['share_token'];
-			$mounts[] = $this->getMount($user, $row, $loader);
-		}
-		$result->closeCursor();
-		return $mounts;
-	}
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('remote', 'share_token', 'password', 'mountpoint', 'owner')
+            ->from('share_external')
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
+            ->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
+        $result = $qb->executeQuery();
+        $mounts = [];
+        while ($row = $result->fetch()) {
+            $row['manager'] = $this;
+            $row['token'] = $row['share_token'];
+            $mounts[] = $this->getMount($user, $row, $loader);
+        }
+        $result->closeCursor();
+        return $mounts;
+    }
 }

lib/private/AppFramework/Http/Output.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 	 * @param bool $httpOnly
 	 */
 	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
-		$path = $this->webRoot ? : '/';
+		$path = $this->webRoot ?: '/';
 
 		setcookie($name, $value, [
 			'expires' => $expire,

Indentation +61 added lines, -61 removed lines

@@ -13,72 +13,72 @@
  * Very thin wrapper class to make output testable
  */
 class Output implements IOutput {
-	public function __construct(
-		private string $webRoot,
-	) {
-	}
+    public function __construct(
+        private string $webRoot,
+    ) {
+    }
 
-	/**
-	 * @param string $out
-	 */
-	public function setOutput($out) {
-		print($out);
-	}
+    /**
+     * @param string $out
+     */
+    public function setOutput($out) {
+        print($out);
+    }
 
-	/**
-	 * @param string|resource $path or file handle
-	 *
-	 * @return bool false if an error occurred
-	 */
-	public function setReadfile($path) {
-		if (is_resource($path)) {
-			$output = fopen('php://output', 'w');
-			return stream_copy_to_stream($path, $output) > 0;
-		} else {
-			return @readfile($path);
-		}
-	}
+    /**
+     * @param string|resource $path or file handle
+     *
+     * @return bool false if an error occurred
+     */
+    public function setReadfile($path) {
+        if (is_resource($path)) {
+            $output = fopen('php://output', 'w');
+            return stream_copy_to_stream($path, $output) > 0;
+        } else {
+            return @readfile($path);
+        }
+    }
 
-	/**
-	 * @param string $header
-	 */
-	public function setHeader($header) {
-		header($header);
-	}
+    /**
+     * @param string $header
+     */
+    public function setHeader($header) {
+        header($header);
+    }
 
-	/**
-	 * @param int $code sets the http status code
-	 */
-	public function setHttpResponseCode($code) {
-		http_response_code($code);
-	}
+    /**
+     * @param int $code sets the http status code
+     */
+    public function setHttpResponseCode($code) {
+        http_response_code($code);
+    }
 
-	/**
-	 * @return int returns the current http response code
-	 */
-	public function getHttpResponseCode() {
-		return http_response_code();
-	}
+    /**
+     * @return int returns the current http response code
+     */
+    public function getHttpResponseCode() {
+        return http_response_code();
+    }
 
-	/**
-	 * @param string $name
-	 * @param string $value
-	 * @param int $expire
-	 * @param string $path
-	 * @param string $domain
-	 * @param bool $secure
-	 * @param bool $httpOnly
-	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
-		$path = $this->webRoot ? : '/';
+    /**
+     * @param string $name
+     * @param string $value
+     * @param int $expire
+     * @param string $path
+     * @param string $domain
+     * @param bool $secure
+     * @param bool $httpOnly
+     */
+    public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
+        $path = $this->webRoot ? : '/';
 
-		setcookie($name, $value, [
-			'expires' => $expire,
-			'path' => $path,
-			'domain' => $domain,
-			'secure' => $secure,
-			'httponly' => $httpOnly,
-			'samesite' => $sameSite
-		]);
-	}
+        setcookie($name, $value, [
+            'expires' => $expire,
+            'path' => $path,
+            'domain' => $domain,
+            'secure' => $secure,
+            'httponly' => $httpOnly,
+            'samesite' => $sameSite
+        ]);
+    }
 }

core/Migrations/Version14000Date20180710092004.php

Indentation +12 added lines, -12 removed lines

@@ -34,19 +34,19 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180710092004 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('share');
+        $table = $schema->getTable('share');
 
-		if (!$table->hasColumn('password_by_talk')) {
-			$table->addColumn('password_by_talk', Types::BOOLEAN, [
-				'default' => 0,
-				'notnull' => false,
-			]);
-		}
+        if (!$table->hasColumn('password_by_talk')) {
+            $table->addColumn('password_by_talk', Types::BOOLEAN, [
+                'default' => 0,
+                'notnull' => false,
+            ]);
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1016Date20201109085907.php

Indentation +26 added lines, -26 removed lines

@@ -32,30 +32,30 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1016Date20201109085907 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$result = $this->ensureColumnIsNullable($schema, 'calendar_reminders', 'is_recurring');
-
-		return $result ? $schema : null;
-	}
-
-	protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
-		$table = $schema->getTable($tableName);
-		$column = $table->getColumn($columnName);
-
-		if ($column->getNotnull()) {
-			$column->setNotnull(false);
-			return true;
-		}
-
-		return false;
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $result = $this->ensureColumnIsNullable($schema, 'calendar_reminders', 'is_recurring');
+
+        return $result ? $schema : null;
+    }
+
+    protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
+        $table = $schema->getTable($tableName);
+        $column = $table->getColumn($columnName);
+
+        if ($column->getNotnull()) {
+            $column->setNotnull(false);
+            return true;
+        }
+
+        return false;
+    }
 }

core/Migrations/Version20000Date20201111081915.php

Indentation +26 added lines, -26 removed lines

@@ -32,30 +32,30 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version20000Date20201111081915 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$result = $this->ensureColumnIsNullable($schema, 'direct_edit', 'accessed');
-
-		return $result ? $schema : null;
-	}
-
-	protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
-		$table = $schema->getTable($tableName);
-		$column = $table->getColumn($columnName);
-
-		if ($column->getNotnull()) {
-			$column->setNotnull(false);
-			return true;
-		}
-
-		return false;
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $result = $this->ensureColumnIsNullable($schema, 'direct_edit', 'accessed');
+
+        return $result ? $schema : null;
+    }
+
+    protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
+        $table = $schema->getTable($tableName);
+        $column = $table->getColumn($columnName);
+
+        if ($column->getNotnull()) {
+            $column->setNotnull(false);
+            return true;
+        }
+
+        return false;
+    }
 }

apps/user_status/lib/Migration/Version0001Date20200602134824.php

Indentation +54 added lines, -54 removed lines

@@ -37,61 +37,61 @@
  */
 class Version0001Date20200602134824 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 20.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 20.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$statusTable = $schema->createTable('user_status');
-		$statusTable->addColumn('id', Types::BIGINT, [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$statusTable->addColumn('user_id', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('status', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('status_timestamp', Types::INTEGER, [
-			'notnull' => true,
-			'length' => 11,
-			'unsigned' => true,
-		]);
-		$statusTable->addColumn('is_user_defined', Types::BOOLEAN, [
-			'notnull' => false,
-		]);
-		$statusTable->addColumn('message_id', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('custom_icon', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('custom_message', Types::TEXT, [
-			'notnull' => false,
-		]);
-		$statusTable->addColumn('clear_at', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 11,
-			'unsigned' => true,
-		]);
+        $statusTable = $schema->createTable('user_status');
+        $statusTable->addColumn('id', Types::BIGINT, [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $statusTable->addColumn('user_id', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('status', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('status_timestamp', Types::INTEGER, [
+            'notnull' => true,
+            'length' => 11,
+            'unsigned' => true,
+        ]);
+        $statusTable->addColumn('is_user_defined', Types::BOOLEAN, [
+            'notnull' => false,
+        ]);
+        $statusTable->addColumn('message_id', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('custom_icon', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('custom_message', Types::TEXT, [
+            'notnull' => false,
+        ]);
+        $statusTable->addColumn('clear_at', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 11,
+            'unsigned' => true,
+        ]);
 
-		$statusTable->setPrimaryKey(['id']);
-		$statusTable->addUniqueIndex(['user_id'], 'user_status_uid_ix');
-		$statusTable->addIndex(['clear_at'], 'user_status_clr_ix');
+        $statusTable->setPrimaryKey(['id']);
+        $statusTable->addUniqueIndex(['user_id'], 'user_status_uid_ix');
+        $statusTable->addIndex(['clear_at'], 'user_status_clr_ix');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/user_status/lib/Migration/Version1000Date20201111130204.php

Indentation +26 added lines, -26 removed lines

@@ -33,30 +33,30 @@
 
 class Version1000Date20201111130204 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$result = $this->ensureColumnIsNullable($schema, 'user_status', 'is_user_defined');
-
-		return $result ? $schema : null;
-	}
-
-	protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
-		$table = $schema->getTable($tableName);
-		$column = $table->getColumn($columnName);
-
-		if ($column->getNotnull()) {
-			$column->setNotnull(false);
-			return true;
-		}
-
-		return false;
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $result = $this->ensureColumnIsNullable($schema, 'user_status', 'is_user_defined');
+
+        return $result ? $schema : null;
+    }
+
+    protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
+        $table = $schema->getTable($tableName);
+        $column = $table->getColumn($columnName);
+
+        if ($column->getNotnull()) {
+            $column->setNotnull(false);
+            return true;
+        }
+
+        return false;
+    }
 }

lib/private/Files/ObjectStore/Swift.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
 
 	public function copyObject($from, $to) {
 		$this->getContainer()->getObject($from)->copy([
-			'destination' => $this->getContainer()->name . '/' . $to
+			'destination' => $this->getContainer()->name.'/'.$to
 		]);
 	}
 }

Indentation +115 added lines, -115 removed lines

@@ -19,119 +19,119 @@
 const SWIFT_SEGMENT_SIZE = 1073741824; // 1GB
 
 class Swift implements IObjectStore {
-	/**
-	 * @var array
-	 */
-	private $params;
-
-	/** @var SwiftFactory */
-	private $swiftFactory;
-
-	public function __construct($params, ?SwiftFactory $connectionFactory = null) {
-		$this->swiftFactory = $connectionFactory ?: new SwiftFactory(
-			\OC::$server->getMemCacheFactory()->createDistributed('swift::'),
-			$params,
-			\OC::$server->get(LoggerInterface::class)
-		);
-		$this->params = $params;
-	}
-
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 */
-	private function getContainer() {
-		return $this->swiftFactory->getContainer();
-	}
-
-	/**
-	 * @return string the container name where objects are stored
-	 */
-	public function getStorageId() {
-		if (isset($this->params['bucket'])) {
-			return $this->params['bucket'];
-		}
-
-		return $this->params['container'];
-	}
-
-	public function writeObject($urn, $stream, ?string $mimetype = null) {
-		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
-		file_put_contents($tmpFile, $stream);
-		$handle = fopen($tmpFile, 'rb');
-
-		if (filesize($tmpFile) < SWIFT_SEGMENT_SIZE) {
-			$this->getContainer()->createObject([
-				'name' => $urn,
-				'stream' => Utils::streamFor($handle),
-				'contentType' => $mimetype,
-			]);
-		} else {
-			$this->getContainer()->createLargeObject([
-				'name' => $urn,
-				'stream' => Utils::streamFor($handle),
-				'segmentSize' => SWIFT_SEGMENT_SIZE,
-				'contentType' => $mimetype,
-			]);
-		}
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return resource stream with the read data
-	 * @throws \Exception from openstack or GuzzleHttp libs when something goes wrong
-	 * @throws NotFoundException if file does not exist
-	 */
-	public function readObject($urn) {
-		try {
-			$publicUri = $this->getContainer()->getObject($urn)->getPublicUri();
-			$tokenId = $this->swiftFactory->getCachedTokenId();
-
-			$response = (new Client())->request('GET', $publicUri,
-				[
-					'stream' => true,
-					'headers' => [
-						'X-Auth-Token' => $tokenId,
-						'Cache-Control' => 'no-cache',
-					],
-				]
-			);
-		} catch (BadResponseException $e) {
-			if ($e->getResponse() && $e->getResponse()->getStatusCode() === 404) {
-				throw new NotFoundException("object $urn not found in object store");
-			} else {
-				throw $e;
-			}
-		}
-
-		return RetryWrapper::wrap($response->getBody()->detach());
-	}
-
-	/**
-	 * @param string $urn Unified Resource Name
-	 * @return void
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function deleteObject($urn) {
-		$this->getContainer()->getObject($urn)->delete();
-	}
-
-	/**
-	 * @return void
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function deleteContainer() {
-		$this->getContainer()->delete();
-	}
-
-	public function objectExists($urn) {
-		return $this->getContainer()->objectExists($urn);
-	}
-
-	public function copyObject($from, $to) {
-		$this->getContainer()->getObject($from)->copy([
-			'destination' => $this->getContainer()->name . '/' . $to
-		]);
-	}
+    /**
+     * @var array
+     */
+    private $params;
+
+    /** @var SwiftFactory */
+    private $swiftFactory;
+
+    public function __construct($params, ?SwiftFactory $connectionFactory = null) {
+        $this->swiftFactory = $connectionFactory ?: new SwiftFactory(
+            \OC::$server->getMemCacheFactory()->createDistributed('swift::'),
+            $params,
+            \OC::$server->get(LoggerInterface::class)
+        );
+        $this->params = $params;
+    }
+
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws \OCP\Files\StorageNotAvailableException
+     */
+    private function getContainer() {
+        return $this->swiftFactory->getContainer();
+    }
+
+    /**
+     * @return string the container name where objects are stored
+     */
+    public function getStorageId() {
+        if (isset($this->params['bucket'])) {
+            return $this->params['bucket'];
+        }
+
+        return $this->params['container'];
+    }
+
+    public function writeObject($urn, $stream, ?string $mimetype = null) {
+        $tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
+        file_put_contents($tmpFile, $stream);
+        $handle = fopen($tmpFile, 'rb');
+
+        if (filesize($tmpFile) < SWIFT_SEGMENT_SIZE) {
+            $this->getContainer()->createObject([
+                'name' => $urn,
+                'stream' => Utils::streamFor($handle),
+                'contentType' => $mimetype,
+            ]);
+        } else {
+            $this->getContainer()->createLargeObject([
+                'name' => $urn,
+                'stream' => Utils::streamFor($handle),
+                'segmentSize' => SWIFT_SEGMENT_SIZE,
+                'contentType' => $mimetype,
+            ]);
+        }
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return resource stream with the read data
+     * @throws \Exception from openstack or GuzzleHttp libs when something goes wrong
+     * @throws NotFoundException if file does not exist
+     */
+    public function readObject($urn) {
+        try {
+            $publicUri = $this->getContainer()->getObject($urn)->getPublicUri();
+            $tokenId = $this->swiftFactory->getCachedTokenId();
+
+            $response = (new Client())->request('GET', $publicUri,
+                [
+                    'stream' => true,
+                    'headers' => [
+                        'X-Auth-Token' => $tokenId,
+                        'Cache-Control' => 'no-cache',
+                    ],
+                ]
+            );
+        } catch (BadResponseException $e) {
+            if ($e->getResponse() && $e->getResponse()->getStatusCode() === 404) {
+                throw new NotFoundException("object $urn not found in object store");
+            } else {
+                throw $e;
+            }
+        }
+
+        return RetryWrapper::wrap($response->getBody()->detach());
+    }
+
+    /**
+     * @param string $urn Unified Resource Name
+     * @return void
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function deleteObject($urn) {
+        $this->getContainer()->getObject($urn)->delete();
+    }
+
+    /**
+     * @return void
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function deleteContainer() {
+        $this->getContainer()->delete();
+    }
+
+    public function objectExists($urn) {
+        return $this->getContainer()->objectExists($urn);
+    }
+
+    public function copyObject($from, $to) {
+        $this->getContainer()->getObject($from)->copy([
+            'destination' => $this->getContainer()->name . '/' . $to
+        ]);
+    }
 }

lib/private/Share/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 		if ($defaultExpireDate === 'yes') {
 			$enforceExpireDate = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
 			$defaultExpireSettings['defaultExpireDateSet'] = true;
-			$defaultExpireSettings['expireAfterDays'] = (int)$config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+			$defaultExpireSettings['expireAfterDays'] = (int) $config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
 			$defaultExpireSettings['enforceExpireDate'] = $enforceExpireDate === 'yes';
 		}
 

Indentation +127 added lines, -127 removed lines

@@ -8,131 +8,131 @@
 namespace OC\Share;
 
 class Helper extends \OC\Share\Constants {
-	/**
-	 * get default expire settings defined by the admin
-	 * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
-	 */
-	public static function getDefaultExpireSetting() {
-		$config = \OC::$server->getConfig();
-
-		$defaultExpireSettings = ['defaultExpireDateSet' => false];
-
-		// get default expire settings
-		$defaultExpireDate = $config->getAppValue('core', 'shareapi_default_expire_date', 'no');
-		if ($defaultExpireDate === 'yes') {
-			$enforceExpireDate = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
-			$defaultExpireSettings['defaultExpireDateSet'] = true;
-			$defaultExpireSettings['expireAfterDays'] = (int)$config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-			$defaultExpireSettings['enforceExpireDate'] = $enforceExpireDate === 'yes';
-		}
-
-		return $defaultExpireSettings;
-	}
-
-	public static function calcExpireDate() {
-		$expireAfter = \OC\Share\Share::getExpireInterval() * 24 * 60 * 60;
-		$expireAt = time() + $expireAfter;
-		$date = new \DateTime();
-		$date->setTimestamp($expireAt);
-		$date->setTime(0, 0, 0);
-		//$dateString = $date->format('Y-m-d') . ' 00:00:00';
-
-		return $date;
-	}
-
-	/**
-	 * calculate expire date
-	 * @param array $defaultExpireSettings contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
-	 * @param int $creationTime timestamp when the share was created
-	 * @param int $userExpireDate expire timestamp set by the user
-	 * @return mixed integer timestamp or False
-	 */
-	public static function calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate = null) {
-		$expires = false;
-		$defaultExpires = null;
-
-		if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
-			$defaultExpires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
-		}
-
-
-		if (isset($userExpireDate)) {
-			// if the admin decided to enforce the default expire date then we only take
-			// the user defined expire date of it is before the default expire date
-			if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
-				$expires = min($userExpireDate, $defaultExpires);
-			} else {
-				$expires = $userExpireDate;
-			}
-		} elseif ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
-			$expires = $defaultExpires;
-		}
-
-		return $expires;
-	}
-
-	/**
-	 * Strips away a potential file names and trailing slashes:
-	 * - http://localhost
-	 * - http://localhost/
-	 * - http://localhost/index.php
-	 * - http://localhost/index.php/s/{shareToken}
-	 *
-	 * all return: http://localhost
-	 *
-	 * @param string $remote
-	 * @return string
-	 */
-	protected static function fixRemoteURL($remote) {
-		$remote = str_replace('\\', '/', $remote);
-		if ($fileNamePosition = strpos($remote, '/index.php')) {
-			$remote = substr($remote, 0, $fileNamePosition);
-		}
-		$remote = rtrim($remote, '/');
-
-		return $remote;
-	}
-
-	/**
-	 * check if two federated cloud IDs refer to the same user
-	 *
-	 * @param string $user1
-	 * @param string $server1
-	 * @param string $user2
-	 * @param string $server2
-	 * @return bool true if both users and servers are the same
-	 */
-	public static function isSameUserOnSameServer($user1, $server1, $user2, $server2) {
-		$normalizedServer1 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server1));
-		$normalizedServer2 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server2));
-
-		if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
-			// FIXME this should be a method in the user management instead
-			\OCP\Util::emitHook(
-				'\OCA\Files_Sharing\API\Server2Server',
-				'preLoginNameUsedAsUserName',
-				['uid' => &$user1]
-			);
-			\OCP\Util::emitHook(
-				'\OCA\Files_Sharing\API\Server2Server',
-				'preLoginNameUsedAsUserName',
-				['uid' => &$user2]
-			);
-
-			if ($user1 === $user2) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public static function getTokenLength(): int {
-		$config = \OCP\Server::get(\OCP\IAppConfig::class);
-		$tokenLength = $config->getValueInt('core', 'shareapi_token_length', self::DEFAULT_TOKEN_LENGTH);
-		$tokenLength = $tokenLength ?: self::DEFAULT_TOKEN_LENGTH;
-
-		// Token length should be within the defined min and max limits
-		return max(self::MIN_TOKEN_LENGTH, min($tokenLength, self::MAX_TOKEN_LENGTH));
-	}
+    /**
+     * get default expire settings defined by the admin
+     * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
+     */
+    public static function getDefaultExpireSetting() {
+        $config = \OC::$server->getConfig();
+
+        $defaultExpireSettings = ['defaultExpireDateSet' => false];
+
+        // get default expire settings
+        $defaultExpireDate = $config->getAppValue('core', 'shareapi_default_expire_date', 'no');
+        if ($defaultExpireDate === 'yes') {
+            $enforceExpireDate = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+            $defaultExpireSettings['defaultExpireDateSet'] = true;
+            $defaultExpireSettings['expireAfterDays'] = (int)$config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+            $defaultExpireSettings['enforceExpireDate'] = $enforceExpireDate === 'yes';
+        }
+
+        return $defaultExpireSettings;
+    }
+
+    public static function calcExpireDate() {
+        $expireAfter = \OC\Share\Share::getExpireInterval() * 24 * 60 * 60;
+        $expireAt = time() + $expireAfter;
+        $date = new \DateTime();
+        $date->setTimestamp($expireAt);
+        $date->setTime(0, 0, 0);
+        //$dateString = $date->format('Y-m-d') . ' 00:00:00';
+
+        return $date;
+    }
+
+    /**
+     * calculate expire date
+     * @param array $defaultExpireSettings contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
+     * @param int $creationTime timestamp when the share was created
+     * @param int $userExpireDate expire timestamp set by the user
+     * @return mixed integer timestamp or False
+     */
+    public static function calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate = null) {
+        $expires = false;
+        $defaultExpires = null;
+
+        if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
+            $defaultExpires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
+        }
+
+
+        if (isset($userExpireDate)) {
+            // if the admin decided to enforce the default expire date then we only take
+            // the user defined expire date of it is before the default expire date
+            if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+                $expires = min($userExpireDate, $defaultExpires);
+            } else {
+                $expires = $userExpireDate;
+            }
+        } elseif ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+            $expires = $defaultExpires;
+        }
+
+        return $expires;
+    }
+
+    /**
+     * Strips away a potential file names and trailing slashes:
+     * - http://localhost
+     * - http://localhost/
+     * - http://localhost/index.php
+     * - http://localhost/index.php/s/{shareToken}
+     *
+     * all return: http://localhost
+     *
+     * @param string $remote
+     * @return string
+     */
+    protected static function fixRemoteURL($remote) {
+        $remote = str_replace('\\', '/', $remote);
+        if ($fileNamePosition = strpos($remote, '/index.php')) {
+            $remote = substr($remote, 0, $fileNamePosition);
+        }
+        $remote = rtrim($remote, '/');
+
+        return $remote;
+    }
+
+    /**
+     * check if two federated cloud IDs refer to the same user
+     *
+     * @param string $user1
+     * @param string $server1
+     * @param string $user2
+     * @param string $server2
+     * @return bool true if both users and servers are the same
+     */
+    public static function isSameUserOnSameServer($user1, $server1, $user2, $server2) {
+        $normalizedServer1 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server1));
+        $normalizedServer2 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server2));
+
+        if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
+            // FIXME this should be a method in the user management instead
+            \OCP\Util::emitHook(
+                '\OCA\Files_Sharing\API\Server2Server',
+                'preLoginNameUsedAsUserName',
+                ['uid' => &$user1]
+            );
+            \OCP\Util::emitHook(
+                '\OCA\Files_Sharing\API\Server2Server',
+                'preLoginNameUsedAsUserName',
+                ['uid' => &$user2]
+            );
+
+            if ($user1 === $user2) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static function getTokenLength(): int {
+        $config = \OCP\Server::get(\OCP\IAppConfig::class);
+        $tokenLength = $config->getValueInt('core', 'shareapi_token_length', self::DEFAULT_TOKEN_LENGTH);
+        $tokenLength = $tokenLength ?: self::DEFAULT_TOKEN_LENGTH;
+
+        // Token length should be within the defined min and max limits
+        return max(self::MIN_TOKEN_LENGTH, min($tokenLength, self::MAX_TOKEN_LENGTH));
+    }
 }