Skip to content

Commit c8402cf

Browse files
committed
do not require argon2 secret backup when version >=3.8.2
1 parent 36249d7 commit c8402cf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ backup-secret "kredz.credz HMAC key" "kredz-credz-hmac" "secrets.kredz.credz-hma
8080
backup-secret "kredz.varz HMAC key" "kredz-varz-hmac" "secrets.kredz.varz-hmac-secret"
8181

8282
# Backup argon secrets for multiuser from ghes version 3.8 onwards
83-
if [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 3.8.0)" ]; then
83+
if [[ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 3.8.0)" && "$(version $GHE_REMOTE_VERSION)" -lt "$(version 3.8.2)" ]]; then
8484
backup-secret "management console argon2 secret" "manage-argon-secret" "secrets.manage-auth.argon-secret"
8585
fi
8686

test/test-ghe-backup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ begin_test "ghe-backup management console does not backup argon secret"
146146

147147
GHE_REMOTE_VERSION=3.7.10 ghe-backup -v | grep -q "management console argon2 secret not set" && exit 1
148148
[ ! -f "$GHE_DATA_DIR/current/manage-argon-secret" ]
149+
150+
GHE_REMOTE_VERSION=3.8.2 ghe-backup -v | grep -q "management console argon2 secret not set" && exit 1
151+
[ ! -f "$GHE_DATA_DIR/current/manage-argon-secret" ]
149152
)
150153
end_test
151154

@@ -161,9 +164,6 @@ begin_test "ghe-backup management console backs up argon secret"
161164

162165
rm -rf "$GHE_DATA_DIR/current"
163166

164-
GHE_REMOTE_VERSION=4.1.0 ghe-backup
165-
166-
[ "$(cat "$GHE_DATA_DIR/current/manage-argon-secret")" = "fake pw" ]
167167
)
168168
end_test
169169

0 commit comments

Comments
 (0)