nextcloud / server

ocs-provider/index.php

Indentation +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@
 $server = \OC::$server;
 
 $controller = new \OC\OCS\Provider(
-	'ocs_provider',
-	$server->getRequest(),
-	$server->getAppManager()
+    'ocs_provider',
+    $server->getRequest(),
+    $server->getAppManager()
 );
 echo $controller->buildProviderList()->render();

core/templates/exception.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-	/** @var array $_ */
-	/** @var \OCP\IL10N $l */
+    /** @var array $_ */
+    /** @var \OCP\IL10N $l */
 
 style('core', ['styles', 'header']);
 ?>

core/Command/Security/RemoveCertificate.php

Indentation +24 added lines, -24 removed lines

@@ -34,28 +34,28 @@
 
 class RemoveCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('security:certificates:remove')
-			->setDescription('remove trusted certificate')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'the file name of the certificate to remove'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$name = $input->getArgument('name');
-
-		$this->certificateManager->removeCertificate($name);
-	}
+    /** @var ICertificateManager */
+    protected $certificateManager;
+
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('security:certificates:remove')
+            ->setDescription('remove trusted certificate')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'the file name of the certificate to remove'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $name = $input->getArgument('name');
+
+        $this->certificateManager->removeCertificate($name);
+    }
 }

core/Command/Security/ListCertificates.php

Indentation +56 added lines, -56 removed lines

@@ -34,64 +34,64 @@
 
 class ListCertificates extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-	/** @var IL10N */
-	protected $l;
+    /** @var ICertificateManager */
+    protected $certificateManager;
+    /** @var IL10N */
+    protected $l;
 
-	public function __construct(ICertificateManager $certificateManager, IL10N $l) {
-		$this->certificateManager = $certificateManager;
-		$this->l = $l;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager, IL10N $l) {
+        $this->certificateManager = $certificateManager;
+        $this->l = $l;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates')
-			->setDescription('list trusted certificates');
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates')
+            ->setDescription('list trusted certificates');
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$outputType = $input->getOption('output');
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
-				return [
-					'name' => $certificate->getName(),
-					'common_name' => $certificate->getCommonName(),
-					'organization' => $certificate->getOrganization(),
-					'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
-					'issuer' => $certificate->getIssuerName(),
-					'issuer_organization' => $certificate->getIssuerOrganization(),
-					'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
-				];
-			}, $this->certificateManager->listCertificates());
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($certificates)));
-			} else {
-				$output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$table = new Table($output);
-			$table->setHeaders([
-				'File Name',
-				'Common Name',
-				'Organization',
-				'Valid Until',
-				'Issued By'
-			]);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $outputType = $input->getOption('output');
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $certificates = array_map(function (ICertificate $certificate) {
+                return [
+                    'name' => $certificate->getName(),
+                    'common_name' => $certificate->getCommonName(),
+                    'organization' => $certificate->getOrganization(),
+                    'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
+                    'issuer' => $certificate->getIssuerName(),
+                    'issuer_organization' => $certificate->getIssuerOrganization(),
+                    'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
+                ];
+            }, $this->certificateManager->listCertificates());
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($certificates)));
+            } else {
+                $output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $table = new Table($output);
+            $table->setHeaders([
+                'File Name',
+                'Common Name',
+                'Organization',
+                'Valid Until',
+                'Issued By'
+            ]);
 
-			$rows = array_map(function (ICertificate $certificate) {
-				return [
-					$certificate->getName(),
-					$certificate->getCommonName(),
-					$certificate->getOrganization(),
-					$this->l->l('date', $certificate->getExpireDate()),
-					$certificate->getIssuerName()
-				];
-			}, $this->certificateManager->listCertificates());
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
+            $rows = array_map(function (ICertificate $certificate) {
+                return [
+                    $certificate->getName(),
+                    $certificate->getCommonName(),
+                    $certificate->getOrganization(),
+                    $this->l->l('date', $certificate->getExpireDate()),
+                    $certificate->getIssuerName()
+                ];
+            }, $this->certificateManager->listCertificates());
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
 }

core/Command/Security/ImportCertificate.php

Indentation +26 added lines, -26 removed lines

@@ -33,36 +33,36 @@
 
 class ImportCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
+    /** @var ICertificateManager */
+    protected $certificateManager;
 
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates:import')
-			->setDescription('import trusted certificate')
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to the certificate to import'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates:import')
+            ->setDescription('import trusted certificate')
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to the certificate to import'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$path = $input->getArgument('path');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $path = $input->getArgument('path');
 
-		if (!file_exists($path)) {
-			$output->writeln('<error>certificate not found</error>');
-			return;
-		}
+        if (!file_exists($path)) {
+            $output->writeln('<error>certificate not found</error>');
+            return;
+        }
 
-		$certData = file_get_contents($path);
-		$name = basename($path);
+        $certData = file_get_contents($path);
+        $name = basename($path);
 
-		$this->certificateManager->addCertificate($certData, $name);
-	}
+        $this->certificateManager->addCertificate($certData, $name);
+    }
 }

core/Command/Integrity/SignCore.php

Indentation +57 added lines, -57 removed lines

@@ -37,69 +37,69 @@
  * @package OC\Core\Command\Integrity
  */
 class SignCore extends Command {
-	/** @var Checker */
-	private $checker;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
+    /** @var Checker */
+    private $checker;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
 
-	/**
-	 * @param Checker $checker
-	 * @param FileAccessHelper $fileAccessHelper
-	 */
-	public function __construct(Checker $checker,
-								FileAccessHelper $fileAccessHelper) {
-		parent::__construct(null);
-		$this->checker = $checker;
-		$this->fileAccessHelper = $fileAccessHelper;
-	}
+    /**
+     * @param Checker $checker
+     * @param FileAccessHelper $fileAccessHelper
+     */
+    public function __construct(Checker $checker,
+                                FileAccessHelper $fileAccessHelper) {
+        parent::__construct(null);
+        $this->checker = $checker;
+        $this->fileAccessHelper = $fileAccessHelper;
+    }
 
-	protected function configure() {
-		$this
-			->setName('integrity:sign-core')
-			->setDescription('Sign core using a private key.')
-			->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
-			->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing')
-			->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign');
-	}
+    protected function configure() {
+        $this
+            ->setName('integrity:sign-core')
+            ->setDescription('Sign core using a private key.')
+            ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
+            ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing')
+            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$privateKeyPath = $input->getOption('privateKey');
-		$keyBundlePath = $input->getOption('certificate');
-		$path = $input->getOption('path');
-		if(is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) {
-			$output->writeln('--privateKey, --certificate and --path are required.');
-			return null;
-		}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $privateKeyPath = $input->getOption('privateKey');
+        $keyBundlePath = $input->getOption('certificate');
+        $path = $input->getOption('path');
+        if(is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) {
+            $output->writeln('--privateKey, --certificate and --path are required.');
+            return null;
+        }
 
-		$privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
-		$keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
+        $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
+        $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
 
-		if($privateKey === false) {
-			$output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
-			return null;
-		}
+        if($privateKey === false) {
+            $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
+            return null;
+        }
 
-		if($keyBundle === false) {
-			$output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
-			return null;
-		}
+        if($keyBundle === false) {
+            $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
+            return null;
+        }
 
-		$rsa = new RSA();
-		$rsa->loadKey($privateKey);
-		$x509 = new X509();
-		$x509->loadX509($keyBundle);
-		$x509->setPrivateKey($rsa);
+        $rsa = new RSA();
+        $rsa->loadKey($privateKey);
+        $x509 = new X509();
+        $x509->loadX509($keyBundle);
+        $x509->setPrivateKey($rsa);
 
-		try {
-			$this->checker->writeCoreSignature($x509, $rsa, $path);
-			$output->writeln('Successfully signed "core"');
-		} catch (\Exception $e){
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
-		return 0;
-	}
+        try {
+            $this->checker->writeCoreSignature($x509, $rsa, $path);
+            $output->writeln('Successfully signed "core"');
+        } catch (\Exception $e){
+            $output->writeln('Error: ' . $e->getMessage());
+            return 1;
+        }
+        return 0;
+    }
 }

core/Command/Integrity/SignApp.php

Indentation +65 added lines, -65 removed lines

@@ -38,76 +38,76 @@
  * @package OC\Core\Command\Integrity
  */
 class SignApp extends Command {
-	/** @var Checker */
-	private $checker;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var Checker */
+    private $checker;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param Checker $checker
-	 * @param FileAccessHelper $fileAccessHelper
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(Checker $checker,
-								FileAccessHelper $fileAccessHelper,
-								IURLGenerator $urlGenerator) {
-		parent::__construct(null);
-		$this->checker = $checker;
-		$this->fileAccessHelper = $fileAccessHelper;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param Checker $checker
+     * @param FileAccessHelper $fileAccessHelper
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(Checker $checker,
+                                FileAccessHelper $fileAccessHelper,
+                                IURLGenerator $urlGenerator) {
+        parent::__construct(null);
+        $this->checker = $checker;
+        $this->fileAccessHelper = $fileAccessHelper;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	protected function configure() {
-		$this
-			->setName('integrity:sign-app')
-			->setDescription('Signs an app using a private key.')
-			->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign')
-			->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
-			->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing');
-	}
+    protected function configure() {
+        $this
+            ->setName('integrity:sign-app')
+            ->setDescription('Signs an app using a private key.')
+            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign')
+            ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
+            ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$path = $input->getOption('path');
-		$privateKeyPath = $input->getOption('privateKey');
-		$keyBundlePath = $input->getOption('certificate');
-		if(is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) {
-			$documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
-			$output->writeln('This command requires the --path, --privateKey and --certificate.');
-			$output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
-			$output->writeln('For more information please consult the documentation: '. $documentationUrl);
-			return null;
-		}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $path = $input->getOption('path');
+        $privateKeyPath = $input->getOption('privateKey');
+        $keyBundlePath = $input->getOption('certificate');
+        if(is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) {
+            $documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
+            $output->writeln('This command requires the --path, --privateKey and --certificate.');
+            $output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
+            $output->writeln('For more information please consult the documentation: '. $documentationUrl);
+            return null;
+        }
 
-		$privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
-		$keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
+        $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
+        $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
 
-		if($privateKey === false) {
-			$output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
-			return null;
-		}
+        if($privateKey === false) {
+            $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
+            return null;
+        }
 
-		if($keyBundle === false) {
-			$output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
-			return null;
-		}
+        if($keyBundle === false) {
+            $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
+            return null;
+        }
 
-		$rsa = new RSA();
-		$rsa->loadKey($privateKey);
-		$x509 = new X509();
-		$x509->loadX509($keyBundle);
-		$x509->setPrivateKey($rsa);
-		try {
-			$this->checker->writeAppSignature($path, $x509, $rsa);
-			$output->writeln('Successfully signed "'.$path.'"');
-		} catch (\Exception $e){
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
-		return 0;
-	}
+        $rsa = new RSA();
+        $rsa->loadKey($privateKey);
+        $x509 = new X509();
+        $x509->loadX509($keyBundle);
+        $x509->setPrivateKey($rsa);
+        try {
+            $this->checker->writeAppSignature($path, $x509, $rsa);
+            $output->writeln('Successfully signed "'.$path.'"');
+        } catch (\Exception $e){
+            $output->writeln('Error: ' . $e->getMessage());
+            return 1;
+        }
+        return 0;
+    }
 }

core/Command/Integrity/CheckCore.php

Indentation +27 added lines, -27 removed lines

@@ -34,34 +34,34 @@
  * @package OC\Core\Command\Integrity
  */
 class CheckCore extends Base {
-	/**
-	 * @var Checker
-	 */
-	private $checker;
+    /**
+     * @var Checker
+     */
+    private $checker;
 
-	public function __construct(Checker $checker) {
-		parent::__construct();
-		$this->checker = $checker;
-	}
+    public function __construct(Checker $checker) {
+        parent::__construct();
+        $this->checker = $checker;
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function configure() {
-		parent::configure();
-		$this
-			->setName('integrity:check-core')
-			->setDescription('Check integrity of core code using a signature.');
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('integrity:check-core')
+            ->setDescription('Check integrity of core code using a signature.');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$result = $this->checker->verifyCoreSignature();
-		$this->writeArrayInOutputFormat($input, $output, $result);
-		if (count($result)>0){
-			return 1;
-		}
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $result = $this->checker->verifyCoreSignature();
+        $this->writeArrayInOutputFormat($input, $output, $result);
+        if (count($result)>0){
+            return 1;
+        }
+    }
 }

core/Command/User/Report.php

Indentation +44 added lines, -44 removed lines

@@ -32,56 +32,56 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Report extends Command {
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:report')
-			->setDescription('shows how many users have access');
-	}
+    protected function configure() {
+        $this
+            ->setName('user:report')
+            ->setDescription('shows how many users have access');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$table = new Table($output);
-		$table->setHeaders(array('User Report', ''));
-		$userCountArray = $this->countUsers();
-		if(!empty($userCountArray)) {
-			$total = 0;
-			$rows = array();
-			foreach($userCountArray as $classname => $users) {
-				$total += $users;
-				$rows[] = array($classname, $users);
-			}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $table = new Table($output);
+        $table->setHeaders(array('User Report', ''));
+        $userCountArray = $this->countUsers();
+        if(!empty($userCountArray)) {
+            $total = 0;
+            $rows = array();
+            foreach($userCountArray as $classname => $users) {
+                $total += $users;
+                $rows[] = array($classname, $users);
+            }
 
-			$rows[] = array(' ');
-			$rows[] = array('total users', $total);
-		} else {
-			$rows[] = array('No backend enabled that supports user counting', '');
-		}
+            $rows[] = array(' ');
+            $rows[] = array('total users', $total);
+        } else {
+            $rows[] = array('No backend enabled that supports user counting', '');
+        }
 
-		$userDirectoryCount = $this->countUserDirectories();
-		$rows[] = array(' ');
-		$rows[] = array('user directories', $userDirectoryCount);
+        $userDirectoryCount = $this->countUserDirectories();
+        $rows[] = array(' ');
+        $rows[] = array('user directories', $userDirectoryCount);
 
-		$table->setRows($rows);
-		$table->render();
-	}
+        $table->setRows($rows);
+        $table->render();
+    }
 
-	private function countUsers() {
-		return $this->userManager->countUsers();
-	}
+    private function countUsers() {
+        return $this->userManager->countUsers();
+    }
 
-	private function countUserDirectories() {
-		$dataview = new \OC\Files\View('/');
-		$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
-		return count($userDirectories);
-	}
+    private function countUserDirectories() {
+        $dataview = new \OC\Files\View('/');
+        $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
+        return count($userDirectories);
+    }
 }