zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,063 Commits 2 Branches 3 Tags 58 MiB
646ea61cab
Commit Graph

4063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
onewe
97deaae995
remove unused import 2022-03-19 13:36:14 +08:00
onewe
c69339fd0d
Merge branch 'develop' into optimize/config-2 2022-03-19 13:31:28 +08:00
李晓双 Li Xiao Shuang
56e7f06e28
Merge pull request #7947 from Chaos-coder/fix_getListeners_500_error 
fix ConfigSubService memberManager null
 2022-03-17 17:20:55 +08:00
chaos
37a1083e58 fix ConfigSubService memberManager null 2022-03-16 18:31:48 +08:00
李晓双 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
胡俊
2093119224
update notice (#7939) 2022-03-15 13:34:41 +08:00
onewe
cd6d7e33b9
[ISSUE #7359] Add xss filter (#7364) 
- Set response header 'Content-Security-Policy'
 2022-03-14 10:34:16 +08:00
ruansheng
13032a253c
fix field NotSerializableException (#7922) 2022-03-14 09:52:54 +08:00
胡俊
2e07c6a0c1
Package scan (#7917) 
* PayloadRegistry update use spi

* PayloadRegistry update use spi

* PayloadRegistry update use spi

* PayloadRegistry update use spi

* add test

* update comment

* remove code
rename code
 2022-03-11 15:50:44 +08:00
zrlw
94f894fb80
[develop] add request type field at the head of task data, exchange parse order between Log and GetRequest (#7871) 
* add request type field and exchange Log and GetRequest parse order

* add unit test
 2022-03-10 09:54:22 +08:00
zrlw
bc40318c66
[develop] set default connection lease request timeout and merge default config (#7906) 
* set default connection lease request timeout and merge default config

* remove useless code

* correct comments of mergeDefaultConfig
 2022-03-09 16:03:27 +08:00
chenhao26
4ceafbeb59
add junit for InstanceUtilTest and ServiceUtilTest (#7909) 2022-03-08 20:16:44 +08:00
胡俊
fdf90133a2
[ISSUE#7886]Feature package scan (#7895) 
* for #7886

* nacos style

* nacos style

* code style

* .

* scan nacos style

* class reader

* class reader

* class reader

* class reader

* add comment

* update dependency

* update dependency

* rat update
check style update

* package change

* pdm exclude

* pdm update

* comment

* comment

* change pkg  final

* code structure update

* code style

* code style update
 2022-03-08 20:11:21 +08:00
李晓双 Li Xiao Shuang
5119228bc8
Merge pull request #7905 from realJackSun/fix_7904 
[#7904] Bad smell code in ClientWorker.java
 2022-03-08 11:16:49 +08:00
realJackSun
a4ce82221f [#7904] Bad smell code in ClientWorker.java 2022-03-08 10:43:50 +08:00
onewe
eaa0efd976
[ISSUE#7902] Optimize some codes for ServerLoaderController (#7903) 
- some type arguments are replaced with <>
- field injection is replaced with constructor injection
- set hash map default initialCapacity
- sdkConCount string variable change to constants

Close #7902
 2022-03-07 19:58:32 +08:00
onewe
8098de7baf
[Optimize] use template patten to refactor AbstractMemberLookup#destroy method (#7880) 
- add doDestroy method
- refactor destroy method for other subclass of AbstractMemberLookup
 2022-03-04 17:59:51 +08:00
chenhao26
9543b6b613
add junit test for RpcConfigChangeNotifier (#7884) 2022-03-04 16:22:19 +08:00
胡俊
e3d239e9b9
Payload registry test (#7885) 
* add ConfigPublishGroupKeyParserTest

* PayloadRegistryTest
 2022-03-04 16:21:52 +08:00
杨翊 SionYang
47506c57ab
[ISSUE#5696] Secured annotation add tags field. (#7878) 
* Add tags in Secured and inject tags into resource properties.

* For checkstyle.
 2022-03-03 15:20:27 +08:00
胡俊
3dddb75fed
optimization append (#7798) 2022-03-03 15:03:33 +08:00
胡俊
f8e83e4a12
[ISSUE#5092]Config change batch listen request handler test (#7800) 
* add ConfigChangeBatchListenRequestHandlerTest

* style

* style
 2022-03-03 13:59:50 +08:00
MajorHe1
47f0c36235
[ISSUE #5092] add unit test for ExternalDataSourceServiceImpl (#7834) 
* [ISSUE #5092] add unit test for ExternalDataSourceServiceImpl

* [ISSUE #5092] delete line about ExternalDataSourceServiceImplTest to make ci re-run
 2022-03-03 13:59:19 +08:00
MajorHe1
29bb690abc
[ISSUE #5092] add test for LocalDataSourceServiceImpl (#7835) 
* [ISSUE #5092] add test for LocalDataSourceServiceImpl

* [ISSUE #5092] delete line about LocalDataSourceServiceImpl to test cla check
 2022-03-03 13:59:04 +08:00
胡俊
f8cc85d6a8
add ConfigChangeListenContextTest (#7847) 2022-03-03 13:58:29 +08:00
胡俊
1ecdee3a26
add InternalConfigChangeNotifierTest (#7852) 2022-03-03 13:58:09 +08:00
胡俊
5d03898049
add DistroClientComponentRegistryTest (#7855) 2022-03-03 13:51:41 +08:00
李晓双 Li Xiao Shuang
21c48dd0cf
Merge pull request #7848 from hujun-w-2/add_ConfigQueryGroupParserTest 
[ISSUE#5092]ConfigQueryGroupParserTest
 2022-03-02 15:04:33 +08:00
李晓双 Li Xiao Shuang
81d1dc7d6e
Merge pull request #7849 from hujun-w-2/ConfigPublishGroupParserTest 
[ISSUE#5092]ConfigPublishGroupParserTest
 2022-03-02 15:01:20 +08:00
李晓双 Li Xiao Shuang
c34fc09b2a
Merge pull request #7851 from hujun-w-2/ConfigRemoveRequestHandlerTest 
[ISSUE#5092]add ConfigRemoveRequestHandlerTest
 2022-03-01 10:05:06 +08:00
李晓双 Li Xiao Shuang
bcd9603b06
Merge pull request #7850 from hujun-w-2/ConfigQueryGroupKeyParserTest 
[ISSUE#5092]add ConfigQueryGroupKeyParserTest
 2022-03-01 10:04:04 +08:00
hujun3
3e1f00362c add ConfigRemoveRequestHandlerTest 2022-02-26 14:28:46 +08:00
hujun3
b553dac47e add ConfigRemoveRequestHandlerTest 2022-02-26 14:25:19 +08:00
hujun3
d4c499aec5 add ConfigQueryGroupKeyParserTest 2022-02-26 13:35:35 +08:00
hujun3
9c805fd4f3 ConfigPublishGroupParserTest 2022-02-26 13:30:04 +08:00
hujun3
92964a66db ConfigQueryGroupParserTest 2022-02-26 13:21:50 +08:00
chenhao26
1caba326e9
删除PayloadRegistry register方法中无效的逻辑判断 (#7839) 2022-02-25 14:11:00 +08:00
李晓双 Li Xiao Shuang
ddd911f5fd
Merge pull request #7838 from Chaos-coder/clean_redundant_code_StorageFactory 
删除StorageFactory类冗余代码
 2022-02-25 11:11:38 +08:00
chaos
d83019cf59 删除冗余代码 2022-02-25 10:46:03 +08:00
MajorHe1
c5c72ab874
[ISSUE #5092] add unit test for TenantCapacityPersistService (#7826) 2022-02-24 14:22:11 +08:00
李晓双 Li Xiao Shuang
5f77ba60f3
Merge pull request #7827 from MajorHe1/add_test_for_DynamicDataSource 
[ISSUE #5092] add unit test for DynamicDataSourceTest
 2022-02-23 22:32:52 +08:00
MajorHe1
4a3dec75f4 [ISSUE #5092] add unit test for DynamicDataSourceTest 2022-02-23 20:58:12 +08:00
胡俊
bcf2951ac1
fix his_config query (#7763) 2022-02-23 16:48:56 +08:00
MajorHe1
46cb3c8d6e
[ISSUE #5092] add unit test for GroupCapacityPersistService (#7819) 2022-02-23 09:45:43 +08:00
胡俊
b695036c88
add ConfigPublishGroupKeyParserTest (#7820) 2022-02-23 09:44:54 +08:00
李晓双 Li Xiao Shuang
494f606f3e
Merge pull request #7817 from hujun-w-2/ConfigChangeClusterSyncRequestHandlerTest 
[ISSUE #5092]Config change cluster sync request handler test
 2022-02-22 20:58:50 +08:00
hujun3
1805793261 add ConfigChangeClusterSyncRequestHandlerTest 2022-02-22 20:22:49 +08:00
hujun3
f8e2e87b58 add ConfigChangeClusterSyncRequestHandlerTest 2022-02-22 20:21:37 +08:00
MajorHe1
ade162c4be
[ISSUE #7593] judge whether file exists in disk (#7677) 2022-02-21 18:33:16 +08:00
Martin Grigorov
e24a80d61c
Build and test on Linux ARM64 at TravisCI (#7777) 
Update Grpc to 1.26.0. This is the first version with aarch_64 support
in protoc-gen-grpc-java
(https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.26.0/)

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
 2022-02-21 17:10:00 +08:00