auxolotl/buildbot-nix
26
1
Fork 0
Code Issues Pull requests 1 Actions 1 Packages Projects Releases Wiki Activity

jwt: fix passing private_key_file to command

Browse source
This commit is contained in:
Jörg Thalheim 2024-07-24 17:21:52 +02:00 committed by mergify[bot]
parent eb6fae3100
commit 7480ee03b3
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
buildbot_nix/github/jwt_token.py
View file

@ -51,7 +51,14 @@ class JWTToken(RepoToken):
def rs256_sign(data: str, private_key_file: Path) -> str: def rs256_sign(data: str, private_key_file: Path) -> str:
signature = subprocess.run( signature = subprocess.run(
["openssl", "dgst", "-binary", "-sha256", "-sign", private_key_file], [
"openssl",
"dgst",
"-binary",
"-sha256",
"-sign",
str(private_key_file),
],
input=data.encode("utf-8"), input=data.encode("utf-8"),
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
check=True, check=True,

2
nix/master.nix
View file

@ -445,7 +445,7 @@ in
else if (cfg.github.authType ? "app") then else if (cfg.github.authType ? "app") then
{ {
id = cfg.github.authType.app.id; id = cfg.github.authType.app.id;
secret_key_file = cfg.github.authType.app.secretKeyFile; secret_key_file = "github-app-secret-key";
installation_token_map_file = "github-app-installation-token-map.json"; installation_token_map_file = "github-app-installation-token-map.json";
project_id_map_file = "github-app-project-id-map-name.json"; project_id_map_file = "github-app-project-id-map-name.json";
jwt_token_map = "github-app-jwt-token"; jwt_token_map = "github-app-jwt-token";