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

fix(dependencies): Upgrade dependencies #126

Merged
merged 2 commits into from
Jun 1, 2023
Merged

fix(dependencies): Upgrade dependencies #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f6db3b
fix(dependencies): Upgrade dependencies
rvelaVenafi Jun 1, 2023
228b4cd
fix(dependencies): Upgrade dependencies
rvelaVenafi Jun 1, 2023
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
3 changes: 2 additions & 1 deletion docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set -o pipefail
bandit -r vcert/

# ID 40291 is pip, ignore so we can still test python 2.7
safety check -i 40291
#Ignoring false-positive issue with pytest. ref: https://github.com/pytest-dev/py/issues/287
safety check -i 40291 -i 51457

pytest -v --junit-xml=junit.xml --junit-prefix=`python -V | tr ' ' '_'` --cov=vcert --cov=vcert.parser --cov=vcert.policy --cov-report term --cov-report xml
8 changes: 4 additions & 4 deletions requirements-build.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest==6.2.5
pytest-cov==3.0.0
safety==1.10.3
bandit==1.7.1
pytest==7.3.1
pytest-cov==4.1.0
safety==2.3.5
bandit==1.7.5
6 changes: 3 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
requests==2.27.1
requests==2.31.0
python-dateutil==2.8.2
cryptography==36.0.1
cryptography==40.0.2
six==1.16.0
ruamel.yaml==0.17.20
ruamel.yaml==0.17.31
pynacl==1.5.0
6 changes: 3 additions & 3 deletions vcert/connection_cloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def _get(self, url, params=None):
'accept': MIME_ANY,
'cache-control': "no-cache"
}
r = requests.get(self._base_url + url, params=params, headers=headers, **self._http_request_kwargs)
r = requests.get(self._base_url + url, params=params, headers=headers, **self._http_request_kwargs) # nosec B113
return self.process_server_response(r)

def _post(self, url, data=None):
Expand All @@ -185,7 +185,7 @@ def _post(self, url, data=None):
'cache-control': "no-cache"
}
if isinstance(data, dict):
r = requests.post(self._base_url + url, json=data, headers=headers, **self._http_request_kwargs)
r = requests.post(self._base_url + url, json=data, headers=headers, **self._http_request_kwargs) # nosec B113
else:
log.error(f"Unexpected client data type: {type(data)} for {url}")
raise ClientBadData
Expand All @@ -204,7 +204,7 @@ def _put(self, url, data=None):
'accept': MIME_JSON
}
if isinstance(data, dict):
r = requests.put(self._base_url + url, json=data, headers=headers, **self._http_request_kwargs)
r = requests.put(self._base_url + url, json=data, headers=headers, **self._http_request_kwargs) # nosec B113
else:
log.error(f"Unexpected client data type: {type(data)} for {url}")
raise ClientBadData
Expand Down
6 changes: 3 additions & 3 deletions vcert/connection_tpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def _get(self, url="", params=None):
'content-type': MIME_JSON,
'cache-control': 'no-cache'},
params=params,
**self._http_request_kwargs)
**self._http_request_kwargs) # nosec B113
return self.process_server_response(r)

def _post(self, url, data=None):
Expand All @@ -100,7 +100,7 @@ def _post(self, url, data=None):
'content-type': MIME_JSON,
'cache-control': "no-cache"},
json=data,
**self._http_request_kwargs)
**self._http_request_kwargs) # nosec B113
else:
log.error(f"Unexpected client data type: {type(data)} for {url}")
raise ClientBadData
Expand All @@ -126,7 +126,7 @@ def auth(self):
json=data,
headers={'content-type': MIME_JSON,
'cache-control': "no-cache"},
**self._http_request_kwargs)
**self._http_request_kwargs) # nosec B113

status, user = self.process_server_response(r)
if status == HTTPStatus.OK:
Expand Down
4 changes: 2 additions & 2 deletions vcert/connection_tpp_token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def _get(self, url=None, params=None, check_token=True, include_token_header=Tru
token = self._get_auth_header_value(self._auth.access_token)
headers[HEADER_AUTHORIZATION] = token

r = requests.get(self._base_url + url, headers=headers, params=params, **self._http_request_kwargs)
r = requests.get(self._base_url + url, headers=headers, params=params, **self._http_request_kwargs) # nosec B113
return self.process_server_response(r)

def _post(self, url=None, data=None, check_token=True, include_token_header=True):
Expand All @@ -115,7 +115,7 @@ def _post(self, url=None, data=None, check_token=True, include_token_header=True

if isinstance(data, dict):
log.debug(f"POST Request\n\tURL: {self._base_url+url}\n\tHeaders:{headers}\n\tBody:{data}\n")
r = requests.post(self._base_url + url, headers=headers, json=data, **self._http_request_kwargs)
r = requests.post(self._base_url + url, headers=headers, json=data, **self._http_request_kwargs) # nosec B113
else:
log.error(f"Unexpected client data type: {type(data)} for {url}")
raise ClientBadData
Expand Down