manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Streamline the creation of users

Browse source
This commit is contained in:
Manuel Thalmann 2024-08-21 18:34:18 +02:00
parent ef372f7feb
commit c0f63f7b52
3 changed files with 227 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
scripts/Common/Scripts/Config.ps1
View file

@ -9,12 +9,20 @@ enum SetupStage {
Configure Configure
Install Install
CreateUser CreateUser
ConfigureUser }
enum UserStage {
Create
Configure
Completed
} }
$null = New-Module { $null = New-Module {
[string] $configRoot = "HKLM:\Software\PortValhalla"; [string] $configRoot = "HKLM:\Software\PortValhalla";
[string] $stageOption = "Stage"; [string] $stageOption = "Stage";
[string] $userOption = "SetupUser";
[string] $userStageOption = "UserStage";
[string] $accountOption = "MSAccount";
[string] $finishedOption = "Finished"; [string] $finishedOption = "Finished";
[RegistryKey] $key = $null; [RegistryKey] $key = $null;
@ -273,6 +281,85 @@ $null = New-Module {
$null = Set-SetupOption $stageOption $Name; $null = Set-SetupOption $stageOption $Name;
} }
<#
.SYNOPSIS
Gets the current user to set up.
#>
function Get-CurrentUser {
return (Get-SetupOption $userOption) ?? 0;
}
<#
.SYNOPSIS
Sets the index of the current user to set up.
.PARAMETER Value
The index of the user to set up.
#>
function Set-CurrentUser {
param(
[int] $Value
)
Set-SetupOption $userOption $value;
}
<#
.SYNOPSIS
Gets the name of the current stage of the user setup.
#>
function Get-UserStage {
$stage = Get-SetupOption $userStageOption;
if ($null -ne $stage) {
$stage = [UserStage]$stage;
}
return $stage;
}
<#
.SYNOPSIS
Sets the current stage of the user setup.
.PARAMETER Name
The name of the stage to set.
#>
function Set-UserStage {
param(
$Name
)
if (-not (($null -eq $Name) -or ($Name -is [string]))) {
$Name = ([UserStage]$Name).ToString();
}
$null = Set-SetupOption $userStageOption $Name;
}
<#
.SYNOPSIS
Gets the name of the microsoft account to create.
#>
function Get-MSAccountName {
return Get-SetupOption $accountOption;
}
<#
.SYNOPSIS
Sets the name of the microsoft account to create.
.PARAMETER Name
The name of the microsoft account to create.
#>
function Set-MSAccountName {
param(
[string] $Name
)
Set-SetupOption $accountOption $Name;
}
<# <#
.SYNOPSIS .SYNOPSIS
Gets a value indicating whether the setup has finished. Gets a value indicating whether the setup has finished.

126
scripts/Windows/OS/Install.ps1
View file

@ -193,6 +193,9 @@ $null = New-Module {
Start-OneShot { Start-OneShot {
switch (Get-OneShotTask) { switch (Get-OneShotTask) {
([OneShotTask]::InitializeMSAccount) {
Initialize-UserCreation;
}
([OneShotTask]::DisableUAC) { ([OneShotTask]::DisableUAC) {
Disable-UAC; Disable-UAC;
Register-Setup; Register-Setup;
@ -533,87 +536,70 @@ $null = New-Module {
Set-Stage ([SetupStage]::CreateUser); Set-Stage ([SetupStage]::CreateUser);
} }
([SetupStage]::CreateUser) { ([SetupStage]::CreateUser) {
Start-ValhallaUserSetup; $users = @(Get-Users);
Set-Stage ([SetupStage]::ConfigureUser); $i = Get-CurrentUser;
}
([SetupStage]::ConfigureUser) {
$userOption = "CurrentUser";
function Get-CurrentUser { for (; $i -lt $users.Count; $i++) {
(Get-SetupOption $userOption) ?? 0; $name = $users[$i];
} $msAccount = Get-UserConfig -UserName $name "microsoftAccount";
Set-CurrentUser $i;
function Set-CurrentUser { if (Test-Admin) {
param([int] $Value) Disable-BootMessage;
Set-SetupOption $userOption $Value; }
}
[string[]] $users = Get-Users; while ((Get-UserStage) -ne ([UserStage]::Completed)) {
$currentUser = Get-CurrentUser; switch (Get-UserStage) {
($null) {
if (Test-Admin) { Set-UserStage ([UserStage]::Create);
Disable-BootMessage; continue;
}
if ($currentUser -lt $users.Count) {
$user = Get-LocalUser $users[$currentUser];
$msAccount = Get-UserConfig -UserName "$user" -Name "microsoftAccount";
$adminGroup = @{
SID = [SecurityIdentifier]::new([WellKnownSidType]::BuiltinAdministratorsSid, $null);
};
Add-LocalGroupMember `
@adminGroup `
$user `
-ErrorAction SilentlyContinue;
if ($env:UserName -ne "$user") {
Disable-LocalUser $env:UserName;
Enable-LocalUser $user;
if ($msAccount) {
Enable-UAC;
Disable-Autologin;
Enable-OneShotListener;
Set-BootMessage -Caption "Please Log In" -Message "Please log in using your new Microsoft Account ``$user``.";
} else {
Set-AutologinUser "$user";
}
Restart-Intermediate -DefaultUser;
return;
} else {
$configure = {
Deploy-SoftwareAction -Action ([InstallerAction]::ConfigureUser);
Remove-LocalGroupMember -Member "$user" @adminGroup -ErrorAction SilentlyContinue;
foreach ($group in Get-UserConfig -UserName "$user" "groups") {
Add-LocalGroupMember -Member "$user" -Name "$group";
} }
} ([UserStage]::Create) {
if ($msAccount) { if ($env:UserName -ne $name) {
if (-not (Test-Admin)) { New-ValhallaUser $name;
Invoke-OneShot DisableUAC;
Restart-Computer; if ($msAccount) {
return; Register-Setup -DefaultUser;
} else { logoff;
& $configure; } else {
Clear-SetupRegistration; Restart-Intermediate;
Disable-OneShotListener; }
exit;
} else {
if ($msAccount) {
if (-not (Test-Admin)) {
Invoke-OneShot DisableUAC;
Restart-Computer;
return;
}
Clear-SetupRegistration;
Disable-OneShotListener;
}
Set-UserStage ([UserStage]::Configure);
}
}
(([UserStage]::Configure)) {
$adminGroup = @{
SID = [SecurityIdentifier]::new([WellKnownSidType]::BuiltinAdministratorsSid, $null);
};
Deploy-SoftwareAction -Action ([InstallerAction]::ConfigureUser);
Remove-LocalGroupMember -Member $name @adminGroup -ErrorAction SilentlyContinue;
foreach ($group in Get-UserConfig -UserName $name "groups") {
Add-LocalGroupMember -Member $name -Name "$group";
}
} }
} else {
& $configure;
} }
} }
if (-not $msAccount) { if (-not $msAccount) {
net user "$user" /logonpasswordchg:yes; net user $name /logonpasswordchg:yes;
} }
Set-CurrentUser ($currentUser + 1);
continue;
} }
Set-IsFinished $true; Set-IsFinished $true;

111
scripts/Windows/Scripts/Users.ps1
View file

@ -1,15 +1,22 @@
using namespace System.Management.Automation.Host; using namespace System.Management.Automation.Host;
using namespace System.Security.Principal;
$null = New-Module { $null = New-Module {
. "$PSScriptRoot/../../Common/Scripts/Config.ps1"; . "$PSScriptRoot/../../Common/Scripts/Config.ps1";
[string] $userOption = "SetupUser"; . "$PSScriptRoot/../../Common/Scripts/Operations.ps1";
$loggedInUserOption = "LoggedInUser";
<# <#
.SYNOPSIS .SYNOPSIS
Creates the configured users. Creates a new user for the PortValhalla setup.
.PARAMETER Name
The name of the user to create.
#> #>
function Start-ValhallaUserSetup { function New-ValhallaUser {
[string[]] $users = Get-Users; param(
[string] $Name
)
function Add-MicrosoftAccount { function Add-MicrosoftAccount {
param( param(
@ -26,7 +33,7 @@ $null = New-Module {
"Thus, you have to do it by yourself.", "Thus, you have to do it by yourself.",
"So sorry…") -join "`n"); "So sorry…") -join "`n");
Write-Host "Create a user for ``$Name`` manually (because Windows is too stupid)…"; Write-Host "Create a user for ``$Name`` manually… (because Windows is too stupid)";
$null = Read-Host "Hit enter once you're done"; $null = Read-Host "Hit enter once you're done";
$newUsers = @(Get-LocalUser | Where-Object { -not ($currentUsers -contains $_.Name) }); $newUsers = @(Get-LocalUser | Where-Object { -not ($currentUsers -contains $_.Name) });
@ -54,10 +61,9 @@ $null = New-Module {
[ChoiceDescription[]]( [ChoiceDescription[]](
& { & {
[ChoiceDescription]::new("&None", "None of these users is yours"); [ChoiceDescription]::new("&None", "None of these users is yours");
for ($i = 0; $i -lt $newUsers.Count; $i++) { for ($i = 0; $i -lt $newUsers.Count; $i++) {
$name = "$($newUsers[$i])"; $name = "$($newUsers[$i])";
[ChoiceDescription]::new("&$($i + 1) - ``$name``", "Your user is ``$name``"); [ChoiceDescription]::new("&$($i + 1) - ``$name``", "Your user is ``$name``");
} }
}), 0); }), 0);
@ -74,33 +80,82 @@ $null = New-Module {
} }
}; };
Write-Host "Renaming the new user to ``$Name``…"; Set-MSAccountName ([string]$newUser);
Rename-LocalUser $newUser $Name;
} }
for ($i = 0; $i -lt $users.Count; $i++) { $msAccount = Get-UserConfig -UserName $Name "microsoftAccount";
Set-SetupOption $userOption $i;
$name = $users[$i];
Write-Host "Creating personal user ``$name``…";
$displayName = Get-UserConfig -UserName $name "displayName";
$userArguments = @{ if ($msAccount) {
name = $name; if (Test-Admin) {
}; Write-Host "Preparing environment for creating MS Account";
Enable-OneShotListener;
if ($displayName) { Enable-UAC;
$userArguments.fullName = $displayName; Restart-Intermediate -CurrentUser;
exit;
} }
}
if (Get-UserConfig -UserName $name "microsoftAccount") { Write-Host "Creating personal user ``$Name``…";
Add-MicrosoftAccount $name;
} else {
New-LocalUser -Disabled -NoPassword @userArguments;
Set-LocalUser $name -PasswordNeverExpires $true;
Set-LocalUser $name -PasswordNeverExpires $false;
}
Set-LocalUser @userArguments; if ($msAccount) {
Add-MicrosoftAccount $Name;
Set-SetupOption $loggedInUserOption $env:UserName;
Invoke-OneShot ([OneShotTask]::InitializeMSAccount);
} else {
New-LocalUser -NoPassword $Name;
Set-LocalUser $Name -PasswordNeverExpires $true;
Set-LocalUser $Name -PasswordNeverExpires $false;
Initialize-UserCreation;
}
}
<#
.SYNOPSIS
Prepares the first login for initializing the current user under configuration.
#>
function Initialize-UserCreation {
$name = (@(Get-Users))[(Get-CurrentUser)];
$msAccount = Get-UserConfig -UserName $name "microsoftAccount";
$displayName = Get-UserConfig -UserName $Name "displayName";
Write-Host "Initializing user ``$name``…";
$userArguments = @{
name = $name;
};
if ($displayName) {
$userArguments.fullName = $displayName;
}
$adminGroup = @{
SID = [SecurityIdentifier]::new([WellKnownSidType]::BuiltinAdministratorsSid, $null);
};
if ($msAccount) {
$accountName = Get-MSAccountName;
Write-Host "Renaming ``$accountName`` to ``$name``…"
Rename-LocalUser $accountName $name;
}
Set-LocalUser @userArguments;
if ($msAccount) {
Disable-LocalUser (Get-SetupOption $loggedInUserOption);
} else {
Disable-LocalUser $env:UserName;
}
Add-LocalGroupMember `
@adminGroup `
$name `
-ErrorAction SilentlyContinue;
if ($msAccount) {
Disable-Autologin;
Set-BootMessage -Caption "Please Log In" -Message "Please log in using your new Microsoft Account ``$name``.";
} else {
Set-AutologinUser "$name";
} }
} }
}; };