Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 978c8ba
Merge: 38de182 c3d6eba
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 15:17:59 2023 +0200

    Merge pull request KelvinTegelaar#404 from KelvinTegelaar/dev

    Dev to release

commit c3d6eba
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 13:26:11 2023 +0200

    removed logo as it made email in outlook ugly

commit eec6a77
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 13:21:55 2023 +0200

    added some debugging

commit c379636
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 12:59:46 2023 +0200

    fixed some links

commit c5733db
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 11:19:58 2023 +0200

    Added bulk requests.

commit bf1a443
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 11:03:21 2023 +0200

    exclude some logon processing

commit 86210c6
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 10:40:51 2023 +0200

    add low risk default

commit d65a982
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 10:32:38 2023 +0200

    #1688

commit cfcf9e5
Merge: 5b57121 b76f2a4
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 01:53:17 2023 +0200

    Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

commit 5b57121
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 01:53:14 2023 +0200

    upped versions

commit b76f2a4
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 01:52:18 2023 +0200

    BPA Templates

commit 76db9ac
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 16 01:23:57 2023 +0200

    prep for release

commit 49700fe
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 15 17:06:51 2023 +0200

    removed extra space

commit 042d367
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 15 15:53:54 2023 +0200

    bug fix

commit c30c58b
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 15 15:48:51 2023 +0200

    finalizing bpa execution

commit 6eb9852
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 15 14:36:04 2023 +0200

    fixed guid in access check for tests

commit 48a93f4
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 15 12:58:58 2023 +0200

    added comma for pretification

commit 21c7016
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 15 12:54:46 2023 +0200

    improvements bpa and access check

commit 76cb1ce
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 14 17:13:42 2023 +0200

    new bpa

commit 77e9adb
Author: KelvinTegelaar <[email protected]>
Date:   Fri Aug 11 23:22:41 2023 +0200

    add ip even if action is not required so we get a corre3ct db.

commit 3c3e63f
Author: KelvinTegelaar <[email protected]>
Date:   Fri Aug 11 22:30:31 2023 +0200

    ipv6 improvements

commit 2827d9a
Author: KelvinTegelaar <[email protected]>
Date:   Fri Aug 11 20:27:16 2023 +0200

    Fixes alerts to have correct api

commit f619949
Author: KelvinTegelaar <[email protected]>
Date:   Fri Aug 11 20:27:00 2023 +0200

    Improvements to password expire via domains endpoint

commit ede38de
Author: KelvinTegelaar <[email protected]>
Date:   Fri Aug 11 20:26:37 2023 +0200

    speed increase by using localdb first if address has already been seen.

commit 1138265
Author: KelvinTegelaar <[email protected]>
Date:   Fri Aug 11 00:23:35 2023 +0200

    improved cpv permissions settings for app perms

commit b636201
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 23:50:29 2023 +0200

    fixes issuers with returned results

commit 0dc8bcb
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 23:31:32 2023 +0200

    alert mods

commit 7d7eb0b
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 21:23:50 2023 +0200

    added writing of url

commit 425c6ef
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 18:39:01 2023 +0200

    reorder

commit 5fb3e24
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 16:54:02 2023 +0200

    speed improvements

commit 5e65c52
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 15:48:50 2023 +0200

    passwords

commit cd00d68
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 15:45:09 2023 +0200

    country

commit 2d0fe7c
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 15:44:44 2023 +0200

    geo ip location

commit 8b39c39
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 15:12:54 2023 +0200

    typos

commit eca8e2a
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 15:12:02 2023 +0200

    missed one

commit 01b641c
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 15:10:59 2023 +0200

    clean error logs

commit 7a2b48d
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 14:53:50 2023 +0200

    performance improvements

commit 78253fb
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 14:20:40 2023 +0200

    print all extended properties as test

commit e5126cf
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 13:57:54 2023 +0200

    still a typo

commit 3af8a33
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 13:52:26 2023 +0200

    typo?

commit bd5ac6e
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 13:21:59 2023 +0200

    add country logging

commit 77db727
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 13:11:04 2023 +0200

    d

commit 60b6df8
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 12:59:05 2023 +0200

    result status

commit 2c3e689
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 12:57:51 2023 +0200

    remove redirects

commit ecb1329
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 12:41:19 2023 +0200

    improvements

commit ca15d5d
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 12:22:54 2023 +0200

    added a default break

commit 6f901e3
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 12:12:02 2023 +0200

    added userkey

commit e0f7b95
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 12:00:54 2023 +0200

    added debug

commit 0ef5851
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 11:46:57 2023 +0200

    does not ahve to be arr

commit 332478c
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 11:46:31 2023 +0200

    added default break

commit 0d577b1
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 11:23:35 2023 +0200

    convert url to frontend

commit 59d0174
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 11:14:02 2023 +0200

    Improvements to login processing

commit 7b9caa6
Merge: 9829a33 12d15fe
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 10:52:32 2023 +0200

    Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

commit 9829a33
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 10:52:30 2023 +0200

    changes to geoip location for ipv6

commit 12d15fe
Merge: 7fa37d6 dc3325b
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 10 10:48:14 2023 +0200

    Merge pull request KelvinTegelaar#403 from johnduprey/dev

    Add ExecDeleteGDAPRoleMapping

commit 7fa37d6
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 20:53:01 2023 +0200

    improved geoip lookup

commit ccf426a
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 13:51:41 2023 +0200

    moved db to top

commit ec7a641
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 13:50:56 2023 +0200

    correction to location of if statement

commit 06580bb
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 13:49:30 2023 +0200

    inside of if

commit 1500df8
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 13:49:08 2023 +0200

    correction

commit d510875
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 11:32:44 2023 +0200

    only process if a title has been set.

commit 41715e2
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 11:05:53 2023 +0200

    returned foreach

commit 405d460
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 10:44:10 2023 +0200

    typo in db

commit 97ffd1c
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 10:41:40 2023 +0200

    bugfix

commit 5b296b9
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 9 00:21:48 2023 +0200

    added severity handling to alerts

commit dc3325b
Author: John Duprey <[email protected]>
Date:   Tue Aug 8 18:04:07 2023 -0400

    Add ExecDeleteGDAPRoleMapping

commit 297d39b
Merge: c0fed11 c111750
Author: John Duprey <[email protected]>
Date:   Tue Aug 8 17:35:49 2023 -0400

    Merge pull request KelvinTegelaar#21 from KelvinTegelaar/dev

    [pull] dev from KelvinTegelaar:dev

commit c111750
Merge: adafc62 14adc5f
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 8 23:17:58 2023 +0200

    Merge pull request KelvinTegelaar#401 from BNWEIN/dev

    Added Functionality to CIPP Notifications so you can filter by severity

commit adafc62
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 8 15:55:59 2023 +0200

    add remote geoipdb

commit e3f781d
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 8 10:46:02 2023 +0200

    changed how we handle operations

commit 028243b
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 8 10:18:42 2023 +0200

    added all tenants support

commit f5c7173
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 8 00:48:17 2023 +0200

    added succesful logging

commit 0467f85
Author: KelvinTegelaar <[email protected]>
Date:   Tue Aug 8 00:06:32 2023 +0200

    added write hosts for troubleshooting

commit c8cf8a4
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 22:53:02 2023 +0200

    added root set

commit aa5192a
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 16:54:41 2023 +0200

    added text

commit f02f385
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 16:53:55 2023 +0200

    updated manually built url

commit 6c96204
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 16:43:06 2023 +0200

    why use a external url if we can just craft it ourselves? saftey!

commit 06ffc05
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 16:36:17 2023 +0200

    something funky with conversion

commit af8ab3e
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 16:18:01 2023 +0200

    force typecasting?

commit 613427d
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 16:12:49 2023 +0200

    sending item, not all of data

commit 77d46a3
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 15:44:13 2023 +0200

    checking uri

commit cec1a62
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 15:24:51 2023 +0200

    loop through received arr

commit 3ff607e
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 14:46:33 2023 +0200

    removed future code

commit 5517419
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 13:49:10 2023 +0200

    webhook writehosts

commit da02df9
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 13:28:55 2023 +0200

    added logging

commit ee39ee8
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 13:27:52 2023 +0200

    public webhook fixes

commit 459e07b
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 13:25:45 2023 +0200

    moved ok into body

commit fabfc90
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 13:23:08 2023 +0200

    correction in webhook code

commit 4a10bf8
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 12:56:26 2023 +0200

    added some more logging

commit 2f6a189
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 12:50:14 2023 +0200

    added permissions endpoint

commit a3874fc
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 12:26:01 2023 +0200

    typo

commit 59995be
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 12:25:07 2023 +0200

    typo

commit 2d619a2
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 12:09:49 2023 +0200

    added logging

commit 2910b5d
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 11:48:39 2023 +0200

    typo

commit 2583b8d
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 11:42:59 2023 +0200

    changes to add alert and webhooks

commit 16982a0
Author: KelvinTegelaar <[email protected]>
Date:   Mon Aug 7 10:53:35 2023 +0200

    webhook updates

commit 3d16bce
Author: KelvinTegelaar <[email protected]>
Date:   Sun Aug 6 17:28:09 2023 +0200

    correct typo

commit abada21
Author: KelvinTegelaar <[email protected]>
Date:   Sun Aug 6 16:54:54 2023 +0200

    webhook stuff for auditlogs

commit c629a27
Author: KelvinTegelaar <[email protected]>
Date:   Sat Aug 5 15:39:36 2023 +0200

    fix standards number matching

commit db52bdc
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 3 14:30:00 2023 +0200

    changes

commit dd52f9f
Merge: 1a6fe3e 4eaa2cd
Author: KelvinTegelaar <[email protected]>
Date:   Thu Aug 3 12:49:14 2023 +0200

    Merge pull request KelvinTegelaar#402 from rvdwegen/patch-3

    Add reverse tenant lookup logic

commit 4eaa2cd
Author: Roel van der Wegen <[email protected]>
Date:   Thu Aug 3 00:49:51 2023 +0200

    Add reverse tenant lookup logic

commit 14adc5f
Author: BNWEIN <[email protected]>
Date:   Wed Aug 2 11:11:50 2023 +0100

    Added Functionality to CIPP Notifications so you can filter by severity

    Added Functionality to CIPP Notifications so you can filter by severity

commit 1a6fe3e
Merge: c0fed11 84c5696
Author: KelvinTegelaar <[email protected]>
Date:   Wed Aug 2 09:56:38 2023 +0200

    Merge pull request KelvinTegelaar#400 from BNWEIN/dev

    Fixed Issue with output on Mailbox Perms

commit 84c5696
Author: BNWEIN <[email protected]>
Date:   Tue Aug 1 16:32:01 2023 +0100

    Fixed Missing API Name from LogBook

    Fixed Missing API Name from LogBook

commit 70b68f2
Author: BNWEIN <[email protected]>
Date:   Tue Aug 1 10:49:50 2023 +0100

    Fixed Issue with output on Mailbox Perms

    Fixed issue with output on Mailbox Perms described here: KelvinTegelaar/CIPP#1662

commit c0fed11
Merge: 5c89831 564c0b0
Author: KelvinTegelaar <[email protected]>
Date:   Mon Jul 31 16:43:21 2023 +0200

    Merge pull request KelvinTegelaar#398 from johnduprey/dev

    API updates

commit 564c0b0
Merge: 3c08aaa 5c89831
Author: John Duprey <[email protected]>
Date:   Mon Jul 31 10:18:47 2023 -0400

    Merge remote-tracking branch 'upstream/dev' into dev

commit 5c89831
Merge: 756ce70 78e7120
Author: KelvinTegelaar <[email protected]>
Date:   Mon Jul 31 16:15:11 2023 +0200

    Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

commit 78e7120
Merge: 26cdc26 c7c8535
Author: KelvinTegelaar <[email protected]>
Date:   Mon Jul 31 16:15:08 2023 +0200

    Merge pull request KelvinTegelaar#395 from BNWEIN/dev

    Added SendOnBehalf Permissions

commit 26cdc26
Merge: c04b65d e37fe12
Author: KelvinTegelaar <[email protected]>
Date:   Mon Jul 31 16:14:45 2023 +0200

    Merge pull request KelvinTegelaar#397 from DChorn-ANS/patch-1

    Adding view query param

commit 3c08aaa
Author: John Duprey <[email protected]>
Date:   Mon Jul 31 07:35:55 2023 -0400

    Update New-CIPPAPIConfig.ps1

commit a398761
Author: John Duprey <[email protected]>
Date:   Mon Jul 31 07:22:23 2023 -0400

    Add more properties to backend urls

commit a31a9da
Merge: 8e4cf22 e5af1c3
Author: John Duprey <[email protected]>
Date:   Mon Jul 31 07:21:28 2023 -0400

    Merge branch 'dev' of https://github.com/johnduprey/CIPP-API into dev

commit 8e4cf22
Author: John Duprey <[email protected]>
Date:   Mon Jul 31 07:20:57 2023 -0400

    Revert "Fix CIPP-API Integration"

    This reverts commit 85d6ec0.

commit e5af1c3
Merge: b9b8e5f c04b65d
Author: John Duprey <[email protected]>
Date:   Mon Jul 31 07:20:40 2023 -0400

    Merge branch 'KelvinTegelaar:dev' into dev

commit 756ce70
Author: KelvinTegelaar <[email protected]>
Date:   Mon Jul 31 01:12:23 2023 +0200

    forgot scope

commit c04b65d
Author: KelvinTegelaar <[email protected]>
Date:   Mon Jul 31 00:57:28 2023 +0200

    Added removal of auditlog subscription

commit 6c296d9
Author: KelvinTegelaar <[email protected]>
Date:   Mon Jul 31 00:52:07 2023 +0200

    add classic auditlog api.

commit e494767
Author: KelvinTegelaar <[email protected]>
Date:   Sun Jul 30 23:46:35 2023 +0200

    added webhook subscription management

commit e37fe12
Author: DChorn-ANS <[email protected]>
Date:   Sun Jul 30 14:21:20 2023 -0600

    Adding view query param

    Corrects display issues in the list templates page

commit b9b8e5f
Merge: 85d6ec0 9a4a71c
Author: John Duprey <[email protected]>
Date:   Sat Jul 29 21:16:13 2023 -0400

    Merge branch 'KelvinTegelaar-dev' into dev

commit 9a4a71c
Merge: 85d6ec0 38ac3c8
Author: John Duprey <[email protected]>
Date:   Sat Jul 29 21:15:14 2023 -0400

    Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into KelvinTegelaar-dev

commit 85d6ec0
Author: John Duprey <[email protected]>
Date:   Sat Jul 29 21:11:52 2023 -0400

    Fix CIPP-API Integration

commit 38ac3c8
Author: KelvinTegelaar <[email protected]>
Date:   Sun Jul 30 02:56:22 2023 +0200

    API starttime/endtime edits

commit 9ce9ff2
Author: KelvinTegelaar <[email protected]>
Date:   Sun Jul 30 01:30:26 2023 +0200

    added parameter based routing header

commit c1e8f3d
Author: KelvinTegelaar <[email protected]>
Date:   Sat Jul 29 00:31:38 2023 +0200

    improved exchange errors

commit c7c8535
Author: BNWEIN <[email protected]>
Date:   Fri Jul 28 13:19:39 2023 +0100

    Updated Permissions to show SendOnBehalf

    Updated Mailbox Permissions to show SendOnBehalf

commit f70b96a
Author: BNWEIN <[email protected]>
Date:   Fri Jul 28 11:02:39 2023 +0100

    Added SendOnBehalf Permissions

    Added ability to add and remove send on behalf permissions from the edit mailbox screen

commit bbb5134
Author: KelvinTegelaar <[email protected]>
Date:   Fri Jul 28 01:29:35 2023 +0200

    Fix for CA policies with external tenants

commit a2d5f5d
Merge: 32b479c daca7d7
Author: KelvinTegelaar <[email protected]>
Date:   Thu Jul 27 22:41:03 2023 +0200

    Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

commit 32b479c
Author: KelvinTegelaar <[email protected]>
Date:   Thu Jul 27 22:41:01 2023 +0200

    fix issue with disableM365 groupusers

commit f8807d8
Merge: 8093869 daca7d7
Author: John Duprey <[email protected]>
Date:   Thu Jul 27 09:45:57 2023 -0400

    Merge pull request KelvinTegelaar#18 from KelvinTegelaar/dev

    [pull] dev from KelvinTegelaar:dev

commit daca7d7
Merge: f0278ee dc4de40
Author: KelvinTegelaar <[email protected]>
Date:   Thu Jul 27 12:02:33 2023 +0200

    Merge pull request KelvinTegelaar#394 from BNWEIN/dev

    Dev

commit dc4de40
Author: BNWEIN <[email protected]>
Date:   Thu Jul 27 10:28:56 2023 +0100

    Update Revoke-CIPPSessions.ps1

    fixed error in writing to logbook

commit 04f74e9
Merge: 3538bea f0278ee
Author: BNWEIN <[email protected]>
Date:   Thu Jul 27 08:19:37 2023 +0100

    Merge branch 'KelvinTegelaar:dev' into dev

commit 8093869
Merge: 04f7db6 3d66fbd
Author: John Duprey <[email protected]>
Date:   Wed Jul 26 22:14:17 2023 -0400

    Merge pull request KelvinTegelaar#16 from KelvinTegelaar/dev

commit 3538bea
Merge: aad4036 fb02f03
Author: BNWEIN <[email protected]>
Date:   Wed Jul 26 16:31:58 2023 +0100

    Merge branch 'KelvinTegelaar:dev' into dev

commit aad4036
Merge: e011262 275e23c
Author: BNWEIN <[email protected]>
Date:   Tue Jul 25 09:36:42 2023 +0100

    Merge pull request KelvinTegelaar#7 from KelvinTegelaar/dev

    [pull] dev from KelvinTegelaar:dev

commit e011262
Merge: 9b54ca1 b3e8d6b
Author: BNWEIN <[email protected]>
Date:   Fri Jul 21 23:43:57 2023 +0100

    Merge pull request #6 from KelvinTegelaar/dev

    [pull] dev from KelvinTegelaar:dev
  • Loading branch information
@DChorn-ANS
DChorn-ANS committed Aug 17, 2023
1 parent 799937a commit c849d4f
Showing 1 changed file with 16 additions and 41 deletions.
57 changes: 16 additions & 41 deletions Scheduler_CIPPNotifications/run.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,24 @@ $Config = [pscustomobject](Get-AzDataTableEntity @Table -Filter $Filter)

$Settings = [System.Collections.ArrayList]@('Alerts')
$Config.psobject.properties.name | ForEach-Object { $settings.add($_) }

$severity = $Config.Severity -split ','
Write-Host "Our Severity table is: $severity"
if (!$severity) {
$severity = [System.Collections.ArrayList]@('Info', 'Error', 'Warning', 'Critical', 'Alert')
}
Write-Host "Our Severity table is: $severity"
$Table = Get-CIPPTable
$PartitionKey = Get-Date -UFormat '%Y%m%d'
$Filter = "PartitionKey eq '{0}'" -f $PartitionKey
$Currentlog = Get-AzDataTableEntity @Table -Filter $Filter | Where-Object { $_.API -In $Settings -and $_.SentAsAlert -ne $true }

$Currentlog = Get-AzDataTableEntity @Table -Filter $Filter | Where-Object {
$_.API -In $Settings -and $_.SentAsAlert -ne $true -and $_.Severity -In $severity
}
Write-Host ($Currentlog).count
#email try
try {
if ($config.onePerTenant) {
if ($Config.email -like '*@*' -and $null -ne $CurrentLog) {
$JSONRecipients = $Config.email.split(",").trim() | ForEach-Object { if ($_ -like '*@*') { '{"EmailAddress": {"Address": "' + $_ + '"}},' } }
$JSONRecipients = $Config.email.split(",").trim() | ForEach-Object { if ($_ -like '*@*') { '{ "EmailAddress": { "Address": "' + $_ + '" } }, ' } }
$JSONRecipients = ([string]$JSONRecipients).Substring(0, ([string]$JSONRecipients).Length - 1)
foreach ($tenant in ($CurrentLog.Tenant | Sort-Object -Unique)) {
$HTMLLog = ($CurrentLog | Select-Object Message, API, Tenant, Username, Severity | Where-Object -Property tenant -EQ $tenant | ConvertTo-Html -frag) -replace '<table>', '<table class=blueTable>' | Out-String
Expand Down Expand Up @@ -47,7 +54,7 @@ try {
}
else {
if ($Config.email -like '*@*' -and $null -ne $CurrentLog) {
$JSONRecipients = $Config.email.split(",").trim() | ForEach-Object { if ($_ -like '*@*') { '{"EmailAddress": {"Address": "' + $_ + '"}},' } }
$JSONRecipients = $Config.email.split(",").trim() | ForEach-Object { if ($_ -like '*@*') { '{ "EmailAddress": { "Address": "' + $_ + '" } }, ' } }
$JSONRecipients = ([string]$JSONRecipients).Substring(0, ([string]$JSONRecipients).Length - 1)
$HTMLLog = ($CurrentLog | Select-Object Message, API, Tenant, Username, Severity | ConvertTo-Html -frag) -replace '<table>', '<table class=blueTable>' | Out-String
$JSONBody = @"
Expand Down Expand Up @@ -78,12 +85,12 @@ catch {
Write-Host "Could not send alerts to email: $($_.Exception.message)"
Write-LogMessage -API 'Alerts' -message "Could not send alerts to : $($_.Exception.message)" -sev info
}
#webhook try


try {
Write-Host $($config | ConvertTo-Json)
Write-Host $config.webhook
if ($Config.webhook -ne '' -and $null -ne $CurrentLog -and $config.onePerTenant) {
foreach ($tenant in ($CurrentLog.Tenant | Sort-Object -Unique)) {
if ($Config.webhook -ne '' -and $null -ne $CurrentLog) {
switch -wildcard ($config.webhook) {

'*webhook.office.com*' {
Expand Down Expand Up @@ -112,39 +119,7 @@ try {
Invoke-RestMethod -Uri $config.webhook -Method POST -ContentType 'Application/json' -Body $JSONBody
}
}
}

}else{
if ($Config.webhook -ne '' -and $null -ne $CurrentLog) {
switch -wildcard ($config.webhook) {

'*webhook.office.com*' {
$Log = $Currentlog | ConvertTo-Html -frag | Out-String
$JSonBody = "{`"text`": `"You've setup your alert policies to be alerted whenever specific events happen. We've found some of these events in the log. <br><br>$Log`"}"
Invoke-RestMethod -Uri $config.webhook -Method POST -ContentType 'Application/json' -Body $JSONBody
}

'*slack.com*' {
$Log = $Currentlog | ForEach-Object {
$JSonBody = @"
{"blocks":[{"type":"header","text":{"type":"plain_text","text":"New Alert from CIPP","emoji":true}},{"type":"section","fields":[{"type":"mrkdwn","text":"*DateTime:*\n$($_.Timestamp)"},{"type":"mrkdwn","text":"*Tenant:*\n$($_.Tenant)"},{"type":"mrkdwn","text":"*API:*\n$($_.API)"},{"type":"mrkdwn","text":"*User:*\n$($_.Username)."}]},{"type":"section","text":{"type":"mrkdwn","text":"*Message:*\n$($_.Message)"}}]}
"@
Invoke-RestMethod -Uri $config.webhook -Method POST -ContentType 'Application/json' -Body $JSONBody
}
}

'*discord.com*' {
$Log = $Currentlog | ConvertTo-Html -frag | Out-String
$JSonBody = "{`"content`": `"You've setup your alert policies to be alerted whenever specific events happen. We've found some of these events in the log. $Log`"}"
Invoke-RestMethod -Uri $config.webhook -Method POST -ContentType 'Application/json' -Body $JSONBody
}
default {
$Log = $Currentlog | ConvertTo-Json -Compress
$JSonBody = $Log
Invoke-RestMethod -Uri $config.webhook -Method POST -ContentType 'Application/json' -Body $JSONBody
}
}
}
}

$UpdateLogs = $CurrentLog | ForEach-Object {
Expand All @@ -159,7 +134,7 @@ catch {
Write-Host "Could not send alerts to webhook: $($_.Exception.message)"
Write-LogMessage -API 'Alerts' -message "Could not send alerts to : $($_.Exception.message)" -sev info
}
#Integration try

if ($config.sendtoIntegration) {
try {
foreach ($tenant in ($CurrentLog.Tenant | Sort-Object -Unique)) {
Expand Down

0 comments on commit c849d4f

Please sign in to comment.