nextcloud / server

apps/federation/lib/Settings/Admin.php

Indentation +30 added lines, -30 removed lines

@@ -29,39 +29,39 @@
 
 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(),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'trustedServers' => $this->trustedServers->getServers(),
+        ];
 
-		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/TrustedServers.php

Indentation +200 added lines, -200 removed lines

@@ -42,227 +42,227 @@
 
 class TrustedServers {
 
-	/** after a user list was exchanged at least once successfully */
-	public const STATUS_OK = 1;
-	/** waiting for shared secret or initial user list exchange */
-	public const STATUS_PENDING = 2;
-	/** something went wrong, misconfigured server, software bug,... user interaction needed */
-	public const STATUS_FAILURE = 3;
-	/** remote server revoked access */
-	public const STATUS_ACCESS_REVOKED = 4;
+    /** after a user list was exchanged at least once successfully */
+    public const STATUS_OK = 1;
+    /** waiting for shared secret or initial user list exchange */
+    public const STATUS_PENDING = 2;
+    /** something went wrong, misconfigured server, software bug,... user interaction needed */
+    public const STATUS_FAILURE = 3;
+    /** remote server revoked access */
+    public const STATUS_ACCESS_REVOKED = 4;
 
-	/** @var  dbHandler */
-	private $dbHandler;
+    /** @var  dbHandler */
+    private $dbHandler;
 
-	/** @var  IClientService */
-	private $httpClientService;
+    /** @var  IClientService */
+    private $httpClientService;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var ISecureRandom */
-	private $secureRandom;
+    /** @var ISecureRandom */
+    private $secureRandom;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/**
-	 * @param DbHandler $dbHandler
-	 * @param IClientService $httpClientService
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ISecureRandom $secureRandom
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(
-		DbHandler $dbHandler,
-		IClientService $httpClientService,
-		ILogger $logger,
-		IJobList $jobList,
-		ISecureRandom $secureRandom,
-		IConfig $config,
-		EventDispatcherInterface $dispatcher,
-		ITimeFactory $timeFactory
-	) {
-		$this->dbHandler = $dbHandler;
-		$this->httpClientService = $httpClientService;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->secureRandom = $secureRandom;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * @param DbHandler $dbHandler
+     * @param IClientService $httpClientService
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ISecureRandom $secureRandom
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(
+        DbHandler $dbHandler,
+        IClientService $httpClientService,
+        ILogger $logger,
+        IJobList $jobList,
+        ISecureRandom $secureRandom,
+        IConfig $config,
+        EventDispatcherInterface $dispatcher,
+        ITimeFactory $timeFactory
+    ) {
+        $this->dbHandler = $dbHandler;
+        $this->httpClientService = $httpClientService;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->secureRandom = $secureRandom;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * add server to the list of trusted servers
-	 *
-	 * @param $url
-	 * @return int server id
-	 */
-	public function addServer($url) {
-		$url = $this->updateProtocol($url);
-		$result = $this->dbHandler->addServer($url);
-		if ($result) {
-			$token = $this->secureRandom->generate(16);
-			$this->dbHandler->addToken($url, $token);
-			$this->jobList->add(
-				RequestSharedSecret::class,
-				[
-					'url' => $url,
-					'token' => $token,
-					'created' => $this->timeFactory->getTime()
-				]
-			);
-		}
+    /**
+     * add server to the list of trusted servers
+     *
+     * @param $url
+     * @return int server id
+     */
+    public function addServer($url) {
+        $url = $this->updateProtocol($url);
+        $result = $this->dbHandler->addServer($url);
+        if ($result) {
+            $token = $this->secureRandom->generate(16);
+            $this->dbHandler->addToken($url, $token);
+            $this->jobList->add(
+                RequestSharedSecret::class,
+                [
+                    'url' => $url,
+                    'token' => $token,
+                    'created' => $this->timeFactory->getTime()
+                ]
+            );
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * get shared secret for the given server
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function getSharedSecret($url) {
-		return $this->dbHandler->getSharedSecret($url);
-	}
+    /**
+     * get shared secret for the given server
+     *
+     * @param string $url
+     * @return string
+     */
+    public function getSharedSecret($url) {
+        return $this->dbHandler->getSharedSecret($url);
+    }
 
-	/**
-	 * add shared secret for the given server
-	 *
-	 * @param string $url
-	 * @param $sharedSecret
-	 */
-	public function addSharedSecret($url, $sharedSecret) {
-		$this->dbHandler->addSharedSecret($url, $sharedSecret);
-	}
+    /**
+     * add shared secret for the given server
+     *
+     * @param string $url
+     * @param $sharedSecret
+     */
+    public function addSharedSecret($url, $sharedSecret) {
+        $this->dbHandler->addSharedSecret($url, $sharedSecret);
+    }
 
-	/**
-	 * remove server from the list of trusted servers
-	 *
-	 * @param int $id
-	 */
-	public function removeServer($id) {
-		$server = $this->dbHandler->getServerById($id);
-		$this->dbHandler->removeServer($id);
-		$event = new GenericEvent($server['url_hash']);
-		$this->dispatcher->dispatch('OCP\Federation\TrustedServerEvent::remove', $event);
-	}
+    /**
+     * remove server from the list of trusted servers
+     *
+     * @param int $id
+     */
+    public function removeServer($id) {
+        $server = $this->dbHandler->getServerById($id);
+        $this->dbHandler->removeServer($id);
+        $event = new GenericEvent($server['url_hash']);
+        $this->dispatcher->dispatch('OCP\Federation\TrustedServerEvent::remove', $event);
+    }
 
-	/**
-	 * get all trusted servers
-	 *
-	 * @return array
-	 */
-	public function getServers() {
-		return $this->dbHandler->getAllServer();
-	}
+    /**
+     * get all trusted servers
+     *
+     * @return array
+     */
+    public function getServers() {
+        return $this->dbHandler->getAllServer();
+    }
 
-	/**
-	 * check if given server is a trusted Nextcloud server
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function isTrustedServer($url) {
-		return $this->dbHandler->serverExists($url);
-	}
+    /**
+     * check if given server is a trusted Nextcloud server
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function isTrustedServer($url) {
+        return $this->dbHandler->serverExists($url);
+    }
 
-	/**
-	 * set server status
-	 *
-	 * @param string $url
-	 * @param int $status
-	 */
-	public function setServerStatus($url, $status) {
-		$this->dbHandler->setServerStatus($url, $status);
-	}
+    /**
+     * set server status
+     *
+     * @param string $url
+     * @param int $status
+     */
+    public function setServerStatus($url, $status) {
+        $this->dbHandler->setServerStatus($url, $status);
+    }
 
-	/**
-	 * @param string $url
-	 * @return int
-	 */
-	public function getServerStatus($url) {
-		return $this->dbHandler->getServerStatus($url);
-	}
+    /**
+     * @param string $url
+     * @return int
+     */
+    public function getServerStatus($url) {
+        return $this->dbHandler->getServerStatus($url);
+    }
 
-	/**
-	 * check if URL point to a ownCloud/Nextcloud server
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function isOwnCloudServer($url) {
-		$isValidOwnCloud = false;
-		$client = $this->httpClientService->newClient();
-		try {
-			$result = $client->get(
-				$url . '/status.php',
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			);
-			if ($result->getStatusCode() === Http::STATUS_OK) {
-				$isValidOwnCloud = $this->checkOwnCloudVersion($result->getBody());
-			}
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'No Nextcloud server.',
-				'level' => ILogger::DEBUG,
-				'app' => 'federation',
-			]);
-			return false;
-		}
+    /**
+     * check if URL point to a ownCloud/Nextcloud server
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function isOwnCloudServer($url) {
+        $isValidOwnCloud = false;
+        $client = $this->httpClientService->newClient();
+        try {
+            $result = $client->get(
+                $url . '/status.php',
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            );
+            if ($result->getStatusCode() === Http::STATUS_OK) {
+                $isValidOwnCloud = $this->checkOwnCloudVersion($result->getBody());
+            }
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'No Nextcloud server.',
+                'level' => ILogger::DEBUG,
+                'app' => 'federation',
+            ]);
+            return false;
+        }
 
-		return $isValidOwnCloud;
-	}
+        return $isValidOwnCloud;
+    }
 
-	/**
-	 * check if ownCloud version is >= 9.0
-	 *
-	 * @param $status
-	 * @return bool
-	 * @throws HintException
-	 */
-	protected function checkOwnCloudVersion($status) {
-		$decoded = json_decode($status, true);
-		if (!empty($decoded) && isset($decoded['version'])) {
-			if (!version_compare($decoded['version'], '9.0.0', '>=')) {
-				throw new HintException('Remote server version is too low. 9.0 is required.');
-			}
-			return true;
-		}
-		return false;
-	}
+    /**
+     * check if ownCloud version is >= 9.0
+     *
+     * @param $status
+     * @return bool
+     * @throws HintException
+     */
+    protected function checkOwnCloudVersion($status) {
+        $decoded = json_decode($status, true);
+        if (!empty($decoded) && isset($decoded['version'])) {
+            if (!version_compare($decoded['version'], '9.0.0', '>=')) {
+                throw new HintException('Remote server version is too low. 9.0 is required.');
+            }
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * check if the URL contain a protocol, if not add https
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function updateProtocol($url) {
-		if (
-			strpos($url, 'https://') === 0
-			|| strpos($url, 'http://') === 0
-		) {
-			return $url;
-		}
+    /**
+     * check if the URL contain a protocol, if not add https
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function updateProtocol($url) {
+        if (
+            strpos($url, 'https://') === 0
+            || strpos($url, 'http://') === 0
+        ) {
+            return $url;
+        }
 
-		return 'https://' . $url;
-	}
+        return 'https://' . $url;
+    }
 }

apps/federation/composer/composer/autoload_static.php

Spacing +23 added lines, -23 removed lines

@@ -6,42 +6,42 @@
 
 class ComposerStaticInitFederation
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Federation\\' => 15,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Federation\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Federation\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => __DIR__ . '/..' . '/../lib/BackgroundJob/GetSharedSecret.php',
-        'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => __DIR__ . '/..' . '/../lib/BackgroundJob/RequestSharedSecret.php',
-        'OCA\\Federation\\Command\\SyncFederationAddressBooks' => __DIR__ . '/..' . '/../lib/Command/SyncFederationAddressBooks.php',
-        'OCA\\Federation\\Controller\\OCSAuthAPIController' => __DIR__ . '/..' . '/../lib/Controller/OCSAuthAPIController.php',
-        'OCA\\Federation\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
-        'OCA\\Federation\\DAV\\FedAuth' => __DIR__ . '/..' . '/../lib/DAV/FedAuth.php',
-        'OCA\\Federation\\DbHandler' => __DIR__ . '/..' . '/../lib/DbHandler.php',
-        'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => __DIR__ . '/..' . '/../lib/Listener/SabrePluginAuthInitListener.php',
-        'OCA\\Federation\\Middleware\\AddServerMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/AddServerMiddleware.php',
-        'OCA\\Federation\\Migration\\Version1010Date20200630191302' => __DIR__ . '/..' . '/../lib/Migration/Version1010Date20200630191302.php',
-        'OCA\\Federation\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\Federation\\SyncFederationAddressBooks' => __DIR__ . '/..' . '/../lib/SyncFederationAddressBooks.php',
-        'OCA\\Federation\\SyncJob' => __DIR__ . '/..' . '/../lib/SyncJob.php',
-        'OCA\\Federation\\TrustedServers' => __DIR__ . '/..' . '/../lib/TrustedServers.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Federation\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => __DIR__.'/..'.'/../lib/BackgroundJob/GetSharedSecret.php',
+        'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => __DIR__.'/..'.'/../lib/BackgroundJob/RequestSharedSecret.php',
+        'OCA\\Federation\\Command\\SyncFederationAddressBooks' => __DIR__.'/..'.'/../lib/Command/SyncFederationAddressBooks.php',
+        'OCA\\Federation\\Controller\\OCSAuthAPIController' => __DIR__.'/..'.'/../lib/Controller/OCSAuthAPIController.php',
+        'OCA\\Federation\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
+        'OCA\\Federation\\DAV\\FedAuth' => __DIR__.'/..'.'/../lib/DAV/FedAuth.php',
+        'OCA\\Federation\\DbHandler' => __DIR__.'/..'.'/../lib/DbHandler.php',
+        'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => __DIR__.'/..'.'/../lib/Listener/SabrePluginAuthInitListener.php',
+        'OCA\\Federation\\Middleware\\AddServerMiddleware' => __DIR__.'/..'.'/../lib/Middleware/AddServerMiddleware.php',
+        'OCA\\Federation\\Migration\\Version1010Date20200630191302' => __DIR__.'/..'.'/../lib/Migration/Version1010Date20200630191302.php',
+        'OCA\\Federation\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\Federation\\SyncFederationAddressBooks' => __DIR__.'/..'.'/../lib/SyncFederationAddressBooks.php',
+        'OCA\\Federation\\SyncJob' => __DIR__.'/..'.'/../lib/SyncJob.php',
+        'OCA\\Federation\\TrustedServers' => __DIR__.'/..'.'/../lib/TrustedServers.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFederation::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFederation::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFederation::$classMap;

apps/federation/composer/composer/autoload_classmap.php

Spacing +16 added lines, -16 removed lines

@@ -6,20 +6,20 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Federation\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => $baseDir . '/../lib/BackgroundJob/GetSharedSecret.php',
-    'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => $baseDir . '/../lib/BackgroundJob/RequestSharedSecret.php',
-    'OCA\\Federation\\Command\\SyncFederationAddressBooks' => $baseDir . '/../lib/Command/SyncFederationAddressBooks.php',
-    'OCA\\Federation\\Controller\\OCSAuthAPIController' => $baseDir . '/../lib/Controller/OCSAuthAPIController.php',
-    'OCA\\Federation\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
-    'OCA\\Federation\\DAV\\FedAuth' => $baseDir . '/../lib/DAV/FedAuth.php',
-    'OCA\\Federation\\DbHandler' => $baseDir . '/../lib/DbHandler.php',
-    'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => $baseDir . '/../lib/Listener/SabrePluginAuthInitListener.php',
-    'OCA\\Federation\\Middleware\\AddServerMiddleware' => $baseDir . '/../lib/Middleware/AddServerMiddleware.php',
-    'OCA\\Federation\\Migration\\Version1010Date20200630191302' => $baseDir . '/../lib/Migration/Version1010Date20200630191302.php',
-    'OCA\\Federation\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\Federation\\SyncFederationAddressBooks' => $baseDir . '/../lib/SyncFederationAddressBooks.php',
-    'OCA\\Federation\\SyncJob' => $baseDir . '/../lib/SyncJob.php',
-    'OCA\\Federation\\TrustedServers' => $baseDir . '/../lib/TrustedServers.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Federation\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => $baseDir.'/../lib/BackgroundJob/GetSharedSecret.php',
+    'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => $baseDir.'/../lib/BackgroundJob/RequestSharedSecret.php',
+    'OCA\\Federation\\Command\\SyncFederationAddressBooks' => $baseDir.'/../lib/Command/SyncFederationAddressBooks.php',
+    'OCA\\Federation\\Controller\\OCSAuthAPIController' => $baseDir.'/../lib/Controller/OCSAuthAPIController.php',
+    'OCA\\Federation\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
+    'OCA\\Federation\\DAV\\FedAuth' => $baseDir.'/../lib/DAV/FedAuth.php',
+    'OCA\\Federation\\DbHandler' => $baseDir.'/../lib/DbHandler.php',
+    'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => $baseDir.'/../lib/Listener/SabrePluginAuthInitListener.php',
+    'OCA\\Federation\\Middleware\\AddServerMiddleware' => $baseDir.'/../lib/Middleware/AddServerMiddleware.php',
+    'OCA\\Federation\\Migration\\Version1010Date20200630191302' => $baseDir.'/../lib/Migration/Version1010Date20200630191302.php',
+    'OCA\\Federation\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\Federation\\SyncFederationAddressBooks' => $baseDir.'/../lib/SyncFederationAddressBooks.php',
+    'OCA\\Federation\\SyncJob' => $baseDir.'/../lib/SyncJob.php',
+    'OCA\\Federation\\TrustedServers' => $baseDir.'/../lib/TrustedServers.php',
 );