Skip to content

Commit 0370c4e

Browse files
committed
refactor: improve ingestion safety and log sanitization
1 parent aaeab9e commit 0370c4e

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

ingestion/src/metadata/ingestion/source/database/sas/client.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
logger = ingestion_logger()
2626

27+
SAS_CLI_AUTH_HEADER = "Basic c2FzLmNsaTo="
28+
2729

2830
class SASClient:
2931
"""
@@ -170,14 +172,16 @@ def get_token(self, base_url, user, password):
170172
payload = {"grant_type": "password", "username": user, "password": password}
171173
headers = {
172174
"Content-type": "application/x-www-form-urlencoded",
173-
"Authorization": "Basic c2FzLmNsaTo=",
175+
"Authorization": SAS_CLI_AUTH_HEADER,
174176
}
175177
url = base_url + endpoint
176178
response = requests.request(
177-
"POST", url, headers=headers, data=payload, verify=False, timeout=10
179+
"POST", url, headers=headers, data=payload, verify=True, timeout=10
178180
)
179-
text_response = response.json()
180-
logger.info(
181-
f"this is user: {user}, password: {password}, text: {text_response}"
181+
logger.debug(
182+
"Token request for user: %s completed with status: %s",
183+
user,
184+
response.status_code,
182185
)
186+
response.raise_for_status()
183187
return response.json()["access_token"]

ingestion/src/metadata/ingestion/source/search/elasticsearch/connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def get_ssl_context(ssl_config: SslConfig) -> ssl.SSLContext:
138138
)
139139
return ssl_context
140140

141-
return ssl._create_unverified_context() # pylint: disable=protected-access
141+
return ssl.create_default_context()
142142

143143

144144
def get_connection(connection: ElasticsearchConnection) -> Elasticsearch:

ingestion/src/metadata/utils/secrets/aws_secrets_manager.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ def get_string_value(self, secret_id: str) -> Optional[str]:
5353
try:
5454
kwargs = {"SecretId": secret_id}
5555
response = self.client.get_secret_value(**kwargs)
56-
logger.debug("Got value for secret %s.", secret_id)
56+
logger.debug("Successfully retrieved value from secrets manager.")
5757
except ClientError as err:
5858
logger.debug(traceback.format_exc())
59-
logger.error(f"Couldn't get value for secret [{secret_id}]: {err}")
59+
logger.error(f"Couldn't get value from secrets manager: {err}")
6060
raise err
6161
if "SecretString" in response:
6262
return (
@@ -65,5 +65,5 @@ def get_string_value(self, secret_id: str) -> Optional[str]:
6565
else None
6666
)
6767
raise ValueError(
68-
f"SecretString for secret [{secret_id}] not present in the response."
68+
"SecretString not present in the response."
6969
)

0 commit comments

Comments
 (0)