nextcloud / server

apps/federatedfilesharing/lib/AddressHandler.php

Indentation +118 added lines, -118 removed lines

@@ -33,122 +33,122 @@
  */
 class AddressHandler {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-
-	/**
-	 * AddressHandler constructor.
-	 *
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $il10n
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(
-		IURLGenerator $urlGenerator,
-		IL10N $il10n,
-		ICloudIdManager $cloudIdManager
-	) {
-		$this->l = $il10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws HintException
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			$hint = $this->l->t('Invalid Federated Cloud ID');
-			throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
-		}
-	}
-
-	/**
-	 * generate remote URL part of federated ID
-	 *
-	 * @return string url of the current server
-	 */
-	public function generateRemoteURL() {
-		$url = $this->urlGenerator->getAbsoluteURL('/');
-		return $url;
-	}
-
-	/**
-	 * 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 function compareAddresses($user1, $server1, $user2, $server2) {
-		$normalizedServer1 = strtolower($this->removeProtocolFromUrl($server1));
-		$normalizedServer2 = strtolower($this->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',
-				array('uid' => &$user1)
-			);
-			\OCP\Util::emitHook(
-				'\OCA\Files_Sharing\API\Server2Server',
-				'preLoginNameUsedAsUserName',
-				array('uid' => &$user2)
-			);
-
-			if ($user1 === $user2) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * remove protocol from URL
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function removeProtocolFromUrl($url) {
-		if (strpos($url, 'https://') === 0) {
-			return substr($url, strlen('https://'));
-		} else if (strpos($url, 'http://') === 0) {
-			return substr($url, strlen('http://'));
-		}
-
-		return $url;
-	}
-
-	/**
-	 * check if the url contain the protocol (http or https)
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function urlContainProtocol($url) {
-		if (strpos($url, 'https://') === 0 ||
-			strpos($url, 'http://') === 0) {
-
-			return true;
-		}
-
-		return false;
-	}
+    /** @var IL10N */
+    private $l;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+
+    /**
+     * AddressHandler constructor.
+     *
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $il10n
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(
+        IURLGenerator $urlGenerator,
+        IL10N $il10n,
+        ICloudIdManager $cloudIdManager
+    ) {
+        $this->l = $il10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws HintException
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            $hint = $this->l->t('Invalid Federated Cloud ID');
+            throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
+        }
+    }
+
+    /**
+     * generate remote URL part of federated ID
+     *
+     * @return string url of the current server
+     */
+    public function generateRemoteURL() {
+        $url = $this->urlGenerator->getAbsoluteURL('/');
+        return $url;
+    }
+
+    /**
+     * 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 function compareAddresses($user1, $server1, $user2, $server2) {
+        $normalizedServer1 = strtolower($this->removeProtocolFromUrl($server1));
+        $normalizedServer2 = strtolower($this->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',
+                array('uid' => &$user1)
+            );
+            \OCP\Util::emitHook(
+                '\OCA\Files_Sharing\API\Server2Server',
+                'preLoginNameUsedAsUserName',
+                array('uid' => &$user2)
+            );
+
+            if ($user1 === $user2) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * remove protocol from URL
+     *
+     * @param string $url
+     * @return string
+     */
+    public function removeProtocolFromUrl($url) {
+        if (strpos($url, 'https://') === 0) {
+            return substr($url, strlen('https://'));
+        } else if (strpos($url, 'http://') === 0) {
+            return substr($url, strlen('http://'));
+        }
+
+        return $url;
+    }
+
+    /**
+     * check if the url contain the protocol (http or https)
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function urlContainProtocol($url) {
+        if (strpos($url, 'https://') === 0 ||
+            strpos($url, 'http://') === 0) {
+
+            return true;
+        }
+
+        return false;
+    }
 }

apps/federation/templates/settings-admin.php

Indentation +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
 				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
-				) { ?>
+                } elseif(
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+                ) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>
 					<span class="status error"></span>

apps/federation/lib/DAV/FedAuth.php

Indentation +32 added lines, -32 removed lines

@@ -29,40 +29,40 @@
 
 class FedAuth extends AbstractBasic {
 
-	/** @var DbHandler */
-	private $db;
+    /** @var DbHandler */
+    private $db;
 
-	/**
-	 * FedAuth constructor.
-	 *
-	 * @param DbHandler $db
-	 */
-	public function __construct(DbHandler $db) {
-		$this->db = $db;
-		$this->principalPrefix = 'principals/system/';
+    /**
+     * FedAuth constructor.
+     *
+     * @param DbHandler $db
+     */
+    public function __construct(DbHandler $db) {
+        $this->db = $db;
+        $this->principalPrefix = 'principals/system/';
 
-		// setup realm
-		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
-	}
+        // setup realm
+        $defaults = new \OCP\Defaults();
+        $this->realm = $defaults->getName();
+    }
 
-	/**
-	 * Validates a username and password
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @return bool
-	 */
-	protected function validateUserPass($username, $password) {
-		return $this->db->auth($username, $password);
-	}
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     */
+    protected function validateUserPass($username, $password) {
+        return $this->db->auth($username, $password);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function challenge(RequestInterface $request, ResponseInterface $response) {
-	}
+    /**
+     * @inheritdoc
+     */
+    function challenge(RequestInterface $request, ResponseInterface $response) {
+    }
 }

apps/federation/lib/Command/SyncFederationAddressBooks.php

Indentation +33 added lines, -33 removed lines

@@ -31,45 +31,45 @@
 
 class SyncFederationAddressBooks extends Command {
 
-	/** @var \OCA\Federation\SyncFederationAddressBooks */
-	private $syncService;
+    /** @var \OCA\Federation\SyncFederationAddressBooks */
+    private $syncService;
 
-	/**
-	 * @param \OCA\Federation\SyncFederationAddressBooks $syncService
-	 */
-	function __construct(\OCA\Federation\SyncFederationAddressBooks $syncService) {
-		parent::__construct();
+    /**
+     * @param \OCA\Federation\SyncFederationAddressBooks $syncService
+     */
+    function __construct(\OCA\Federation\SyncFederationAddressBooks $syncService) {
+        parent::__construct();
 
-		$this->syncService = $syncService;
-	}
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('federation:sync-addressbooks')
-			->setDescription('Synchronizes addressbooks of all federated clouds');
-	}
+    protected function configure() {
+        $this
+            ->setName('federation:sync-addressbooks')
+            ->setDescription('Synchronizes addressbooks of all federated clouds');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
 
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
-			if ($ex instanceof \Exception) {
-				$output->writeln("Error while syncing $url : " . $ex->getMessage());
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
+            if ($ex instanceof \Exception) {
+                $output->writeln("Error while syncing $url : " . $ex->getMessage());
 
-			} else {
-				$progress->advance();
-			}
-		});
+            } else {
+                $progress->advance();
+            }
+        });
 
-		$progress->finish();
-		$output->writeln('');
+        $progress->finish();
+        $output->writeln('');
 
-		return 0;
-	}
+        return 0;
+    }
 }

apps/federation/lib/Settings/Admin.php

Indentation +31 added lines, -31 removed lines

@@ -29,41 +29,41 @@
 
 class Admin implements ISettings {
 
-	/** @var TrustedServers */
-	private $trustedServers;
+    /** @var TrustedServers */
+    private $trustedServers;
 
-	public function __construct(TrustedServers $trustedServers) {
-		$this->trustedServers = $trustedServers;
-	}
+    public function __construct(TrustedServers $trustedServers) {
+        $this->trustedServers = $trustedServers;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			'trustedServers' => $this->trustedServers->getServers(),
-			'autoAddServers' => $this->trustedServers->getAutoAddServers(),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'trustedServers' => $this->trustedServers->getServers(),
+            'autoAddServers' => $this->trustedServers->getAutoAddServers(),
+        ];
 
-		return new TemplateResponse('federation', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('federation', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @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() {
-		return 30;
-	}
+    /**
+     * @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() {
+        return 30;
+    }
 
 }

apps/federation/lib/Hooks.php

Indentation +20 added lines, -20 removed lines

@@ -27,25 +27,25 @@
 
 class Hooks {
 
-	/** @var TrustedServers */
-	private $trustedServers;
-
-	public function __construct(TrustedServers $trustedServers) {
-		$this->trustedServers = $trustedServers;
-	}
-
-	/**
-	 * add servers to the list of trusted servers once a federated share was established
-	 *
-	 * @param array $params
-	 */
-	public function addServerHook($params) {
-		if (
-			$this->trustedServers->getAutoAddServers() === true &&
-			$this->trustedServers->isTrustedServer($params['server']) === false
-		) {
-			$this->trustedServers->addServer($params['server']);
-		}
-	}
+    /** @var TrustedServers */
+    private $trustedServers;
+
+    public function __construct(TrustedServers $trustedServers) {
+        $this->trustedServers = $trustedServers;
+    }
+
+    /**
+     * add servers to the list of trusted servers once a federated share was established
+     *
+     * @param array $params
+     */
+    public function addServerHook($params) {
+        if (
+            $this->trustedServers->getAutoAddServers() === true &&
+            $this->trustedServers->isTrustedServer($params['server']) === false
+        ) {
+            $this->trustedServers->addServer($params['server']);
+        }
+    }
 
 }

apps/federation/lib/DbHandler.php

Indentation +275 added lines, -275 removed lines

@@ -42,280 +42,280 @@
  */
 class DbHandler {
 
-	/** @var  IDBConnection */
-	private $connection;
-
-	/** @var  IL10N */
-	private $IL10N;
-
-	/** @var string  */
-	private $dbTable = 'trusted_servers';
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IL10N $il10n
-	 */
-	public function __construct(
-		IDBConnection $connection,
-		IL10N $il10n
-	) {
-		$this->connection = $connection;
-		$this->IL10N = $il10n;
-	}
-
-	/**
-	 * add server to the list of trusted servers
-	 *
-	 * @param string $url
-	 * @return int
-	 * @throws HintException
-	 */
-	public function addServer($url) {
-		$hash = $this->hash($url);
-		$url = rtrim($url, '/');
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->dbTable)
-			->values(
-				[
-					'url' =>  $query->createParameter('url'),
-					'url_hash' => $query->createParameter('url_hash'),
-				]
-			)
-			->setParameter('url', $url)
-			->setParameter('url_hash', $hash);
-
-		$result = $query->execute();
-
-		if ($result) {
-			return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
-		} else {
-			$message = 'Internal failure, Could not add trusted server: ' . $url;
-			$message_t = $this->IL10N->t('Could not add server');
-			throw new HintException($message, $message_t);
-		}
-	}
-
-	/**
-	 * remove server from the list of trusted servers
-	 *
-	 * @param int $id
-	 */
-	public function removeServer($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->dbTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id);
-		$query->execute();
-	}
-
-	/**
-	 * get trusted server with given ID
-	 *
-	 * @param int $id
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getServerById($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from($this->dbTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id);
-		$query->execute();
-		$result = $query->execute()->fetchAll();
-
-		if (empty($result)) {
-			throw new \Exception('No Server found with ID: ' . $id);
-		}
-
-		return $result[0];
-	}
-
-	/**
-	 * get all trusted servers
-	 *
-	 * @return array
-	 */
-	public function getAllServer() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['url', 'url_hash', 'id', 'status', 'shared_secret', 'sync_token'])->from($this->dbTable);
-		$result = $query->execute()->fetchAll();
-		return $result;
-	}
-
-	/**
-	 * check if server already exists in the database table
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function serverExists($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('url')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-		$result = $query->execute()->fetchAll();
-
-		return !empty($result);
-	}
-
-	/**
-	 * write token to database. Token is used to exchange the secret
-	 *
-	 * @param string $url
-	 * @param string $token
-	 */
-	public function addToken($url, $token) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-			->set('token', $query->createParameter('token'))
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash)
-			->setParameter('token', $token);
-		$query->execute();
-	}
-
-	/**
-	 * get token stored in database
-	 *
-	 * @param string $url
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function getToken($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('token')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-
-		$result = $query->execute()->fetch();
-
-		if (!isset($result['token'])) {
-			throw new \Exception('No token found for: ' . $url);
-		}
-
-		return $result['token'];
-	}
-
-	/**
-	 * add shared Secret to database
-	 *
-	 * @param string $url
-	 * @param string $sharedSecret
-	 */
-	public function addSharedSecret($url, $sharedSecret) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-			->set('shared_secret', $query->createParameter('sharedSecret'))
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash)
-			->setParameter('sharedSecret', $sharedSecret);
-		$query->execute();
-	}
-
-	/**
-	 * get shared secret from database
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function getSharedSecret($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('shared_secret')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-
-		$result = $query->execute()->fetch();
-		return $result['shared_secret'];
-	}
-
-	/**
-	 * set server status
-	 *
-	 * @param string $url
-	 * @param int $status
-	 * @param string|null $token
-	 */
-	public function setServerStatus($url, $status, $token = null) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-				->set('status', $query->createNamedParameter($status))
-				->where($query->expr()->eq('url_hash', $query->createNamedParameter($hash)));
-		if (!is_null($token)) {
-			$query->set('sync_token', $query->createNamedParameter($token));
-		}
-		$query->execute();
-	}
-
-	/**
-	 * get server status
-	 *
-	 * @param string $url
-	 * @return int
-	 */
-	public function getServerStatus($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('status')->from($this->dbTable)
-				->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-				->setParameter('url_hash', $hash);
-
-		$result = $query->execute()->fetch();
-		return (int)$result['status'];
-	}
-
-	/**
-	 * create hash from URL
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function hash($url) {
-		$normalized = $this->normalizeUrl($url);
-		return sha1($normalized);
-	}
-
-	/**
-	 * normalize URL, used to create the sha1 hash
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function normalizeUrl($url) {
-		$normalized = $url;
-
-		if (strpos($url, 'https://') === 0) {
-			$normalized = substr($url, strlen('https://'));
-		} else if (strpos($url, 'http://') === 0) {
-			$normalized = substr($url, strlen('http://'));
-		}
-
-		$normalized = Filesystem::normalizePath($normalized);
-		$normalized = trim($normalized, '/');
-
-		return $normalized;
-	}
-
-	/**
-	 * @param $username
-	 * @param $password
-	 * @return bool
-	 */
-	public function auth($username, $password) {
-		if ($username !== 'system') {
-			return false;
-		}
-		$query = $this->connection->getQueryBuilder();
-		$query->select('url')->from($this->dbTable)
-				->where($query->expr()->eq('shared_secret', $query->createNamedParameter($password)));
-
-		$result = $query->execute()->fetch();
-		return !empty($result);
-	}
+    /** @var  IDBConnection */
+    private $connection;
+
+    /** @var  IL10N */
+    private $IL10N;
+
+    /** @var string  */
+    private $dbTable = 'trusted_servers';
+
+    /**
+     * @param IDBConnection $connection
+     * @param IL10N $il10n
+     */
+    public function __construct(
+        IDBConnection $connection,
+        IL10N $il10n
+    ) {
+        $this->connection = $connection;
+        $this->IL10N = $il10n;
+    }
+
+    /**
+     * add server to the list of trusted servers
+     *
+     * @param string $url
+     * @return int
+     * @throws HintException
+     */
+    public function addServer($url) {
+        $hash = $this->hash($url);
+        $url = rtrim($url, '/');
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->dbTable)
+            ->values(
+                [
+                    'url' =>  $query->createParameter('url'),
+                    'url_hash' => $query->createParameter('url_hash'),
+                ]
+            )
+            ->setParameter('url', $url)
+            ->setParameter('url_hash', $hash);
+
+        $result = $query->execute();
+
+        if ($result) {
+            return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
+        } else {
+            $message = 'Internal failure, Could not add trusted server: ' . $url;
+            $message_t = $this->IL10N->t('Could not add server');
+            throw new HintException($message, $message_t);
+        }
+    }
+
+    /**
+     * remove server from the list of trusted servers
+     *
+     * @param int $id
+     */
+    public function removeServer($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->dbTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id);
+        $query->execute();
+    }
+
+    /**
+     * get trusted server with given ID
+     *
+     * @param int $id
+     * @return array
+     * @throws \Exception
+     */
+    public function getServerById($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from($this->dbTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id);
+        $query->execute();
+        $result = $query->execute()->fetchAll();
+
+        if (empty($result)) {
+            throw new \Exception('No Server found with ID: ' . $id);
+        }
+
+        return $result[0];
+    }
+
+    /**
+     * get all trusted servers
+     *
+     * @return array
+     */
+    public function getAllServer() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['url', 'url_hash', 'id', 'status', 'shared_secret', 'sync_token'])->from($this->dbTable);
+        $result = $query->execute()->fetchAll();
+        return $result;
+    }
+
+    /**
+     * check if server already exists in the database table
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function serverExists($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('url')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+        $result = $query->execute()->fetchAll();
+
+        return !empty($result);
+    }
+
+    /**
+     * write token to database. Token is used to exchange the secret
+     *
+     * @param string $url
+     * @param string $token
+     */
+    public function addToken($url, $token) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+            ->set('token', $query->createParameter('token'))
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash)
+            ->setParameter('token', $token);
+        $query->execute();
+    }
+
+    /**
+     * get token stored in database
+     *
+     * @param string $url
+     * @return string
+     * @throws \Exception
+     */
+    public function getToken($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('token')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+
+        $result = $query->execute()->fetch();
+
+        if (!isset($result['token'])) {
+            throw new \Exception('No token found for: ' . $url);
+        }
+
+        return $result['token'];
+    }
+
+    /**
+     * add shared Secret to database
+     *
+     * @param string $url
+     * @param string $sharedSecret
+     */
+    public function addSharedSecret($url, $sharedSecret) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+            ->set('shared_secret', $query->createParameter('sharedSecret'))
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash)
+            ->setParameter('sharedSecret', $sharedSecret);
+        $query->execute();
+    }
+
+    /**
+     * get shared secret from database
+     *
+     * @param string $url
+     * @return string
+     */
+    public function getSharedSecret($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('shared_secret')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+
+        $result = $query->execute()->fetch();
+        return $result['shared_secret'];
+    }
+
+    /**
+     * set server status
+     *
+     * @param string $url
+     * @param int $status
+     * @param string|null $token
+     */
+    public function setServerStatus($url, $status, $token = null) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+                ->set('status', $query->createNamedParameter($status))
+                ->where($query->expr()->eq('url_hash', $query->createNamedParameter($hash)));
+        if (!is_null($token)) {
+            $query->set('sync_token', $query->createNamedParameter($token));
+        }
+        $query->execute();
+    }
+
+    /**
+     * get server status
+     *
+     * @param string $url
+     * @return int
+     */
+    public function getServerStatus($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('status')->from($this->dbTable)
+                ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+                ->setParameter('url_hash', $hash);
+
+        $result = $query->execute()->fetch();
+        return (int)$result['status'];
+    }
+
+    /**
+     * create hash from URL
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function hash($url) {
+        $normalized = $this->normalizeUrl($url);
+        return sha1($normalized);
+    }
+
+    /**
+     * normalize URL, used to create the sha1 hash
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function normalizeUrl($url) {
+        $normalized = $url;
+
+        if (strpos($url, 'https://') === 0) {
+            $normalized = substr($url, strlen('https://'));
+        } else if (strpos($url, 'http://') === 0) {
+            $normalized = substr($url, strlen('http://'));
+        }
+
+        $normalized = Filesystem::normalizePath($normalized);
+        $normalized = trim($normalized, '/');
+
+        return $normalized;
+    }
+
+    /**
+     * @param $username
+     * @param $password
+     * @return bool
+     */
+    public function auth($username, $password) {
+        if ($username !== 'system') {
+            return false;
+        }
+        $query = $this->connection->getQueryBuilder();
+        $query->select('url')->from($this->dbTable)
+                ->where($query->expr()->eq('shared_secret', $query->createNamedParameter($password)));
+
+        $result = $query->execute()->fetch();
+        return !empty($result);
+    }
 
 }

apps/federation/lib/SyncJob.php

Indentation +13 added lines, -13 removed lines

@@ -27,18 +27,18 @@
 
 class SyncJob extends TimedJob {
 
-	public function __construct() {
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-	}
+    public function __construct() {
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+    }
 
-	protected function run($argument) {
-		$app = new Application();
-		$ss = $app->getSyncService();
-		$ss->syncThemAll(function($url, $ex) {
-			if ($ex instanceof \Exception) {
-				\OC::$server->getLogger()->error("Error while syncing $url : " . $ex->getMessage(), ['app' => 'fed-sync']);
-			}
-		});
-	}
+    protected function run($argument) {
+        $app = new Application();
+        $ss = $app->getSyncService();
+        $ss->syncThemAll(function($url, $ex) {
+            if ($ex instanceof \Exception) {
+                \OC::$server->getLogger()->error("Error while syncing $url : " . $ex->getMessage(), ['app' => 'fed-sync']);
+            }
+        });
+    }
 }

apps/dav/lib/DAV/PublicAuth.php

Indentation +58 added lines, -58 removed lines

@@ -26,67 +26,67 @@
 
 class PublicAuth implements BackendInterface {
 
-	/** @var string[] */
-	private $publicURLs;
+    /** @var string[] */
+    private $publicURLs;
 
-	public function __construct() {
-		$this->publicURLs = [
-			'public-calendars',
-			'principals/system/public'
-		];
-	}
+    public function __construct() {
+        $this->publicURLs = [
+            'public-calendars',
+            'principals/system/public'
+        ];
+    }
 
-	/**
-	 * When this method is called, the backend must check if authentication was
-	 * successful.
-	 *
-	 * The returned value must be one of the following
-	 *
-	 * [true, "principals/username"]
-	 * [false, "reason for failure"]
-	 *
-	 * If authentication was successful, it's expected that the authentication
-	 * backend returns a so-called principal url.
-	 *
-	 * Examples of a principal url:
-	 *
-	 * principals/admin
-	 * principals/user1
-	 * principals/users/joe
-	 * principals/uid/123457
-	 *
-	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-	 * return a string such as:
-	 *
-	 * principals/users/[username]
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return array
-	 */
-	function check(RequestInterface $request, ResponseInterface $response) {
+    /**
+     * When this method is called, the backend must check if authentication was
+     * successful.
+     *
+     * The returned value must be one of the following
+     *
+     * [true, "principals/username"]
+     * [false, "reason for failure"]
+     *
+     * If authentication was successful, it's expected that the authentication
+     * backend returns a so-called principal url.
+     *
+     * Examples of a principal url:
+     *
+     * principals/admin
+     * principals/user1
+     * principals/users/joe
+     * principals/uid/123457
+     *
+     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+     * return a string such as:
+     *
+     * principals/users/[username]
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return array
+     */
+    function check(RequestInterface $request, ResponseInterface $response) {
 
-		if ($this->isRequestPublic($request)) {
-			return [true, "principals/system/public"];
-		}
-		return [false, "No public access to this resource."];
-	}
+        if ($this->isRequestPublic($request)) {
+            return [true, "principals/system/public"];
+        }
+        return [false, "No public access to this resource."];
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function challenge(RequestInterface $request, ResponseInterface $response) {
-	}
+    /**
+     * @inheritdoc
+     */
+    function challenge(RequestInterface $request, ResponseInterface $response) {
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @return bool
-	 */
-	private function isRequestPublic(RequestInterface $request) {
-		$url = $request->getPath();
-		$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
-			return strpos($url, $publicUrl, 0) === 0;
-		});
-		return !empty($matchingUrls);
-	}
+    /**
+     * @param RequestInterface $request
+     * @return bool
+     */
+    private function isRequestPublic(RequestInterface $request) {
+        $url = $request->getPath();
+        $matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
+            return strpos($url, $publicUrl, 0) === 0;
+        });
+        return !empty($matchingUrls);
+    }
 }