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

fix: Added Parameter ConditionalAccessPolicy to Resource SPOAccessControlSettings #4290

Merged
merged 16 commits into from
Feb 26, 2024
Merged

fix: Added Parameter ConditionalAccessPolicy to Resource SPOAccessControlSettings #4290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f546869
fix: Added Parameter ConditionalAccessPolicy to Resource SPOAccessCon…
Feb 6, 2024
933301f
fix: Corrected schema definition and added correct Valuemap and Value…
hosebei Feb 6, 2024
49cd4d5
added changelog entry for the parameter support
hosebei Feb 10, 2024
ffdb34d
fixed conflict
hosebei Feb 11, 2024
e070897
fixed typo
hosebei Feb 11, 2024
d5013ee
Merge branch 'Dev' into mwu-Added-Parameter
andikrueger Feb 13, 2024
8916583
Merge branch 'Dev' into mwu-Added-Parameter
andikrueger Feb 15, 2024
7a0a18b
fix: wrong indentation corrected
hosebei Feb 15, 2024
8101595
Updated/fixed conflict changelog.md
hosebei Feb 17, 2024
8f89874
Merge branch 'mwu-Added-Parameter' of https://github.com/hosebei/Micr…
hosebei Feb 17, 2024
2497ad8
Merged changed from new version
hosebei Feb 20, 2024
e965a5d
removed version 1.24.214.1 from changelog
hosebei Feb 20, 2024
f766bfe
Merge branch 'Dev' into mwu-Added-Parameter
andikrueger Feb 21, 2024
10d774e
Merge branch 'dev' into pr/4290
hosebei Feb 24, 2024
edf350d
merge dev branch in pr
hosebei Feb 24, 2024
ddaf36f
Merge branch 'Dev' into mwu-Added-Parameter
ykuijs Feb 26, 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
25 changes: 21 additions & 4 deletions ...osoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ function Get-TargetResource

[Parameter()]
[Switch]
$ManagedIdentity
$ManagedIdentity,

[Parameter()]
[ValidateSet('AllowFullAccess', 'AllowLimitedAccess', 'BlockAccess', 'ProtectionLevel')]
[System.String]
$ConditionalAccessPolicy
)

Write-Verbose -Message 'Getting configuration of SharePoint Online Access Control Settings'
Expand Down Expand Up @@ -137,6 +142,7 @@ function Get-TargetResource
CertificateThumbprint = $CertificateThumbprint
Managedidentity = $ManagedIdentity.IsPresent
Ensure = 'Present'
ConditionalAccessPolicy = $SPOAccessControlSettings.ConditionalAccessPolicy
}
}
catch
Expand Down Expand Up @@ -245,7 +251,12 @@ function Set-TargetResource

[Parameter()]
[Switch]
$ManagedIdentity
$ManagedIdentity,

[Parameter()]
[ValidateSet('AllowFullAccess', 'AllowLimitedAccess', 'BlockAccess', 'ProtectionLevel')]
[System.String]
$ConditionalAccessPolicy
)

Write-Verbose -Message 'Setting configuration of SharePoint Online Access Control Settings'
Expand Down Expand Up @@ -377,7 +388,12 @@ function Test-TargetResource

[Parameter()]
[Switch]
$ManagedIdentity
$ManagedIdentity,

[Parameter()]
[ValidateSet('AllowFullAccess', 'AllowLimitedAccess', 'BlockAccess', 'ProtectionLevel')]
[System.String]
$ConditionalAccessPolicy
)
#Ensure the proper dependencies are installed in the current environment.
Confirm-M365DSCDependencies
Expand Down Expand Up @@ -413,7 +429,8 @@ function Test-TargetResource
'DisallowInfectedFileDownload', `
'ExternalServicesEnabled', `
'EmailAttestationRequired', `
'EmailAttestationReAuthDays')
'EmailAttestationReAuthDays',
'ConditionalAccessPolicy')
hosebei marked this conversation as resolved.
Show resolved Hide resolved

Write-Verbose -Message "Test-TargetResource returned $TestResult"

Expand Down
1 change: 1 addition & 0 deletions ...65DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.schema.mof
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ class MSFT_SPOAccessControlSettings : OMI_BaseResource
[Write, Description("Path to certificate used in service principal usually a PFX file.")] String CertificatePath;
[Write, Description("Thumbprint of the Azure Active Directory application's authentication certificate to use for authentication.")] String CertificateThumbprint;
[Write, Description("Managed ID being used for authentication.")] Boolean ManagedIdentity;
[Write, Description("Blocks or limits access to SharePoint and OneDrive content from un-managed devices.")] Boolean ConditionalAccessPolicy;
hosebei marked this conversation as resolved.
Show resolved Hide resolved
};
1 change: 1 addition & 0 deletions docs/docs/resources/sharepoint/SPOAccessControlSettings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
| **CertificatePath** | Write | String | Path to certificate used in service principal usually a PFX file. | |
| **CertificateThumbprint** | Write | String | Thumbprint of the Azure Active Directory application's authentication certificate to use for authentication. | |
| **ManagedIdentity** | Write | Boolean | Managed ID being used for authentication. | |
| **ConditionalAccessPolicy** | Write | SPOConditionalAccessPolicyType | Blocks or limits access to SharePoint and OneDrive content from un-managed devices. | `AllowFullAccess`, `AllowLimitedAccess`, `BlockAccess`, `ProtectionLevel` |


# SPO Access Control Settings
Expand Down
Loading