From 3d7bcbf03b38c320bf94684d004906ee981e3f55 Mon Sep 17 00:00:00 2001 From: D3Hunter Date: Mon, 4 Nov 2024 13:21:11 +0800 Subject: [PATCH 1/6] change --- dm/dm-master-configuration-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm/dm-master-configuration-file.md b/dm/dm-master-configuration-file.md index 14994db133141..bce9141106e20 100644 --- a/dm/dm-master-configuration-file.md +++ b/dm/dm-master-configuration-file.md @@ -59,4 +59,4 @@ This section introduces the configuration parameters of DM-master. | `ssl-cert` | The path of the file that contains X509 certificate in PEM format for DM-master to connect with other components. | | `ssl-key` | The path of the file that contains X509 key in PEM format for DM-master to connect with other components. | | `cert-allowed-cn` | Common Name list. | -| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. | \ No newline at end of file +| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by hashing random data, such as `head -n 256 /dev/urandom|sha256sum`. | \ No newline at end of file From 4e1665650f1506ac31acca5d6dacad2fe1891e43 Mon Sep 17 00:00:00 2001 From: D3Hunter Date: Mon, 4 Nov 2024 13:29:46 +0800 Subject: [PATCH 2/6] Update dm/dm-master-configuration-file.md --- dm/dm-master-configuration-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm/dm-master-configuration-file.md b/dm/dm-master-configuration-file.md index bce9141106e20..0e815610f59b2 100644 --- a/dm/dm-master-configuration-file.md +++ b/dm/dm-master-configuration-file.md @@ -59,4 +59,4 @@ This section introduces the configuration parameters of DM-master. | `ssl-cert` | The path of the file that contains X509 certificate in PEM format for DM-master to connect with other components. | | `ssl-key` | The path of the file that contains X509 key in PEM format for DM-master to connect with other components. | | `cert-allowed-cn` | Common Name list. | -| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by hashing random data, such as `head -n 256 /dev/urandom|sha256sum`. | \ No newline at end of file +| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as `head -n 256 /dev/urandom|sha256sum`. | \ No newline at end of file From 88a6d93464f83d57f8b8b1412fd2d98d789c4665 Mon Sep 17 00:00:00 2001 From: D3Hunter Date: Tue, 5 Nov 2024 08:59:26 +0800 Subject: [PATCH 3/6] Update dm/dm-master-configuration-file.md Co-authored-by: lance6716 --- dm/dm-master-configuration-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm/dm-master-configuration-file.md b/dm/dm-master-configuration-file.md index 0e815610f59b2..45cbdd7890c4f 100644 --- a/dm/dm-master-configuration-file.md +++ b/dm/dm-master-configuration-file.md @@ -59,4 +59,4 @@ This section introduces the configuration parameters of DM-master. | `ssl-cert` | The path of the file that contains X509 certificate in PEM format for DM-master to connect with other components. | | `ssl-key` | The path of the file that contains X509 key in PEM format for DM-master to connect with other components. | | `cert-allowed-cn` | Common Name list. | -| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as `head -n 256 /dev/urandom|sha256sum`. | \ No newline at end of file +| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as `head -n 256 /dev/urandom | sha256sum`. | \ No newline at end of file From d04810759343d550372a41bfa16e23ff48db8452 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Wed, 6 Nov 2024 13:39:26 +0800 Subject: [PATCH 4/6] sync zh changes to en --- dm/dm-customized-secret-key.md | 2 +- dm/dm-master-configuration-file.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dm/dm-customized-secret-key.md b/dm/dm-customized-secret-key.md index af71bb0bdf4bc..1b0dd51f11c97 100644 --- a/dm/dm-customized-secret-key.md +++ b/dm/dm-customized-secret-key.md @@ -9,7 +9,7 @@ Before v8.0.0, [DM](/dm/dm-overview.md) uses a [fixed AES-256 secret key](https: ## Usage -1. Create a custom key file, which must contain a 64-character hexadecimal AES-256 secret key. +1. Create a custom key file, which must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as `head -n 256 /dev/urandom | sha256sum`. 2. In the DM-master [command-line flags](/dm/dm-command-line-flags.md) or [configuration file](/dm/dm-master-configuration-file.md), specify `secret-key-path` as the path of your custom key file. ## Upgrade from a version earlier than v8.0.0 diff --git a/dm/dm-master-configuration-file.md b/dm/dm-master-configuration-file.md index 45cbdd7890c4f..136d56919001b 100644 --- a/dm/dm-master-configuration-file.md +++ b/dm/dm-master-configuration-file.md @@ -59,4 +59,4 @@ This section introduces the configuration parameters of DM-master. | `ssl-cert` | The path of the file that contains X509 certificate in PEM format for DM-master to connect with other components. | | `ssl-key` | The path of the file that contains X509 key in PEM format for DM-master to connect with other components. | | `cert-allowed-cn` | Common Name list. | -| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as `head -n 256 /dev/urandom | sha256sum`. | \ No newline at end of file +| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as head -n 256 /dev/urandom \| sha256sum. For more information, see [Customize a secret key for DM encryption and decryption](dm-customized-secret-key.md).| \ No newline at end of file From 122dc4117c892fbef6332e82575470b252215fc3 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Wed, 6 Nov 2024 13:40:27 +0800 Subject: [PATCH 5/6] Update dm-master-configuration-file.md --- dm/dm-master-configuration-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm/dm-master-configuration-file.md b/dm/dm-master-configuration-file.md index 136d56919001b..25e6dd503359f 100644 --- a/dm/dm-master-configuration-file.md +++ b/dm/dm-master-configuration-file.md @@ -59,4 +59,4 @@ This section introduces the configuration parameters of DM-master. | `ssl-cert` | The path of the file that contains X509 certificate in PEM format for DM-master to connect with other components. | | `ssl-key` | The path of the file that contains X509 key in PEM format for DM-master to connect with other components. | | `cert-allowed-cn` | Common Name list. | -| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as head -n 256 /dev/urandom \| sha256sum. For more information, see [Customize a secret key for DM encryption and decryption](dm-customized-secret-key.md).| \ No newline at end of file +| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as head -n 256 /dev/urandom \| sha256sum. For more information, see [Customize a secret key for DM encryption and decryption](dm-customized-secret-key.md). | \ No newline at end of file From 8ba885ee328a3fdaf94fd724ee3ea7ed51346fef Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Wed, 6 Nov 2024 13:45:25 +0800 Subject: [PATCH 6/6] fix a broken link --- dm/dm-master-configuration-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm/dm-master-configuration-file.md b/dm/dm-master-configuration-file.md index 25e6dd503359f..d275ffab278f0 100644 --- a/dm/dm-master-configuration-file.md +++ b/dm/dm-master-configuration-file.md @@ -59,4 +59,4 @@ This section introduces the configuration parameters of DM-master. | `ssl-cert` | The path of the file that contains X509 certificate in PEM format for DM-master to connect with other components. | | `ssl-key` | The path of the file that contains X509 key in PEM format for DM-master to connect with other components. | | `cert-allowed-cn` | Common Name list. | -| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as head -n 256 /dev/urandom \| sha256sum. For more information, see [Customize a secret key for DM encryption and decryption](dm-customized-secret-key.md). | \ No newline at end of file +| `secret-key-path` | The file path of the secret key, which is used to encrypt and decrypt upstream and downstream passwords. The file must contain a 64-character hexadecimal AES-256 secret key. One way to generate this key is by calculating SHA256 checksum of random data, such as head -n 256 /dev/urandom \| sha256sum. For more information, see [Customize a secret key for DM encryption and decryption](/dm/dm-customized-secret-key.md). | \ No newline at end of file