From fad32a303fda1e306812ca86c23047eca58a5f61 Mon Sep 17 00:00:00 2001 From: Thomas Tendyck Date: Wed, 6 Nov 2024 16:34:47 +0100 Subject: [PATCH] docs: replace base64 command with openssl --- docs/docs/workflows/recover-coordinator.md | 7 ++++--- .../version-1.1/workflows/recover-coordinator.md | 7 ++++--- .../version-1.2/workflows/recover-coordinator.md | 7 ++++--- .../version-1.3/workflows/recover-coordinator.md | 7 ++++--- .../version-1.4/workflows/recover-coordinator.md | 7 ++++--- .../version-1.5/workflows/recover-coordinator.md | 7 ++++--- .../version-1.6/workflows/recover-coordinator.md | 7 ++++--- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/docs/docs/workflows/recover-coordinator.md b/docs/docs/workflows/recover-coordinator.md index 23da81b0..dadd5475 100644 --- a/docs/docs/workflows/recover-coordinator.md +++ b/docs/docs/workflows/recover-coordinator.md @@ -28,7 +28,7 @@ You can upload the recovery secret through the `/recover` client API endpoint. T Assuming you saved the output from the manifest upload step in a file called `recovery_data` and the recovery private key in a file called `private_key.pem`, perform recovery like this: ```bash -base64 -d recovery_data \ +openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -41,6 +41,7 @@ marblerun recover recovery_key_decrypted $MARBLERUN ``` Alternatively, you can use `curl`: + ```bash era -c coordinator-era.json -h $MARBLERUN -output-root marblerun-temp.pem curl --cacert marblerun-temp.pem --data-binary @recovery_key_decrypted https://$MARBLERUN/recover @@ -94,7 +95,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "EbkX/skIPrJISf8PiXdzRIKnwQyJ+VejtGzHGfES5NIPuCeEFedqgCVDk=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -116,7 +117,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "bvPzio4A4SvzeHajsb+dFDpDarErcU9wMR0V9hyHtG2lC4ZfyrYjDBE7wtis3eOPgDaMG/HCt=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted diff --git a/docs/versioned_docs/version-1.1/workflows/recover-coordinator.md b/docs/versioned_docs/version-1.1/workflows/recover-coordinator.md index 23da81b0..dadd5475 100644 --- a/docs/versioned_docs/version-1.1/workflows/recover-coordinator.md +++ b/docs/versioned_docs/version-1.1/workflows/recover-coordinator.md @@ -28,7 +28,7 @@ You can upload the recovery secret through the `/recover` client API endpoint. T Assuming you saved the output from the manifest upload step in a file called `recovery_data` and the recovery private key in a file called `private_key.pem`, perform recovery like this: ```bash -base64 -d recovery_data \ +openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -41,6 +41,7 @@ marblerun recover recovery_key_decrypted $MARBLERUN ``` Alternatively, you can use `curl`: + ```bash era -c coordinator-era.json -h $MARBLERUN -output-root marblerun-temp.pem curl --cacert marblerun-temp.pem --data-binary @recovery_key_decrypted https://$MARBLERUN/recover @@ -94,7 +95,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "EbkX/skIPrJISf8PiXdzRIKnwQyJ+VejtGzHGfES5NIPuCeEFedqgCVDk=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -116,7 +117,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "bvPzio4A4SvzeHajsb+dFDpDarErcU9wMR0V9hyHtG2lC4ZfyrYjDBE7wtis3eOPgDaMG/HCt=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted diff --git a/docs/versioned_docs/version-1.2/workflows/recover-coordinator.md b/docs/versioned_docs/version-1.2/workflows/recover-coordinator.md index 23da81b0..dadd5475 100644 --- a/docs/versioned_docs/version-1.2/workflows/recover-coordinator.md +++ b/docs/versioned_docs/version-1.2/workflows/recover-coordinator.md @@ -28,7 +28,7 @@ You can upload the recovery secret through the `/recover` client API endpoint. T Assuming you saved the output from the manifest upload step in a file called `recovery_data` and the recovery private key in a file called `private_key.pem`, perform recovery like this: ```bash -base64 -d recovery_data \ +openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -41,6 +41,7 @@ marblerun recover recovery_key_decrypted $MARBLERUN ``` Alternatively, you can use `curl`: + ```bash era -c coordinator-era.json -h $MARBLERUN -output-root marblerun-temp.pem curl --cacert marblerun-temp.pem --data-binary @recovery_key_decrypted https://$MARBLERUN/recover @@ -94,7 +95,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "EbkX/skIPrJISf8PiXdzRIKnwQyJ+VejtGzHGfES5NIPuCeEFedqgCVDk=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -116,7 +117,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "bvPzio4A4SvzeHajsb+dFDpDarErcU9wMR0V9hyHtG2lC4ZfyrYjDBE7wtis3eOPgDaMG/HCt=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted diff --git a/docs/versioned_docs/version-1.3/workflows/recover-coordinator.md b/docs/versioned_docs/version-1.3/workflows/recover-coordinator.md index 23da81b0..dadd5475 100644 --- a/docs/versioned_docs/version-1.3/workflows/recover-coordinator.md +++ b/docs/versioned_docs/version-1.3/workflows/recover-coordinator.md @@ -28,7 +28,7 @@ You can upload the recovery secret through the `/recover` client API endpoint. T Assuming you saved the output from the manifest upload step in a file called `recovery_data` and the recovery private key in a file called `private_key.pem`, perform recovery like this: ```bash -base64 -d recovery_data \ +openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -41,6 +41,7 @@ marblerun recover recovery_key_decrypted $MARBLERUN ``` Alternatively, you can use `curl`: + ```bash era -c coordinator-era.json -h $MARBLERUN -output-root marblerun-temp.pem curl --cacert marblerun-temp.pem --data-binary @recovery_key_decrypted https://$MARBLERUN/recover @@ -94,7 +95,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "EbkX/skIPrJISf8PiXdzRIKnwQyJ+VejtGzHGfES5NIPuCeEFedqgCVDk=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -116,7 +117,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "bvPzio4A4SvzeHajsb+dFDpDarErcU9wMR0V9hyHtG2lC4ZfyrYjDBE7wtis3eOPgDaMG/HCt=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted diff --git a/docs/versioned_docs/version-1.4/workflows/recover-coordinator.md b/docs/versioned_docs/version-1.4/workflows/recover-coordinator.md index 23da81b0..dadd5475 100644 --- a/docs/versioned_docs/version-1.4/workflows/recover-coordinator.md +++ b/docs/versioned_docs/version-1.4/workflows/recover-coordinator.md @@ -28,7 +28,7 @@ You can upload the recovery secret through the `/recover` client API endpoint. T Assuming you saved the output from the manifest upload step in a file called `recovery_data` and the recovery private key in a file called `private_key.pem`, perform recovery like this: ```bash -base64 -d recovery_data \ +openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -41,6 +41,7 @@ marblerun recover recovery_key_decrypted $MARBLERUN ``` Alternatively, you can use `curl`: + ```bash era -c coordinator-era.json -h $MARBLERUN -output-root marblerun-temp.pem curl --cacert marblerun-temp.pem --data-binary @recovery_key_decrypted https://$MARBLERUN/recover @@ -94,7 +95,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "EbkX/skIPrJISf8PiXdzRIKnwQyJ+VejtGzHGfES5NIPuCeEFedqgCVDk=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -116,7 +117,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "bvPzio4A4SvzeHajsb+dFDpDarErcU9wMR0V9hyHtG2lC4ZfyrYjDBE7wtis3eOPgDaMG/HCt=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted diff --git a/docs/versioned_docs/version-1.5/workflows/recover-coordinator.md b/docs/versioned_docs/version-1.5/workflows/recover-coordinator.md index 23da81b0..dadd5475 100644 --- a/docs/versioned_docs/version-1.5/workflows/recover-coordinator.md +++ b/docs/versioned_docs/version-1.5/workflows/recover-coordinator.md @@ -28,7 +28,7 @@ You can upload the recovery secret through the `/recover` client API endpoint. T Assuming you saved the output from the manifest upload step in a file called `recovery_data` and the recovery private key in a file called `private_key.pem`, perform recovery like this: ```bash -base64 -d recovery_data \ +openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -41,6 +41,7 @@ marblerun recover recovery_key_decrypted $MARBLERUN ``` Alternatively, you can use `curl`: + ```bash era -c coordinator-era.json -h $MARBLERUN -output-root marblerun-temp.pem curl --cacert marblerun-temp.pem --data-binary @recovery_key_decrypted https://$MARBLERUN/recover @@ -94,7 +95,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "EbkX/skIPrJISf8PiXdzRIKnwQyJ+VejtGzHGfES5NIPuCeEFedqgCVDk=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -116,7 +117,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "bvPzio4A4SvzeHajsb+dFDpDarErcU9wMR0V9hyHtG2lC4ZfyrYjDBE7wtis3eOPgDaMG/HCt=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted diff --git a/docs/versioned_docs/version-1.6/workflows/recover-coordinator.md b/docs/versioned_docs/version-1.6/workflows/recover-coordinator.md index 23da81b0..dadd5475 100644 --- a/docs/versioned_docs/version-1.6/workflows/recover-coordinator.md +++ b/docs/versioned_docs/version-1.6/workflows/recover-coordinator.md @@ -28,7 +28,7 @@ You can upload the recovery secret through the `/recover` client API endpoint. T Assuming you saved the output from the manifest upload step in a file called `recovery_data` and the recovery private key in a file called `private_key.pem`, perform recovery like this: ```bash -base64 -d recovery_data \ +openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -41,6 +41,7 @@ marblerun recover recovery_key_decrypted $MARBLERUN ``` Alternatively, you can use `curl`: + ```bash era -c coordinator-era.json -h $MARBLERUN -output-root marblerun-temp.pem curl --cacert marblerun-temp.pem --data-binary @recovery_key_decrypted https://$MARBLERUN/recover @@ -94,7 +95,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "EbkX/skIPrJISf8PiXdzRIKnwQyJ+VejtGzHGfES5NIPuCeEFedqgCVDk=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted @@ -116,7 +117,7 @@ Assume the following `RecoveryKeys` were set in the manifest: $ marblerun status $MARBLERUN 1: Coordinator is in recovery mode. Either upload a key to unseal the saved state, or set a new manifest. For more information on how to proceed, consult the documentation. $ echo "bvPzio4A4SvzeHajsb+dFDpDarErcU9wMR0V9hyHtG2lC4ZfyrYjDBE7wtis3eOPgDaMG/HCt=" > recovery_data - $ base64 -d recovery_data \ + $ openssl base64 -d -in recovery_data \ | openssl pkeyutl -inkey private_key.pem -decrypt \ -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256 \ -out recovery_key_decrypted