25 Commits

Author SHA1 Message Date
杨翊 SionYang 2a8809fd44 [ISSUE #15634] Align API authorization metadata and resource parsing (#15635)
* Fix reviewed HTTP authorization metadata

Assisted-by: Claude Code

* Protect Prometheus service discovery subpaths

Assisted-by: Claude Code

* Secure plugin availability cluster requests

Assisted-by: Claude Code

* Honor explicit authorization resource parsers

Assisted-by: Claude Code

* Fix AgentSpec authorization resource parsing

Assisted-by: Claude Code
2026-08-03 11:09:19 +08:00
徐晓伟 4bec8b06c5 chore(deps): spring-boot upgrade from 3.5.14 to 4.0.6 (#14945)
* chore(deps): spring-boot upgrade from 3.4.10 to 4.0.5

* chore(deps): micrometer upgrade from 1.12.8 to 1.13.0

* chore(deps): replace javax.annotation with jakarta.annotation

* chore(deps): spring-boot upgrade from 3.4.10 to 4.0.5

* chore(deps): spring-boot upgrade from 3.4.10 to 4.0.5: fix controller response

* chore(deps): spring-boot upgrade from 4.0.5 to 4.0.6

* chore(deps): spring-boot upgrade from 3.5.13 to 4.0.6: Restore blank line indentation whitespace to match develop

Blank lines adjacent to @Mock → @MockitoBean changes lost their
indentation spaces (e.g., 4 spaces became empty). Restore the
original whitespace to minimize unrelated diff noise.

* chore(deps): spring-boot upgrade from 3.5.13 to 4.0.6: Remove duplicate micrometer version override in pom.xml

The old 1.13.0 override was superseded by 1.15.10 (for Spring Boot
upgrade compatibility, see #15033). Having two definitions is
confusing; only the latter takes effect in Maven.

* chore(deps): spring-boot upgrade from 3.5.13 to 4.0.6: Restore blank line indentation whitespace to match develop

* style: apply spotless formatting fixes

Assisted-by: Claude Code

* Merge branch 'develop' into xuxiaowei/spring-boot-4

# Conflicts:
#	.github/workflows/it-new.yml
#	config/src/test/java/com/alibaba/nacos/config/server/controller/v3/ConfigOpsControllerV3Test.java
#	config/src/test/java/com/alibaba/nacos/config/server/exception/GlobalExceptionHandlerTest.java
#	config/src/test/java/com/alibaba/nacos/config/server/service/capacity/CapacityServiceTest.java

* style: apply spotless formatting

* chore(build): bump MCP SDK from 0.17.0 to 0.18.2

Assisted-by: Claude Code

* Remove spring-boot-starter-ldap-test dependency from console module

* Apply spotless formatting to ConfigOpenApiITCase

* Update TomcatConnectorCustomizer import for Spring Boot 4 compatibility

Assisted-by: Claude Code

* Replace ObjectNode with Map<String, Object> in ClientService API for Spring Boot 4 compatibility

* Remove redundant dependencies from test aggregator POM for Spring Boot 4 compatibility

* Makefile: Enhance Makefile for local dev workflow: add auth-disabled args, release-nacos profile, and IT test targets

* Makefile: Extract auth-disabled JVM args into standalone AUTH_DISABLED_ARGS variable

* Makefile: Add missing IT test targets to .PHONY declaration

Assisted-by: Claude Code

* build(deps): Refactor LDAP dependency: move spring-boot-starter-ldap to nacos-ldap-auth-plugin only

* build(deps): Add nacos-ldap-auth-plugin dependency to nacos-server module

* build(deps): Add nacos-ldap-auth-plugin dependency to nacos-console module

* build(deps): Remove nacos-ldap-auth-plugin dependency and LdapAutoConfiguration exclusion

* build(deps): Remove nacos-ldap-auth-plugin dependency and LdapAutoConfiguration exclusion

* Remove ConfigInfoBetaPersistService references and fix formatting in tests

Assisted-by: Claude Code

* Migrate javax.annotation to jakarta.annotation for Spring Boot 4 compatibility

Replace javax.annotation.{PostConstruct,PreDestroy,Resource} imports and
native-image reflect-config entries with jakarta.annotation equivalents.

* Add issue link for Makefile usage guide (#15338)

* Add test, check-maven, build-maven-test targets to Makefile (#15338)

---------

Co-authored-by: 杨翊 SionYang <xiweng.yy@alibaba-inc.com>
2026-06-10 10:08:48 +08:00
杨翊 SionYang 9136e9864f Add @Since annotations for public APIs (#15266)
* chore(build): bump project revision from 3.2.1 to 3.2.2.

* Add since annotation requirements to API specs

* Add API since annotation

* Add since annotations to SDK service APIs

* Add since annotations to core APIs

* Add since annotations to config and naming APIs

* Add since annotations to AI and lock APIs

* Add since annotations to console and plugin APIs

* Add since annotations to address APIs
2026-05-28 15:40:04 +08:00
cxhello f085e06392 [ISSUE #14815] build(style): apply Spotless formatting to small modules (#15111)
Modules: logger-adapter-impl, cmdb, address, prometheus, server, example, bootstrap

Signed-off-by: cxhello <caixiaohuichn@gmail.com>
2026-05-09 18:02:12 +08:00
杨翊 SionYang 8bbcbbbbfe V3.0 develop fix ut (#13167)
* Fix nacos client and relative depend ut.

* Fix nacos config ut.

* Fix nacos console ut.

* Fix nacos core ut.

* Fix nacos naming ut.

* Fix nacos default-auth-plugin-impl ut.

* Fix nacos prometheus ut.
2025-03-10 15:38:27 +08:00
杨翊 SionYang 762405f148 Fix prometheus auth manager problem. (#13071) 2025-01-24 11:30:22 +08:00
KomachiSion 7ccf2fbf53 Fix Unit test problem. 2025-01-10 14:35:50 +08:00
KomachiSion 87382160df Merge branch 'refs/heads/v3.0-develop' into summer-ospp#12028-sync-develop
# Conflicts:
#	auth/src/test/java/com/alibaba/nacos/auth/config/AuthConfigsTest.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java
#	config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigPublishRequestHandler.java
#	config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/ConfigOperationService.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpChangeConfigWorker.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpConfigHandler.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/dump/processor/DumpAllProcessor.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/merge/MergeDatumService.java
#	config/src/test/java/com/alibaba/nacos/config/server/controller/v2/ConfigControllerV2Test.java
#	console/pom.xml
#	console/src/main/java/com/alibaba/nacos/console/config/ConsoleConfig.java
#	core/src/main/java/com/alibaba/nacos/core/auth/AuthFilter.java
#	core/src/main/java/com/alibaba/nacos/core/cluster/ServerMemberManager.java
#	core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
#	core/src/main/resources/META-INF/logback/nacos.xml
#	core/src/test/java/com/alibaba/nacos/core/auth/AuthFilterTest.java
#	core/src/test/java/com/alibaba/nacos/core/cluster/ServerMemberManagerTest.java
#	distribution/conf/nacos-logback.xml
#	plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/NacosAuthConfig.java
#	plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/NacosAuthManager.java
#	plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/authenticate/AuthenticationManagerDelegator.java
#	plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/filter/JwtAuthenticationTokenFilter.java
#	pom.xml
#	prometheus/src/main/java/com/alibaba/nacos/prometheus/conf/PrometheusSecurityConfiguration.java
2025-01-08 11:19:35 +08:00
Moritz Arena b16b90048a Upgrade to SpringBoot 3 and support GraalVM packaging (#13020)
Upgrade to SpringBoot 3, JDK 17 and support GraalVM
2025-01-08 09:49:56 +08:00
杨翊 SionYang 05362b0b90 V3.0 develop starting listening enhance & fix console auth invalid problem. (#13001)
* Enhance StartingApplicationListener to reduce duplicate operation.

* Fix console auth invalid problem.
2024-12-30 17:51:49 +08:00
杨翊 SionYang 8478fd7204 Enhance to reuse duplicate spring beans to reduce memory usage. (#12990) 2024-12-25 15:17:06 +08:00
Thomas Lee 92a3d17681 [ISSUE #12196] FIX prometheus http sd invalid label names (#12239)
* prometheus http sd: fix invalid label names

* Update PrometheusUtils.java
2024-07-01 13:53:32 +08:00
shalk(xiao kun) 8034da88e5 [ISSUE #12016] upgrade to junit5 and remove junit4 (#12280)
* clean junit4

* clean junit4

* clean some test dep; fix scope

* fix test compile
2024-06-26 17:39:08 +08:00
Kurok1 da78aeea0d [ISSUE #12130] add metadata as labels in prometheus http sd (#12144)
* add metadata as labels in prometheus http sd

* fix style
2024-06-03 10:41:10 +08:00
publicize-y 2df335d57e Response wrong status code for some situation for openAPI (#11864)
* fix:Response wrong status code for some situation for openAPI

* fix:Response wrong status code for some situation for openAPI for PrometheusApiExceptionHandler

* fix:PrometheusApiExceptionHandler status modify

* fix:add unit test

* fix:modify the unit test description

* fix:the code style modify

* fix:the UT modify
2024-04-01 14:11:16 +08:00
Karson 97104b2445 [ISSUE #11586]Remove deprecated api of spring security (#11587)
* remove deprecated config

* style fix
2024-01-05 17:02:39 +08:00
Karson 327ebaf36e [ISSUE #10752] Fix Prometheus sd api security is not compatiable with nacos original security configs (#11470)
* fix issue #10752

* fix issue #10752
2023-12-06 13:13:15 +08:00
ZhangShenao 95df397616 Refactor Prometheus Module (#10827)
* Refactor Prometheus Module

* Complete Test Case

* format

* format
2023-07-25 09:33:14 +08:00
Joey777210 f986916acf [ISSUE #10662]Prometheus-sd add namespace and service api (#10663)
* add apis

* add tests

* fix checkstyle

* param namespace to namespaceId

* namespace to namespaceId

* fix test case

* fix test case
2023-07-17 11:20:07 +08:00
ZhangShenao 1f28e28549 [ISSUE #10308] Use Generic Type (#10309)
* code optimization for `ConfigChangeHandler`

* [ISSUE #9930] fix word spelling error in com.alibaba.nacos.common.http.AbstractHttpClientFactory#ASYNC_IO_REACTOR_NAME

* [ISSUE #10020] Use Generic Type When Declaring `authFilterRegistration` in com.alibaba.nacos.core.auth.AuthConfig

* fix code format

* fix code format

* Fix Code Format

* Fix Code Format

* [ISSUE #10308] Use Generic Type
2023-04-13 18:01:51 +08:00
Karson 0c9f08130e [Enhancement] Add prometheus api exception handling (#9885)
* add prometheus api exceptionHandler and ut.

* fix style issue.

* return failure status。

* add it case.

* enhance exception handler

* enhance exception handler

* fix IT problem.

* delete it test
2023-02-13 14:57:00 +08:00
vivid 4e08d61c4a [ISSUE #9710]prometheus-sd support basic auth. (#9912)
* [ISSUE #9710]prometheus-sd support basic auth.

* [ISSUE #9710]prometheus-sd support basic auth.
2023-02-08 11:23:43 +08:00
gongzhongqiang 708387c277 fix:replace nacos website url to https. (#9797) 2023-01-10 09:47:52 +08:00
Karson 20c183058d [ISSUE #9728] Prometheus http sd 返回空数组[] (#9762)
* fix issue #9728

* reformat code style
2023-01-03 11:32:11 +08:00
Karson 4bd5b7c85a support prometheus sd (#9518) 2022-11-17 11:13:51 +08:00