This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from c06c11c754 update IPv6 annotation and filter invalid IPv6 (#11266)
add 3d64f1192d Update protobuf-java version in both dependency and plugin
(#11261)
add 213363422e Add mapping retry (#11265)
add 671c7ff950 Enhance nacos regsitry (#11262)
add 84c1c35aae Add serialization check (#11217)
add fc00efd704 Fix test cases for service name mapping (#11280)
add 67993e168e Switch default check level (#11279)
new a278feb372 Merge branch 'apache-3.1' into apache-3.2
new 44fc2a6c2e Fix conflict
new 7237e8baae Fix conflict for Nacos
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../dubbo/common/CommonScopeModelInitializer.java | 2 +
.../dubbo/common/constants/CommonConstants.java | 2 +
.../common/constants/LoggerCodeConstants.java | 2 +
.../common/utils/AllowClassNotifyListener.java} | 10 +-
.../common/utils/ClassLoaderResourceLoader.java | 4 +-
.../dubbo/common/utils/SerializeCheckStatus.java} | 11 +-
.../dubbo/common/utils/SerializeClassChecker.java | 30 ++-
.../common/utils/SerializeSecurityManager.java | 224 ++++++++++++++++
.../org/apache/dubbo/config/ApplicationConfig.java | 48 ++--
.../main/resources/security/serialize.allowlist | 125 +++++++++
.../main/resources/security/serialize.blockedlist | 74 ++++--
.../src/test/java/com/pojo/Demo1.java | 13 +-
.../src/test/java/com/pojo/Demo2.java | 4 +-
.../src/test/java/com/pojo/Demo3.java | 4 +-
.../src/test/java/com/pojo/Demo4.java | 4 +-
.../src/test/java/com/pojo/Demo5.java | 4 +-
.../src/test/java/com/pojo/Demo6.java | 4 +-
.../src/test/java/com/pojo/Demo7.java | 4 +-
.../src/test/java/com/pojo/Demo8.java | 4 +-
.../src/test/java/com/pojo/DemoException1.java | 4 +-
.../src/test/java/com/pojo/DemoException2.java | 4 +-
.../src/test/java/com/pojo/DemoException3.java | 5 +-
.../src/test/java/com/pojo/Simple.java | 4 +-
.../src/test/java/com/service/DemoService1.java | 41 +--
.../src/test/java/com/service/DemoService2.java | 5 +-
.../common/utils/SerializeSecurityManagerTest.java | 128 +++++++++
.../utils/TestAllowClassNotifyListener.java} | 22 +-
.../test/resources/security/serialize.allowlist | 6 +-
.../org/apache/dubbo/config/ServiceConfig.java | 64 +++--
.../apache/dubbo/config/ReferenceConfigTest.java | 3 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 95 ++++++-
.../test/resources/security/serialize.allowlist | 5 +-
.../src/main/resources/META-INF/dubbo.xsd | 5 +
dubbo-demo/dubbo-demo-triple/pom.xml | 4 +-
dubbo-dependencies-bom/pom.xml | 3 +-
dubbo-distribution/dubbo-all/pom.xml | 6 -
dubbo-distribution/dubbo-core-spi/pom.xml | 6 -
.../META-INF/native-image/reflect-config.json | 13 -
.../META-INF/native-image/resource-config.json | 3 -
.../registry/nacos/NacosNamingServiceWrapper.java | 129 +++++++--
.../registry/nacos/function/NacosConsumer.java | 22 +-
.../registry/nacos/function/NacosFunction.java | 23 +-
.../nacos/util/NacosNamingServiceUtils.java | 8 +-
.../dubbo/registry/nacos/MockNamingService.java | 289 +++++++++++++++++++++
.../nacos/NacosNamingServiceWrapperTest.java | 122 +++++++--
.../dubbo/registry/nacos/NacosRegistryTest.java | 30 +--
...erWrapper.java => ProtocolSecurityWrapper.java} | 63 +++--
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 1 +
dubbo-rpc/dubbo-rpc-triple/pom.xml | 4 +-
.../serialize/fastjson2/FastJson2ObjectInput.java | 12 +-
.../serialize/fastjson2/FastJson2ObjectOutput.java | 1 +
.../fastjson2/FastJson2Serialization.java | 5 +-
.../fastjson2/Fastjson2ScopeModelInitializer.java | 2 +
.../fastjson2/Fastjson2SecurityManager.java | 128 +++++++++
.../hessian2/Hessian2AllowClassManager.java | 120 +++++++++
.../hessian2/Hessian2ClassLoaderListener.java | 26 +-
.../serialize/hessian2/Hessian2FactoryManager.java | 110 ++++++++
.../serialize/hessian2/Hessian2ObjectInput.java | 21 +-
.../serialize/hessian2/Hessian2ObjectOutput.java | 11 +-
.../hessian2/Hessian2ScopeModelInitializer.java | 7 +-
.../serialize/hessian2/Hessian2Serialization.java | 11 +-
.../hessian2/Hessian2SerializerFactory.java | 9 +-
.../dubbo/AbstractHessian2FactoryInitializer.java | 56 ----
.../dubbo/DefaultHessian2FactoryInitializer.java | 31 ---
.../hessian2/dubbo/Hessian2FactoryInitializer.java | 45 ----
.../dubbo/WhitelistHessian2FactoryInitializer.java | 52 ----
...alize.hessian2.dubbo.Hessian2FactoryInitializer | 2 -
...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 +
dubbo-xds/pom.xml | 16 +-
pom.xml | 1 +
70 files changed, 1842 insertions(+), 515 deletions(-)
copy dubbo-common/src/{test/java/org/apache/dubbo/common/utils/MyEnum.java =>
main/java/org/apache/dubbo/common/utils/AllowClassNotifyListener.java} (80%)
copy dubbo-common/src/{test/java/org/apache/dubbo/common/utils/MyEnum.java =>
main/java/org/apache/dubbo/common/utils/SerializeCheckStatus.java} (92%)
create mode 100644
dubbo-common/src/main/java/org/apache/dubbo/common/utils/SerializeSecurityManager.java
create mode 100644 dubbo-common/src/main/resources/security/serialize.allowlist
copy
dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/LocalException.java
=> dubbo-common/src/test/java/com/pojo/Demo1.java (80%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/Demo2.java (95%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/Demo3.java (95%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/Demo4.java (93%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/Demo5.java (95%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/Demo6.java (95%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/Demo7.java (95%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/Demo8.java (95%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/DemoException1.java (92%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/DemoException2.java (92%)
copy
dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcConfig.java
=> dubbo-common/src/test/java/com/pojo/DemoException3.java (91%)
copy dubbo-rpc/dubbo-rpc-injvm/src/test/java/demo/Empty.java =>
dubbo-common/src/test/java/com/pojo/Simple.java (95%)
copy
dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java
=> dubbo-common/src/test/java/com/service/DemoService1.java (54%)
copy
dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcConfig.java
=> dubbo-common/src/test/java/com/service/DemoService2.java (91%)
create mode 100644
dubbo-common/src/test/java/org/apache/dubbo/common/utils/SerializeSecurityManagerTest.java
copy
dubbo-common/src/{main/java/org/apache/dubbo/common/utils/CharSequenceComparator.java
=> test/java/org/apache/dubbo/common/utils/TestAllowClassNotifyListener.java}
(65%)
copy
dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/dubbo-migration.yaml
=> dubbo-common/src/test/resources/security/serialize.allowlist (93%)
copy
dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/dubbo-migration.yaml
=>
dubbo-config/dubbo-config-api/src/test/resources/security/serialize.allowlist
(93%)
copy
dubbo-test/dubbo-test-common/src/main/java/org/apache/dubbo/test/common/ErrorHandler.java
=>
dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/function/NacosConsumer.java
(64%)
copy
dubbo-test/dubbo-test-common/src/main/java/org/apache/dubbo/test/common/ErrorHandler.java
=>
dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/function/NacosFunction.java
(63%)
create mode 100644
dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/MockNamingService.java
copy
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/{ProtocolListenerWrapper.java
=> ProtocolSecurityWrapper.java} (52%)
create mode 100644
dubbo-serialization/dubbo-serialization-fastjson2/src/main/java/org/apache/dubbo/common/serialize/fastjson2/Fastjson2SecurityManager.java
create mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2AllowClassManager.java
copy
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/SpringScopeModelInitializer.java
=>
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ClassLoaderListener.java
(60%)
create mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2FactoryManager.java
copy
dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/QosScopeModelInitializer.java
=>
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ScopeModelInitializer.java
(88%)
delete mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/dubbo/AbstractHessian2FactoryInitializer.java
delete mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/dubbo/DefaultHessian2FactoryInitializer.java
delete mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/dubbo/Hessian2FactoryInitializer.java
delete mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/dubbo/WhitelistHessian2FactoryInitializer.java
delete mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.hessian2.dubbo.Hessian2FactoryInitializer
create mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer
