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

Added the ability to enable trusted_env. #1727

Merged
merged 3 commits into from
Aug 27, 2024
Merged

Added the ability to enable trusted_env. #1727

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f92d68
Added the ability to enable trusted_env.
DerekRushton Aug 26, 2024
51a1a0c
Fixed an issue with False and added a comment.
DerekRushton Aug 26, 2024
063e62a
Default changed to string.
DerekRushton Aug 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
13 changes: 12 additions & 1 deletion stix_shifter_utils/stix_transmission/utils/RestApiClientAsync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@ def __init__(self, host, port=None, headers={}, url_modifier_function=None, cert
unique_file_handle = uuid.uuid4()
self.server_cert_name = "/tmp/{0}-server_cert.pem".format(unique_file_handle)
server_ip = host

#To enable proxy, set the environment variable "STIX_SHIFTER_ENABLE_TRUST_ENV" to true. This option will allow the connection
#to use the system environments proxy settings. This can be done by setting the "https_proxy" environment variable to
#"http(s)://[username]:[password]@[hostname]/[ipaddress]:[port]". Alternative proxy schema's may or may not work.
self.trust_env_enabled = os.environ.get("STIX_SHIFTER_ENABLE_TRUST_ENV", False).lower()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think STIX_SHIFTER_ENABLE_TRUST_PROXY_ENV would be more descriptive or just leave it as it is ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to remove the .lower there.

if self.trust_env_enabled == "true":
self.trust_env_enabled = True
else:
self.trust_env_enabled = False
self.logger.debug(f"Proxy Environment - Trusted_Env Enabled : {self.trust_env_enabled}")

if port is not None:
server_ip += ":" + str(port)
self.server_ip = server_ip
Expand Down Expand Up @@ -101,7 +112,7 @@ async def call_api(self, endpoint, method, headers=None, cookies=None, data=None
try:
client_timeout = ClientTimeout(connect=self.connect_timeout, total=timeout) # https://docs.aiohttp.org/en/stable/client_reference.html?highlight=timeout#aiohttp.ClientTimeout
retry_options = ExponentialRetry(attempts=self.retry_max, statuses=[429, 500, 502, 503, 504])
async with RetryClient(retry_options=retry_options) as client:
async with RetryClient(trust_env=self.trust_env_enabled, retry_options=retry_options) as client:
call = getattr(client, method.lower())

async with call(url, headers=actual_headers, params=urldata, data=data,
Expand Down
Loading