Merge pull request #6448 from weizenspreu/master
print generated encryption key passwords directly after generating th…
This commit is contained in:
commit
ff27308b88
|
@ -153,12 +153,8 @@ class EncryptAll {
|
||||||
$this->createKeyPairs();
|
$this->createKeyPairs();
|
||||||
}
|
}
|
||||||
|
|
||||||
//setup users file system and encrypt all files one by one (take should encrypt setting of storage into account)
|
|
||||||
$this->output->writeln("\n");
|
// output generated encryption key passwords
|
||||||
$this->output->writeln('Start to encrypt users files');
|
|
||||||
$this->output->writeln('----------------------------');
|
|
||||||
$this->output->writeln('');
|
|
||||||
$this->encryptAllUsersFiles();
|
|
||||||
if ($this->util->isMasterKeyEnabled() === false) {
|
if ($this->util->isMasterKeyEnabled() === false) {
|
||||||
//send-out or display password list and write it to a file
|
//send-out or display password list and write it to a file
|
||||||
$this->output->writeln("\n");
|
$this->output->writeln("\n");
|
||||||
|
@ -167,6 +163,13 @@ class EncryptAll {
|
||||||
$this->output->writeln('');
|
$this->output->writeln('');
|
||||||
$this->outputPasswords();
|
$this->outputPasswords();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//setup users file system and encrypt all files one by one (take should encrypt setting of storage into account)
|
||||||
|
$this->output->writeln("\n");
|
||||||
|
$this->output->writeln('Start to encrypt users files');
|
||||||
|
$this->output->writeln('----------------------------');
|
||||||
|
$this->output->writeln('');
|
||||||
|
$this->encryptAllUsersFiles();
|
||||||
$this->output->writeln("\n");
|
$this->output->writeln("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -149,8 +149,8 @@ class EncryptAllTest extends TestCase {
|
||||||
|
|
||||||
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false);
|
$this->util->expects($this->any())->method('isMasterKeyEnabled')->willReturn(false);
|
||||||
$encryptAll->expects($this->at(0))->method('createKeyPairs')->with();
|
$encryptAll->expects($this->at(0))->method('createKeyPairs')->with();
|
||||||
$encryptAll->expects($this->at(1))->method('encryptAllUsersFiles')->with();
|
$encryptAll->expects($this->at(1))->method('outputPasswords')->with();
|
||||||
$encryptAll->expects($this->at(2))->method('outputPasswords')->with();
|
$encryptAll->expects($this->at(2))->method('encryptAllUsersFiles')->with();
|
||||||
|
|
||||||
$encryptAll->encryptAll($this->inputInterface, $this->outputInterface);
|
$encryptAll->encryptAll($this->inputInterface, $this->outputInterface);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue