Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix restoring the password pepper for already configured instances #683

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

Merged
merged 1 commit into from
Jan 18, 2021
Merged

Fix restoring the password pepper for already configured instances #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions share/github-backup-utils/ghe-restore-mysql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ghe_remote_version_required "$GHE_HOSTNAME"
export GHE_RESTORE_SNAPSHOT

# The directory holding the snapshot to restore
snapshot_dir="$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT"
GHE_RESTORE_SNAPSHOT_PATH="$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT"

if is_external_database_snapshot; then
if [ -n "$EXTERNAL_DATABASE_RESTORE_SCRIPT" ]; then
Expand All @@ -40,7 +40,7 @@ if is_external_database_snapshot; then
bm_end "$(basename $0)"
exit 0
else
if is_binary_backup "$snapshot_dir"; then
if is_binary_backup "$GHE_RESTORE_SNAPSHOT_PATH"; then
echo "Error: Restore of a binary backup to appliance with an external database configured is not supported."
echo "Please provide a custom external database restore script with EXTERNAL_DATABASE_RESTORE_SCRIPT"
exit 1
Expand All @@ -63,18 +63,22 @@ if is_external_database_snapshot; then
fi

if is_binary_backup_feature_on; then
# Always restore the password pepper here since it is tied to the MySQL data.
restore-secret "password pepper" "password-pepper" "secrets.github.user-password-secrets"
# Feature "mysql.backup.binary" is on, which means new backup scripts are available
if is_binary_backup "$snapshot_dir"; then
if is_binary_backup "$GHE_RESTORE_SNAPSHOT_PATH"; then
ghe-restore-mysql-binary $GHE_HOSTNAME
else
ghe-restore-mysql-logical $GHE_HOSTNAME
fi
else
# We do not allow to restore binary backup without "mysql.backup.binary" set
if is_binary_backup "$snapshot_dir"; then
if is_binary_backup "$GHE_RESTORE_SNAPSHOT_PATH"; then
echo "To restore from a binary backup, you have to set ghe-config \"mysql.backup.binary\" to true" >&2
exit 2
else
# Always restore the password pepper here since it is tied to the MySQL data.
restore-secret "password pepper" "password-pepper" "secrets.github.user-password-secrets"
if is_default_external_database_snapshot; then
ghe-restore-mysql-logical $GHE_HOSTNAME
else
Expand Down
2 changes: 0 additions & 2 deletions share/github-backup-utils/ghe-restore-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ restore-secret "external MySQL password" "external-mysql-password" "secrets.exte

# Restore management console password hash if present.
restore-secret "management console password" "manage-password" "secrets.manage"
# Restore password pepper if present
restore-secret "password pepper" "password-pepper" "secrets.github.user-password-secrets"

# Restore SAML keys if present.
if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/saml-keys.tar" ]; then
Expand Down