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

4001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
onewe
8292d9e16c
[ISSUE #7999] Fix config that can't read environment args (#8055) 
- add unit test
- resetConfig method move to subclass's constructor
 2022-04-07 10:20:13 +08:00
胡俊
953d82759f
秘钥加密 (#8084) 2022-04-06 14:29:19 +08:00
chenhao26
5efb233909
add junit test from InstanceControllerV2Test (#8056) 2022-04-06 10:51:24 +08:00
lmw0509
d3264546ad
Replace redundant code with lambda expression (#8074) 2022-04-06 10:47:28 +08:00
李晓双 Li Xiao Shuang
d074a98237
fix newline (#8064) 2022-04-01 12:03:38 +08:00
杨翊 SionYang
71eaa323f1
upgrade to 2.1.0-BETA. (#8057) 2022-04-01 11:50:29 +08:00
chenhao26
b2e81d8e37
delete redundant toString() method (#8049) 2022-03-31 16:27:05 +08:00
李晓双 Li Xiao Shuang
70df11540d
Merge pull request #8040 from lmw0509/fix_8035 
[#8035] Add serialVersionUID for serializable interface
 2022-03-31 10:17:26 +08:00
李晓双 Li Xiao Shuang
5a781dee4b
Merge pull request #7742 from onewe/optimize/config-2 
[Optimize] Optimize some code of config controller
 2022-03-31 08:26:53 +08:00
lmw
c51b405565 [#8035] Missing serialVersionUID when class implements Serializable interface 2022-03-30 20:34:28 +08:00
lmw
47a9064eec [#8035] Missing serialVersionUID when class implements Serializable interface 2022-03-30 20:30:13 +08:00
胡俊
f59ca65f98
Merge pull request #8022 from Chaos-coder/improve_code_readability_of_TimerContext 
Improve the code readability of TimerContext replace if with switch case
 2022-03-30 09:25:10 +08:00
chaos
13719df7a0 Improve the code readability of TimerContext replace if with switch case 2022-03-29 09:36:05 +08:00
胡俊
0161797e01
Merge pull request #8014 from KomachiSion/develop-issue#8009 
[ISSUE#8009] Fix NPE of unit test.
 2022-03-28 14:17:31 +08:00
杨翊 SionYang
26ef77378c
For #7930. Default close support upgrade from 1.X feature. (#8016) 
* For #7930. Default close support upgrade from 1.X feature(double write and old raft).

* Fix use still use old raft when close upgrade feature.

* UpgradeJudgement subscribe member change event only open upgrade feature.
 2022-03-28 14:15:18 +08:00
KomachiSion
d91ac9e2ea Fix #8009. 2022-03-28 10:34:24 +08:00
MajorHe1
5665cfe072
[ISSUE #7966] modify returned msg in Auth/Distro/Curcuit-Filter when internal server error (#7967) 
* [ISSUE #7966] modify returned msg in Auth/Distro/Curcuit-Filter when internal server error

* [ISSUE #7966] add log output instead of return stacktrace
 2022-03-28 10:22:55 +08:00
spark.ye
71440a99d4
[ISSUE #7971] fix ClusterVersionJudgement#ClusterVersionJudge Task never stop (#7972) 
* fix bug(#7971) ClusterVersionJudgement ClusterVersionJudge Task never stop

* fix bug(#7971) change code style
 2022-03-28 10:21:50 +08:00
Oliver
5a8c088a2f
remove unused variety and define constant (#8010) 
* remove unused variety and define constant

* fix spelling error
 2022-03-28 10:18:56 +08:00
Oliver
83aafb7e65
fix comment grammar (#8011) 
* optimize method comment grammar

* format method comment

* fix spelling error
 2022-03-28 10:18:13 +08:00
胡俊
b4758788b2
Merge pull request #8005 from Oliverwqcwrw/develop-update-UT 
[ISSUE #8004]update unit test to fix expected value and actual value is inverse
 2022-03-26 22:59:37 +08:00
wangqiang32
a47f936730 checkstyle 2022-03-26 22:14:44 +08:00
wangqiang32
f9f0f58019 update unit test 2022-03-26 22:10:43 +08:00
胡俊
1cf115f975
Merge pull request #8000 from Oliverwqcwrw/develop-remove-unusedImport 
remove unused import
 2022-03-26 18:35:12 +08:00
wangqiang32
e8cde09036 remove unused import 2022-03-25 21:56:49 +08:00
李晓双 Li Xiao Shuang
341227fbd5
Merge pull request #7995 from hujun-w-2/feature_encty_324 
SPI adds secret key encryption and decryption support
 2022-03-25 19:36:47 +08:00
chenhao26
b4cc3fcddb
Optimize HTTP constants (#7998) 
* Optimize HTTP constants

* check nacos style

* check nacos style2

* check nacos style3

* deleet Unused constants in UtilAndComs
 2022-03-25 16:05:42 +08:00
Oliver
8c330eaa4c
optimization method definition (#7986) 2022-03-25 16:05:13 +08:00
赵延
cc549cbac7
follower state machine ignore read operation. (#7989) 2022-03-25 15:07:42 +08:00
Pixy Yuan
2d0a8add41
Support cluster grpc client to set pool size (#7993) 
* [ISSUE #7992] Support ThreadUtils preset processors count by property or env.

* [ISSUE #7992] Add thread pool params for cluster grpc client.
 2022-03-25 15:04:12 +08:00
hujun3
df92ad907b spi 添加秘钥加解密支持 2022-03-25 11:08:07 +08:00
hujun3
f1484e9f22 spi 添加秘钥加解密支持 2022-03-25 10:25:24 +08:00
myifeng
6aa867337e
[ISSUE #7941] FIX: Missing parameters 'dataId' and 'group'. (#7964) 
* [ISSUE #7941] FIX: Missing parameters 'dataId' and 'group'.

* check tenant.
 2022-03-24 09:50:44 +08:00
liaochuntao
fabf6d43a5
Merge pull request #7981 from KomachiSion/develop#5696 
[ISSUE#5696] Add requestClass to resource properties for grpc resource parser.
 2022-03-23 13:34:10 +08:00
KomachiSion
7623bb82b2 Add requestClass to resource properties for grpc resource parser. 2022-03-23 11:47:54 +08:00
onewe
4a7d875eca remove duplicate import 2022-03-22 09:07:29 +08:00
onewe
9110dd8aa9
Merge branch 'develop' into optimize/config-2 2022-03-22 08:58:19 +08:00
李晓双 Li Xiao Shuang
f93813b38d
配置接口兼容解密 (#7949) 2022-03-21 15:17:35 +08:00
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