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

Open binary files in binary mode and do not encode them #829

Merged
merged 6 commits into from
Apr 12, 2022
Merged

Open binary files in binary mode and do not encode them #829

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a4c722
open binary files in binary mode and do not encode them
Tymolc Mar 4, 2022
834290e
reveal base64 string if binary data, otherwise decode
Tymolc Mar 10, 2022
de76c45
fix linting, use raw data if binary for all cases
Tymolc Mar 10, 2022
6784f5a
handle None MIME type as non-binary
Tymolc Mar 21, 2022
c581971
provide --binary command line parameter
Tymolc Mar 28, 2022
33e0c27
Merge branch 'master' into fix/binary_value_handling
ramaro Apr 12, 2022
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
6 changes: 5 additions & 1 deletion kapitan/refs/base64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ def __init__(self, data, from_base64=False, **kwargs):

def reveal(self):
# TODO data should be bytes only
return base64.b64decode(self.data).decode()
decoded = base64.b64decode(self.data)
try:
return decoded.decode()
except:
return self.data

def compile_embedded(self):
dump = self.dump()
Expand Down
16 changes: 11 additions & 5 deletions kapitan/refs/cmd_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import logging
import os
import sys
import mimetypes

from kapitan.errors import KapitanError, RefHashMismatchError
from kapitan.refs.base import PlainRef, RefController, Revealer
Expand Down Expand Up @@ -38,6 +39,7 @@ def ref_write(args, ref_controller):
token_name = args.write
file_name = args.file
data = None
is_binary = False

if file_name is None:
fatal_error("--file is required with --write")
Expand All @@ -46,8 +48,12 @@ def ref_write(args, ref_controller):
for line in sys.stdin:
data += line
else:
with open(file_name) as fp:
mime_type = mimetypes.guess_type(file_name)
modifier = "r" if "text" in mime_type or mime_type[0] is None else "rb"
with open(file_name, modifier) as fp:
data = fp.read()
if "b" in fp.mode:
is_binary = True

if token_name.startswith("gpg:"):
type_name, token_path = token_name.split(":")
Expand Down Expand Up @@ -167,7 +173,7 @@ def ref_write(args, ref_controller):

elif token_name.startswith("base64:"):
type_name, token_path = token_name.split(":")
_data = data.encode()
_data = data if is_binary else data.encode()
encoding = "original"
if args.base64:
_data = base64.b64encode(_data).decode()
Expand All @@ -179,7 +185,7 @@ def ref_write(args, ref_controller):

elif token_name.startswith("vaultkv:"):
type_name, token_path = token_name.split(":")
_data = data.encode()
_data = data if is_binary else data.encode()
vault_params = {}
encoding = "original"
if args.target_name:
Expand Down Expand Up @@ -213,7 +219,7 @@ def ref_write(args, ref_controller):

elif token_name.startswith("plain:"):
type_name, token_path = token_name.split(":")
_data = data.encode()
_data = data if is_binary else data.encode()
encoding = "original"
if args.base64:
_data = base64.b64encode(_data).decode()
Expand All @@ -225,7 +231,7 @@ def ref_write(args, ref_controller):

elif token_name.startswith("env:"):
type_name, token_path = token_name.split(":")
_data = data.encode()
_data = data if is_binary else data.encode()
encoding = "original"
if args.base64:
_data = base64.b64encode(_data).decode()
Expand Down