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

feat: remove dependency to urllib3 from kube_config, pin urlllib>=1.23 due to CVE-2018-20060 #56

Merged
merged 2 commits into from
Dec 16, 2018
Merged

feat: remove dependency to urllib3 from kube_config, pin urlllib>=1.23 due to CVE-2018-20060 #56

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
16daf06
feat: urllib3>1.23 CVE-2018-20060
tomplus Dec 13, 2018
bd19590
feat: remove dependency to urllib3
tomplus Dec 13, 2018
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
7 changes: 3 additions & 4 deletions kubernetes_asyncio/config/kube_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import os
import tempfile

import urllib3
import yaml

from kubernetes_asyncio.client import ApiClient, Configuration
Expand Down Expand Up @@ -319,9 +318,9 @@ def _load_user_token(self):

def _load_user_pass_token(self):
if 'username' in self._user and 'password' in self._user:
self.token = urllib3.util.make_headers(
basic_auth=(self._user['username'] + ':' +
self._user['password'])).get('authorization')
basic_auth = self._user['username'] + ':' + self._user['password']
self.token = 'Basic ' + base64.b64encode(
basic_auth.encode()).decode('utf-8')
return True

def _load_cluster_info(self):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ certifi>=14.05.14 # MPL
six>=1.9.0 # MIT
python-dateutil>=2.5.3 # BSD
setuptools>=21.0.0 # PSF/ZPL
urllib3>=1.19.1,!=1.21,<1.23 # MIT
urllib3>=1.23 # MIT
pyyaml>=3.12 # MIT
aiohttp>=2.3.10 # # Apache-2.0