Commit Graph

312 Commits

Author SHA1 Message Date
KomachiSion
131dc643b3 Merge remote-tracking branch 'upstream/develop' into asoc2022_issue#8460-2
# Conflicts:
#	persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConfigChangeConfigsTest.java
2023-05-11 15:41:17 +08:00
KomachiSion
f83061f47d Move some datasource and relative classes into persistence module. 2023-04-23 16:00:42 +08:00
杨翊 SionYang
0e0a73e025
Revert "[issue #10148]Replace sync forward request with async request (#10158)" (#10358)
This reverts commit a273705b8d.
2023-04-20 20:12:33 +08:00
Zhaohui Yu
a273705b8d
[issue #10148]Replace sync forward request with async request (#10158)
* Replace sync forward request with async request in DistroFilter. issue #10148

* extract method for config default headers

* add env switch for async distro forward.

* Fixed code review problems:
1. Move async forward switch from sys module to naming module.
2. use nacos code style to format code.

* Fixed nacos code checkstyle:
1. one import per Class
2. add javadoc

* In order to avoid additional overhead, move switch from GlobalConfig to ClientConfig and cache the env switch.

* Move switch from ClientConfig to DistroConfig.

* Removed unused import.

* Add test for async forward for DistroFilter

* Add license

* rename test method name

* Should enable async forward

* fixed test

* set async forward request switch to true in test

* fixed test: create and set property with MockEnvironment

* fixed check style

* move MockEnvironment init to BeforeClass

* add setter for asyncForwardRequest switch
2023-04-20 20:10:26 +08:00
杨翊 SionYang
b3b5236cd4
Develop synced from 2.2.2 (#10307)
* Fix dynamic change token to illegal value will use old token.

* Add description in pom for release.

* Upgrade to 2.2.2

* Upgrade to 2.3.0-SNAPSHOT
2023-04-11 17:34:06 +08:00
杨翊 SionYang
e26dc2fb23
Merge pull request #10277 from alibaba/develop#10153
Develop#10153
2023-04-06 17:25:18 +08:00
kanlon
2bca057137
[ISSUE #7698] refactor: remove httpasyncclient version dependency management, avoid version conflicts (#10170)
* refactor: remove httpasyncclient version dependency management, Avoid version conflicts

* refactor: remove httpasyncclient.version
2023-03-31 14:53:21 +08:00
杨翊 SionYang
5fffde5bde
[ISSUE#10153] Add auth state into /state api and add announcement api. (#10203)
* Add ModuleState and use ModuleState replace ServerStateController.

* Add AuthModuleStateBuilder

* state接口使用ModuleState.

* Add announcement api.

* skip rat scan for announcement.conf

* default plugin open login page when auth.enabled=true.
2023-03-27 19:00:22 +08:00
杨翊 SionYang
8ab205832d
Upgrade to 2.2.1 (#10121) 2023-03-17 17:32:32 +08:00
杨翊 SionYang
81dda26709
Upgrade snakeYaml to 2.0 (#10092)
* Upgrade snakeYaml to 2.0

* Fix unit.
2023-03-14 13:15:51 +08:00
WangLiang/王良
6ba05fa7a8
Replace flatten-maven-plugin with easyj-maven-plugin (#9985)
* Replace `flatten-maven-plugin` with `easyj-maven-plugin`

* revert indent

* apache-rat-plugin exclude `.flattened-pom.xml`

* fix style

* optimize github action

* optimize github action

* fix dependencies

* upgrade easyj-maven-plugin to 1.1.5

* optimize github action

* optimize spring-boot-maven-plugin configuration
2023-03-02 10:43:08 +08:00
WangLiang/王良
a397c10a54
Optimize the nacos-client/pom.xml for exclude google/**/*.proto (#9982)
* Optimize the pom.xml of the nacos-client

* optimize pom

* exclude `google/**/*.proto`

* tab

* Remove dependency `io.grpc:protoc-gen-grpc-java:${version}:pom`

* revert indent

* revert native-image
2023-03-01 09:42:15 +08:00
杨翊 SionYang
428e0bc668
Develop add unit test api (#9910)
* Add some unit test for api.

* Add Unit test for api.naming.utils.

* Add Unit test for api.naming.ability.

* Add Unit test for some pojo.

* Add Unit test for naming.pojo.

* For checkstyle.
2023-02-07 17:05:35 +08:00
杨翊 SionYang
4db3e8c28f
[ISSUE #9816] Add expected final state for redo data. (#9893)
* Fix #9816, add expected final state to make redo task execute right finally.

* Upgrade version to 2.2.1-SNAPSHOT.
2023-02-03 14:13:08 +08:00
xzxiaoshan
41f03fea0f
[ISSUE#9730] 对多数据源插件代码进行调整(向前兼容) (#9784)
* Upgrade to 2.2.1-RC (#9741)

* 补充处理所有 tenantId

* 补充处理 tenantId

* 处理tenantid,内部类引用的变量不能被修改,换个变量名

* 新增支持:nacos 默认的 tenant/namespaceId 为空字符串,自 nacos 2.2.0 版本起开始支持多数据源插件,为空的 ID 会在 oracle 数据库适配中出现问题 ( where tenantid = '' ),本次修改对以往程序不产生影响。

* 固定填充的ID为public,完全自定义没有太大意义,目的是在保证默认id不为空,可选填充,不配置默认照旧

* fix bug

* 将通用的SQL提取到Mapper接口中,这样能很大的降低不同数据库需要重写的SQL的量,同时避免了大量的重复代码问题。

* 将原来sql中固定写死的 tenant_id = ''  修改为 tenant_id =  NamespaceUtil.getNamespaceDefaultId() 。暂时没深究为什么不用问号动参而是固定写死。

* 方法提取到 mapper 接口中,顺便解决了多余 paramList 定义的(虽然这个方法好像已经弃用)

* 方法迁移到接口默认实现中

* 恢复 publci id 默认值为空值 "",等以后决策好使用默认值为 "public" 时,再设置 NAMESPACE_PUBLIC_ID_DEFAULT="public" 即可。

* 回滚 Controller 层对 tenant_id 的处理,另起PR讨论和修改。

* code style

* 变量名称和注释未通过 checkStyle 检查,按规范调整。

* nacos check style 修改,无代码变动

* fix code

* fix checkstyle

* fix checkstyle 去除多余的 return

* fix pmd

* fix test unit bug

* 因为将sql提取到 mapper 接口中,一些不影响sql语句运行的sql,有空格等差异,出现了test用例差异问题,逐个处理。比如(where a =? 和 where a= ?)

Co-authored-by: 杨翊 SionYang <xiweng.yy@alibaba-inc.com>
2023-01-16 16:14:29 +08:00
李云飞
d45ba449ca
[ISSUE #8460]add config change plugin (#9820) 2023-01-16 10:04:24 +08:00
gongzhongqiang
708387c277
fix:replace nacos website url to https. (#9797) 2023-01-10 09:47:52 +08:00
Weizhan Yun
1bc2e4185e
upgrade grpc-java version to 1.50.2, (#9799)
protobuf-java  to 3.21.11, proto-google-common-protos to 2.7.1
2023-01-05 17:27:56 +08:00
Weizhan Yun
34ba3818ce
upgrade jraft version to 1.3.12; (#9790)
upgrade rpc-grpc-impl version to 1.3.12
2023-01-04 09:39:23 +08:00
Karson
b347b46549
upgeade-spring-boot version to 2.6.14 (#9785) 2023-01-03 15:39:07 +08:00
KomachiSion
4573705584 Upgrade to 2.2.0. 2022-12-14 11:23:49 +08:00
nov.lzf
acc8ab46cf
Refactor connection limit module to plugin (#9653)
* 限流插件提交

* 限流插件提交

* 限流插件提交

* 限流插件重构提交

* connection control test case submit

* tps control test case submit

* tps control test case submit

* tps control test case submit

* exact model has higher priority

* exact model has higher priority

* tpsreporter

* tpsreporter

* tpsreporter

* check style

* log optimize

* interceptor

* checkstyle

* tps check

* configController query http

* rename component

* 优化参数命名

* 优化参数命名

* 优化参数命名

* 优化参数命名

* optimize connection manager

* optimize connection manager

* optimize connection manager

* optimize connection manager

* interceptor to mse

* Monitor Model

* Monitor Model

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* opensource submit

* opensource submit

* check style

* check style

* pmd ,rat

* update db params

* test case fix

* 简化开源反脆弱实现

* test case

* test  case fix

* 修复单测

* 修复单测

* 修复单测
2022-12-06 16:15:51 +08:00
Karson
4bd5b7c85a
support prometheus sd (#9518) 2022-11-17 11:13:51 +08:00
dependabot[bot]
8292d2ccb1
Bump jackson-databind from 2.12.6.1 to 2.12.7.1 (#9582)
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.12.6.1 to 2.12.7.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-17 10:59:04 +08:00
hth
898cbb18d4
move custom db pwd plugin to nacos-group and specification plugin name (#9480) 2022-11-07 17:09:13 +08:00
hth
5ea747b863
[ISSUE #8619] add CustomEnvironmentPlugin (#8619) (#9296)
* [ISSUE #8619] add CustomEnvironmentPlugin (#8619)

* feature issue #8619 .

* custom properties.

* reformat codes and author fix

* remove customEnvironment to nacos-core and Complete test

* add license

* pmd fix

* code optimization

* conflict fix
2022-11-04 15:24:25 +08:00
杨翊 SionYang
c5a20d1e97
Upgrade to 2.2.0-beta. (#9413) 2022-10-28 15:09:50 +08:00
KomachiSion
3863ede017 Change datasource plugin version as revision. 2022-10-24 16:09:50 +08:00
杨翊 SionYang
b1ac88be78
[ISSUE#8481] Add Trace Event SPI for Naming. (#9336)
* Add Trace plugin spi.

* Add NacosCombinedTraceSubscriber

* Subscribe NamingTraceEvent when start up cluster.

* Fix test error.
2022-10-18 09:30:37 +08:00
KomachiSion
ebe81f86c0 Upgrade to 2.2.0-SNAPSHOT 2022-10-17 19:25:31 +08:00
KomachiSion
a1b705406a build pure nacos-client when release. 2022-10-10 15:36:49 +08:00
dependabot[bot]
e4510d67e0
Bump protobuf-java from 3.16.1 to 3.16.3 (#9259)
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.16.1 to 3.16.3.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.16.1...v3.16.3)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-10 09:46:34 +08:00
Karson
b37d100eb3
upgrade org.yaml.snakeyaml version from 1.30 to 1.32 (#9179) 2022-09-21 14:29:47 +08:00
杨翊 SionYang
bf76143e59
Upgrade to 2.1.1 (#8899) 2022-08-08 17:42:59 +08:00
Oliver
f53d50c94e
Bump mysql-connector-java from 8.0.21 to 8.0.28 (#8623) 2022-06-24 16:25:50 +08:00
liqipeng
2a4c2816b9
explicitly specify spring-boot-maven-plugin version same as spring-boot (#8596) 2022-06-24 15:05:56 +08:00
Cherish 蔡梦缘
703925a84f
feat(#8472): [Dependency Governance] Remove useless dependencies. (#8472) (#8473) 2022-06-13 10:31:11 +08:00
chenhao26
9273252ffc
fix spring security vulnerability(cve-2022-22978)issue#8540 (#8541) 2022-06-10 10:36:43 +08:00
liqipeng
989d437d69
[ISSUE #8539] fix prometheus api error (#8542) 2022-06-10 09:51:33 +08:00
chenhao26
8a9f6f8bd6
upgrade grpc netty version to 1.30.2 (#8491) 2022-06-07 15:36:21 +08:00
liqipeng
4c23846cd9
fix #8169: Upgrade spring-boot version to 2.6.6 (#8184) 2022-06-06 11:28:32 +08:00
Cherish 蔡梦缘
9d9a26ace3
feat(#8472): [Dependency Governance] Remove useless netty. (#8472) (#8474) 2022-06-06 11:24:33 +08:00
liqipeng
84644e07f3
remove commonOkHttp dependency to solve okHttp3 compatibility after upgrade spring-boot to 2.6.6 (#8422) 2022-05-23 15:03:40 +08:00
杨翊 SionYang
39015341af
Upgrade jackson version to 2.12.6.1 (#8383) 2022-05-18 10:53:16 +08:00
杨翊 SionYang
646ea61cab
Remove mina dependency. (#8369) 2022-05-16 10:14:58 +08:00
杨翊 SionYang
ed999d9522
Add codeCov report after CI finish (#8344)
* Try add codecov

* Try add codecov

* Try scan all jacoco.xml

* Try to add all jacoco.xml

* Add codecov.yml

* Fix copyright check for codecov.yml

* Fix copyright check for codecov.yml
2022-05-11 16:20:28 +08:00
杨翊 SionYang
a1c7715e16
[ISSUE#4982] Fix naming module unit test and generate jacoco coverage report (#8282)
* 更新jacoco版本

* Fix naming module unit test and generate jacoco coverage.

* Fix log too long problem.

* Fix MetricsMonitorTest
2022-05-09 16:08:59 +08:00
杨翊 SionYang
2e0eca4093
Upgrade to 2.1.0 (#8268) 2022-04-27 15:50:38 +08:00
杨翊 SionYang
71eaa323f1
upgrade to 2.1.0-BETA. (#8057) 2022-04-01 11:50:29 +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