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

Jump to bottom

fix(certmanager): patches for auth handler #626

Merged
merged 2 commits into from
Jan 20, 2022
Merged

fix(certmanager): patches for auth handler #626

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ecf89
fix(certmanager): ensure jansRevision always updated #614
iromli Jan 19, 2022
2806e29
fix(certmanager): ensure backup for auth-server private keys is creat…
iromli Jan 19, 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
11 changes: 8 additions & 3 deletions docker-jans-certmanager/scripts/auth_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,18 @@ def patch(self):
if int(self.privkey_push_delay) > 0:
logger.info(f"Waiting for private key push delay ({int(self.privkey_push_delay)} seconds) ...")
time.sleep(int(self.privkey_push_delay))

for container in auth_containers:
logger.info(f"creating backup of {name}:{jks_fn}")
self.meta_client.exec_cmd(container, f"cp {jks_fn} {jks_fn}.backup")
logger.info(f"creating new {name}:{jks_fn}")
self.meta_client.copy_to_container(container, jks_fn)

# key selection is changed
if self.privkey_push_strategy != self.key_strategy:
rev = rev + 1
# as new JKS pushed to container, we need to tell auth-server to reload the private keys
# by increasing jansRevision again; note that as jansRevision may have been modified externally
# we need to ensure we have fresh jansRevision value to increase to
config = self.backend.get_auth_config()
rev = int(config["jansRevision"]) + 1
conf_dynamic.update({
"keySelectionStrategy": self.privkey_push_strategy,
})
Expand Down