nextcloud / server

lib/public/Files.php

Indentation +64 added lines, -64 removed lines

@@ -49,73 +49,73 @@
  * @deprecated 14.0.0
  */
 class Files {
-	/**
-	 * Recusive deletion of folders
-	 * @return bool
-	 * @since 5.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function rmdirr($dir) {
-		return \OC_Helper::rmdirr($dir);
-	}
+    /**
+     * Recusive deletion of folders
+     * @return bool
+     * @since 5.0.0
+     * @deprecated 14.0.0
+     */
+    public static function rmdirr($dir) {
+        return \OC_Helper::rmdirr($dir);
+    }
 
-	/**
-	 * Get the mimetype form a local file
-	 * @param string $path
-	 * @return string
-	 * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
-	 * @since 5.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function getMimeType($path) {
-		return \OC::$server->getMimeTypeDetector()->detect($path);
-	}
+    /**
+     * Get the mimetype form a local file
+     * @param string $path
+     * @return string
+     * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
+     * @since 5.0.0
+     * @deprecated 14.0.0
+     */
+    public static function getMimeType($path) {
+        return \OC::$server->getMimeTypeDetector()->detect($path);
+    }
 
-	/**
-	 * Search for files by mimetype
-	 * @param string $mimetype
-	 * @return array
-	 * @since 6.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function searchByMime($mimetype) {
-		return \OC\Files\Filesystem::searchByMime($mimetype);
-	}
+    /**
+     * Search for files by mimetype
+     * @param string $mimetype
+     * @return array
+     * @since 6.0.0
+     * @deprecated 14.0.0
+     */
+    public static function searchByMime($mimetype) {
+        return \OC\Files\Filesystem::searchByMime($mimetype);
+    }
 
-	/**
-	 * Copy the contents of one stream to another
-	 * @param resource $source
-	 * @param resource $target
-	 * @return int the number of bytes copied
-	 * @since 5.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function streamCopy($source, $target) {
-		[$count, ] = \OC_Helper::streamCopy($source, $target);
-		return $count;
-	}
+    /**
+     * Copy the contents of one stream to another
+     * @param resource $source
+     * @param resource $target
+     * @return int the number of bytes copied
+     * @since 5.0.0
+     * @deprecated 14.0.0
+     */
+    public static function streamCopy($source, $target) {
+        [$count, ] = \OC_Helper::streamCopy($source, $target);
+        return $count;
+    }
 
-	/**
-	 * Adds a suffix to the name in case the file exists
-	 * @param string $path
-	 * @param string $filename
-	 * @return string
-	 * @since 5.0.0
-	 * @deprecated 14.0.0 use getNonExistingName of the OCP\Files\Folder object
-	 */
-	public static function buildNotExistingFileName($path, $filename) {
-		return \OC_Helper::buildNotExistingFileName($path, $filename);
-	}
+    /**
+     * Adds a suffix to the name in case the file exists
+     * @param string $path
+     * @param string $filename
+     * @return string
+     * @since 5.0.0
+     * @deprecated 14.0.0 use getNonExistingName of the OCP\Files\Folder object
+     */
+    public static function buildNotExistingFileName($path, $filename) {
+        return \OC_Helper::buildNotExistingFileName($path, $filename);
+    }
 
-	/**
-	 * Gets the Storage for an app - creates the needed folder if they are not
-	 * existent
-	 * @param string $app
-	 * @return \OC\Files\View
-	 * @since 5.0.0
-	 * @deprecated 14.0.0 use IAppData instead
-	 */
-	public static function getStorage($app) {
-		return \OC_App::getStorage($app);
-	}
+    /**
+     * Gets the Storage for an app - creates the needed folder if they are not
+     * existent
+     * @param string $app
+     * @return \OC\Files\View
+     * @since 5.0.0
+     * @deprecated 14.0.0 use IAppData instead
+     */
+    public static function getStorage($app) {
+        return \OC_App::getStorage($app);
+    }
 }

core/Command/L10n/CreateJs.php

Indentation +131 added lines, -131 removed lines

@@ -36,135 +36,135 @@
 use UnexpectedValueException;
 
 class CreateJs extends Command implements CompletionAwareInterface {
-	protected function configure() {
-		$this
-			->setName('l10n:createjs')
-			->setDescription('Create javascript translation files for a given app')
-			->addArgument(
-				'app',
-				InputOption::VALUE_REQUIRED,
-				'name of the app'
-			)
-			->addArgument(
-				'lang',
-				InputOption::VALUE_OPTIONAL,
-				'name of the language'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$app = $input->getArgument('app');
-		$lang = $input->getArgument('lang');
-
-		$path = \OC_App::getAppPath($app);
-		if ($path === false) {
-			$output->writeln("The app <$app> is unknown.");
-			return 1;
-		}
-		$languages = $lang;
-		if (empty($lang)) {
-			$languages = $this->getAllLanguages($path);
-		}
-
-		foreach ($languages as $lang) {
-			$this->writeFiles($app, $path, $lang, $output);
-		}
-		return 0;
-	}
-
-	private function getAllLanguages($path) {
-		$result = [];
-		foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
-			if ($fileInfo->isDot()) {
-				continue;
-			}
-			if ($fileInfo->isDir()) {
-				continue;
-			}
-			if ($fileInfo->getExtension() !== 'php') {
-				continue;
-			}
-			$result[] = substr($fileInfo->getBasename(), 0, -4);
-		}
-
-		return $result;
-	}
-
-	private function writeFiles($app, $path, $lang, OutputInterface $output) {
-		[$translations, $plurals] = $this->loadTranslations($path, $lang);
-		$this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
-		$this->writeJsonFile($path, $lang, $output, $translations, $plurals);
-	}
-
-	private function writeJsFile($app, $path, $lang, OutputInterface $output, $translations, $plurals) {
-		$jsFile = "$path/l10n/$lang.js";
-		if (file_exists($jsFile)) {
-			$output->writeln("File already exists: $jsFile");
-			return;
-		}
-		$content = "OC.L10N.register(\n    \"$app\",\n    {\n    ";
-		$jsTrans = [];
-		foreach ($translations as $id => $val) {
-			if (is_array($val)) {
-				$val = '[ ' . implode(',', $val) . ']';
-			}
-			$jsTrans[] = "\"$id\" : \"$val\"";
-		}
-		$content .= implode(",\n    ", $jsTrans);
-		$content .= "\n},\n\"$plurals\");\n";
-
-		file_put_contents($jsFile, $content);
-		$output->writeln("Javascript translation file generated: $jsFile");
-	}
-
-	private function writeJsonFile($path, $lang, OutputInterface $output, $translations, $plurals) {
-		$jsFile = "$path/l10n/$lang.json";
-		if (file_exists($jsFile)) {
-			$output->writeln("File already exists: $jsFile");
-			return;
-		}
-		$content = ['translations' => $translations, 'pluralForm' => $plurals];
-		file_put_contents($jsFile, json_encode($content));
-		$output->writeln("Json translation file generated: $jsFile");
-	}
-
-	private function loadTranslations($path, $lang) {
-		$phpFile = "$path/l10n/$lang.php";
-		$TRANSLATIONS = [];
-		$PLURAL_FORMS = '';
-		if (!file_exists($phpFile)) {
-			throw new UnexpectedValueException("PHP translation file <$phpFile> does not exist.");
-		}
-		require $phpFile;
-
-		return [$TRANSLATIONS, $PLURAL_FORMS];
-	}
-
-	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * Return possible values for the named argument
-	 *
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return \OC_App::getAllApps();
-		} elseif ($argumentName === 'lang') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-			return $this->getAllLanguages(\OC_App::getAppPath($appName));
-		}
-		return [];
-	}
+    protected function configure() {
+        $this
+            ->setName('l10n:createjs')
+            ->setDescription('Create javascript translation files for a given app')
+            ->addArgument(
+                'app',
+                InputOption::VALUE_REQUIRED,
+                'name of the app'
+            )
+            ->addArgument(
+                'lang',
+                InputOption::VALUE_OPTIONAL,
+                'name of the language'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $app = $input->getArgument('app');
+        $lang = $input->getArgument('lang');
+
+        $path = \OC_App::getAppPath($app);
+        if ($path === false) {
+            $output->writeln("The app <$app> is unknown.");
+            return 1;
+        }
+        $languages = $lang;
+        if (empty($lang)) {
+            $languages = $this->getAllLanguages($path);
+        }
+
+        foreach ($languages as $lang) {
+            $this->writeFiles($app, $path, $lang, $output);
+        }
+        return 0;
+    }
+
+    private function getAllLanguages($path) {
+        $result = [];
+        foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
+            if ($fileInfo->isDot()) {
+                continue;
+            }
+            if ($fileInfo->isDir()) {
+                continue;
+            }
+            if ($fileInfo->getExtension() !== 'php') {
+                continue;
+            }
+            $result[] = substr($fileInfo->getBasename(), 0, -4);
+        }
+
+        return $result;
+    }
+
+    private function writeFiles($app, $path, $lang, OutputInterface $output) {
+        [$translations, $plurals] = $this->loadTranslations($path, $lang);
+        $this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
+        $this->writeJsonFile($path, $lang, $output, $translations, $plurals);
+    }
+
+    private function writeJsFile($app, $path, $lang, OutputInterface $output, $translations, $plurals) {
+        $jsFile = "$path/l10n/$lang.js";
+        if (file_exists($jsFile)) {
+            $output->writeln("File already exists: $jsFile");
+            return;
+        }
+        $content = "OC.L10N.register(\n    \"$app\",\n    {\n    ";
+        $jsTrans = [];
+        foreach ($translations as $id => $val) {
+            if (is_array($val)) {
+                $val = '[ ' . implode(',', $val) . ']';
+            }
+            $jsTrans[] = "\"$id\" : \"$val\"";
+        }
+        $content .= implode(",\n    ", $jsTrans);
+        $content .= "\n},\n\"$plurals\");\n";
+
+        file_put_contents($jsFile, $content);
+        $output->writeln("Javascript translation file generated: $jsFile");
+    }
+
+    private function writeJsonFile($path, $lang, OutputInterface $output, $translations, $plurals) {
+        $jsFile = "$path/l10n/$lang.json";
+        if (file_exists($jsFile)) {
+            $output->writeln("File already exists: $jsFile");
+            return;
+        }
+        $content = ['translations' => $translations, 'pluralForm' => $plurals];
+        file_put_contents($jsFile, json_encode($content));
+        $output->writeln("Json translation file generated: $jsFile");
+    }
+
+    private function loadTranslations($path, $lang) {
+        $phpFile = "$path/l10n/$lang.php";
+        $TRANSLATIONS = [];
+        $PLURAL_FORMS = '';
+        if (!file_exists($phpFile)) {
+            throw new UnexpectedValueException("PHP translation file <$phpFile> does not exist.");
+        }
+        require $phpFile;
+
+        return [$TRANSLATIONS, $PLURAL_FORMS];
+    }
+
+    /**
+     * Return possible values for the named option
+     *
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * Return possible values for the named argument
+     *
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return \OC_App::getAllApps();
+        } elseif ($argumentName === 'lang') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+            return $this->getAllLanguages(\OC_App::getAppPath($appName));
+        }
+        return [];
+    }
 }

core/Command/TwoFactorAuth/State.php

Indentation +70 added lines, -70 removed lines

@@ -35,74 +35,74 @@
 
 class State extends Base {
 
-	/** @var IRegistry */
-	private $registry;
-
-	public function __construct(IRegistry $registry, IUserManager $userManager) {
-		parent::__construct('twofactorauth:state');
-
-		$this->registry = $registry;
-		$this->userManager = $userManager;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this->setName('twofactorauth:state');
-		$this->setDescription('Get the two-factor authentication (2FA) state of a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$uid = $input->getArgument('uid');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return 1;
-		}
-
-		$providerStates = $this->registry->getProviderStates($user);
-		$filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
-		[$enabled, $disabled] = $filtered;
-
-		if (!empty($enabled)) {
-			$output->writeln("Two-factor authentication is enabled for user $uid");
-		} else {
-			$output->writeln("Two-factor authentication is not enabled for user $uid");
-		}
-
-		$output->writeln("");
-		$this->printProviders("Enabled providers", $enabled, $output);
-		$this->printProviders("Disabled providers", $disabled, $output);
-
-		return 0;
-	}
-
-	private function filterEnabledDisabledUnknownProviders(array $providerStates): array {
-		$enabled = [];
-		$disabled = [];
-
-		foreach ($providerStates as $providerId => $isEnabled) {
-			if ($isEnabled) {
-				$enabled[] = $providerId;
-			} else {
-				$disabled[] = $providerId;
-			}
-		}
-
-		return [$enabled, $disabled];
-	}
-
-	private function printProviders(string $title, array $providers,
-									OutputInterface $output) {
-		if (empty($providers)) {
-			// Ignore and don't print anything
-			return;
-		}
-
-		$output->writeln($title . ":");
-		foreach ($providers as $provider) {
-			$output->writeln("- " . $provider);
-		}
-	}
+    /** @var IRegistry */
+    private $registry;
+
+    public function __construct(IRegistry $registry, IUserManager $userManager) {
+        parent::__construct('twofactorauth:state');
+
+        $this->registry = $registry;
+        $this->userManager = $userManager;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this->setName('twofactorauth:state');
+        $this->setDescription('Get the two-factor authentication (2FA) state of a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $uid = $input->getArgument('uid');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return 1;
+        }
+
+        $providerStates = $this->registry->getProviderStates($user);
+        $filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
+        [$enabled, $disabled] = $filtered;
+
+        if (!empty($enabled)) {
+            $output->writeln("Two-factor authentication is enabled for user $uid");
+        } else {
+            $output->writeln("Two-factor authentication is not enabled for user $uid");
+        }
+
+        $output->writeln("");
+        $this->printProviders("Enabled providers", $enabled, $output);
+        $this->printProviders("Disabled providers", $disabled, $output);
+
+        return 0;
+    }
+
+    private function filterEnabledDisabledUnknownProviders(array $providerStates): array {
+        $enabled = [];
+        $disabled = [];
+
+        foreach ($providerStates as $providerId => $isEnabled) {
+            if ($isEnabled) {
+                $enabled[] = $providerId;
+            } else {
+                $disabled[] = $providerId;
+            }
+        }
+
+        return [$enabled, $disabled];
+    }
+
+    private function printProviders(string $title, array $providers,
+                                    OutputInterface $output) {
+        if (empty($providers)) {
+            // Ignore and don't print anything
+            return;
+        }
+
+        $output->writeln($title . ":");
+        foreach ($providers as $provider) {
+            $output->writeln("- " . $provider);
+        }
+    }
 }

core/Controller/TwoFactorChallengeController.php

Indentation +207 added lines, -207 removed lines

@@ -43,239 +43,239 @@
 
 class TwoFactorChallengeController extends Controller {
 
-	/** @var Manager */
-	private $twoFactorManager;
+    /** @var Manager */
+    private $twoFactorManager;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var ISession */
-	private $session;
+    /** @var ISession */
+    private $session;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param Manager $twoFactorManager
-	 * @param IUserSession $userSession
-	 * @param ISession $session
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct($appName, IRequest $request, Manager $twoFactorManager, IUserSession $userSession,
-		ISession $session, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->twoFactorManager = $twoFactorManager;
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param Manager $twoFactorManager
+     * @param IUserSession $userSession
+     * @param ISession $session
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct($appName, IRequest $request, Manager $twoFactorManager, IUserSession $userSession,
+        ISession $session, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->twoFactorManager = $twoFactorManager;
+        $this->userSession = $userSession;
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @return string
-	 */
-	protected function getLogoutUrl() {
-		return OC_User::getLogoutUrl($this->urlGenerator);
-	}
+    /**
+     * @return string
+     */
+    protected function getLogoutUrl() {
+        return OC_User::getLogoutUrl($this->urlGenerator);
+    }
 	
-	/**
-	 * @param IProvider[] $providers
-	 */
-	private function splitProvidersAndBackupCodes(array $providers): array {
-		$regular = [];
-		$backup = null;
-		foreach ($providers as $provider) {
-			if ($provider->getId() === 'backup_codes') {
-				$backup = $provider;
-			} else {
-				$regular[] = $provider;
-			}
-		}
+    /**
+     * @param IProvider[] $providers
+     */
+    private function splitProvidersAndBackupCodes(array $providers): array {
+        $regular = [];
+        $backup = null;
+        foreach ($providers as $provider) {
+            if ($provider->getId() === 'backup_codes') {
+                $backup = $provider;
+            } else {
+                $regular[] = $provider;
+            }
+        }
 
-		return [$regular, $backup];
-	}
+        return [$regular, $backup];
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @TwoFactorSetUpDoneRequired
-	 *
-	 * @param string $redirect_url
-	 * @return StandaloneTemplateResponse
-	 */
-	public function selectChallenge($redirect_url) {
-		$user = $this->userSession->getUser();
-		$providerSet = $this->twoFactorManager->getProviderSet($user);
-		$allProviders = $providerSet->getProviders();
-		[$providers, $backupProvider] = $this->splitProvidersAndBackupCodes($allProviders);
-		$setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @TwoFactorSetUpDoneRequired
+     *
+     * @param string $redirect_url
+     * @return StandaloneTemplateResponse
+     */
+    public function selectChallenge($redirect_url) {
+        $user = $this->userSession->getUser();
+        $providerSet = $this->twoFactorManager->getProviderSet($user);
+        $allProviders = $providerSet->getProviders();
+        [$providers, $backupProvider] = $this->splitProvidersAndBackupCodes($allProviders);
+        $setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
 
-		$data = [
-			'providers' => $providers,
-			'backupProvider' => $backupProvider,
-			'providerMissing' => $providerSet->isProviderMissing(),
-			'redirect_url' => $redirect_url,
-			'logout_url' => $this->getLogoutUrl(),
-			'hasSetupProviders' => !empty($setupProviders),
-		];
-		return new StandaloneTemplateResponse($this->appName, 'twofactorselectchallenge', $data, 'guest');
-	}
+        $data = [
+            'providers' => $providers,
+            'backupProvider' => $backupProvider,
+            'providerMissing' => $providerSet->isProviderMissing(),
+            'redirect_url' => $redirect_url,
+            'logout_url' => $this->getLogoutUrl(),
+            'hasSetupProviders' => !empty($setupProviders),
+        ];
+        return new StandaloneTemplateResponse($this->appName, 'twofactorselectchallenge', $data, 'guest');
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @UseSession
-	 * @TwoFactorSetUpDoneRequired
-	 *
-	 * @param string $challengeProviderId
-	 * @param string $redirect_url
-	 * @return StandaloneTemplateResponse|RedirectResponse
-	 */
-	public function showChallenge($challengeProviderId, $redirect_url) {
-		$user = $this->userSession->getUser();
-		$providerSet = $this->twoFactorManager->getProviderSet($user);
-		$provider = $providerSet->getProvider($challengeProviderId);
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @UseSession
+     * @TwoFactorSetUpDoneRequired
+     *
+     * @param string $challengeProviderId
+     * @param string $redirect_url
+     * @return StandaloneTemplateResponse|RedirectResponse
+     */
+    public function showChallenge($challengeProviderId, $redirect_url) {
+        $user = $this->userSession->getUser();
+        $providerSet = $this->twoFactorManager->getProviderSet($user);
+        $provider = $providerSet->getProvider($challengeProviderId);
 
-		if (is_null($provider)) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-		}
+        if (is_null($provider)) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+        }
 
-		$backupProvider = $providerSet->getProvider('backup_codes');
-		if (!is_null($backupProvider) && $backupProvider->getId() === $provider->getId()) {
-			// Don't show the backup provider link if we're already showing that provider's challenge
-			$backupProvider = null;
-		}
+        $backupProvider = $providerSet->getProvider('backup_codes');
+        if (!is_null($backupProvider) && $backupProvider->getId() === $provider->getId()) {
+            // Don't show the backup provider link if we're already showing that provider's challenge
+            $backupProvider = null;
+        }
 
-		$errorMessage = '';
-		$error = false;
-		if ($this->session->exists('two_factor_auth_error')) {
-			$this->session->remove('two_factor_auth_error');
-			$error = true;
-			$errorMessage = $this->session->get("two_factor_auth_error_message");
-			$this->session->remove('two_factor_auth_error_message');
-		}
-		$tmpl = $provider->getTemplate($user);
-		$tmpl->assign('redirect_url', $redirect_url);
-		$data = [
-			'error' => $error,
-			'error_message' => $errorMessage,
-			'provider' => $provider,
-			'backupProvider' => $backupProvider,
-			'logout_url' => $this->getLogoutUrl(),
-			'redirect_url' => $redirect_url,
-			'template' => $tmpl->fetchPage(),
-		];
-		$response = new StandaloneTemplateResponse($this->appName, 'twofactorshowchallenge', $data, 'guest');
-		if ($provider instanceof IProvidesCustomCSP) {
-			$response->setContentSecurityPolicy($provider->getCSP());
-		}
-		return $response;
-	}
+        $errorMessage = '';
+        $error = false;
+        if ($this->session->exists('two_factor_auth_error')) {
+            $this->session->remove('two_factor_auth_error');
+            $error = true;
+            $errorMessage = $this->session->get("two_factor_auth_error_message");
+            $this->session->remove('two_factor_auth_error_message');
+        }
+        $tmpl = $provider->getTemplate($user);
+        $tmpl->assign('redirect_url', $redirect_url);
+        $data = [
+            'error' => $error,
+            'error_message' => $errorMessage,
+            'provider' => $provider,
+            'backupProvider' => $backupProvider,
+            'logout_url' => $this->getLogoutUrl(),
+            'redirect_url' => $redirect_url,
+            'template' => $tmpl->fetchPage(),
+        ];
+        $response = new StandaloneTemplateResponse($this->appName, 'twofactorshowchallenge', $data, 'guest');
+        if ($provider instanceof IProvidesCustomCSP) {
+            $response->setContentSecurityPolicy($provider->getCSP());
+        }
+        return $response;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @UseSession
-	 * @TwoFactorSetUpDoneRequired
-	 *
-	 * @UserRateThrottle(limit=5, period=100)
-	 *
-	 * @param string $challengeProviderId
-	 * @param string $challenge
-	 * @param string $redirect_url
-	 * @return RedirectResponse
-	 */
-	public function solveChallenge($challengeProviderId, $challenge, $redirect_url = null) {
-		$user = $this->userSession->getUser();
-		$provider = $this->twoFactorManager->getProvider($user, $challengeProviderId);
-		if (is_null($provider)) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @UseSession
+     * @TwoFactorSetUpDoneRequired
+     *
+     * @UserRateThrottle(limit=5, period=100)
+     *
+     * @param string $challengeProviderId
+     * @param string $challenge
+     * @param string $redirect_url
+     * @return RedirectResponse
+     */
+    public function solveChallenge($challengeProviderId, $challenge, $redirect_url = null) {
+        $user = $this->userSession->getUser();
+        $provider = $this->twoFactorManager->getProvider($user, $challengeProviderId);
+        if (is_null($provider)) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+        }
 
-		try {
-			if ($this->twoFactorManager->verifyChallenge($challengeProviderId, $user, $challenge)) {
-				if (!is_null($redirect_url)) {
-					return new RedirectResponse($this->urlGenerator->getAbsoluteURL(urldecode($redirect_url)));
-				}
-				return new RedirectResponse(OC_Util::getDefaultPageUrl());
-			}
-		} catch (TwoFactorException $e) {
-			/*
+        try {
+            if ($this->twoFactorManager->verifyChallenge($challengeProviderId, $user, $challenge)) {
+                if (!is_null($redirect_url)) {
+                    return new RedirectResponse($this->urlGenerator->getAbsoluteURL(urldecode($redirect_url)));
+                }
+                return new RedirectResponse(OC_Util::getDefaultPageUrl());
+            }
+        } catch (TwoFactorException $e) {
+            /*
 			 * The 2FA App threw an TwoFactorException. Now we display more
 			 * information to the user. The exception text is stored in the
 			 * session to be used in showChallenge()
 			 */
-			$this->session->set('two_factor_auth_error_message', $e->getMessage());
-		}
+            $this->session->set('two_factor_auth_error_message', $e->getMessage());
+        }
 
-		$this->session->set('two_factor_auth_error', true);
-		return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.showChallenge', [
-			'challengeProviderId' => $provider->getId(),
-			'redirect_url' => $redirect_url,
-		]));
-	}
+        $this->session->set('two_factor_auth_error', true);
+        return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.showChallenge', [
+            'challengeProviderId' => $provider->getId(),
+            'redirect_url' => $redirect_url,
+        ]));
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function setupProviders() {
-		$user = $this->userSession->getUser();
-		$setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function setupProviders() {
+        $user = $this->userSession->getUser();
+        $setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
 
-		$data = [
-			'providers' => $setupProviders,
-			'logout_url' => $this->getLogoutUrl(),
-		];
+        $data = [
+            'providers' => $setupProviders,
+            'logout_url' => $this->getLogoutUrl(),
+        ];
 
-		$response = new StandaloneTemplateResponse($this->appName, 'twofactorsetupselection', $data, 'guest');
-		return $response;
-	}
+        $response = new StandaloneTemplateResponse($this->appName, 'twofactorsetupselection', $data, 'guest');
+        return $response;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function setupProvider(string $providerId) {
-		$user = $this->userSession->getUser();
-		$providers = $this->twoFactorManager->getLoginSetupProviders($user);
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function setupProvider(string $providerId) {
+        $user = $this->userSession->getUser();
+        $providers = $this->twoFactorManager->getLoginSetupProviders($user);
 
-		$provider = null;
-		foreach ($providers as $p) {
-			if ($p->getId() === $providerId) {
-				$provider = $p;
-				break;
-			}
-		}
+        $provider = null;
+        foreach ($providers as $p) {
+            if ($p->getId() === $providerId) {
+                $provider = $p;
+                break;
+            }
+        }
 
-		if ($provider === null) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-		}
+        if ($provider === null) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+        }
 
-		/** @var IActivatableAtLogin $provider */
-		$tmpl = $provider->getLoginSetup($user)->getBody();
-		$data = [
-			'provider' => $provider,
-			'logout_url' => $this->getLogoutUrl(),
-			'template' => $tmpl->fetchPage(),
-		];
-		$response = new StandaloneTemplateResponse($this->appName, 'twofactorsetupchallenge', $data, 'guest');
-		return $response;
-	}
+        /** @var IActivatableAtLogin $provider */
+        $tmpl = $provider->getLoginSetup($user)->getBody();
+        $data = [
+            'provider' => $provider,
+            'logout_url' => $this->getLogoutUrl(),
+            'template' => $tmpl->fetchPage(),
+        ];
+        $response = new StandaloneTemplateResponse($this->appName, 'twofactorsetupchallenge', $data, 'guest');
+        return $response;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @todo handle the extreme edge case of an invalid provider ID and redirect to the provider selection page
-	 */
-	public function confirmProviderSetup(string $providerId) {
-		return new RedirectResponse($this->urlGenerator->linkToRoute(
-			'core.TwoFactorChallenge.showChallenge',
-			[
-				'challengeProviderId' => $providerId,
-			]
-		));
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @todo handle the extreme edge case of an invalid provider ID and redirect to the provider selection page
+     */
+    public function confirmProviderSetup(string $providerId) {
+        return new RedirectResponse($this->urlGenerator->linkToRoute(
+            'core.TwoFactorChallenge.showChallenge',
+            [
+                'challengeProviderId' => $providerId,
+            ]
+        ));
+    }
 }

core/Controller/OCSController.php

Indentation +110 added lines, -110 removed lines

@@ -37,125 +37,125 @@
 
 class OCSController extends \OCP\AppFramework\OCSController {
 
-	/** @var CapabilitiesManager */
-	private $capabilitiesManager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var Manager */
-	private $keyManager;
+    /** @var CapabilitiesManager */
+    private $capabilitiesManager;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var Manager */
+    private $keyManager;
 
-	/**
-	 * OCSController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param CapabilitiesManager $capabilitiesManager
-	 * @param IUserSession $userSession
-	 * @param IUserManager $userManager
-	 * @param Manager $keyManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								CapabilitiesManager $capabilitiesManager,
-								IUserSession $userSession,
-								IUserManager $userManager,
-								Manager $keyManager) {
-		parent::__construct($appName, $request);
-		$this->capabilitiesManager = $capabilitiesManager;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->keyManager = $keyManager;
-	}
+    /**
+     * OCSController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param CapabilitiesManager $capabilitiesManager
+     * @param IUserSession $userSession
+     * @param IUserManager $userManager
+     * @param Manager $keyManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                CapabilitiesManager $capabilitiesManager,
+                                IUserSession $userSession,
+                                IUserManager $userManager,
+                                Manager $keyManager) {
+        parent::__construct($appName, $request);
+        $this->capabilitiesManager = $capabilitiesManager;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->keyManager = $keyManager;
+    }
 
-	/**
-	 * @PublicPage
-	 *
-	 * @return DataResponse
-	 */
-	public function getConfig() {
-		$data = [
-			'version' => '1.7',
-			'website' => 'Nextcloud',
-			'host' => $this->request->getServerHost(),
-			'contact' => '',
-			'ssl' => 'false',
-		];
+    /**
+     * @PublicPage
+     *
+     * @return DataResponse
+     */
+    public function getConfig() {
+        $data = [
+            'version' => '1.7',
+            'website' => 'Nextcloud',
+            'host' => $this->request->getServerHost(),
+            'contact' => '',
+            'ssl' => 'false',
+        ];
 
-		return new DataResponse($data);
-	}
+        return new DataResponse($data);
+    }
 
-	/**
-	 * @PublicPage
-	 *
-	 * @return DataResponse
-	 */
-	public function getCapabilities() {
-		$result = [];
-		[$major, $minor, $micro] = \OCP\Util::getVersion();
-		$result['version'] = [
-			'major' => $major,
-			'minor' => $minor,
-			'micro' => $micro,
-			'string' => \OC_Util::getVersionString(),
-			'edition' => '',
-			'extendedSupport' => \OCP\Util::hasExtendedSupport()
-		];
+    /**
+     * @PublicPage
+     *
+     * @return DataResponse
+     */
+    public function getCapabilities() {
+        $result = [];
+        [$major, $minor, $micro] = \OCP\Util::getVersion();
+        $result['version'] = [
+            'major' => $major,
+            'minor' => $minor,
+            'micro' => $micro,
+            'string' => \OC_Util::getVersionString(),
+            'edition' => '',
+            'extendedSupport' => \OCP\Util::hasExtendedSupport()
+        ];
 
-		if ($this->userSession->isLoggedIn()) {
-			$result['capabilities'] = $this->capabilitiesManager->getCapabilities();
-		} else {
-			$result['capabilities'] = $this->capabilitiesManager->getCapabilities(true);
-		}
+        if ($this->userSession->isLoggedIn()) {
+            $result['capabilities'] = $this->capabilitiesManager->getCapabilities();
+        } else {
+            $result['capabilities'] = $this->capabilitiesManager->getCapabilities(true);
+        }
 
-		$response = new DataResponse($result);
-		$response->setETag(md5(json_encode($result)));
-		return $response;
-	}
+        $response = new DataResponse($result);
+        $response->setETag(md5(json_encode($result)));
+        return $response;
+    }
 
-	/**
-	 * @PublicPage
-	 * @BruteForceProtection(action=login)
-	 *
-	 * @param string $login
-	 * @param string $password
-	 * @return DataResponse
-	 */
-	public function personCheck($login = '', $password = '') {
-		if ($login !== '' && $password !== '') {
-			if ($this->userManager->checkPassword($login, $password)) {
-				return new DataResponse([
-					'person' => [
-						'personid' => $login
-					]
-				]);
-			}
+    /**
+     * @PublicPage
+     * @BruteForceProtection(action=login)
+     *
+     * @param string $login
+     * @param string $password
+     * @return DataResponse
+     */
+    public function personCheck($login = '', $password = '') {
+        if ($login !== '' && $password !== '') {
+            if ($this->userManager->checkPassword($login, $password)) {
+                return new DataResponse([
+                    'person' => [
+                        'personid' => $login
+                    ]
+                ]);
+            }
 
-			$response = new DataResponse([], 102);
-			$response->throttle();
-			return $response;
-		}
-		return new DataResponse([], 101);
-	}
+            $response = new DataResponse([], 102);
+            $response->throttle();
+            return $response;
+        }
+        return new DataResponse([], 101);
+    }
 
-	/**
-	 * @PublicPage
-	 *
-	 * @param string $cloudId
-	 * @return DataResponse
-	 */
-	public function getIdentityProof($cloudId) {
-		$userObject = $this->userManager->get($cloudId);
+    /**
+     * @PublicPage
+     *
+     * @param string $cloudId
+     * @return DataResponse
+     */
+    public function getIdentityProof($cloudId) {
+        $userObject = $this->userManager->get($cloudId);
 
-		if ($userObject !== null) {
-			$key = $this->keyManager->getKey($userObject);
-			$data = [
-				'public' => $key->getPublic(),
-			];
-			return new DataResponse($data);
-		}
+        if ($userObject !== null) {
+            $key = $this->keyManager->getKey($userObject);
+            $data = [
+                'public' => $key->getPublic(),
+            ];
+            return new DataResponse($data);
+        }
 
-		return new DataResponse(['User not found'], 404);
-	}
+        return new DataResponse(['User not found'], 404);
+    }
 }

core/Controller/LoginController.php

Indentation +317 added lines, -317 removed lines

@@ -58,321 +58,321 @@
 use OCP\Util;
 
 class LoginController extends Controller {
-	public const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword';
-	public const LOGIN_MSG_USERDISABLED = 'userdisabled';
-
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var ISession */
-	private $session;
-	/** @var IUserSession|Session */
-	private $userSession;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var ILogger */
-	private $logger;
-	/** @var Defaults */
-	private $defaults;
-	/** @var Throttler */
-	private $throttler;
-	/** @var Chain */
-	private $loginChain;
-	/** @var IInitialStateService */
-	private $initialStateService;
-	/** @var WebAuthnManager */
-	private $webAuthnManager;
-
-	public function __construct(?string $appName,
-								IRequest $request,
-								IUserManager $userManager,
-								IConfig $config,
-								ISession $session,
-								IUserSession $userSession,
-								IURLGenerator $urlGenerator,
-								ILogger $logger,
-								Defaults $defaults,
-								Throttler $throttler,
-								Chain $loginChain,
-								IInitialStateService $initialStateService,
-								WebAuthnManager $webAuthnManager) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->session = $session;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
-		$this->defaults = $defaults;
-		$this->throttler = $throttler;
-		$this->loginChain = $loginChain;
-		$this->initialStateService = $initialStateService;
-		$this->webAuthnManager = $webAuthnManager;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @UseSession
-	 *
-	 * @return RedirectResponse
-	 */
-	public function logout() {
-		$loginToken = $this->request->getCookie('nc_token');
-		if (!is_null($loginToken)) {
-			$this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken);
-		}
-		$this->userSession->logout();
-
-		$response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
-			'core.login.showLoginForm',
-			['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
-		));
-
-		$this->session->set('clearingExecutionContexts', '1');
-		$this->session->close();
-
-		if (!$this->request->isUserAgent([Request::USER_AGENT_CHROME, Request::USER_AGENT_ANDROID_MOBILE_CHROME])) {
-			$response->addHeader('Clear-Site-Data', '"cache", "storage"');
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @param string $user
-	 * @param string $redirect_url
-	 *
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function showLoginForm(string $user = null, string $redirect_url = null): Http\Response {
-		if ($this->userSession->isLoggedIn()) {
-			return new RedirectResponse(OC_Util::getDefaultPageUrl());
-		}
-
-		$loginMessages = $this->session->get('loginMessages');
-		if (is_array($loginMessages)) {
-			[$errors, $messages] = $loginMessages;
-			$this->initialStateService->provideInitialState('core', 'loginMessages', $messages);
-			$this->initialStateService->provideInitialState('core', 'loginErrors', $errors);
-		}
-		$this->session->remove('loginMessages');
-
-		if ($user !== null && $user !== '') {
-			$this->initialStateService->provideInitialState('core', 'loginUsername', $user);
-		} else {
-			$this->initialStateService->provideInitialState('core', 'loginUsername', '');
-		}
-
-		$this->initialStateService->provideInitialState(
-			'core',
-			'loginAutocomplete',
-			$this->config->getSystemValue('login_form_autocomplete', true) === true
-		);
-
-		if (!empty($redirect_url)) {
-			[$url, ] = explode('?', $redirect_url);
-			if ($url !== $this->urlGenerator->linkToRoute('core.login.logout')) {
-				$this->initialStateService->provideInitialState('core', 'loginRedirectUrl', $redirect_url);
-			}
-		}
-
-		$this->initialStateService->provideInitialState(
-			'core',
-			'loginThrottleDelay',
-			$this->throttler->getDelay($this->request->getRemoteAddress())
-		);
-
-		$this->setPasswordResetInitialState($user);
-
-		$this->initialStateService->provideInitialState('core', 'webauthn-available', $this->webAuthnManager->isWebAuthnAvailable());
-
-		// OpenGraph Support: http://ogp.me/
-		Util::addHeader('meta', ['property' => 'og:title', 'content' => Util::sanitizeHTML($this->defaults->getName())]);
-		Util::addHeader('meta', ['property' => 'og:description', 'content' => Util::sanitizeHTML($this->defaults->getSlogan())]);
-		Util::addHeader('meta', ['property' => 'og:site_name', 'content' => Util::sanitizeHTML($this->defaults->getName())]);
-		Util::addHeader('meta', ['property' => 'og:url', 'content' => $this->urlGenerator->getAbsoluteURL('/')]);
-		Util::addHeader('meta', ['property' => 'og:type', 'content' => 'website']);
-		Util::addHeader('meta', ['property' => 'og:image', 'content' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-touch.png'))]);
-
-		$parameters = [
-			'alt_login' => OC_App::getAlternativeLogIns(),
-		];
-		return new TemplateResponse(
-			$this->appName, 'login', $parameters, 'guest'
-		);
-	}
-
-	/**
-	 * Sets the password reset state
-	 *
-	 * @param string $username
-	 */
-	private function setPasswordResetInitialState(?string $username): void {
-		if ($username !== null && $username !== '') {
-			$user = $this->userManager->get($username);
-		} else {
-			$user = null;
-		}
-
-		$passwordLink = $this->config->getSystemValue('lost_password_link', '');
-
-		$this->initialStateService->provideInitialState(
-			'core',
-			'loginResetPasswordLink',
-			$passwordLink
-		);
-
-		$this->initialStateService->provideInitialState(
-			'core',
-			'loginCanResetPassword',
-			$this->canResetPassword($passwordLink, $user)
-		);
-	}
-
-	/**
-	 * @param string|null $passwordLink
-	 * @param IUser|null $user
-	 *
-	 * Users may not change their passwords if:
-	 * - The account is disabled
-	 * - The backend doesn't support password resets
-	 * - The password reset function is disabled
-	 *
-	 * @return bool
-	 */
-	private function canResetPassword(?string $passwordLink, ?IUser $user): bool {
-		if ($passwordLink === 'disabled') {
-			return false;
-		}
-
-		if (!$passwordLink && $user !== null) {
-			return $user->canChangePassword();
-		}
-
-		if ($user !== null && $user->isEnabled() === false) {
-			return false;
-		}
-
-		return true;
-	}
-
-	private function generateRedirect(?string $redirectUrl): RedirectResponse {
-		if ($redirectUrl !== null && $this->userSession->isLoggedIn()) {
-			$location = $this->urlGenerator->getAbsoluteURL($redirectUrl);
-			// Deny the redirect if the URL contains a @
-			// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
-			if (strpos($location, '@') === false) {
-				return new RedirectResponse($location);
-			}
-		}
-		return new RedirectResponse(OC_Util::getDefaultPageUrl());
-	}
-
-	/**
-	 * @PublicPage
-	 * @UseSession
-	 * @NoCSRFRequired
-	 * @BruteForceProtection(action=login)
-	 *
-	 * @param string $user
-	 * @param string $password
-	 * @param string $redirect_url
-	 * @param string $timezone
-	 * @param string $timezone_offset
-	 *
-	 * @return RedirectResponse
-	 */
-	public function tryLogin(string $user,
-							 string $password,
-							 string $redirect_url = null,
-							 string $timezone = '',
-							 string $timezone_offset = ''): RedirectResponse {
-		// If the user is already logged in and the CSRF check does not pass then
-		// simply redirect the user to the correct page as required. This is the
-		// case when an user has already logged-in, in another tab.
-		if (!$this->request->passesCSRFCheck()) {
-			return $this->generateRedirect($redirect_url);
-		}
-
-		$data = new LoginData(
-			$this->request,
-			trim($user),
-			$password,
-			$redirect_url,
-			$timezone,
-			$timezone_offset
-		);
-		$result = $this->loginChain->process($data);
-		if (!$result->isSuccess()) {
-			return $this->createLoginFailedResponse(
-				$data->getUsername(),
-				$user,
-				$redirect_url,
-				$result->getErrorMessage()
-			);
-		}
-
-		if ($result->getRedirectUrl() !== null) {
-			return new RedirectResponse($result->getRedirectUrl());
-		}
-		return $this->generateRedirect($redirect_url);
-	}
-
-	/**
-	 * Creates a login failed response.
-	 *
-	 * @param string $user
-	 * @param string $originalUser
-	 * @param string $redirect_url
-	 * @param string $loginMessage
-	 *
-	 * @return RedirectResponse
-	 */
-	private function createLoginFailedResponse(
-		$user, $originalUser, $redirect_url, string $loginMessage) {
-		// Read current user and append if possible we need to
-		// return the unmodified user otherwise we will leak the login name
-		$args = $user !== null ? ['user' => $originalUser, 'direct' => 1] : [];
-		if ($redirect_url !== null) {
-			$args['redirect_url'] = $redirect_url;
-		}
-		$response = new RedirectResponse(
-			$this->urlGenerator->linkToRoute('core.login.showLoginForm', $args)
-		);
-		$response->throttle(['user' => substr($user, 0, 64)]);
-		$this->session->set('loginMessages', [
-			[$loginMessage], []
-		]);
-		return $response;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @UseSession
-	 * @BruteForceProtection(action=sudo)
-	 *
-	 * @param string $password
-	 *
-	 * @return DataResponse
-	 * @license GNU AGPL version 3 or any later version
-	 *
-	 */
-	public function confirmPassword($password) {
-		$loginName = $this->userSession->getLoginName();
-		$loginResult = $this->userManager->checkPassword($loginName, $password);
-		if ($loginResult === false) {
-			$response = new DataResponse([], Http::STATUS_FORBIDDEN);
-			$response->throttle();
-			return $response;
-		}
-
-		$confirmTimestamp = time();
-		$this->session->set('last-password-confirm', $confirmTimestamp);
-		return new DataResponse(['lastLogin' => $confirmTimestamp], Http::STATUS_OK);
-	}
+    public const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword';
+    public const LOGIN_MSG_USERDISABLED = 'userdisabled';
+
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ISession */
+    private $session;
+    /** @var IUserSession|Session */
+    private $userSession;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var ILogger */
+    private $logger;
+    /** @var Defaults */
+    private $defaults;
+    /** @var Throttler */
+    private $throttler;
+    /** @var Chain */
+    private $loginChain;
+    /** @var IInitialStateService */
+    private $initialStateService;
+    /** @var WebAuthnManager */
+    private $webAuthnManager;
+
+    public function __construct(?string $appName,
+                                IRequest $request,
+                                IUserManager $userManager,
+                                IConfig $config,
+                                ISession $session,
+                                IUserSession $userSession,
+                                IURLGenerator $urlGenerator,
+                                ILogger $logger,
+                                Defaults $defaults,
+                                Throttler $throttler,
+                                Chain $loginChain,
+                                IInitialStateService $initialStateService,
+                                WebAuthnManager $webAuthnManager) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->session = $session;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->logger = $logger;
+        $this->defaults = $defaults;
+        $this->throttler = $throttler;
+        $this->loginChain = $loginChain;
+        $this->initialStateService = $initialStateService;
+        $this->webAuthnManager = $webAuthnManager;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @UseSession
+     *
+     * @return RedirectResponse
+     */
+    public function logout() {
+        $loginToken = $this->request->getCookie('nc_token');
+        if (!is_null($loginToken)) {
+            $this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken);
+        }
+        $this->userSession->logout();
+
+        $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
+            'core.login.showLoginForm',
+            ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
+        ));
+
+        $this->session->set('clearingExecutionContexts', '1');
+        $this->session->close();
+
+        if (!$this->request->isUserAgent([Request::USER_AGENT_CHROME, Request::USER_AGENT_ANDROID_MOBILE_CHROME])) {
+            $response->addHeader('Clear-Site-Data', '"cache", "storage"');
+        }
+
+        return $response;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @param string $user
+     * @param string $redirect_url
+     *
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function showLoginForm(string $user = null, string $redirect_url = null): Http\Response {
+        if ($this->userSession->isLoggedIn()) {
+            return new RedirectResponse(OC_Util::getDefaultPageUrl());
+        }
+
+        $loginMessages = $this->session->get('loginMessages');
+        if (is_array($loginMessages)) {
+            [$errors, $messages] = $loginMessages;
+            $this->initialStateService->provideInitialState('core', 'loginMessages', $messages);
+            $this->initialStateService->provideInitialState('core', 'loginErrors', $errors);
+        }
+        $this->session->remove('loginMessages');
+
+        if ($user !== null && $user !== '') {
+            $this->initialStateService->provideInitialState('core', 'loginUsername', $user);
+        } else {
+            $this->initialStateService->provideInitialState('core', 'loginUsername', '');
+        }
+
+        $this->initialStateService->provideInitialState(
+            'core',
+            'loginAutocomplete',
+            $this->config->getSystemValue('login_form_autocomplete', true) === true
+        );
+
+        if (!empty($redirect_url)) {
+            [$url, ] = explode('?', $redirect_url);
+            if ($url !== $this->urlGenerator->linkToRoute('core.login.logout')) {
+                $this->initialStateService->provideInitialState('core', 'loginRedirectUrl', $redirect_url);
+            }
+        }
+
+        $this->initialStateService->provideInitialState(
+            'core',
+            'loginThrottleDelay',
+            $this->throttler->getDelay($this->request->getRemoteAddress())
+        );
+
+        $this->setPasswordResetInitialState($user);
+
+        $this->initialStateService->provideInitialState('core', 'webauthn-available', $this->webAuthnManager->isWebAuthnAvailable());
+
+        // OpenGraph Support: http://ogp.me/
+        Util::addHeader('meta', ['property' => 'og:title', 'content' => Util::sanitizeHTML($this->defaults->getName())]);
+        Util::addHeader('meta', ['property' => 'og:description', 'content' => Util::sanitizeHTML($this->defaults->getSlogan())]);
+        Util::addHeader('meta', ['property' => 'og:site_name', 'content' => Util::sanitizeHTML($this->defaults->getName())]);
+        Util::addHeader('meta', ['property' => 'og:url', 'content' => $this->urlGenerator->getAbsoluteURL('/')]);
+        Util::addHeader('meta', ['property' => 'og:type', 'content' => 'website']);
+        Util::addHeader('meta', ['property' => 'og:image', 'content' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-touch.png'))]);
+
+        $parameters = [
+            'alt_login' => OC_App::getAlternativeLogIns(),
+        ];
+        return new TemplateResponse(
+            $this->appName, 'login', $parameters, 'guest'
+        );
+    }
+
+    /**
+     * Sets the password reset state
+     *
+     * @param string $username
+     */
+    private function setPasswordResetInitialState(?string $username): void {
+        if ($username !== null && $username !== '') {
+            $user = $this->userManager->get($username);
+        } else {
+            $user = null;
+        }
+
+        $passwordLink = $this->config->getSystemValue('lost_password_link', '');
+
+        $this->initialStateService->provideInitialState(
+            'core',
+            'loginResetPasswordLink',
+            $passwordLink
+        );
+
+        $this->initialStateService->provideInitialState(
+            'core',
+            'loginCanResetPassword',
+            $this->canResetPassword($passwordLink, $user)
+        );
+    }
+
+    /**
+     * @param string|null $passwordLink
+     * @param IUser|null $user
+     *
+     * Users may not change their passwords if:
+     * - The account is disabled
+     * - The backend doesn't support password resets
+     * - The password reset function is disabled
+     *
+     * @return bool
+     */
+    private function canResetPassword(?string $passwordLink, ?IUser $user): bool {
+        if ($passwordLink === 'disabled') {
+            return false;
+        }
+
+        if (!$passwordLink && $user !== null) {
+            return $user->canChangePassword();
+        }
+
+        if ($user !== null && $user->isEnabled() === false) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function generateRedirect(?string $redirectUrl): RedirectResponse {
+        if ($redirectUrl !== null && $this->userSession->isLoggedIn()) {
+            $location = $this->urlGenerator->getAbsoluteURL($redirectUrl);
+            // Deny the redirect if the URL contains a @
+            // This prevents unvalidated redirects like ?redirect_url=:user@domain.com
+            if (strpos($location, '@') === false) {
+                return new RedirectResponse($location);
+            }
+        }
+        return new RedirectResponse(OC_Util::getDefaultPageUrl());
+    }
+
+    /**
+     * @PublicPage
+     * @UseSession
+     * @NoCSRFRequired
+     * @BruteForceProtection(action=login)
+     *
+     * @param string $user
+     * @param string $password
+     * @param string $redirect_url
+     * @param string $timezone
+     * @param string $timezone_offset
+     *
+     * @return RedirectResponse
+     */
+    public function tryLogin(string $user,
+                                string $password,
+                                string $redirect_url = null,
+                                string $timezone = '',
+                                string $timezone_offset = ''): RedirectResponse {
+        // If the user is already logged in and the CSRF check does not pass then
+        // simply redirect the user to the correct page as required. This is the
+        // case when an user has already logged-in, in another tab.
+        if (!$this->request->passesCSRFCheck()) {
+            return $this->generateRedirect($redirect_url);
+        }
+
+        $data = new LoginData(
+            $this->request,
+            trim($user),
+            $password,
+            $redirect_url,
+            $timezone,
+            $timezone_offset
+        );
+        $result = $this->loginChain->process($data);
+        if (!$result->isSuccess()) {
+            return $this->createLoginFailedResponse(
+                $data->getUsername(),
+                $user,
+                $redirect_url,
+                $result->getErrorMessage()
+            );
+        }
+
+        if ($result->getRedirectUrl() !== null) {
+            return new RedirectResponse($result->getRedirectUrl());
+        }
+        return $this->generateRedirect($redirect_url);
+    }
+
+    /**
+     * Creates a login failed response.
+     *
+     * @param string $user
+     * @param string $originalUser
+     * @param string $redirect_url
+     * @param string $loginMessage
+     *
+     * @return RedirectResponse
+     */
+    private function createLoginFailedResponse(
+        $user, $originalUser, $redirect_url, string $loginMessage) {
+        // Read current user and append if possible we need to
+        // return the unmodified user otherwise we will leak the login name
+        $args = $user !== null ? ['user' => $originalUser, 'direct' => 1] : [];
+        if ($redirect_url !== null) {
+            $args['redirect_url'] = $redirect_url;
+        }
+        $response = new RedirectResponse(
+            $this->urlGenerator->linkToRoute('core.login.showLoginForm', $args)
+        );
+        $response->throttle(['user' => substr($user, 0, 64)]);
+        $this->session->set('loginMessages', [
+            [$loginMessage], []
+        ]);
+        return $response;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @UseSession
+     * @BruteForceProtection(action=sudo)
+     *
+     * @param string $password
+     *
+     * @return DataResponse
+     * @license GNU AGPL version 3 or any later version
+     *
+     */
+    public function confirmPassword($password) {
+        $loginName = $this->userSession->getLoginName();
+        $loginResult = $this->userManager->checkPassword($loginName, $password);
+        if ($loginResult === false) {
+            $response = new DataResponse([], Http::STATUS_FORBIDDEN);
+            $response->throttle();
+            return $response;
+        }
+
+        $confirmTimestamp = time();
+        $this->session->set('last-password-confirm', $confirmTimestamp);
+        return new DataResponse(['lastLogin' => $confirmTimestamp], Http::STATUS_OK);
+    }
 }

apps/comments/lib/Notification/Notifier.php

Indentation +191 added lines, -191 removed lines

@@ -39,195 +39,195 @@
 
 class Notifier implements INotifier {
 
-	/** @var IFactory */
-	protected $l10nFactory;
-
-	/** @var IRootFolder  */
-	protected $rootFolder;
-
-	/** @var ICommentsManager  */
-	protected $commentsManager;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	public function __construct(
-		IFactory $l10nFactory,
-		IRootFolder $rootFolder,
-		ICommentsManager $commentsManager,
-		IURLGenerator $url,
-		IUserManager $userManager
-	) {
-		$this->l10nFactory = $l10nFactory;
-		$this->rootFolder = $rootFolder;
-		$this->commentsManager = $commentsManager;
-		$this->url = $url;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'comments';
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->l10nFactory->get('comments')->t('Comments');
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
-	 * @since 9.0.0
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'comments') {
-			throw new \InvalidArgumentException();
-		}
-		try {
-			$comment = $this->commentsManager->get($notification->getObjectId());
-		} catch (NotFoundException $e) {
-			// needs to be converted to InvalidArgumentException, otherwise none Notifications will be shown at all
-			throw new \InvalidArgumentException('Comment not found', 0, $e);
-		}
-		$l = $this->l10nFactory->get('comments', $languageCode);
-		$displayName = $comment->getActorId();
-		$isDeletedActor = $comment->getActorType() === ICommentsManager::DELETED_USER;
-		if ($comment->getActorType() === 'users') {
-			$commenter = $this->userManager->get($comment->getActorId());
-			if ($commenter instanceof IUser) {
-				$displayName = $commenter->getDisplayName();
-			}
-		}
-
-		switch ($notification->getSubject()) {
-			case 'mention':
-				$parameters = $notification->getSubjectParameters();
-				if ($parameters[0] !== 'files') {
-					throw new \InvalidArgumentException('Unsupported comment object');
-				}
-				$userFolder = $this->rootFolder->getUserFolder($notification->getUser());
-				$nodes = $userFolder->getById((int)$parameters[1]);
-				if (empty($nodes)) {
-					throw new AlreadyProcessedException();
-				}
-				$node = $nodes[0];
-
-				$path = rtrim($node->getPath(), '/');
-				if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
-					// Remove /user/files/...
-					$fullPath = $path;
-					[,,, $path] = explode('/', $fullPath, 4);
-				}
-				$subjectParameters = [
-					'file' => [
-						'type' => 'file',
-						'id' => $comment->getObjectId(),
-						'name' => $node->getName(),
-						'path' => $path,
-						'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $comment->getObjectId()]),
-					],
-				];
-
-				if ($isDeletedActor) {
-					$subject = $l->t('You were mentioned on “{file}”, in a comment by a user that has since been deleted');
-				} else {
-					$subject = $l->t('{user} mentioned you in a comment on “{file}”');
-					$subjectParameters['user'] = [
-						'type' => 'user',
-						'id' => $comment->getActorId(),
-						'name' => $displayName,
-					];
-				}
-				[$message, $messageParameters] = $this->commentToRichMessage($comment);
-				$notification->setRichSubject($subject, $subjectParameters)
-					->setParsedSubject($this->richToParsed($subject, $subjectParameters))
-					->setRichMessage($message, $messageParameters)
-					->setParsedMessage($this->richToParsed($message, $messageParameters))
-					->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')))
-					->setLink($this->url->linkToRouteAbsolute(
-						'comments.Notifications.view',
-						['id' => $comment->getId()])
-					);
-
-				return $notification;
-				break;
-
-			default:
-				throw new \InvalidArgumentException('Invalid subject');
-		}
-	}
-
-	public function commentToRichMessage(IComment $comment): array {
-		$message = $comment->getMessage();
-		$messageParameters = [];
-		$mentionTypeCount = [];
-		$mentions = $comment->getMentions();
-		foreach ($mentions as $mention) {
-			if ($mention['type'] === 'user') {
-				$user = $this->userManager->get($mention['id']);
-				if (!$user instanceof IUser) {
-					continue;
-				}
-			}
-			if (!array_key_exists($mention['type'], $mentionTypeCount)) {
-				$mentionTypeCount[$mention['type']] = 0;
-			}
-			$mentionTypeCount[$mention['type']]++;
-			// To keep a limited character set in parameter IDs ([a-zA-Z0-9-])
-			// the mention parameter ID does not include the mention ID (which
-			// could contain characters like '@' for user IDs) but a one-based
-			// index of the mentions of that type.
-			$mentionParameterId = 'mention-' . $mention['type'] . $mentionTypeCount[$mention['type']];
-			$message = str_replace('@"' . $mention['id'] . '"', '{' . $mentionParameterId . '}', $message);
-			if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
-				$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
-			}
-
-			try {
-				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
-			} catch (\OutOfBoundsException $e) {
-				// There is no registered display name resolver for the mention
-				// type, so the client decides what to display.
-				$displayName = '';
-			}
-			$messageParameters[$mentionParameterId] = [
-				'type' => $mention['type'],
-				'id' => $mention['id'],
-				'name' => $displayName
-			];
-		}
-		return [$message, $messageParameters];
-	}
-
-	public function richToParsed(string $message, array $parameters): string {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'user') {
-				$replacements[] = '@' . $parameter['name'];
-			} elseif ($parameter['type'] === 'file') {
-				$replacements[] = $parameter['path'];
-			} else {
-				$replacements[] = $parameter['name'];
-			}
-		}
-		return str_replace($placeholders, $replacements, $message);
-	}
+    /** @var IFactory */
+    protected $l10nFactory;
+
+    /** @var IRootFolder  */
+    protected $rootFolder;
+
+    /** @var ICommentsManager  */
+    protected $commentsManager;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    public function __construct(
+        IFactory $l10nFactory,
+        IRootFolder $rootFolder,
+        ICommentsManager $commentsManager,
+        IURLGenerator $url,
+        IUserManager $userManager
+    ) {
+        $this->l10nFactory = $l10nFactory;
+        $this->rootFolder = $rootFolder;
+        $this->commentsManager = $commentsManager;
+        $this->url = $url;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'comments';
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->l10nFactory->get('comments')->t('Comments');
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
+     * @since 9.0.0
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'comments') {
+            throw new \InvalidArgumentException();
+        }
+        try {
+            $comment = $this->commentsManager->get($notification->getObjectId());
+        } catch (NotFoundException $e) {
+            // needs to be converted to InvalidArgumentException, otherwise none Notifications will be shown at all
+            throw new \InvalidArgumentException('Comment not found', 0, $e);
+        }
+        $l = $this->l10nFactory->get('comments', $languageCode);
+        $displayName = $comment->getActorId();
+        $isDeletedActor = $comment->getActorType() === ICommentsManager::DELETED_USER;
+        if ($comment->getActorType() === 'users') {
+            $commenter = $this->userManager->get($comment->getActorId());
+            if ($commenter instanceof IUser) {
+                $displayName = $commenter->getDisplayName();
+            }
+        }
+
+        switch ($notification->getSubject()) {
+            case 'mention':
+                $parameters = $notification->getSubjectParameters();
+                if ($parameters[0] !== 'files') {
+                    throw new \InvalidArgumentException('Unsupported comment object');
+                }
+                $userFolder = $this->rootFolder->getUserFolder($notification->getUser());
+                $nodes = $userFolder->getById((int)$parameters[1]);
+                if (empty($nodes)) {
+                    throw new AlreadyProcessedException();
+                }
+                $node = $nodes[0];
+
+                $path = rtrim($node->getPath(), '/');
+                if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
+                    // Remove /user/files/...
+                    $fullPath = $path;
+                    [,,, $path] = explode('/', $fullPath, 4);
+                }
+                $subjectParameters = [
+                    'file' => [
+                        'type' => 'file',
+                        'id' => $comment->getObjectId(),
+                        'name' => $node->getName(),
+                        'path' => $path,
+                        'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $comment->getObjectId()]),
+                    ],
+                ];
+
+                if ($isDeletedActor) {
+                    $subject = $l->t('You were mentioned on “{file}”, in a comment by a user that has since been deleted');
+                } else {
+                    $subject = $l->t('{user} mentioned you in a comment on “{file}”');
+                    $subjectParameters['user'] = [
+                        'type' => 'user',
+                        'id' => $comment->getActorId(),
+                        'name' => $displayName,
+                    ];
+                }
+                [$message, $messageParameters] = $this->commentToRichMessage($comment);
+                $notification->setRichSubject($subject, $subjectParameters)
+                    ->setParsedSubject($this->richToParsed($subject, $subjectParameters))
+                    ->setRichMessage($message, $messageParameters)
+                    ->setParsedMessage($this->richToParsed($message, $messageParameters))
+                    ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')))
+                    ->setLink($this->url->linkToRouteAbsolute(
+                        'comments.Notifications.view',
+                        ['id' => $comment->getId()])
+                    );
+
+                return $notification;
+                break;
+
+            default:
+                throw new \InvalidArgumentException('Invalid subject');
+        }
+    }
+
+    public function commentToRichMessage(IComment $comment): array {
+        $message = $comment->getMessage();
+        $messageParameters = [];
+        $mentionTypeCount = [];
+        $mentions = $comment->getMentions();
+        foreach ($mentions as $mention) {
+            if ($mention['type'] === 'user') {
+                $user = $this->userManager->get($mention['id']);
+                if (!$user instanceof IUser) {
+                    continue;
+                }
+            }
+            if (!array_key_exists($mention['type'], $mentionTypeCount)) {
+                $mentionTypeCount[$mention['type']] = 0;
+            }
+            $mentionTypeCount[$mention['type']]++;
+            // To keep a limited character set in parameter IDs ([a-zA-Z0-9-])
+            // the mention parameter ID does not include the mention ID (which
+            // could contain characters like '@' for user IDs) but a one-based
+            // index of the mentions of that type.
+            $mentionParameterId = 'mention-' . $mention['type'] . $mentionTypeCount[$mention['type']];
+            $message = str_replace('@"' . $mention['id'] . '"', '{' . $mentionParameterId . '}', $message);
+            if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
+                $message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
+            }
+
+            try {
+                $displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
+            } catch (\OutOfBoundsException $e) {
+                // There is no registered display name resolver for the mention
+                // type, so the client decides what to display.
+                $displayName = '';
+            }
+            $messageParameters[$mentionParameterId] = [
+                'type' => $mention['type'],
+                'id' => $mention['id'],
+                'name' => $displayName
+            ];
+        }
+        return [$message, $messageParameters];
+    }
+
+    public function richToParsed(string $message, array $parameters): string {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'user') {
+                $replacements[] = '@' . $parameter['name'];
+            } elseif ($parameter['type'] === 'file') {
+                $replacements[] = $parameter['path'];
+            } else {
+                $replacements[] = $parameter['name'];
+            }
+        }
+        return str_replace($placeholders, $replacements, $message);
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -123,14 +123,14 @@ 
 					throw new \InvalidArgumentException('Unsupported comment object');
 				}
 				$userFolder = $this->rootFolder->getUserFolder($notification->getUser());
-				$nodes = $userFolder->getById((int)$parameters[1]);
+				$nodes = $userFolder->getById((int) $parameters[1]);
 				if (empty($nodes)) {
 					throw new AlreadyProcessedException();
 				}
 				$node = $nodes[0];
 
 				$path = rtrim($node->getPath(), '/');
-				if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
+				if (strpos($path, '/'.$notification->getUser().'/files/') === 0) {
 					// Remove /user/files/...
 					$fullPath = $path;
 					[,,, $path] = explode('/', $fullPath, 4);
@@ -194,10 +194,10 @@ 
 			// the mention parameter ID does not include the mention ID (which
 			// could contain characters like '@' for user IDs) but a one-based
 			// index of the mentions of that type.
-			$mentionParameterId = 'mention-' . $mention['type'] . $mentionTypeCount[$mention['type']];
-			$message = str_replace('@"' . $mention['id'] . '"', '{' . $mentionParameterId . '}', $message);
+			$mentionParameterId = 'mention-'.$mention['type'].$mentionTypeCount[$mention['type']];
+			$message = str_replace('@"'.$mention['id'].'"', '{'.$mentionParameterId.'}', $message);
 			if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
-				$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
+				$message = str_replace('@'.$mention['id'], '{'.$mentionParameterId.'}', $message);
 			}
 
 			try {
@@ -219,9 +219,9 @@ 
 	public function richToParsed(string $message, array $parameters): string {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			if ($parameter['type'] === 'user') {
-				$replacements[] = '@' . $parameter['name'];
+				$replacements[] = '@'.$parameter['name'];
 			} elseif ($parameter['type'] === 'file') {
 				$replacements[] = $parameter['path'];
 			} else {

apps/files_sharing/lib/External/Cache.php

Indentation +37 added lines, -37 removed lines

@@ -27,44 +27,44 @@
 use OCP\Federation\ICloudId;
 
 class Cache extends \OC\Files\Cache\Cache {
-	/** @var ICloudId */
-	private $cloudId;
-	private $remote;
-	private $remoteUser;
-	private $storage;
+    /** @var ICloudId */
+    private $cloudId;
+    private $remote;
+    private $remoteUser;
+    private $storage;
 
-	/**
-	 * @param \OCA\Files_Sharing\External\Storage $storage
-	 * @param ICloudId $cloudId
-	 */
-	public function __construct($storage, ICloudId $cloudId) {
-		$this->cloudId = $cloudId;
-		$this->storage = $storage;
-		[, $remote] = explode('://', $cloudId->getRemote(), 2);
-		$this->remote = $remote;
-		$this->remoteUser = $cloudId->getUser();
-		parent::__construct($storage);
-	}
+    /**
+     * @param \OCA\Files_Sharing\External\Storage $storage
+     * @param ICloudId $cloudId
+     */
+    public function __construct($storage, ICloudId $cloudId) {
+        $this->cloudId = $cloudId;
+        $this->storage = $storage;
+        [, $remote] = explode('://', $cloudId->getRemote(), 2);
+        $this->remote = $remote;
+        $this->remoteUser = $cloudId->getUser();
+        parent::__construct($storage);
+    }
 
-	public function get($file) {
-		$result = parent::get($file);
-		if (!$result) {
-			return false;
-		}
-		$result['displayname_owner'] = $this->cloudId->getDisplayId();
-		if (!$file || $file === '') {
-			$result['is_share_mount_point'] = true;
-			$mountPoint = rtrim($this->storage->getMountPoint());
-			$result['name'] = basename($mountPoint);
-		}
-		return $result;
-	}
+    public function get($file) {
+        $result = parent::get($file);
+        if (!$result) {
+            return false;
+        }
+        $result['displayname_owner'] = $this->cloudId->getDisplayId();
+        if (!$file || $file === '') {
+            $result['is_share_mount_point'] = true;
+            $mountPoint = rtrim($this->storage->getMountPoint());
+            $result['name'] = basename($mountPoint);
+        }
+        return $result;
+    }
 
-	public function getFolderContentsById($id) {
-		$results = parent::getFolderContentsById($id);
-		foreach ($results as &$file) {
-			$file['displayname_owner'] = $this->cloudId->getDisplayId();
-		}
-		return $results;
-	}
+    public function getFolderContentsById($id) {
+        $results = parent::getFolderContentsById($id);
+        foreach ($results as &$file) {
+            $file['displayname_owner'] = $this->cloudId->getDisplayId();
+        }
+        return $results;
+    }
 }

apps/files_sharing/lib/External/Storage.php

Indentation +378 added lines, -378 removed lines

@@ -47,382 +47,382 @@
 use OCP\Files\StorageNotAvailableException;
 
 class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage {
-	/** @var ICloudId */
-	private $cloudId;
-	/** @var string */
-	private $mountPoint;
-	/** @var string */
-	private $token;
-	/** @var \OCP\ICacheFactory */
-	private $memcacheFactory;
-	/** @var \OCP\Http\Client\IClientService */
-	private $httpClient;
-	/** @var bool */
-	private $updateChecked = false;
-
-	/**
-	 * @var \OCA\Files_Sharing\External\Manager
-	 */
-	private $manager;
-
-	public function __construct($options) {
-		$this->memcacheFactory = \OC::$server->getMemCacheFactory();
-		$this->httpClient = $options['HttpClientService'];
-
-		$this->manager = $options['manager'];
-		$this->cloudId = $options['cloudId'];
-		$discoveryService = \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
-
-		[$protocol, $remote] = explode('://', $this->cloudId->getRemote());
-		if (strpos($remote, '/')) {
-			[$host, $root] = explode('/', $remote, 2);
-		} else {
-			$host = $remote;
-			$root = '';
-		}
-		$secure = $protocol === 'https';
-		$federatedSharingEndpoints = $discoveryService->discover($this->cloudId->getRemote(), 'FEDERATED_SHARING');
-		$webDavEndpoint = isset($federatedSharingEndpoints['webdav']) ? $federatedSharingEndpoints['webdav'] : '/public.php/webdav';
-		$root = rtrim($root, '/') . $webDavEndpoint;
-		$this->mountPoint = $options['mountpoint'];
-		$this->token = $options['token'];
-
-		parent::__construct([
-			'secure' => $secure,
-			'host' => $host,
-			'root' => $root,
-			'user' => $options['token'],
-			'password' => (string)$options['password']
-		]);
-	}
-
-	public function getWatcher($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->watcher)) {
-			$this->watcher = new Watcher($storage);
-			$this->watcher->setPolicy(\OC\Files\Cache\Watcher::CHECK_ONCE);
-		}
-		return $this->watcher;
-	}
-
-	public function getRemoteUser() {
-		return $this->cloudId->getUser();
-	}
-
-	public function getRemote() {
-		return $this->cloudId->getRemote();
-	}
-
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
-
-	public function getToken() {
-		return $this->token;
-	}
-
-	public function getPassword() {
-		return $this->password;
-	}
-
-	/**
-	 * @brief get id of the mount point
-	 * @return string
-	 */
-	public function getId() {
-		return 'shared::' . md5($this->token . '@' . $this->getRemote());
-	}
-
-	public function getCache($path = '', $storage = null) {
-		if (is_null($this->cache)) {
-			$this->cache = new Cache($this, $this->cloudId);
-		}
-		return $this->cache;
-	}
-
-	/**
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @return \OCA\Files_Sharing\External\Scanner
-	 */
-	public function getScanner($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->scanner)) {
-			$this->scanner = new Scanner($storage);
-		}
-		return $this->scanner;
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 * @throws \OCP\Files\StorageInvalidException
-	 * @return bool
-	 */
-	public function hasUpdated($path, $time) {
-		// since for owncloud webdav servers we can rely on etag propagation we only need to check the root of the storage
-		// because of that we only do one check for the entire storage per request
-		if ($this->updateChecked) {
-			return false;
-		}
-		$this->updateChecked = true;
-		try {
-			return parent::hasUpdated('', $time);
-		} catch (StorageInvalidException $e) {
-			// check if it needs to be removed
-			$this->checkStorageAvailability();
-			throw $e;
-		} catch (StorageNotAvailableException $e) {
-			// check if it needs to be removed or just temp unavailable
-			$this->checkStorageAvailability();
-			throw $e;
-		}
-	}
-
-	public function test() {
-		try {
-			return parent::test();
-		} catch (StorageInvalidException $e) {
-			// check if it needs to be removed
-			$this->checkStorageAvailability();
-			throw $e;
-		} catch (StorageNotAvailableException $e) {
-			// check if it needs to be removed or just temp unavailable
-			$this->checkStorageAvailability();
-			throw $e;
-		}
-	}
-
-	/**
-	 * Check whether this storage is permanently or temporarily
-	 * unavailable
-	 *
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 * @throws \OCP\Files\StorageInvalidException
-	 */
-	public function checkStorageAvailability() {
-		// see if we can find out why the share is unavailable
-		try {
-			$this->getShareInfo();
-		} catch (NotFoundException $e) {
-			// a 404 can either mean that the share no longer exists or there is no Nextcloud on the remote
-			if ($this->testRemote()) {
-				// valid Nextcloud instance means that the public share no longer exists
-				// since this is permanent (re-sharing the file will create a new token)
-				// we remove the invalid storage
-				$this->manager->removeShare($this->mountPoint);
-				$this->manager->getMountManager()->removeMount($this->mountPoint);
-				throw new StorageInvalidException();
-			} else {
-				// Nextcloud instance is gone, likely to be a temporary server configuration error
-				throw new StorageNotAvailableException();
-			}
-		} catch (ForbiddenException $e) {
-			// auth error, remove share for now (provide a dialog in the future)
-			$this->manager->removeShare($this->mountPoint);
-			$this->manager->getMountManager()->removeMount($this->mountPoint);
-			throw new StorageInvalidException();
-		} catch (\GuzzleHttp\Exception\ConnectException $e) {
-			throw new StorageNotAvailableException();
-		} catch (\GuzzleHttp\Exception\RequestException $e) {
-			throw new StorageNotAvailableException();
-		} catch (\Exception $e) {
-			throw $e;
-		}
-	}
-
-	public function file_exists($path) {
-		if ($path === '') {
-			return true;
-		} else {
-			return parent::file_exists($path);
-		}
-	}
-
-	/**
-	 * check if the configured remote is a valid federated share provider
-	 *
-	 * @return bool
-	 */
-	protected function testRemote() {
-		try {
-			return $this->testRemoteUrl($this->getRemote() . '/ocs-provider/index.php')
-				|| $this->testRemoteUrl($this->getRemote() . '/ocs-provider/')
-				|| $this->testRemoteUrl($this->getRemote() . '/status.php');
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $url
-	 * @return bool
-	 */
-	private function testRemoteUrl($url) {
-		$cache = $this->memcacheFactory->createDistributed('files_sharing_remote_url');
-		if ($cache->hasKey($url)) {
-			return (bool)$cache->get($url);
-		}
-
-		$client = $this->httpClient->newClient();
-		try {
-			$result = $client->get($url, [
-				'timeout' => 10,
-				'connect_timeout' => 10,
-			])->getBody();
-			$data = json_decode($result);
-			$returnValue = (is_object($data) && !empty($data->version));
-		} catch (ConnectException $e) {
-			$returnValue = false;
-		} catch (ClientException $e) {
-			$returnValue = false;
-		} catch (RequestException $e) {
-			$returnValue = false;
-		}
-
-		$cache->set($url, $returnValue, 60 * 60 * 24);
-		return $returnValue;
-	}
-
-	/**
-	 * Whether the remote is an ownCloud/Nextcloud, used since some sharing features are not
-	 * standardized. Let's use this to detect whether to use it.
-	 *
-	 * @return bool
-	 */
-	public function remoteIsOwnCloud() {
-		if (defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote() . '/status.php')) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @return mixed
-	 * @throws ForbiddenException
-	 * @throws NotFoundException
-	 * @throws \Exception
-	 */
-	public function getShareInfo() {
-		$remote = $this->getRemote();
-		$token = $this->getToken();
-		$password = $this->getPassword();
-
-		// If remote is not an ownCloud do not try to get any share info
-		if (!$this->remoteIsOwnCloud()) {
-			return ['status' => 'unsupported'];
-		}
-
-		$url = rtrim($remote, '/') . '/index.php/apps/files_sharing/shareinfo?t=' . $token;
-
-		// TODO: DI
-		$client = \OC::$server->getHTTPClientService()->newClient();
-		try {
-			$response = $client->post($url, [
-				'body' => ['password' => $password],
-				'timeout' => 10,
-				'connect_timeout' => 10,
-			]);
-		} catch (\GuzzleHttp\Exception\RequestException $e) {
-			if ($e->getCode() === Http::STATUS_UNAUTHORIZED || $e->getCode() === Http::STATUS_FORBIDDEN) {
-				throw new ForbiddenException();
-			}
-			if ($e->getCode() === Http::STATUS_NOT_FOUND) {
-				throw new NotFoundException();
-			}
-			// throw this to be on the safe side: the share will still be visible
-			// in the UI in case the failure is intermittent, and the user will
-			// be able to decide whether to remove it if it's really gone
-			throw new StorageNotAvailableException();
-		}
-
-		return json_decode($response->getBody(), true);
-	}
-
-	public function getOwner($path) {
-		return $this->cloudId->getDisplayId();
-	}
-
-	public function isSharable($path) {
-		if (\OCP\Util::isSharingDisabledForUser() || !\OC\Share\Share::isResharingAllowed()) {
-			return false;
-		}
-		return ($this->getPermissions($path) & Constants::PERMISSION_SHARE);
-	}
-
-	public function getPermissions($path) {
-		$response = $this->propfind($path);
-		// old federated sharing permissions
-		if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
-			$permissions = $response['{http://open-collaboration-services.org/ns}share-permissions'];
-		} elseif (isset($response['{http://open-cloud-mesh.org/ns}share-permissions'])) {
-			// permissions provided by the OCM API
-			$permissions = $this->ocmPermissions2ncPermissions($response['{http://open-collaboration-services.org/ns}share-permissions'], $path);
-		} else {
-			// use default permission if remote server doesn't provide the share permissions
-			$permissions = $this->getDefaultPermissions($path);
-		}
-
-		return $permissions;
-	}
-
-	public function needsPartFile() {
-		return false;
-	}
-
-	/**
-	 * translate OCM Permissions to Nextcloud permissions
-	 *
-	 * @param string $ocmPermissions json encoded OCM permissions
-	 * @param string $path path to file
-	 * @return int
-	 */
-	protected function ocmPermissions2ncPermissions($ocmPermissions, $path) {
-		try {
-			$ocmPermissions = json_decode($ocmPermissions);
-			$ncPermissions = 0;
-			foreach ($ocmPermissions as $permission) {
-				switch (strtolower($permission)) {
-					case 'read':
-						$ncPermissions += Constants::PERMISSION_READ;
-						break;
-					case 'write':
-						$ncPermissions += Constants::PERMISSION_CREATE + Constants::PERMISSION_UPDATE;
-						break;
-					case 'share':
-						$ncPermissions += Constants::PERMISSION_SHARE;
-						break;
-					default:
-						throw new \Exception();
-				}
-			}
-		} catch (\Exception $e) {
-			$ncPermissions = $this->getDefaultPermissions($path);
-		}
-
-		return $ncPermissions;
-	}
-
-	/**
-	 * calculate default permissions in case no permissions are provided
-	 *
-	 * @param $path
-	 * @return int
-	 */
-	protected function getDefaultPermissions($path) {
-		if ($this->is_dir($path)) {
-			$permissions = Constants::PERMISSION_ALL;
-		} else {
-			$permissions = Constants::PERMISSION_ALL & ~Constants::PERMISSION_CREATE;
-		}
-
-		return $permissions;
-	}
+    /** @var ICloudId */
+    private $cloudId;
+    /** @var string */
+    private $mountPoint;
+    /** @var string */
+    private $token;
+    /** @var \OCP\ICacheFactory */
+    private $memcacheFactory;
+    /** @var \OCP\Http\Client\IClientService */
+    private $httpClient;
+    /** @var bool */
+    private $updateChecked = false;
+
+    /**
+     * @var \OCA\Files_Sharing\External\Manager
+     */
+    private $manager;
+
+    public function __construct($options) {
+        $this->memcacheFactory = \OC::$server->getMemCacheFactory();
+        $this->httpClient = $options['HttpClientService'];
+
+        $this->manager = $options['manager'];
+        $this->cloudId = $options['cloudId'];
+        $discoveryService = \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
+
+        [$protocol, $remote] = explode('://', $this->cloudId->getRemote());
+        if (strpos($remote, '/')) {
+            [$host, $root] = explode('/', $remote, 2);
+        } else {
+            $host = $remote;
+            $root = '';
+        }
+        $secure = $protocol === 'https';
+        $federatedSharingEndpoints = $discoveryService->discover($this->cloudId->getRemote(), 'FEDERATED_SHARING');
+        $webDavEndpoint = isset($federatedSharingEndpoints['webdav']) ? $federatedSharingEndpoints['webdav'] : '/public.php/webdav';
+        $root = rtrim($root, '/') . $webDavEndpoint;
+        $this->mountPoint = $options['mountpoint'];
+        $this->token = $options['token'];
+
+        parent::__construct([
+            'secure' => $secure,
+            'host' => $host,
+            'root' => $root,
+            'user' => $options['token'],
+            'password' => (string)$options['password']
+        ]);
+    }
+
+    public function getWatcher($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->watcher)) {
+            $this->watcher = new Watcher($storage);
+            $this->watcher->setPolicy(\OC\Files\Cache\Watcher::CHECK_ONCE);
+        }
+        return $this->watcher;
+    }
+
+    public function getRemoteUser() {
+        return $this->cloudId->getUser();
+    }
+
+    public function getRemote() {
+        return $this->cloudId->getRemote();
+    }
+
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
+
+    public function getToken() {
+        return $this->token;
+    }
+
+    public function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     * @brief get id of the mount point
+     * @return string
+     */
+    public function getId() {
+        return 'shared::' . md5($this->token . '@' . $this->getRemote());
+    }
+
+    public function getCache($path = '', $storage = null) {
+        if (is_null($this->cache)) {
+            $this->cache = new Cache($this, $this->cloudId);
+        }
+        return $this->cache;
+    }
+
+    /**
+     * @param string $path
+     * @param \OC\Files\Storage\Storage $storage
+     * @return \OCA\Files_Sharing\External\Scanner
+     */
+    public function getScanner($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->scanner)) {
+            $this->scanner = new Scanner($storage);
+        }
+        return $this->scanner;
+    }
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @param string $path
+     * @param int $time
+     * @throws \OCP\Files\StorageNotAvailableException
+     * @throws \OCP\Files\StorageInvalidException
+     * @return bool
+     */
+    public function hasUpdated($path, $time) {
+        // since for owncloud webdav servers we can rely on etag propagation we only need to check the root of the storage
+        // because of that we only do one check for the entire storage per request
+        if ($this->updateChecked) {
+            return false;
+        }
+        $this->updateChecked = true;
+        try {
+            return parent::hasUpdated('', $time);
+        } catch (StorageInvalidException $e) {
+            // check if it needs to be removed
+            $this->checkStorageAvailability();
+            throw $e;
+        } catch (StorageNotAvailableException $e) {
+            // check if it needs to be removed or just temp unavailable
+            $this->checkStorageAvailability();
+            throw $e;
+        }
+    }
+
+    public function test() {
+        try {
+            return parent::test();
+        } catch (StorageInvalidException $e) {
+            // check if it needs to be removed
+            $this->checkStorageAvailability();
+            throw $e;
+        } catch (StorageNotAvailableException $e) {
+            // check if it needs to be removed or just temp unavailable
+            $this->checkStorageAvailability();
+            throw $e;
+        }
+    }
+
+    /**
+     * Check whether this storage is permanently or temporarily
+     * unavailable
+     *
+     * @throws \OCP\Files\StorageNotAvailableException
+     * @throws \OCP\Files\StorageInvalidException
+     */
+    public function checkStorageAvailability() {
+        // see if we can find out why the share is unavailable
+        try {
+            $this->getShareInfo();
+        } catch (NotFoundException $e) {
+            // a 404 can either mean that the share no longer exists or there is no Nextcloud on the remote
+            if ($this->testRemote()) {
+                // valid Nextcloud instance means that the public share no longer exists
+                // since this is permanent (re-sharing the file will create a new token)
+                // we remove the invalid storage
+                $this->manager->removeShare($this->mountPoint);
+                $this->manager->getMountManager()->removeMount($this->mountPoint);
+                throw new StorageInvalidException();
+            } else {
+                // Nextcloud instance is gone, likely to be a temporary server configuration error
+                throw new StorageNotAvailableException();
+            }
+        } catch (ForbiddenException $e) {
+            // auth error, remove share for now (provide a dialog in the future)
+            $this->manager->removeShare($this->mountPoint);
+            $this->manager->getMountManager()->removeMount($this->mountPoint);
+            throw new StorageInvalidException();
+        } catch (\GuzzleHttp\Exception\ConnectException $e) {
+            throw new StorageNotAvailableException();
+        } catch (\GuzzleHttp\Exception\RequestException $e) {
+            throw new StorageNotAvailableException();
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+
+    public function file_exists($path) {
+        if ($path === '') {
+            return true;
+        } else {
+            return parent::file_exists($path);
+        }
+    }
+
+    /**
+     * check if the configured remote is a valid federated share provider
+     *
+     * @return bool
+     */
+    protected function testRemote() {
+        try {
+            return $this->testRemoteUrl($this->getRemote() . '/ocs-provider/index.php')
+                || $this->testRemoteUrl($this->getRemote() . '/ocs-provider/')
+                || $this->testRemoteUrl($this->getRemote() . '/status.php');
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $url
+     * @return bool
+     */
+    private function testRemoteUrl($url) {
+        $cache = $this->memcacheFactory->createDistributed('files_sharing_remote_url');
+        if ($cache->hasKey($url)) {
+            return (bool)$cache->get($url);
+        }
+
+        $client = $this->httpClient->newClient();
+        try {
+            $result = $client->get($url, [
+                'timeout' => 10,
+                'connect_timeout' => 10,
+            ])->getBody();
+            $data = json_decode($result);
+            $returnValue = (is_object($data) && !empty($data->version));
+        } catch (ConnectException $e) {
+            $returnValue = false;
+        } catch (ClientException $e) {
+            $returnValue = false;
+        } catch (RequestException $e) {
+            $returnValue = false;
+        }
+
+        $cache->set($url, $returnValue, 60 * 60 * 24);
+        return $returnValue;
+    }
+
+    /**
+     * Whether the remote is an ownCloud/Nextcloud, used since some sharing features are not
+     * standardized. Let's use this to detect whether to use it.
+     *
+     * @return bool
+     */
+    public function remoteIsOwnCloud() {
+        if (defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote() . '/status.php')) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @return mixed
+     * @throws ForbiddenException
+     * @throws NotFoundException
+     * @throws \Exception
+     */
+    public function getShareInfo() {
+        $remote = $this->getRemote();
+        $token = $this->getToken();
+        $password = $this->getPassword();
+
+        // If remote is not an ownCloud do not try to get any share info
+        if (!$this->remoteIsOwnCloud()) {
+            return ['status' => 'unsupported'];
+        }
+
+        $url = rtrim($remote, '/') . '/index.php/apps/files_sharing/shareinfo?t=' . $token;
+
+        // TODO: DI
+        $client = \OC::$server->getHTTPClientService()->newClient();
+        try {
+            $response = $client->post($url, [
+                'body' => ['password' => $password],
+                'timeout' => 10,
+                'connect_timeout' => 10,
+            ]);
+        } catch (\GuzzleHttp\Exception\RequestException $e) {
+            if ($e->getCode() === Http::STATUS_UNAUTHORIZED || $e->getCode() === Http::STATUS_FORBIDDEN) {
+                throw new ForbiddenException();
+            }
+            if ($e->getCode() === Http::STATUS_NOT_FOUND) {
+                throw new NotFoundException();
+            }
+            // throw this to be on the safe side: the share will still be visible
+            // in the UI in case the failure is intermittent, and the user will
+            // be able to decide whether to remove it if it's really gone
+            throw new StorageNotAvailableException();
+        }
+
+        return json_decode($response->getBody(), true);
+    }
+
+    public function getOwner($path) {
+        return $this->cloudId->getDisplayId();
+    }
+
+    public function isSharable($path) {
+        if (\OCP\Util::isSharingDisabledForUser() || !\OC\Share\Share::isResharingAllowed()) {
+            return false;
+        }
+        return ($this->getPermissions($path) & Constants::PERMISSION_SHARE);
+    }
+
+    public function getPermissions($path) {
+        $response = $this->propfind($path);
+        // old federated sharing permissions
+        if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
+            $permissions = $response['{http://open-collaboration-services.org/ns}share-permissions'];
+        } elseif (isset($response['{http://open-cloud-mesh.org/ns}share-permissions'])) {
+            // permissions provided by the OCM API
+            $permissions = $this->ocmPermissions2ncPermissions($response['{http://open-collaboration-services.org/ns}share-permissions'], $path);
+        } else {
+            // use default permission if remote server doesn't provide the share permissions
+            $permissions = $this->getDefaultPermissions($path);
+        }
+
+        return $permissions;
+    }
+
+    public function needsPartFile() {
+        return false;
+    }
+
+    /**
+     * translate OCM Permissions to Nextcloud permissions
+     *
+     * @param string $ocmPermissions json encoded OCM permissions
+     * @param string $path path to file
+     * @return int
+     */
+    protected function ocmPermissions2ncPermissions($ocmPermissions, $path) {
+        try {
+            $ocmPermissions = json_decode($ocmPermissions);
+            $ncPermissions = 0;
+            foreach ($ocmPermissions as $permission) {
+                switch (strtolower($permission)) {
+                    case 'read':
+                        $ncPermissions += Constants::PERMISSION_READ;
+                        break;
+                    case 'write':
+                        $ncPermissions += Constants::PERMISSION_CREATE + Constants::PERMISSION_UPDATE;
+                        break;
+                    case 'share':
+                        $ncPermissions += Constants::PERMISSION_SHARE;
+                        break;
+                    default:
+                        throw new \Exception();
+                }
+            }
+        } catch (\Exception $e) {
+            $ncPermissions = $this->getDefaultPermissions($path);
+        }
+
+        return $ncPermissions;
+    }
+
+    /**
+     * calculate default permissions in case no permissions are provided
+     *
+     * @param $path
+     * @return int
+     */
+    protected function getDefaultPermissions($path) {
+        if ($this->is_dir($path)) {
+            $permissions = Constants::PERMISSION_ALL;
+        } else {
+            $permissions = Constants::PERMISSION_ALL & ~Constants::PERMISSION_CREATE;
+        }
+
+        return $permissions;
+    }
 }