8000 BUGFIX: token file should not be decoded · kubernetes-client/python@2c80352 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2c80352

Browse files
mbohloolmbohlool
committed
BUGFIX: token file should not be decoded
1 parent 3517bed commit 2c80352

File tree

2 files changed

+32
-8
lines changed

2 files changed

+32
-8
lines changed

‎kubernetes/config/kube_config.py

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,18 @@ class FileOrData(object):
5959
content of obj[%file_key_name] and represent it as file or data.
6060
Note that the data is preferred. The obj[%file_key_name] will be used iff
6161
obj['%data_key_name'] is not set or empty. Assumption is file content is
62-
raw data and data field is base64 string."""
62+
raw data and data field is base64 string. The assumption can be changed
63+
with base64_file_content flag. If set to False, the content of the file
64+
will assumed to be base64 and read as is. The default True value will
65+
result in base64 encode of the file content after read."""
6366

6467
def __init__(self, obj, file_key_name, data_key_name=None,
65-
file_base_path=""):
68+
file_base_path="", base64_file_content=True):
6669
if not data_key_name:
6770
data_key_name = file_key_name + "-data"
6871
self._file = None
6972
self._data = None
73+
self._base64_file_content = base64_file_content
7074
if data_key_name in obj:
7175
self._data = obj[data_key_name]
7276
elif file_key_name in obj:
@@ -78,8 +82,11 @@ def as_file(self):
7882
decoded obj[%data_key_name] content otherwise obj[%file_key_name]."""
7983
use_data_if_no_file = not self._file and self._data
8084
if use_data_if_no_file:
81-
self._file = _create_temp_file_with_content(
82-
base64.decodestring(self._data.encode()))
85+
if self._base64_file_content:
86+
self._file = _create_temp_file_with_content(
87+
base64.decodestring(self._data.encode()))
88+
else:
89+
self._file = _create_temp_file_with_content(self._data)
8390
if self._file and not os.path.isfile(self._file):
8491
raise ConfigException("File does not exists: %s" % self._file)
8592
return self._file
@@ -90,8 +97,11 @@ def as_data(self):
9097
use_file_if_no_data = not self._data and self._file
9198
if use_file_if_no_data:
9299
with open(self._file) as f:
93-
self._data = bytes.decode(
94-
base64.encodestring(str.encode(f.read())))
100+
if self._base64_file_content:
101+
self._data = bytes.decode(
102+
base64.encodestring(str.encode(f.read())))
103+
else:
104+
self._data = f.read()
95105
return self._data
96106

97107

@@ -164,7 +174,8 @@ def _load_gcp_token(self):
164174
def _load_user_token(self):
165175
token = FileOrData(
166176
self._user, 'tokenFile', 'token',
167-
file_base_path=self._config_base_path).as_data()
177+
file_base_path=self._config_base_path,
178+
base64_file_content=False).as_data()
168179
if token:
169180
self.token = "Bearer %s" % token
170181
return True

‎kubernetes/config/kube_config_test.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@ def test_file_given_data(self):
108108
data_key_name=TEST_DATA_KEY)
109109
self.assertEqual(TEST_DATA, self.get_file_content(t.as_file()))
110110

111+
def test_file_given_data_no_base64(self):
112+
obj = {TEST_DATA_KEY: TEST_DATA}
113+
t = FileOrData(obj=obj, file_key_name=TEST_FILE_KEY,
114+
data_key_name=TEST_DATA_KEY, base64_file_content=False)
115+
self.assertEqual(TEST_DATA, self.get_file_content(t.as_file()))
116+
111117
def test_data_given_data(self):
112118
obj = {TEST_DATA_KEY: TEST_DATA_BASE64}
113119
t = FileOrData(obj=obj, file_key_name=TEST_FILE_KEY,
@@ -120,6 +126,13 @@ def test_data_given_file(self):
120126
t = FileOrData(obj=obj, file_key_name=TEST_FILE_KEY)
121127
self.assertEqual(TEST_DATA_BASE64, t.as_data())
122128

129+
def test_data_given_file_no_base64(self):
130+
obj = {
131+
TEST_FILE_KEY: self._create_temp_file(content=TEST_DATA)}
132+
t = FileOrData(obj=obj, file_key_name=TEST_FILE_KEY,
133+
base64_file_content=False)
134+
self.assertEqual(TEST_DATA, t.as_data())
135+
123136
def test_data_given_file_and_data(self):
124137
obj = {
125138
TEST_DATA_KEY: TEST_DATA_BASE64,
@@ -562,7 +575,7 @@ def test_ssl_with_relative_ssl_files(self):
562575
with open(os.path.join(temp_dir, "client_key"), "wb") as fd:
563576
fd.write(TEST_CLIENT_KEY.encode())
564577
with open(os.path.join(temp_dir, "token_file"), "wb") as fd:
565-
fd.write(TEST_DATA.encode())
578+
fd.write(TEST_DATA_BASE64.encode())
566579
KubeConfigLoader(
567580
config_dict=self.TEST_KUBE_CONFIG,
568581
active_context="ssl-local-file",

0 commit comments

Comments
 (0)
0