Skip to content

Commit 368e584

Browse files
committed
only create a backup of the current encryption key on 3.8+
* remove check in 3.7 test * ghe-secrets-init will create a new current encryption key if it doesn't exist https://github.com/github/enterprise2/blob/a97cc4b077b8f8be2772959c07e2d0ca729fd079/vm_files/usr/local/share/enterprise/ghe-secrets-init#L505 since this is restoring from a backup, we need the current encryption key to match a value that was backed up in encryption keying material because encryption keying material is used to decrypt
1 parent 19dd3b4 commit 368e584

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

share/github-backup-utils/ghe-backup-settings

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ backup-secret "kredz.varz HMAC key" "kredz-varz-hmac" "secrets.kredz.varz-hmac-s
8383
# this is for forwards compatibility with GHES 3.8.0 onwards
8484
if [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 3.7.0)" ]; then
8585
backup-secret "encrypted column encryption keying material" "encrypted-column-encryption-keying-material" "secrets.github.encrypted-column-keying-material"
86-
echo "ghe-config 'secrets.github.encrypted-column-keying-material' | sed 's:.*;::' > encrypted-column-current-encryption-key" |
87-
ghe-ssh "$host" /bin/bash
86+
fi
87+
88+
if [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 3.8.0)" ]; then
89+
cat "$GHE_SNAPSHOT_DIR/encrypted-column-encryption-keying-material" | sed 's:.*;::' > "$GHE_SNAPSHOT_DIR/encrypted-column-current-encryption-key"
8890
fi
8991

9092
backup-secret "secret scanning encrypted secrets current storage key" "secret-scanning-encrypted-secrets-current-storage-key" "secrets.secret-scanning.encrypted-secrets-current-storage-key"

test/test-ghe-backup.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,6 @@ begin_test "ghe-backup takes backup of encrypted column encryption keying materi
586586

587587
required_files=(
588588
"encrypted-column-encryption-keying-material"
589-
"encrypted-column-current-encryption-key"
590589
)
591590

592591
for file in "${required_files[@]}"; do

0 commit comments

Comments
 (0)