Skip to content
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

B#150: Fix authorization of standard SSH keys in context-windows #151

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

B#150: Fix authorization of standard SSH keys in context-windows #151

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9724f1c
Fix authorization of standard SSH keys in context-windows
lukasfazik Dec 4, 2024
4a263aa
fixup! Fix authorization of standard SSH keys in context-windows
lukasfazik Dec 5, 2024
b00a08a
Silence New-Item call when creating .ssh folder
lukasfazik Dec 5, 2024
256c301
Enhance log message for .ssh folder creation
lukasfazik Dec 5, 2024
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
62 changes: 53 additions & 9 deletions context-windows/src/context.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1296,16 +1296,58 @@ function authorizeSSHKeyAdmin {

}

function disableSharedAdminSSHKeys {
$cfgtoRemoveRegex = ('Match Group administrators\r?\n' +
' {7}AuthorizedKeysFile __PROGRAMDATA__/ssh/administrators_authorized_keys(?:\r?\n)')
$sshdConfigPath = "$env:PROGRAMDATA\ssh\sshd_config"
$currentConfig = Get-Content $sshdConfigPath -Raw
if ($currentConfig -match $cfgtoRemoveRegex) {
$updatedConfig = $currentConfig -replace $cfgtoRemoveRegex
logmsg "- Disabling use of default shared admins_authorized_keys for Administrators group"
Set-Content -Path $sshdConfigPath -Value $updatedConfig
if ($?) {
logsuccess
} else {
logfail
}
$sshdService = Get-Service -Name sshd -ErrorAction SilentlyContinue
if ($sshdService.Status -eq "Running") {
Restart-Service $sshdService
}
}
}

function authorizeSSHKeyStandard {
param (
$authorizedKeys
$authorizedKeys,
$username
)

# Check if user profile directory exists
$userProfilePath = "$env:systemdrive\Users\$username"
if ( !(Test-Path $userProfilePath)) {
logmsg " ... Failed (Userprofile directory $userProfilePath does not exists)"
return
}

# prepare .ssh folder
$sshFolderPath = "$userProfilePath\.ssh"
if ( !(Test-Path $sshFolderPath)) {
logmsg "- Creating .ssh folder in $userProfilePath"
New-Item -Force -ItemType Directory -Path $sshFolderPath | Out-Null
if ($?) {
logsuccess
}
else {
logfail
return
}
}

$authorizedKeysPath = "$env:USERPROFILE\.ssh"

New-Item -Force -ItemType Directory -Path $authorizedKeysPath
Set-Content $authorized_keys_path $authorizedKeys

# write the keys
$authorizedKeysFilePath = "$userProfilePath\.ssh\authorized_keys"
logmsg "- Writing key to $authorizedKeysFilePath"
Set-Content -Path $authorizedKeysFilePath -Value $authorizedKeys
if ($?) {
logsuccess
}
Expand All @@ -1317,13 +1359,15 @@ function authorizeSSHKeyStandard {
function authorizeSSHKey {
param (
$authorizedKeys,
$winadmin
$winadmin,
$username
)

logmsg "* Authorizing SSH_PUBLIC_KEY: ${authorizedKeys}"

if ($winadmin -ieq "no") {
authorizeSSHKeyStandard $authorizedKeys
disableSharedAdminSSHKeys
authorizeSSHKeyStandard $authorizedKeys $username
}
else {
authorizeSSHKeyAdmin $authorizedKeys
Expand Down Expand Up @@ -1388,7 +1432,7 @@ do {
configureNetwork $context
renameComputer $context
runScripts $context $contextPaths
authorizeSSHKey $context["SSH_PUBLIC_KEY"] $context["WINADMIN"]
authorizeSSHKey $context["SSH_PUBLIC_KEY"] $context["WINADMIN"] $context["USERNAME"]
reportReady $context $contextPaths.contextLetter

# Save the 'applied' context.sh checksum for the next recontextualization
Expand Down