Compare commits
12 Commits
v0.5.0
...
4e23b67f5d
Author | SHA1 | Date | |
---|---|---|---|
4e23b67f5d | |||
f4d05fdd0f | |||
48bc422974 | |||
41d4959422 | |||
c2116c24ec | |||
67692b372f | |||
8a6219718a
|
|||
a10f6b3c9a | |||
56657df85a | |||
6a324e66da | |||
6081374696 | |||
a3cec12284 |
6
.github/workflows/release.yml
vendored
6
.github/workflows/release.yml
vendored
@ -27,14 +27,14 @@ jobs:
|
||||
version: v3.10.0
|
||||
|
||||
- name: Run chart-releaser
|
||||
uses: helm/chart-releaser-action@v1.4.1
|
||||
uses: helm/chart-releaser-action@v1.5.0
|
||||
with:
|
||||
charts_dir: charts
|
||||
env:
|
||||
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||
|
||||
- name: Get app version from chart
|
||||
uses: mikefarah/yq@v4.30.6
|
||||
uses: mikefarah/yq@v4.30.8
|
||||
id: app_version
|
||||
with:
|
||||
cmd: yq '.appVersion' charts/bitwarden-crd-operator/Chart.yaml
|
||||
@ -65,4 +65,4 @@ jobs:
|
||||
file_glob: true
|
||||
file: lerentis-bitwarden-crd-operator_*.spdx.json
|
||||
tag: ${{ steps.previoustag.outputs.tag }}
|
||||
overwrite: false
|
||||
overwrite: true
|
||||
|
25
src/kv.py
25
src/kv.py
@ -19,11 +19,17 @@ def create_kv(secret, secret_json, content_def):
|
||||
if key == "secretScope":
|
||||
_secret_scope = value
|
||||
if _secret_scope == "login":
|
||||
value = parse_login_scope(secret_json, _secret_key)
|
||||
if value is None:
|
||||
raise Exception(f"Field {_secret_key} has no value in bitwarden secret")
|
||||
secret.data[_secret_ref] = str(base64.b64encode(
|
||||
parse_login_scope(secret_json, _secret_key).encode("utf-8")), "utf-8")
|
||||
value.encode("utf-8")), "utf-8")
|
||||
if _secret_scope == "fields":
|
||||
value = parse_fields_scope(secret_json, _secret_key)
|
||||
if value is None:
|
||||
raise Exception(f"Field {_secret_key} has no value in bitwarden secret")
|
||||
secret.data[_secret_ref] = str(base64.b64encode(
|
||||
parse_fields_scope(secret_json, _secret_key).encode("utf-8")), "utf-8")
|
||||
value.encode("utf-8")), "utf-8")
|
||||
return secret
|
||||
|
||||
|
||||
@ -64,9 +70,24 @@ def update_managed_secret(spec, status, name, namespace, logger, body, **kwargs)
|
||||
|
||||
content_def = body['spec']['content']
|
||||
id = spec.get('id')
|
||||
old_config = None
|
||||
old_secret_name = None
|
||||
old_secret_namespace = None
|
||||
if 'kopf.zalando.org/last-handled-configuration' in body.metadata.annotations:
|
||||
old_config = json.loads(body.metadata.annotations['kopf.zalando.org/last-handled-configuration'])
|
||||
old_secret_name = old_config['spec'].get('name')
|
||||
old_secret_namespace = old_config['spec'].get('namespace')
|
||||
secret_name = spec.get('name')
|
||||
secret_namespace = spec.get('namespace')
|
||||
|
||||
if old_config is not None and (old_secret_name != secret_name or old_secret_namespace != secret_namespace):
|
||||
# If the name of the secret or the namespace of the secret is different
|
||||
# We have to delete the secret an recreate it
|
||||
logger.info("Secret name or namespace changed, let's recreate it")
|
||||
delete_managed_secret(old_config['spec'], name, namespace, logger, **kwargs)
|
||||
create_managed_secret(spec, name, namespace, logger, body, **kwargs)
|
||||
return
|
||||
|
||||
unlock_bw(logger)
|
||||
logger.info(f"Locking up secret with ID: {id}")
|
||||
secret_json_object = json.loads(get_secret_from_bitwarden(id))
|
||||
|
@ -1,4 +1,5 @@
|
||||
import os
|
||||
import json
|
||||
import subprocess
|
||||
|
||||
class BitwardenCommandException(Exception):
|
||||
@ -8,6 +9,11 @@ def get_secret_from_bitwarden(id):
|
||||
return command_wrapper(command=f"get item {id}")
|
||||
|
||||
def unlock_bw(logger):
|
||||
status_output = command_wrapper("status")
|
||||
status = json.loads(status_output)['status']
|
||||
if status == 'unlocked':
|
||||
logger.info("Already unlocked")
|
||||
return
|
||||
token_output = command_wrapper("unlock --passwordenv BW_PASSWORD")
|
||||
tokens = token_output.split('"')[1::2]
|
||||
os.environ["BW_SESSION"] = tokens[1]
|
||||
@ -25,6 +31,8 @@ def parse_login_scope(secret_json, key):
|
||||
return secret_json["login"][key]
|
||||
|
||||
def parse_fields_scope(secret_json, key):
|
||||
if "fields" not in secret_json:
|
||||
return None
|
||||
for entry in secret_json["fields"]:
|
||||
if entry['name'] == key:
|
||||
return entry['value']
|
||||
|
Reference in New Issue
Block a user