From 8401a354ccc9e93e2342aca2cfeafed11424c05e Mon Sep 17 00:00:00 2001 From: lsmith090 <47199231+lsmith090@users.noreply.github.com> Date: Sat, 20 Jul 2024 15:57:03 -0400 Subject: [PATCH 1/3] Add or update the Azure App Service build and deployment workflow config --- .github/workflows/master_cippuly5i.yml | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/master_cippuly5i.yml diff --git a/.github/workflows/master_cippuly5i.yml b/.github/workflows/master_cippuly5i.yml new file mode 100644 index 000000000000..50cccc96dd58 --- /dev/null +++ b/.github/workflows/master_cippuly5i.yml @@ -0,0 +1,30 @@ +# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action +# More GitHub Actions for Azure: https://github.com/Azure/actions + +name: Build and deploy Powershell project to Azure Function App - cippuly5i + +on: + push: + branches: + - master + workflow_dispatch: + +env: + AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root + +jobs: + deploy: + runs-on: windows-latest + + steps: + - name: 'Checkout GitHub Action' + uses: actions/checkout@v4 + + - name: 'Run Azure Functions Action' + uses: Azure/functions-action@v1 + id: fa + with: + app-name: 'cippuly5i' + slot-name: 'Production' + package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }} + publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_452C5A9999324E13A027A5EB15A846E4 }} \ No newline at end of file From a8d84bee2e614712fbf45867c94d6bfe4e7bb943 Mon Sep 17 00:00:00 2001 From: lsmith090 <47199231+lsmith090@users.noreply.github.com> Date: Wed, 21 Aug 2024 08:26:51 -0400 Subject: [PATCH 2/3] Fix snooze duration input validation --- .../CIPPCore/Public/Standards/Invoke-CIPPStandardNudgeMFA.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardNudgeMFA.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardNudgeMFA.ps1 index 35eb01b0cbf5..92b0a7bdf229 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardNudgeMFA.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardNudgeMFA.ps1 @@ -45,7 +45,8 @@ function Invoke-CIPPStandardNudgeMFA { Return } # Input validation - if (($Settings.snoozeDurationInDays -lt 0 -or $Settings.snoozeDurationInDays -gt 15) -and ($Settings.remediate -eq $true -or $Settings.alert -eq $true)) { + [int]$snoozeDurationInDays = $Settings.snoozeDurationInDays + if (($snoozeDurationInDays -lt 0 -or $snoozeDurationInDays -gt 14) -and ($Settings.remediate -eq $true -or $Settings.alert -eq $true)) { Write-LogMessage -API 'Standards' -tenant $tenant -message 'NudgeMFA: Invalid snoozeDurationInDays parameter set' -sev Error Return } From 033e901f4b3c5581cec56cdce202ad0926770073 Mon Sep 17 00:00:00 2001 From: lsmith090 <47199231+lsmith090@users.noreply.github.com> Date: Wed, 21 Aug 2024 08:42:23 -0400 Subject: [PATCH 3/3] chore: Remove Azure Web Apps Deploy action workflow --- .github/workflows/master_cippuly5i.yml | 30 -------------------------- 1 file changed, 30 deletions(-) delete mode 100644 .github/workflows/master_cippuly5i.yml diff --git a/.github/workflows/master_cippuly5i.yml b/.github/workflows/master_cippuly5i.yml deleted file mode 100644 index 50cccc96dd58..000000000000 --- a/.github/workflows/master_cippuly5i.yml +++ /dev/null @@ -1,30 +0,0 @@ -# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action -# More GitHub Actions for Azure: https://github.com/Azure/actions - -name: Build and deploy Powershell project to Azure Function App - cippuly5i - -on: - push: - branches: - - master - workflow_dispatch: - -env: - AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root - -jobs: - deploy: - runs-on: windows-latest - - steps: - - name: 'Checkout GitHub Action' - uses: actions/checkout@v4 - - - name: 'Run Azure Functions Action' - uses: Azure/functions-action@v1 - id: fa - with: - app-name: 'cippuly5i' - slot-name: 'Production' - package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }} - publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_452C5A9999324E13A027A5EB15A846E4 }} \ No newline at end of file