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

Tests for radius membership #647

Merged
merged 6 commits into from
Feb 4, 2025
Merged

Tests for radius membership #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d47871e
Tests for radius membership
jworkmanjc Jan 31, 2025
7f645ed
user variable to test
jworkmanjc Jan 31, 2025
14e2629
remove duplicate code
jworkmanjc Jan 31, 2025
f14296e
only return certs for the selected cert type and filter by users in t…
jworkmanjc Jan 31, 2025
e0cbc81
fix for returning users with an index of 0
jworkmanjc Jan 31, 2025
3dc7f3f
validate user cert tests
jworkmanjc Jan 31, 2025
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
11 changes: 9 additions & 2 deletions scripts/automation/Radius/Functions/Private/CertDeployment/Get-CertInfo.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,17 @@ function Get-CertInfo {
if ($UserCerts) {
# Find all userCert paths
if ($username) {
$foundCerts = Resolve-Path -Path "$JCScriptRoot/UserCerts/$username-*.crt" -ErrorAction SilentlyContinue
$foundCerts = Resolve-Path -Path "$JCScriptRoot/UserCerts/$username-$($Global:JCR_CERT_TYPE)*.crt" -ErrorAction SilentlyContinue

} else {
$foundCerts = Resolve-Path -Path "$JCScriptRoot/UserCerts/*.crt" -ErrorAction SilentlyContinue
$foundCerts = New-Object System.Collections.ArrayList
$global:JCRRadiusMembers.username | ForEach-Object {
$foundCert = Resolve-Path -Path "$JCScriptRoot/UserCerts/$_-$($Global:JCR_CERT_TYPE)*.crt" -ErrorAction SilentlyContinue
if ($foundCert) {
$foundCerts.Add($foundCert) | Out-Null
}

}
}
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/automation/Radius/Functions/Private/HashFunctions/Test-UserFromHash.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function Test-UserFromHash {
# Get the UserID from the keys
$matchedUserID = $Global:JCRUsers.keys | Select-Object -Index $matchedIndex
# validate that the userID is in the radiusMembership hash:
if ($matchedIndex) {
if ($matchedUserID) {
# finally return the $matchedUser object
$matchedUser = $Global:JCRUsers[$matchedUserID]
} else {
Expand Down
42 changes: 42 additions & 0 deletions scripts/automation/Radius/Tests/Public/Get-JCRGlobalVars.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,4 +196,46 @@ Describe "Get Global Variable Data Tests" -Tag "Cache" {
}

}
Context "Tests that the RadiusMembers.json file is updated when users are added or removed from the user group" {
BeforeAll {
# create a new user
$user = New-RandomUser -Domain "pesterRadius" | New-JCUser
}
It "when a user is added to the group, they should be added to the RadiusMembers.json & users.json file" {
# get the RadiusMembers.json before
# get the user.json file before
# add a user to the radius Group
Add-JCUserGroupMember -GroupID $Global:JCR_USER_GROUP -UserID $user.id
Start-Sleep 1
# update the cache forcefully
Get-JCRGlobalVars -force -skipAssociation -associateManually
Start-Sleep 1
# the new user should be in the membership list
$global:JCRRadiusMembers.username | Should -Contain $user.username

# the new user should be in user.json list
$userData = Get-UserJsonData
$userData.username | Should -Contain $user.username




}
It "when a user is removed from the group, they should be removed to the RadiusMembers.json & users.json file" {
# get the RadiusMembers.json before
# get the user.json file before
# add a user to the radius Group
Remove-JCUserGroupMember -GroupID $Global:JCR_USER_GROUP -UserID $user.id
Start-Sleep 1
# update the cache forcefully
Get-JCRGlobalVars -force -skipAssociation -associateManually
Start-Sleep 1
# the new user should be in the membership list
$global:JCRRadiusMembers.username | Should -Not -Contain $user.username

# the new user should be in user.json list
$userData = Get-UserJsonData
$userData.username | Should -Not -Contain $user.username
}
}
}
87 changes: 10 additions & 77 deletions scripts/automation/Radius/Tests/Public/Start-GenerateRootCert.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
Describe "Generate Root Certificate Tests" -Tag "GenerateRootCert" {
BeforeEach {
# If the /Cert/ folder is not empty, clear the directory
$items = Get-ChildItem "$JCScriptRoot/Cert"
if ($items) {
foreach ($item in $items) {
# If the item is the 'backup' folder, process its contents separately
Remove-Item -Path $item.FullName -Recurse -Force -Confirm:$false
}
}
}
Context "A new certificate can be generated" {
It 'Generates a new root certificate' {
# If the /Cert/ folder is not empty, clear the directory
$items = Get-ChildItem "$JCScriptRoot/Cert"
if ($items) {
foreach ($item in $items) {
# If the item is the 'backup' folder, process its contents separately
if ($item.Name -eq 'Backups') {
$backupItems = Get-ChildItem $item.FullName
foreach ($backupItem in $backupItems) {
Write-Host "Removing $($backupItem.FullName)"
Remove-Item -Path $backupItem.FullName -Force
}
}
# Otherwise, remove the item directly (outside of the 'backup' folder)
elseif ($item.PSIsContainer -eq $false) {
Write-Host "Removing $($item.FullName)"
Remove-Item -Path $item.FullName -Force
}
}
}
Start-GenerateRootCert -certKeyPassword "testCertificate123!@#" -generateType "new" -force

# both the key and the cert should be generated
Expand All @@ -43,26 +34,6 @@ Describe "Generate Root Certificate Tests" -Tag "GenerateRootCert" {

Context "Overwrite an existing root certificate when creating a new one" {
It 'Generates a new root certificate when there is an existing one' {
# If the /Cert/ folder is not empty, clear the directory
$items = Get-ChildItem "$JCScriptRoot/Cert"
if ($items) {
foreach ($item in $items) {
# If the item is the 'backup' folder, process its contents separately
if ($item.Name -eq 'Backups') {
$backupItems = Get-ChildItem $item.FullName
foreach ($backupItem in $backupItems) {
Write-Host "Removing $($backupItem.FullName)"
Remove-Item -Path $backupItem.FullName -Force
}
}
# Otherwise, remove the item directly (outside of the 'backup' folder)
elseif ($item.PSIsContainer -eq $false) {
Write-Host "Removing $($item.FullName)"
Remove-Item -Path $item.FullName -Force
}
}
}

# Create a new root certificate
Start-GenerateRootCert -certKeyPassword "testCertificate123!@#" -generateType "New" -force
# get existing cert serial:
Expand Down Expand Up @@ -97,25 +68,6 @@ Describe "Generate Root Certificate Tests" -Tag "GenerateRootCert" {

Context "An existing certificate can be replaced" {
It 'Replaces a root certificate' {
# If the /Cert/ folder is not empty, clear the directory
$items = Get-ChildItem "$JCScriptRoot/Cert"
if ($items) {
foreach ($item in $items) {
# If the item is the 'backup' folder, process its contents separately
if ($item.Name -eq 'Backups') {
$backupItems = Get-ChildItem $item.FullName
foreach ($backupItem in $backupItems) {
Write-Host "Removing $($backupItem.FullName)"
Remove-Item -Path $backupItem.FullName -Force
}
}
# Otherwise, remove the item directly (outside of the 'backup' folder)
elseif ($item.PSIsContainer -eq $false) {
Write-Host "Removing $($item.FullName)"
Remove-Item -Path $item.FullName -Force
}
}
}
# Create a new root certificate
Start-GenerateRootCert -certKeyPassword "testCertificate123!@#" -generateType "new" -force
# get existing cert serial:
Expand Down Expand Up @@ -150,25 +102,6 @@ Describe "Generate Root Certificate Tests" -Tag "GenerateRootCert" {
}
Context "An existing certificate can be renewed" {
It 'Renews a root certificate' {
# If the /Cert/ folder is not empty, clear the directory
$items = Get-ChildItem "$JCScriptRoot/Cert"
if ($items) {
foreach ($item in $items) {
# If the item is the 'backup' folder, process its contents separately
if ($item.Name -eq 'Backups') {
$backupItems = Get-ChildItem $item.FullName
foreach ($backupItem in $backupItems) {
Write-Host "Removing $($backupItem.FullName)"
Remove-Item -Path $backupItem.FullName -Force
}
}
# Otherwise, remove the item directly (outside of the 'backup' folder)
elseif ($item.PSIsContainer -eq $false) {
Write-Host "Removing $($item.FullName)"
Remove-Item -Path $item.FullName -Force
}
}
}
# Generate new CA
Start-GenerateRootCert -certKeyPassword "testCertificate123!@#" -generateType "new" -force
# get existing cert serial:
Expand Down
9 changes: 6 additions & 3 deletions scripts/automation/Radius/Tests/Public/Start-GenerateUserCerts.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@ Describe 'Generate User Cert Tests' -Tag "GenerateUserCerts" {
# Get the certs before
$certsBefore = Get-ChildItem -Path "$JCScriptRoot/UserCerts"
# wait one moment
Start-Sleep 2
Start-Sleep 1
# update the cache
Get-JCRGlobalVars -force -skipAssociation -associateManually
# wait just one moment before testing membership since we are writing a file
Start-Sleep 1
# the new user should be in the membership list:
$global:JCRRadiusMembers.username | Should -Contain $user.username
$Global:JCRUsers.keys | should -Contain $user.id
# Generate the user cert:
Start-GenerateUserCerts -type ByUsername -username $($user.username) -forceReplaceCerts
# Get the certs after
Expand Down Expand Up @@ -170,13 +171,14 @@ Describe 'Generate User Cert Tests' -Tag "GenerateUserCerts" {
# Get the certs before
$certsBefore = Get-ChildItem -Path "$JCScriptRoot/UserCerts"
# wait one moment
Start-Sleep 2
Start-Sleep 1
# update the cache
Get-JCRGlobalVars -force -skipAssociation -associateManually
# wait just one moment before testing membership since we are writing a file
Start-Sleep 1
# the new user should be in the membership list:
$global:JCRRadiusMembers.username | Should -Contain $user.username
$Global:JCRUsers.keys | should -Contain $user.id
# Generate the user cert:
Start-GenerateUserCerts -type ByUsername -username $($user.username) -forceReplaceCerts
# Get the certs after
Expand All @@ -201,13 +203,14 @@ Describe 'Generate User Cert Tests' -Tag "GenerateUserCerts" {
# Get the certs before
$certsBefore = Get-ChildItem -Path "$JCScriptRoot/UserCerts"
# wait one moment
Start-Sleep 2
Start-Sleep 1
# update the cache
Get-JCRGlobalVars -force -skipAssociation -associateManually
# wait just one moment before testing membership since we are writing a file
Start-Sleep 1
# the new user should be in the membership list:
$global:JCRRadiusMembers.username | Should -Contain $user.username
$Global:JCRUsers.keys | should -Contain $user.id
# Generate the user cert:
Start-GenerateUserCerts -type ByUsername -username $($user.username) -forceReplaceCerts
# Get the certs after
Expand Down