Skip to content

Changing the MDE/M365D request content to json encoding. #498

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

Merged
petebryan merged 5 commits into from
Sep 9, 2022
Merged

Changing the MDE/M365D request content to json encoding. #498

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6532cd8
Changing the request content to json encoding.
ianhelle Aug 5, 2022
b632f31
Merge branch 'main' into ianhelle/odata_driver_json_encode-2022-08-05
ianhelle Sep 9, 2022
8e2e995
Merge branch 'main' into ianhelle/odata_driver_json_encode-2022-08-05
ianhelle Sep 9, 2022
eeaf226
Forcing install of prospector before rest of dev tools in python-pack…
ianhelle Sep 9, 2022
2ab1d9d
Merge branch 'main' into ianhelle/odata_driver_json_encode-2022-08-05
petebryan Sep 9, 2022
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
10 changes: 4 additions & 6 deletions msticpy/data/drivers/odata_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def query_with_results(self, query: str, **kwargs) -> Tuple[pd.DataFrame, Any]:
Returns
-------
Tuple[pd.DataFrame, results.ResultSet]
A DataFrame (if successfull) and
A DataFrame (if successful) and
Kql ResultSet.

"""
Expand All @@ -240,20 +240,18 @@ def query_with_results(self, query: str, **kwargs) -> Tuple[pd.DataFrame, Any]:

# Build request based on whether endpoint requires data to be passed in
# request body in or URL
body = None
if kwargs["body"] is True:
req_url = self.request_uri + kwargs["api_end"]
req_url = f"{self.request_uri}{kwargs['api_end']}"
req_url = urllib.parse.quote(req_url, safe="%/:=&?~#+!$,;'@()*[]")
body = {"Query": query}
response = httpx.post(
url=req_url,
headers=self.req_headers,
content=str(body),
json={"Query": query},
timeout=self.get_http_timeout(**kwargs),
)
else:
# self.request_uri set if self.connected
req_url = self.request_uri + query # type: ignore
req_url = f"{self.request_uri}{query}"
response = httpx.get(
url=req_url,
headers=self.req_headers,
Expand Down