| commit c2166d61ec9450599278cae6254a5fc9399201fe |
| Author: huanghao495430759 <34728144+huanghao495430759@users.noreply.github.com> |
| Date: Thu Apr 8 01:32:55 2021 -0500 |
| |
| Issue#9326. New yaml configuration for authentication of ShardingProxy (#9897) |
| |
| * Add test case for PostgreSQLCommand #8439 |
| |
| * Add test case for UpdateResponseHeader #8440 |
| |
| * Add test case for PostgreSQLCommand #8439 |
| |
| * Add test case for UpdateResponseHeader #8440 |
| |
| * revert commit |
| |
| * issue#9326.New yaml configuration for authentication of ShardingProxy. |
| |
| * issue#9326.New yaml configuration for authentication of ShardingProxy. |
| |
| * issue#9326.New yaml configuration for authentication of ShardingProxy. |
| |
| * issue#9326.delete any unnecessary code. |
| |
| * issue#9326.fix authentication documents error. |
| |
| * issue#9326.fix any documents error and code error. |
| |
| * issue#9326.Renaming YamlUserConfigurationConverter.convertYamlUserConfigurationFormattings to YamlUserConfigurationConverter.convertYamlUserConfigurations. |
| |
| * issue#9326.Resolve RegistryCenter conflict. |
| |
| * issue#9845.fix any javadoc of YamlUserConfigurationConverter. |
| |
| * issue#9845.fix any conflict file error. |
| |
| * issue#9845.fix any conflict file error. |
| |
| * issue#9845.fix any conflict file error. |
| |
| Co-authored-by: huanghao-jk <huanghao-jk@360jinrong.net> |
| |
| diff --git a/docs/document/content/features/governance/management/config-center.cn.md b/docs/document/content/features/governance/management/config-center.cn.md |
| index 819b22d951..adee9ea22b 100644 |
| --- a/docs/document/content/features/governance/management/config-center.cn.md |
| +++ b/docs/document/content/features/governance/management/config-center.cn.md |
| @@ -15,7 +15,7 @@ weight = 1 |
| |
| ``` |
| namespace |
| - ├──authentication # 权限配置 |
| + ├──users # 权限配置 |
| ├──props # 属性配置 |
| ├──schemas # Schema 配置 |
| ├ ├──${schema_1} # Schema 名称1 |
| @@ -28,13 +28,13 @@ namespace |
| ├ ├ ├──table # 表结构配置 |
| ``` |
| |
| -### /authentication |
| +### /users |
| |
| 权限配置，可配置访问 ShardingSphere-Proxy 的用户名和密码。 |
| |
| ```yaml |
| -username: root |
| -password: root |
| +- root@127.0.0.1:root |
| +- sharding@%:sharding |
| ``` |
| |
| ### /props |
| diff --git a/docs/document/content/features/governance/management/config-center.en.md b/docs/document/content/features/governance/management/config-center.en.md |
| index 8f46a719b3..ef92824f90 100644 |
| --- a/docs/document/content/features/governance/management/config-center.en.md |
| +++ b/docs/document/content/features/governance/management/config-center.en.md |
| @@ -11,11 +11,11 @@ weight = 1 |
| |
| ## Structure in Configuration Center |
| |
| -Under defined namespace, configuration center stores data sources, rule configurations, authentication configuration, and properties in YAML. Modifying nodes can dynamically refresh configurations. |
| +Under defined namespace, configuration center stores data sources, rule configurations, user configurations, and properties in YAML. Modifying nodes can dynamically refresh configurations. |
| |
| ``` |
| namespace |
| - ├──authentication # Authentication configuration |
| + ├──users # Users configuration |
| ├──props # Properties configuration |
| ├──schemas # Schema configuration |
| ├ ├──${schema_1} # Schema name 1 |
| @@ -28,13 +28,13 @@ namespace |
| ├ ├ ├──table # Table configuration |
| ``` |
| |
| -### /authentication |
| +### /users |
| |
| -Authentication configuration. Can configure username and password for ShardingSphere-Proxy. |
| +user configurations. Can configure username and password for ShardingSphere-Proxy. |
| |
| ```yaml |
| -username: root |
| -password: root |
| +- root@127.0.0.1:root |
| +- sharding@%:sharding |
| ``` |
| |
| ### /props |
| diff --git a/docs/document/content/user-manual/shardingsphere-proxy/configuration/authentication.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/configuration/authentication.cn.md |
| index 416a22283c..d7117f514e 100644 |
| --- a/docs/document/content/user-manual/shardingsphere-proxy/configuration/authentication.cn.md |
| +++ b/docs/document/content/user-manual/shardingsphere-proxy/configuration/authentication.cn.md |
| @@ -7,11 +7,7 @@ weight = 2 |
| 配置用户名、密码、可访问的数据库后，必须使用正确的用户名、密码才可登录。 |
| |
| ```yaml |
| -authentication: |
| users: |
| - root: # 自定义用户名 |
| - password: root # 自定义密码 |
| - sharding: # 自定义用户名 |
| - password: sharding # 自定义密码 |
| - hostname: '%' # 允许访问Sharding Proxy的主机。 |
| + - root@:root # <username>@<hostname>:<password> |
| + - sharding@%:sharding |
| ``` |
| diff --git a/docs/document/content/user-manual/shardingsphere-proxy/configuration/authentication.en.md b/docs/document/content/user-manual/shardingsphere-proxy/configuration/authentication.en.md |
| index 953ef4712d..2540919149 100644 |
| --- a/docs/document/content/user-manual/shardingsphere-proxy/configuration/authentication.en.md |
| +++ b/docs/document/content/user-manual/shardingsphere-proxy/configuration/authentication.en.md |
| @@ -6,11 +6,7 @@ weight = 2 |
| It is used to verify the authentication to log in ShardingSphere-Proxy, which must use correct user name and password after the configuration of them. |
| |
| ```yaml |
| -authentication: |
| - users: |
| - root: # Self-defined username |
| - password: root # Self-defined password |
| - sharding: # Self-defined username |
| - password: sharding # Self-defined password |
| - hostname: '%' # Which host can be allowed to access the Sharding Proxy. |
| +users: |
| + - root@:root # <username>@<hostname>:<password> |
| + - sharding@%:sharding |
| ``` |
