nextcloud / server

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/Log/Manage.php

Indentation +163 added lines, -163 removed lines

@@ -34,167 +34,167 @@
 
 class Manage extends Command implements CompletionAwareInterface {
 
-	const DEFAULT_BACKEND = 'file';
-	const DEFAULT_LOG_LEVEL = 2;
-	const DEFAULT_TIMEZONE = 'UTC';
-
-	/** @var IConfig */
-	protected $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('log:manage')
-			->setDescription('manage logging configuration')
-			->addOption(
-				'backend',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the logging backend [file, syslog, errorlog]'
-			)
-			->addOption(
-				'level',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the log level [debug, info, warning, error]'
-			)
-			->addOption(
-				'timezone',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the logging timezone'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		// collate config setting to the end, to avoid partial configuration
-		$toBeSet = [];
-
-		if ($backend = $input->getOption('backend')) {
-			$this->validateBackend($backend);
-			$toBeSet['log_type'] = $backend;
-		}
-
-		$level = $input->getOption('level');
-		if ($level !== null) {
-			if (is_numeric($level)) {
-				$levelNum = $level;
-				// sanity check
-				$this->convertLevelNumber($levelNum);
-			} else {
-				$levelNum = $this->convertLevelString($level);
-			}
-			$toBeSet['loglevel'] = $levelNum;
-		}
-
-		if ($timezone = $input->getOption('timezone')) {
-			$this->validateTimezone($timezone);
-			$toBeSet['logtimezone'] = $timezone;
-		}
-
-		// set config
-		foreach ($toBeSet as $option => $value) {
-			$this->config->setSystemValue($option, $value);
-		}
-
-		// display configuration
-		$backend = $this->config->getSystemValue('log_type', self::DEFAULT_BACKEND);
-		$output->writeln('Enabled logging backend: '.$backend);
-
-		$levelNum = $this->config->getSystemValue('loglevel', self::DEFAULT_LOG_LEVEL);
-		$level = $this->convertLevelNumber($levelNum);
-		$output->writeln('Log level: '.$level.' ('.$levelNum.')');
-
-		$timezone = $this->config->getSystemValue('logtimezone', self::DEFAULT_TIMEZONE);
-		$output->writeln('Log timezone: '.$timezone);
-	}
-
-	/**
-	 * @param string $backend
-	 * @throws \InvalidArgumentException
-	 */
-	protected function validateBackend($backend) {
-		if (!class_exists('OC\\Log\\'.ucfirst($backend))) {
-			throw new \InvalidArgumentException('Invalid backend');
-		}
-	}
-
-	/**
-	 * @param string $timezone
-	 * @throws \Exception
-	 */
-	protected function validateTimezone($timezone) {
-		new \DateTimeZone($timezone);
-	}
-
-	/**
-	 * @param string $level
-	 * @return int
-	 * @throws \InvalidArgumentException
-	 */
-	protected function convertLevelString($level) {
-		$level = strtolower($level);
-		switch ($level) {
-		case 'debug':
-			return 0;
-		case 'info':
-			return 1;
-		case 'warning':
-		case 'warn':
-			return 2;
-		case 'error':
-		case 'err':
-			return 3;
-		}
-		throw new \InvalidArgumentException('Invalid log level string');
-	}
-
-	/**
-	 * @param int $levelNum
-	 * @return string
-	 * @throws \InvalidArgumentException
-	 */
-	protected function convertLevelNumber($levelNum) {
-		switch ($levelNum) {
-		case 0:
-			return 'Debug';
-		case 1:
-			return 'Info';
-		case 2:
-			return 'Warning';
-		case 3:
-			return 'Error';
-		}
-		throw new \InvalidArgumentException('Invalid log level number');
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'backend') {
-			return ['file', 'syslog', 'errorlog'];
-		} else if ($optionName === 'level') {
-			return ['debug', 'info', 'warning', 'error'];
-		} else if ($optionName === 'timezone') {
-			return \DateTimeZone::listIdentifiers();
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    const DEFAULT_BACKEND = 'file';
+    const DEFAULT_LOG_LEVEL = 2;
+    const DEFAULT_TIMEZONE = 'UTC';
+
+    /** @var IConfig */
+    protected $config;
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('log:manage')
+            ->setDescription('manage logging configuration')
+            ->addOption(
+                'backend',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the logging backend [file, syslog, errorlog]'
+            )
+            ->addOption(
+                'level',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the log level [debug, info, warning, error]'
+            )
+            ->addOption(
+                'timezone',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the logging timezone'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        // collate config setting to the end, to avoid partial configuration
+        $toBeSet = [];
+
+        if ($backend = $input->getOption('backend')) {
+            $this->validateBackend($backend);
+            $toBeSet['log_type'] = $backend;
+        }
+
+        $level = $input->getOption('level');
+        if ($level !== null) {
+            if (is_numeric($level)) {
+                $levelNum = $level;
+                // sanity check
+                $this->convertLevelNumber($levelNum);
+            } else {
+                $levelNum = $this->convertLevelString($level);
+            }
+            $toBeSet['loglevel'] = $levelNum;
+        }
+
+        if ($timezone = $input->getOption('timezone')) {
+            $this->validateTimezone($timezone);
+            $toBeSet['logtimezone'] = $timezone;
+        }
+
+        // set config
+        foreach ($toBeSet as $option => $value) {
+            $this->config->setSystemValue($option, $value);
+        }
+
+        // display configuration
+        $backend = $this->config->getSystemValue('log_type', self::DEFAULT_BACKEND);
+        $output->writeln('Enabled logging backend: '.$backend);
+
+        $levelNum = $this->config->getSystemValue('loglevel', self::DEFAULT_LOG_LEVEL);
+        $level = $this->convertLevelNumber($levelNum);
+        $output->writeln('Log level: '.$level.' ('.$levelNum.')');
+
+        $timezone = $this->config->getSystemValue('logtimezone', self::DEFAULT_TIMEZONE);
+        $output->writeln('Log timezone: '.$timezone);
+    }
+
+    /**
+     * @param string $backend
+     * @throws \InvalidArgumentException
+     */
+    protected function validateBackend($backend) {
+        if (!class_exists('OC\\Log\\'.ucfirst($backend))) {
+            throw new \InvalidArgumentException('Invalid backend');
+        }
+    }
+
+    /**
+     * @param string $timezone
+     * @throws \Exception
+     */
+    protected function validateTimezone($timezone) {
+        new \DateTimeZone($timezone);
+    }
+
+    /**
+     * @param string $level
+     * @return int
+     * @throws \InvalidArgumentException
+     */
+    protected function convertLevelString($level) {
+        $level = strtolower($level);
+        switch ($level) {
+        case 'debug':
+            return 0;
+        case 'info':
+            return 1;
+        case 'warning':
+        case 'warn':
+            return 2;
+        case 'error':
+        case 'err':
+            return 3;
+        }
+        throw new \InvalidArgumentException('Invalid log level string');
+    }
+
+    /**
+     * @param int $levelNum
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    protected function convertLevelNumber($levelNum) {
+        switch ($levelNum) {
+        case 0:
+            return 'Debug';
+        case 1:
+            return 'Info';
+        case 2:
+            return 'Warning';
+        case 3:
+            return 'Error';
+        }
+        throw new \InvalidArgumentException('Invalid log level number');
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'backend') {
+            return ['file', 'syslog', 'errorlog'];
+        } else if ($optionName === 'level') {
+            return ['debug', 'info', 'warning', 'error'];
+        } else if ($optionName === 'timezone') {
+            return \DateTimeZone::listIdentifiers();
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }

core/Command/Log/File.php

Indentation +119 added lines, -119 removed lines

@@ -35,123 +35,123 @@
 
 class File extends Command implements Completion\CompletionAwareInterface {
 
-	/** @var IConfig */
-	protected $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('log:file')
-			->setDescription('manipulate logging backend')
-			->addOption(
-				'enable',
-				null,
-				InputOption::VALUE_NONE,
-				'enable this logging backend'
-			)
-			->addOption(
-				'file',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the log file path'
-			)
-			->addOption(
-				'rotate-size',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the file size for log rotation, 0 = disabled'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$toBeSet = [];
-
-		if ($input->getOption('enable')) {
-			$toBeSet['log_type'] = 'file';
-		}
-
-		if ($file = $input->getOption('file')) {
-			$toBeSet['logfile'] = $file;
-		}
-
-		if (($rotateSize = $input->getOption('rotate-size')) !== null) {
-			$rotateSize = \OCP\Util::computerFileSize($rotateSize);
-			$this->validateRotateSize($rotateSize);
-			$toBeSet['log_rotate_size'] = $rotateSize;
-		}
-
-		// set config
-		foreach ($toBeSet as $option => $value) {
-			$this->config->setSystemValue($option, $value);
-		}
-
-		// display config
-		// TODO: Drop backwards compatibility for config in the future
-		$logType = $this->config->getSystemValue('log_type', 'file');
-		if ($logType === 'file' || $logType === 'owncloud') {
-			$enabledText = 'enabled';
-		} else {
-			$enabledText = 'disabled';
-		}
-		$output->writeln('Log backend file: '.$enabledText);
-
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
-		$defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
-		$output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
-
-		$rotateSize = $this->config->getSystemValue('log_rotate_size', 0);
-		if ($rotateSize) {
-			$rotateString = \OCP\Util::humanFileSize($rotateSize);
-		} else {
-			$rotateString = 'disabled';
-		}
-		$output->writeln('Rotate at: '.$rotateString);
-	}
-
-	/**
-	 * @param mixed $rotateSize
-	 * @throws \InvalidArgumentException
-	 */
-	protected function validateRotateSize(&$rotateSize) {
-		if ($rotateSize === false) {
-			throw new \InvalidArgumentException('Error parsing log rotation file size');
-		}
-		$rotateSize = (int) $rotateSize;
-		if ($rotateSize < 0) {
-			throw new \InvalidArgumentException('Log rotation file size must be non-negative');
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'file') {
-			$helper = new ShellPathCompletion(
-				$this->getName(),
-				'file',
-				Completion::TYPE_OPTION
-			);
-			return $helper->run();
-		} else if ($optionName === 'rotate-size') {
-			return [0];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    /** @var IConfig */
+    protected $config;
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('log:file')
+            ->setDescription('manipulate logging backend')
+            ->addOption(
+                'enable',
+                null,
+                InputOption::VALUE_NONE,
+                'enable this logging backend'
+            )
+            ->addOption(
+                'file',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the log file path'
+            )
+            ->addOption(
+                'rotate-size',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the file size for log rotation, 0 = disabled'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $toBeSet = [];
+
+        if ($input->getOption('enable')) {
+            $toBeSet['log_type'] = 'file';
+        }
+
+        if ($file = $input->getOption('file')) {
+            $toBeSet['logfile'] = $file;
+        }
+
+        if (($rotateSize = $input->getOption('rotate-size')) !== null) {
+            $rotateSize = \OCP\Util::computerFileSize($rotateSize);
+            $this->validateRotateSize($rotateSize);
+            $toBeSet['log_rotate_size'] = $rotateSize;
+        }
+
+        // set config
+        foreach ($toBeSet as $option => $value) {
+            $this->config->setSystemValue($option, $value);
+        }
+
+        // display config
+        // TODO: Drop backwards compatibility for config in the future
+        $logType = $this->config->getSystemValue('log_type', 'file');
+        if ($logType === 'file' || $logType === 'owncloud') {
+            $enabledText = 'enabled';
+        } else {
+            $enabledText = 'disabled';
+        }
+        $output->writeln('Log backend file: '.$enabledText);
+
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
+        $defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
+        $output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
+
+        $rotateSize = $this->config->getSystemValue('log_rotate_size', 0);
+        if ($rotateSize) {
+            $rotateString = \OCP\Util::humanFileSize($rotateSize);
+        } else {
+            $rotateString = 'disabled';
+        }
+        $output->writeln('Rotate at: '.$rotateString);
+    }
+
+    /**
+     * @param mixed $rotateSize
+     * @throws \InvalidArgumentException
+     */
+    protected function validateRotateSize(&$rotateSize) {
+        if ($rotateSize === false) {
+            throw new \InvalidArgumentException('Error parsing log rotation file size');
+        }
+        $rotateSize = (int) $rotateSize;
+        if ($rotateSize < 0) {
+            throw new \InvalidArgumentException('Log rotation file size must be non-negative');
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'file') {
+            $helper = new ShellPathCompletion(
+                $this->getName(),
+                'file',
+                Completion::TYPE_OPTION
+            );
+            return $helper->run();
+        } else if ($optionName === 'rotate-size') {
+            return [0];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }

core/Command/Integrity/CheckApp.php

Indentation +31 added lines, -31 removed lines

@@ -36,39 +36,39 @@
  */
 class CheckApp 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-app')
-			->setDescription('Check integrity of an app using a signature.')
-			->addArgument('appid', null, InputArgument::REQUIRED, 'Application to check')
-			->addOption('path', null, InputOption::VALUE_OPTIONAL, 'Path to application. If none is given it will be guessed.');
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('integrity:check-app')
+            ->setDescription('Check integrity of an app using a signature.')
+            ->addArgument('appid', null, InputArgument::REQUIRED, 'Application to check')
+            ->addOption('path', null, InputOption::VALUE_OPTIONAL, 'Path to application. If none is given it will be guessed.');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appid = $input->getArgument('appid');
-		$path = strval($input->getOption('path'));
-		$result = $this->checker->verifyAppSignature($appid, $path);
-		$this->writeArrayInOutputFormat($input, $output, $result);
-		if (count($result)>0){
-			return 1;
-		}
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appid = $input->getArgument('appid');
+        $path = strval($input->getOption('path'));
+        $result = $this->checker->verifyAppSignature($appid, $path);
+        $this->writeArrayInOutputFormat($input, $output, $result);
+        if (count($result)>0){
+            return 1;
+        }
+    }
 
 }

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/LastSeen.php

Indentation +36 added lines, -36 removed lines

@@ -32,44 +32,44 @@
 use Symfony\Component\Console\Input\InputArgument;
 
 class LastSeen 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:lastseen')
-			->setDescription('shows when the user was logged in last time')
-			->addArgument(
-				'uid',
-				InputArgument::REQUIRED,
-				'the username'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:lastseen')
+            ->setDescription('shows when the user was logged in last time')
+            ->addArgument(
+                'uid',
+                InputArgument::REQUIRED,
+                'the username'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $this->userManager->get($input->getArgument('uid'));
-		if(is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $this->userManager->get($input->getArgument('uid'));
+        if(is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return;
+        }
 
-		$lastLogin = $user->getLastLogin();
-		if($lastLogin === 0) {
-			$output->writeln('User ' . $user->getUID() .
-				' has never logged in, yet.');
-		} else {
-			$date = new \DateTime();
-			$date->setTimestamp($lastLogin);
-			$output->writeln($user->getUID() .
-				'`s last login: ' . $date->format('d.m.Y H:i'));
-		}
-	}
+        $lastLogin = $user->getLastLogin();
+        if($lastLogin === 0) {
+            $output->writeln('User ' . $user->getUID() .
+                ' has never logged in, yet.');
+        } else {
+            $date = new \DateTime();
+            $date->setTimestamp($lastLogin);
+            $output->writeln($user->getUID() .
+                '`s last login: ' . $date->format('d.m.Y H:i'));
+        }
+    }
 }

core/Command/User/ListCommand.php

Indentation +50 added lines, -50 removed lines

@@ -32,58 +32,58 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	/** @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:list')
-			->setDescription('list configured users')
-			->addOption(
-				'limit',
-				'l',
-				InputOption::VALUE_OPTIONAL,
-				'Number of users to retrieve',
-				500
-			)->addOption(
-				'offset',
-				'o',
-				InputOption::VALUE_OPTIONAL,
-				'Offset for retrieving users',
-				0
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:list')
+            ->setDescription('list configured users')
+            ->addOption(
+                'limit',
+                'l',
+                InputOption::VALUE_OPTIONAL,
+                'Number of users to retrieve',
+                500
+            )->addOption(
+                'offset',
+                'o',
+                InputOption::VALUE_OPTIONAL,
+                'Offset for retrieving users',
+                0
+            )->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$users = $this->userManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
-		$this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users));
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $users = $this->userManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+        $this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users));
+    }
 
-	/**
-	 * @param IUser[] $users
-	 * @return array
-	 */
-	private function formatUsers(array $users) {
-		$keys = array_map(function (IUser $user) {
-			return $user->getUID();
-		}, $users);
-		$values = array_map(function (IUser $user) {
-			return $user->getDisplayName();
-		}, $users);
-		return array_combine($keys, $values);
-	}
+    /**
+     * @param IUser[] $users
+     * @return array
+     */
+    private function formatUsers(array $users) {
+        $keys = array_map(function (IUser $user) {
+            return $user->getUID();
+        }, $users);
+        $values = array_map(function (IUser $user) {
+            return $user->getDisplayName();
+        }, $users);
+        return array_combine($keys, $values);
+    }
 }