Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected delivery of TLS format

This commit is contained in:
sirferl 2020-12-04 13:54:39 +01:00
parent bc6c913a7a
commit 2b65ab8972
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lemur/plugins/lemur_kubernetes/plugin.py
View File

@ -10,6 +10,7 @@
.. moduleauthor:: Mikhail Khodorovskiy <mikhail.khodorovskiy@jivesoftware.com> .. moduleauthor:: Mikhail Khodorovskiy <mikhail.khodorovskiy@jivesoftware.com>
""" """
import base64
import itertools import itertools
import os import os
@ -17,7 +18,7 @@ import requests
from flask import current_app from flask import current_app
from lemur.common.defaults import common_name from lemur.common.defaults import common_name
from lemur.common.utils import parse_certificate, base64encode from lemur.common.utils import parse_certificate
from lemur.plugins.bases import DestinationPlugin from lemur.plugins.bases import DestinationPlugin
DEFAULT_API_VERSION = "v1" DEFAULT_API_VERSION = "v1"
@ -72,6 +73,12 @@ def _resolve_uri(k8s_base_uri, namespace, kind, name=None, api_ver=DEFAULT_API_V
) )
# Performs Base64 encoding of string to string using the base64.b64encode() function
# which encodes bytes to bytes.
def base64encode(string):
return base64.b64encode(string.encode()).decode()
def build_secret(secret_format, secret_name, body, private_key, cert_chain): def build_secret(secret_format, secret_name, body, private_key, cert_chain):
secret = { secret = {
"apiVersion": "v1", "apiVersion": "v1",
@ -89,7 +96,7 @@ def build_secret(secret_format, secret_name, body, private_key, cert_chain):
if secret_format == "TLS": if secret_format == "TLS":
secret["type"] = "kubernetes.io/tls" secret["type"] = "kubernetes.io/tls"
secret["data"] = { secret["data"] = {
"tls.crt": base64encode(body), "tls.crt": base64encode("%s\n%s" % (body, cert_chain)),
"tls.key": base64encode(private_key), "tls.key": base64encode(private_key),
} }
if secret_format == "Certificate": if secret_format == "Certificate":