napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[users] Refactor /etc/group file handing

Browse Source
This commit is contained in:
Adriaan de Groot 2020-06-22 16:40:12 +02:00
parent 4d3422b931
commit bc484ae5da
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/modules/users/CreateUserJob.cpp
View File

@ -54,6 +54,36 @@ CreateUserJob::prettyStatusMessage() const
return tr( "Creating user %1." ).arg( m_userName ); return tr( "Creating user %1." ).arg( m_userName );
} }
static QStringList
groupsInTargetSystem( const QDir& targetRoot )
{
QFileInfo groupsFi( targetRoot.absoluteFilePath( "etc/group" ) );
QFile groupsFile( groupsFi.absoluteFilePath() );
if ( !groupsFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
return QStringList();
}
QString groupsData = QString::fromLocal8Bit( groupsFile.readAll() );
QStringList groupsLines = groupsData.split( '\n' );
for ( QStringList::iterator it = groupsLines.begin(); it != groupsLines.end(); ++it )
{
int indexOfFirstToDrop = it->indexOf( ':' );
it->truncate( indexOfFirstToDrop );
}
return groupsLines;
}
static void
ensureGroupsExistInTarget( const QStringList& wantedGroups, const QStringList& availableGroups )
{
for ( const QString& group : wantedGroups )
{
if ( !availableGroups.contains( group ) )
{
CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", group } );
}
}
}
Calamares::JobResult Calamares::JobResult
CreateUserJob::exec() CreateUserJob::exec()
@ -89,36 +119,16 @@ CreateUserJob::exec()
cDebug() << "[CREATEUSER]: preparing groups"; cDebug() << "[CREATEUSER]: preparing groups";
QFileInfo groupsFi( destDir.absoluteFilePath( "etc/group" ) ); QStringList availableGroups = groupsInTargetSystem( destDir );
QFile groupsFile( groupsFi.absoluteFilePath() ); ensureGroupsExistInTarget( m_defaultGroups, availableGroups );
if ( !groupsFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
return Calamares::JobResult::error( tr( "Cannot open groups file for reading." ) );
}
QString groupsData = QString::fromLocal8Bit( groupsFile.readAll() );
QStringList groupsLines = groupsData.split( '\n' );
for ( QStringList::iterator it = groupsLines.begin(); it != groupsLines.end(); ++it )
{
int indexOfFirstToDrop = it->indexOf( ':' );
it->truncate( indexOfFirstToDrop );
}
for ( const QString& group : m_defaultGroups )
{
if ( !groupsLines.contains( group ) )
{
CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", group } );
}
}
QString defaultGroups = m_defaultGroups.join( ',' ); QString defaultGroups = m_defaultGroups.join( ',' );
if ( m_autologin ) if ( m_autologin )
{ {
QString autologinGroup;
if ( gs->contains( "autologinGroup" ) && !gs->value( "autologinGroup" ).toString().isEmpty() ) if ( gs->contains( "autologinGroup" ) && !gs->value( "autologinGroup" ).toString().isEmpty() )
{ {
autologinGroup = gs->value( "autologinGroup" ).toString(); QString autologinGroup = gs->value( "autologinGroup" ).toString();
CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", autologinGroup } ); ensureGroupsExistInTarget( QStringList { autologinGroup }, availableGroups );
defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) ); defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) );
} }
} }