李晓双 Li Xiao Shuang
88fb26cfc6
[ISSUE #5695 ] Add config encrypt spi for nacos server. ( #7934 )
...
* [ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0 (#6655 )
* Defines the interface
* 增加aes实现
* 客户端、服务端加解密实现
* 客户端、服务端加解密实现
* fix code quality (#6727 )
* [ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0, EncryptedDataKey is persisted (#6740 )
* Defines the interface
* 增加aes实现
* 客户端、服务端加解密实现
* 客户端、服务端加解密实现
* 秘钥持久化
* 秘钥持久化
* [ISSUE#5695] Summer2021 Cache encryptedDataKey (#6878 )
* Defines the interface
* 增加aes实现
* 客户端、服务端加解密实现
* 客户端、服务端加解密实现
* 秘钥持久化
* 秘钥持久化
* 秘钥缓存到内存中
* 解决冲突
* 修改filter继承AbstractConfigFilter (#6879 )
* [ISSUE#5695] Summer2021 EncryptedDataKey is persisted to Derby (#6882 )
* [ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0 (#6655 )
* Defines the interface
* 增加aes实现
* 客户端、服务端加解密实现
* 客户端、服务端加解密实现
* fix code quality (#6727 )
* # This is a combination of 6 commits.tree cf7a399f99c4d81b8667c8de06f5ceb8c79fb6f0
parent 8024ecf31bf23a9edab416be8a3bfd1c0e48ce5e
author 李晓双 Li Xiao Shuang <644968328@qq.com> 1630028256 +0800
committer lixiaoshuang <644968328@qq.com> 1631804378 +0800
# This is a combination of 3 commits.
# This is the 1st commit message:
[ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0, EncryptedDataKey is persisted (#6740 )
* Defines the interface
* 增加aes实现
* 客户端、服务端加解密实现
* 客户端、服务端加解密实现
* 秘钥持久化
* 秘钥持久化
# This is the commit message #2 :
[ISSUE#5695] Summer2021 Cache encryptedDataKey (#6878 )
* Defines the interface
* 增加aes实现
* 客户端、服务端加解密实现
* 客户端、服务端加解密实现
* 秘钥持久化
* 秘钥持久化
* 秘钥缓存到内存中
* 解决冲突
# This is the commit message #3 :
修改filter继承AbstractConfigFilter (#6879 )
# This is the commit message #6 :
客户端、服务端加解密实现
* parent 8024ecf31bf23a9edab416be8a3bfd1c0e48ce5e
author 李晓双 Li Xiao Shuang <644968328@qq.com> 1630028256 +0800
committer lixiaoshuang <644968328@qq.com> 1631805204 +0800
parent 8024ecf31bf23a9edab416be8a3bfd1c0e48ce5e
author 李晓双 Li Xiao Shuang <644968328@qq.com> 1630028256 +0800
committer lixiaoshuang <644968328@qq.com> 1631804378 +0800
[ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0, EncryptedDataKey is persisted (#6740 )
* 配置加解密插件
* derby支持秘钥存储
* 克隆功能兼容配置加解密 (#6913 )
* [ISSUE#5695] Summer2021 Import/export compatible with configuration encryption and decryption (#6956 )
* 克隆功能兼容配置加解密
* 导入导出兼容配置加解密
* 秘钥base64编码、更换AES加密模式 (#6974 )
* [ISSUE#5695] Summer2021 add unit test for ConfigCryptoFilter (#6991 )
* add unit test for ConfigCryptoFilter
* add unit test for ConfigCryptoFilter
* [ISSUE#5695] Summer2021 add unit test for CryptoExecutor (#6990 )
* add unit test for CryptoExecutor
* add Copyright
* [ISSUE#5695] Summer2021 add unit test for CryptoManager (#6989 )
* add unit test for CryptoManager
* add unit test for CryptoManager
* [ISSUE#5695] Summer2021 add unit test for AesCrypto (#6988 )
* add unit test for AesCrypto
* update AesCryptoTest
* Increased iv randomness
* add default Iv
* fix javadoc
* fix unit test
* defining plugin intergace
* Replace the client encryption and decryption actuator
* Replace the server encryption and decryption actuator
* add unit test
* add unit test
* remove old code
* fix NacosConfigServiceTest
* Encryption and decryption to achieve migration
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
2022-03-16 10:54:11 +08:00
KomachiSion
9020bb9d6e
Move plugin config to nacos-auth-plugin-impl module.
2022-01-26 11:54:52 +08:00
KomachiSion
135ab364fe
Move client spi to nacos-auth-plugin module
2022-01-21 15:40:02 +08:00
KomachiSion
78de31dbdd
Merge remote-tracking branch 'upstream/develop' into issue#5696-merge-develop
...
# Conflicts:
# auth/src/main/java/com/alibaba/nacos/auth/common/AuthConfigs.java
# client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java
# client/src/main/java/com/alibaba/nacos/client/naming/remote/AbstractNamingClientProxy.java
# client/src/main/java/com/alibaba/nacos/client/naming/remote/NamingClientProxyDelegate.java
# client/src/test/java/com/alibaba/nacos/client/naming/remote/AbstractNamingClientProxyTest.java
2022-01-12 16:52:14 +08:00
杨翊 SionYang
b7910a6219
[ISSUE#5696] revert nacos server plugin implementation moved operation ( #7636 )
...
* Revert "[ISSUE#5696] Fix auth server type (#7004 )"
This reverts commit e3b7f0e7#6996 )"
This reverts commit fea9d727#6968 )"
This reverts commit 3c0508d2#5696 ] Add auth server implement (#6901 )"
This reverts commit 76ac8434
2022-01-12 16:45:18 +08:00
Roger3581321
0aeab6229f
Updated the copyright time ( #7119 )
2021-10-28 10:12:05 +08:00
Wuyunfan-BUPT
e3b7f0e79f
[ISSUE#5696] Fix auth server type ( #7004 )
...
* Add MySQL DataBase
* Add Derby Database
* Replace Auth Server
* Revise: change to AuthSystemType
2021-09-28 19:30:20 +08:00
Wuyunfan-BUPT
af8d04f59b
Revise Auth server plugin ( #6890 )
2021-09-16 14:11:28 +08:00
brotherlu-xcq
d2267d7bf3
[ISSUE #6609 ] fix the startup.sh problem. ( #6739 )
...
* [ISSUE #6737 ] fix the shell issue.
* [ISSUE #6737 ] fix the shell issue.
2021-08-27 09:33:47 +08:00
brotherlu-xcq
4aadcf8333
[ISSUE #6609 ] fix the shell issue using jdk more than 8. ( #6725 )
2021-08-24 09:43:29 +08:00
brotherlu-xcq
ba6e161353
[ISSUE #6301 ] [TASK 2] change the UI and startup shell to support custom selector config. ( #6691 )
2021-08-20 09:32:31 +08:00
Wuyunfan-BUPT
ac878582e4
[ISSUE#5696] Add auth plugin interface. ( #6593 )
...
* define plugin
* add User model
* add authContext
* add SPI
* add resource, modify request, reformat code
* copyright, Serverloader, IdentityContext
* add unit test
* modify ClassLoader, and delete GrantType
* delete redundancy code
* remove authservice default name
* Change to StringUtils
2021-08-13 13:43:58 +08:00
杨翊 SionYang
a5cc7178fc
[ISSUE#6403] the expired time of naming client can be configured. ( #6422 )
...
* add AbstractDynamicConfig
* Add ClientConfig
* use ClientConfig to remove expired client.
* For checkstyle
* Update application.properties
2021-07-23 14:03:46 +08:00
Zark Zheng
ece17fb223
Fix the Algorithm HmacSHA256 not available error when login( #6382 ) ( #6409 )
2021-07-23 10:41:38 +08:00
ixx
c0958269b0
Fix the problem of startup error when the JAVA_HOME path contains spaces under Linux/Unix/Mac system ( #6335 )
2021-07-14 09:55:23 +08:00
杨翊 SionYang
834c173959
Fix the error merge for application.properties ( #5833 )
2021-05-24 20:39:01 +08:00
杨翊 SionYang
71a0037f50
Refactor Distro Config as singleton and replace GlobalConfig ( #5486 )
...
* Refactor Distro Config as singleton and replace GlobalConfig
* Use configed timeout for distro sync and verify
* Fix IT error.
2021-04-25 16:50:10 +08:00
TouchZZZ
4b4d21d54f
support ldap login ( #5225 )
2021-04-12 10:09:16 +08:00
杨翊 SionYang
a50d9678ae
Push support config some parameters ( #5307 )
2021-04-08 17:25:31 +08:00
nov.lzf
91bf227c4a
tps control submit; connection rule ( #4752 )
...
* tps reporter submit
* tps reporter submit
* log optimize; listen concurrent bugfix; async request exception fix
* server loader bugfix;increase keep alive default time
* tps report bugfix, tps log bugfix;
* rpc server push ack notify bugfix.
* change rule store dir ;add local file change event of connection rule.
* remove client side request meta; reduce client parameters
* 简化冗余代码
* 优化异常日志
* md5 sync bugfix
* client metrics submit; tps monitor ip list support
* client metrics submit; tps monitor ip list support
2021-01-20 09:21:40 +08:00
KomachiSion
fd06b5a7b6
Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
...
# Conflicts:
# address/pom.xml
# api/pom.xml
# auth/pom.xml
# client/pom.xml
# cmdb/pom.xml
# common/pom.xml
# config/pom.xml
# consistency/pom.xml
# console/pom.xml
# core/pom.xml
# distribution/pom.xml
# example/pom.xml
# istio/pom.xml
# naming/pom.xml
# pom.xml
# sys/pom.xml
# test/pom.xml
2021-01-18 10:32:57 +08:00
杨翊 SionYang
1bd67269cd
Use revision to set version and upgrade to 1.4.2-SNAPSHOT ( #4711 )
...
* Use revision set version
* Use revision set version
* Add flatten plugin
2021-01-15 14:37:47 +08:00
杨翊 SionYang
67eb36976e
Upgrade to 1.4.1 ( #4695 )
2021-01-14 11:36:57 +08:00
KomachiSion
902f501fac
Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
...
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
# client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
# config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
# naming/src/main/java/com/alibaba/nacos/naming/push/ClientInfo.java
# naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
2021-01-13 15:53:50 +08:00
杨翊 SionYang
998947315e
Add server identity to replace user-agent white list. ( #4683 )
2021-01-13 14:12:56 +08:00
nov.lzf
6027d36222
client use same executor during different connection;metrics count bugfix.;recommend server check ( #4659 )
...
* client use same executor during different connection.
* metrics count bugfix.
* recommend server check
* remove rsocket ;add client metrics
* add client metrics to get cache value
* rpc tps control basic api submit.
* check style ,pmd fix.
2021-01-11 14:11:32 +08:00
KomachiSion
bdacd0958d
Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-develop
...
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
# core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
2020-12-31 11:48:52 +08:00
paderlol
903ff0f546
Fix the configuration file loading issue #4556 #4541 ( #4590 )
2020-12-29 09:52:07 +08:00
杨翊 SionYang
93a3ac7816
Upgrade to 2.0.0-ALPHA.1 ( #4410 )
...
* Add some new server config parameters
* Upgrade to 2.0.0-ALPHA.1
2020-12-04 18:46:24 +08:00
KomachiSion
d6fcac85c5
Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
...
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java
# config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
# config/src/main/java/com/alibaba/nacos/config/server/result/ResultBuilder.java
# core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
# naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java
# naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckCommon.java
# naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java
# sys/src/main/java/com/alibaba/nacos/sys/utils/ApplicationUtils.java
# test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
2020-12-03 18:41:41 +08:00
赵延
7f2a3307d6
[ISSUE-#4256] Just inject environment in StartingSpringApplicationRunListener ( #4257 )
...
* just inject environment in StartingSpringApplicationRunListener
* make nacosStartingListener is decoupling with springApplicationRunListener.
* add api doc
* refactor. transfer nacos listeners to SpringApplicationRunListener.
* remove unuseful import
* add doc info
2020-11-24 11:17:13 +08:00
KomachiSion
e56eb3680c
Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
...
# Conflicts:
# api/pom.xml
# client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
# client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
# client/src/test/java/com/alibaba/nacos/client/naming/core/HostReactorTest.java
# common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java
# core/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
# naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
# pom.xml
2020-11-20 17:13:49 +08:00
nov.lzf
70d976db18
更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志 ( #4217 )
...
* listen context bugfix.
* 更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志
2020-11-12 18:03:07 +08:00
邪影oO
027538ce2e
解决前端目录调整后前端访问不了问题 ( #4206 )
2020-11-12 09:18:45 +08:00
杨翊 SionYang
164ed33ada
Feature support grpc core ( #4204 )
...
* NacosNamingMetadataManager --> NamingMetadataManager
* Try to add ServiceMetadata consistency
* add catalog api support new data
* Change version to 2.0.0-SNAPSHOT
2020-11-11 19:50:14 +08:00
杨翊 SionYang
757fc1efeb
Revert "解决前端目录调整后前端访问不了问题 ( #4195 )" ( #4196 )
...
This reverts commit a0bbd562b0
2020-11-11 13:59:50 +08:00
邪影oO
a0bbd562b0
解决前端目录调整后前端访问不了问题 ( #4195 )
2020-11-11 10:44:43 +08:00
赵延
f808ffdb65
[ISSUE-#4179] Add index for db.user and db.password ( #4186 )
...
* add index for db.user and db.password, to avoid some situation that it contains symbol ','
* add multi data source template
* add line to separate
* Revert "add line to separate"
This reverts commit 390eb6fb
* Revert "add multi data source template"
This reverts commit 4470e633
2020-11-10 17:53:37 +08:00
杨翊 SionYang
6b7fb05601
For #3607 , #4078 , #4170 , Datasource pool configuration can be configured. ( #4178 )
...
* For #3607 , #4078 , #4170 , Datasource pool configuration.
* Fix ci error.
2020-11-09 20:18:27 +08:00
邪影oO
538509502f
IPv6 support ( #3773 )
...
* IPv6 support
* AddressServerParamCheckUtil 合并到 IpUtil 及一些修改
* 解决魔法值
* 修改隐患
* 调整使用了类似 ip.indexOf(":") 查找是否有端口的地方的逻辑, 一些 ":" 替换为常量
* 删除无用测试
* IpUtil 改名 为 IPUtil, 涉及IP的相关方法名修改,涉及到的调用修改,检测IP的地方调用的isIPv4改为isIP. 修改涉及IP的字段长度及相关升级更新的sql
* no message
* no message
* no message
* no message
* 获取本机IP时,如果本机IP是IPv6并且包含网卡信息(V6地址中最后面的百分号和百分号后面的内容)则去除网卡信息
* 解决 AvoidComplexConditionRule(请不要在条件中使用复杂的表达式)
* 移除无用代码
* 添加注释
* 调整code style, 调整获取本机IP的逻辑
2020-11-05 20:15:06 +08:00
KomachiSion
8829d3c6ed
Upgrade to 2.0.0-ALPHA
2020-11-05 19:38:15 +08:00
KomachiSion
9cbc0bfeea
Merge branch 'upsteam-develop' into feature_support_grpc_core
...
# Conflicts:
# api/src/main/java/com/alibaba/nacos/api/common/Constants.java
# client/src/main/java/com/alibaba/nacos/client/naming/remote/http/HttpClient.java
# common/src/main/java/com/alibaba/nacos/common/utils/VersionUtils.java
# core/src/main/java/com/alibaba/nacos/core/distributed/distro/DistroProtocol.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
2020-11-05 19:33:46 +08:00
杨翊 SionYang
ccea6ee112
Upgrade to 1.4.1-SNAPSHOT ( #4135 )
2020-11-05 09:43:33 +08:00
KomachiSion
adbcb7549d
Upgrade to 1.4.0
2020-11-02 19:09:19 +08:00
wangpin
acc865d441
Modify the startup script custom configuration first default configuration ( #4021 )
2020-10-20 20:11:50 +08:00
KomachiSion
6e5b09aee7
Merge branch 'upsteam-develop' into feature_support_grpc_core
...
# Conflicts:
# common/src/main/java/com/alibaba/nacos/common/notify/DefaultSharePublisher.java
# test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
2020-09-18 16:16:00 +08:00
liaochuntao
7fd4d9a5d1
feature issue #3804 ( #3805 )
...
* improvement: merge upstream/develop
* feat: merge upstream develop
* feat: manage the loading of configuration files uniformly
* fix: fix copyright style
* style: fix code style
* fix: fix code style
2020-09-18 16:05:36 +08:00
KomachiSion
ee406d5e5e
Merge branch 'upsteam-develop' into feature_support_grpc_core
...
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java
# client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
# client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
# client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
# client/src/test/java/com/alibaba/nacos/client/ConfigTest.java
# config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
# core/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
2020-09-04 17:03:26 +08:00
杨翊 SionYang
0b73cfc769
Upgrade version to 1.4.0-SNAPSHOT ( #3549 )
2020-08-12 09:32:06 +08:00
nov.lzf
a0a1486fa2
rsocket support and optimize client abstract ( #3559 )
...
* Add gprc support-> rpc Rsocket submit
* Add gprc support-> rpc Rsocket submit
* Add gprc support-> rpc Rsocket submit
* Add gprc support-> upgrade api client common jdk compiler to 1.8 for test Rsocket only
* Add gprc support-> rsocket client test code submit
* Add gprc support-> rpc client factory optimize
* Add gprc support-> config client factory rename
* Add gprc support-> rsocket submit
* Add gprc support-> rsocket client switch submit
* Add gprc support-> rsocket support and optimize rpc client
2020-08-10 09:11:53 +08:00
