You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2022/06/14 06:14:06 UTC
[dubbo] branch master updated: Fix can't authenticate by username and password when use Nacos (#9941)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 9efe21af84 Fix can't authenticate by username and password when use Nacos (#9941)
9efe21af84 is described below
commit 9efe21af84e586c7c27a024a74bfb4036c1f558f
Author: Wu Xuecheng <xx...@gmail.com>
AuthorDate: Tue Jun 14 14:14:00 2022 +0800
Fix can't authenticate by username and password when use Nacos (#9941)
#9910
---
.../configcenter/support/nacos/NacosDynamicConfiguration.java | 8 ++++++++
.../dubbo/registry/nacos/util/NacosNamingServiceUtils.java | 9 ++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
index 5356b9da8b..e8e50d8b74 100644
--- a/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java
@@ -52,7 +52,9 @@ import java.util.concurrent.Executor;
import java.util.stream.Stream;
import static com.alibaba.nacos.api.PropertyKeyConst.ENCODE;
+import static com.alibaba.nacos.api.PropertyKeyConst.PASSWORD;
import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
+import static com.alibaba.nacos.api.PropertyKeyConst.USERNAME;
import static java.util.Collections.emptyMap;
import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
import static org.apache.dubbo.common.utils.StringConstantFieldValuePredicate.of;
@@ -143,6 +145,12 @@ public class NacosDynamicConfiguration implements DynamicConfiguration {
private static void setProperties(URL url, Properties properties) {
// Get the parameters from constants
Map<String, String> parameters = url.getParameters(of(PropertyKeyConst.class));
+ if (StringUtils.isNotEmpty(url.getUsername())){
+ properties.put(USERNAME, url.getUsername());
+ }
+ if (StringUtils.isNotEmpty(url.getPassword())){
+ properties.put(PASSWORD, url.getPassword());
+ }
// Put all parameters
properties.putAll(parameters);
}
diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
index 6e8d47238b..c9f90fdf7e 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
@@ -37,7 +37,9 @@ import java.util.Map;
import java.util.Properties;
import static com.alibaba.nacos.api.PropertyKeyConst.NAMING_LOAD_CACHE_AT_START;
+import static com.alibaba.nacos.api.PropertyKeyConst.PASSWORD;
import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
+import static com.alibaba.nacos.api.PropertyKeyConst.USERNAME;
import static com.alibaba.nacos.api.common.Constants.DEFAULT_GROUP;
import static com.alibaba.nacos.client.naming.utils.UtilAndComs.NACOS_NAMING_LOG_NAME;
import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
@@ -150,7 +152,12 @@ public class NacosNamingServiceUtils {
Map<String, String> parameters = url.getParameters(of(PropertyKeyConst.class));
// Put all parameters
properties.putAll(parameters);
-
+ if (StringUtils.isNotEmpty(url.getUsername())){
+ properties.put(USERNAME, url.getUsername());
+ }
+ if (StringUtils.isNotEmpty(url.getPassword())){
+ properties.put(PASSWORD, url.getPassword());
+ }
putPropertyIfAbsent(url, properties, NAMING_LOAD_CACHE_AT_START, "true");
}