Merge pull request #2424 from SixK/calamares

Save obfuscated luks passphrase in calamares globals variables
This commit is contained in:
Adriaan de Groot 2025-02-04 10:27:57 +01:00 committed by GitHub
commit 830f3f874f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -41,6 +41,7 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "utils/Units.h" #include "utils/Units.h"
#include "utils/String.h"
#include "widgets/PrettyRadioButton.h" #include "widgets/PrettyRadioButton.h"
#include <kpmcore/core/device.h> #include <kpmcore/core/device.h>
@ -689,6 +690,13 @@ ChoicePage::onHomeCheckBoxStateChanged()
void void
ChoicePage::onLeave() ChoicePage::onLeave()
{ {
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
if ( m_encryptWidget->state() == EncryptWidget::Encryption::Confirmed ) {
gs->insert( "passphrase", Calamares::String::obscure( m_encryptWidget->passphrase() ) );
}else{
gs->insert( "passphrase", "" );
}
if ( m_config->installChoice() == InstallChoice::Alongside ) if ( m_config->installChoice() == InstallChoice::Alongside )
{ {
if ( m_afterPartitionSplitterWidget->splitPartitionSize() >= 0 if ( m_afterPartitionSplitterWidget->splitPartitionSize() >= 0