Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3cfecdb
init
jlevypaloalto Oct 26, 2025
f88fa1d
init
jlevypaloalto Oct 26, 2025
2407ebd
more
jlevypaloalto Oct 27, 2025
81db190
code complete
jlevypaloalto Oct 27, 2025
fac63de
real code complete
jlevypaloalto Oct 27, 2025
56c19b6
real code complete
jlevypaloalto Oct 27, 2025
92ad781
remove 365
jlevypaloalto Oct 27, 2025
8f1c344
real code complete
jlevypaloalto Oct 27, 2025
694697b
real code complete
jlevypaloalto Oct 27, 2025
638df6e
minor changes
jlevypaloalto Oct 28, 2025
737f62d
minor changes
jlevypaloalto Oct 29, 2025
066b86c
minor changes
jlevypaloalto Oct 29, 2025
8215f55
minor changes
jlevypaloalto Oct 29, 2025
4b3f42f
works
jlevypaloalto Oct 29, 2025
784244e
works
jlevypaloalto Oct 29, 2025
99d49ef
docs
jlevypaloalto Oct 30, 2025
490a0cb
RE
jlevypaloalto Oct 30, 2025
a385c62
pre-commit
jlevypaloalto Oct 30, 2025
9ef2fb3
RN
jlevypaloalto Nov 9, 2025
987265f
merge master
jlevypaloalto Nov 9, 2025
3a32740
docs
jlevypaloalto Nov 9, 2025
1464897
revert RN chnages
jlevypaloalto Nov 9, 2025
e59a78c
Update Packs/MicrosoftGraphSecurity/ReleaseNotes/2_2_41.md
jlevypaloalto Nov 9, 2025
27377ab
Merge branch 'master' into jl-microsoft-sec-root-url
jlevypaloalto Nov 10, 2025
380cd1c
remove default
jlevypaloalto Nov 10, 2025
9b48f4a
Merge branch 'jl-microsoft-sec-root-url' of github.com:demisto/conten…
jlevypaloalto Nov 10, 2025
521e175
Merge branch 'master' into jl-microsoft-sec-root-url
jlevypaloalto Nov 10, 2025
8258ff0
Merge branch 'master' into jl-microsoft-sec-root-url
jlevypaloalto Nov 12, 2025
5ab2fce
Merge branch 'master' into jl-microsoft-sec-root-url
jlevypaloalto Nov 13, 2025
6218ec4
Merge branch 'master' into jl-microsoft-sec-root-url
jlevypaloalto Nov 16, 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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from typing import Any

import demistomock as demisto # noqa: F401
import urllib3
from CommonServerPython import * # noqa: F401
from MicrosoftApiModule import * # noqa: E402
from requests import Response
Expand All @@ -12,7 +11,6 @@

# disable insecure warnings
DEFAULT_KEYS_TO_REPLACE = {"createdDateTime": "CreatedDate"}
urllib3.disable_warnings()

APP_NAME = "ms-graph-security"
API_V2 = "Alerts v2"
Expand Down Expand Up @@ -276,7 +274,7 @@ def create_mail_assessment_request(self, recipient_email, expected_assessment, c
"recipientEmail": recipient_email,
"expectedAssessment": expected_assessment,
"category": category,
"messageUri": f"https://graph.microsoft.com/v1.0/users/{user_id}/messages/{message_id}",
"messageUri": urljoin(self.ms_client._base_url, "users/{user_id}/messages/{message_id}"),
}
return self.ms_client.http_request(method="POST", url_suffix=THREAT_ASSESSMENT_URL_PREFIX, json_data=body)

Expand Down Expand Up @@ -2030,7 +2028,6 @@ def list_threat_assessment_requests_command(client: MsGraphClient, args) -> list
def main():
params: dict = demisto.params()
args: dict = demisto.args()
url = params.get("host", "").rstrip("/") + "/v1.0/"
tenant = params.get("creds_tenant_id", {}).get("password") or params.get("tenant_id")
auth_and_token_url = params.get("creds_auth_id", {}).get("password") or params.get("auth_id", "")
enc_key = params.get("creds_enc_key", {}).get("password") or params.get("enc_key")
Expand All @@ -2041,6 +2038,7 @@ def main():
managed_identities_client_id = get_azure_managed_identities_client_id(params)
self_deployed: bool = params.get("self_deployed", False) or managed_identities_client_id is not None
api_version: str = params.get("api_version", API_V2)
azure_cloud = get_azure_cloud(params, "MicrosoftGraphSecurity")

if not managed_identities_client_id:
if not self_deployed and not enc_key:
Expand Down Expand Up @@ -2102,7 +2100,10 @@ def main():
enc_key=enc_key,
redirect_uri=redirect_uri,
app_name=APP_NAME,
base_url=url,
azure_cloud=azure_cloud,
azure_ad_endpoint=azure_cloud.endpoints.active_directory,
token_retrieval_url=urljoin(azure_cloud.endpoints.active_directory, f"/{tenant}/oauth2/v2.0/token"),
base_url=urljoin(azure_cloud.endpoints.microsoft_graph_resource_id, "/v1.0/"),
verify=use_ssl,
proxy=proxy,
self_deployed=self_deployed,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,29 @@ commonfields:
id: Microsoft Graph
version: -1
configuration:
- defaultvalue: https://graph.microsoft.com
display: Host URL
- defaultvalue: Worldwide
display: Azure Cloud
name: azure_cloud
required: false
type: 15
options:
- Worldwide
- US GCC
- US GCC-High
- DoD
- Germany
- China
- Custom
additionalinfo: When selecting the Custom option, the Host URL parameter must be filled. More information about National clouds can be found here - https://xsoar.pan.dev/docs/reference/articles/microsoft-integrations---authentication#using-national-cloud
section: Connect
advanced: true
- display: Host URL
name: host
required: true
required: false
type: 0
section: Connect
advanced: true
additionalinfo: The host URL. When using this parameter, select the Custom option for the Azure Cloud. More information about National clouds can be found here - https://xsoar.pan.dev/docs/reference/articles/microsoft-integrations---authentication#using-national-cloud
- defaultvalue: Alerts v2
display: MS graph security alert API Version
name: api_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ For more information, see: https://github.com/microsoftgraph/security-api-soluti

| **Parameter** | **Description** | **Required** |
| --- | --- | --- |
| Host URL | The host URL. | True |
| Azure Cloud | When selecting the Custom option, the Host URL parameter must be filled. More information about National clouds can be found [here](https://xsoar.pan.dev/docs/reference/articles/microsoft-integrations---authentication#using-national-cloud). | False |
| Host URL | The host URL. When using this parameter, select the Custom option for the Azure Cloud. More information about National clouds can be found [here](https://xsoar.pan.dev/docs/reference/articles/microsoft-integrations---authentication#using-national-cloud). | False |
| MS graph security version | MS graph security API version. | True |
| Application ID or Client ID | The app registration ID. | True |
| Token or Tenant ID | The tenant ID. | True |
Expand Down
6 changes: 6 additions & 0 deletions Packs/MicrosoftGraphSecurity/ReleaseNotes/2_2_41.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

#### Integrations

##### Microsoft Graph Security

- Added a new parameter **Azure Cloud** to support all of the following environments: Public, GCC, GCC-High, DoD, Germany, and China.
2 changes: 1 addition & 1 deletion Packs/MicrosoftGraphSecurity/pack_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Microsoft Graph Security",
"description": "Unified gateway to security insights - all from a unified Microsoft Graph\n Security API.",
"support": "xsoar",
"currentVersion": "2.2.40",
"currentVersion": "2.2.41",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
"email": "",
Expand Down
Loading