Skip to content

[local] feat: declarative password salt, secret config #57994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
provokateurin wants to merge 1 commit into from
+21 −6
Closed

[local] feat: declarative password salt, secret config #57994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions core/Command/Maintenance/Install.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ protected function configure(): void {
->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'Login of the admin account', 'admin')
->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
->addOption('admin-email', null, InputOption::VALUE_OPTIONAL, 'E-Mail of the admin account')
->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT . '/data');
->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT . '/data')
->addOption('password-salt', null, InputOption::VALUE_OPTIONAL, 'Password salt, at least ' . Setup::MIN_PASSWORD_SALT_LENGTH . ' characters (will be randomly generated if not provided)')
->addOption('server-secret', null, InputOption::VALUE_OPTIONAL, 'Server secret, at least ' . Setup::MIN_SECRET_LENGTH . ' characters (will be randomly generated if not provided)');
}

protected function execute(InputInterface $input, OutputInterface $output): int {
Expand Down Expand Up @@ -152,6 +154,16 @@ protected function validateInput(InputInterface $input, OutputInterface $output,
throw new InvalidArgumentException('Invalid e-mail-address <' . $adminEmail . '> for <' . $adminLogin . '>.');
}

$passwordSalt = $input->getOption('password-salt');
$secret = $input->getOption('server-secret');

if ($passwordSalt !== null && strlen($passwordSalt) < Setup::MIN_PASSWORD_SALT_LENGTH) {
throw new InvalidArgumentException('Password salt must be at least ' . Setup::MIN_PASSWORD_SALT_LENGTH . ' characters long.');
}
if ($secret !== null && strlen($secret) < Setup::MIN_SECRET_LENGTH) {
throw new InvalidArgumentException('Server secret must be at least ' . Setup::MIN_SECRET_LENGTH . ' characters long.');
}

$options = [
'dbtype' => $db,
'dbuser' => $dbUser,
Expand All @@ -162,7 +174,9 @@ protected function validateInput(InputInterface $input, OutputInterface $output,
'adminlogin' => $adminLogin,
'adminpass' => $adminPassword,
'adminemail' => $adminEmail,
'directory' => $dataDir
'directory' => $dataDir,
'passwordsalt' => $passwordSalt,
'secret' => $secret,
];
if ($db === 'oci') {
$options['dbtablespace'] = $input->getParameterOption('--database-table-space', '');
Expand Down
9 changes: 5 additions & 4 deletions lib/private/Setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
use Psr\Log\LoggerInterface;

class Setup {
public const MIN_PASSWORD_SALT_LENGTH = 30;
public const MIN_SECRET_LENGTH = 48;

protected IL10N $l10n;

public function __construct(
Expand Down Expand Up @@ -357,10 +360,8 @@ public function install(array $options, ?IOutput $output = null): array {
$dbType = 'sqlite3';
}

//generate a random salt that is used to salt the local passwords
$salt = $this->random->generate(30);
// generate a secret
$secret = $this->random->generate(48);
$salt = $options['passwordsalt'] ?: $this->random->generate(self::MIN_PASSWORD_SALT_LENGTH);
$secret = $options['secret'] ?: $this->random->generate(self::MIN_SECRET_LENGTH);

//write the config file
$newConfigValues = [
Expand Down
Loading