Skip to content

Sycn with official master#5

Merged
laddcn merged 75 commits intoladdcn:masterfrom
apache:master
Jun 20, 2020
Merged

Sycn with official master#5
laddcn merged 75 commits intoladdcn:masterfrom
apache:master

Conversation

@laddcn
Copy link
Copy Markdown
Owner

@laddcn laddcn commented Jun 20, 2020

What is the purpose of the change

XXXXX

Brief changelog

XXXXX

Verifying this change

XXXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a GITHUB_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add sample in dubbo samples project.
  • Run mvn clean install -DskipTests=false & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
  • If this contribution is large, please follow the Software Donation Guide.

LinShunKang and others added 30 commits April 7, 2020 10:42
Co-authored-by: quzijing <quzijing@oppo.com>
use loop instead of recursion
* Polish #6058 : [Enhancement] Adding a build tools module for Apache License

* Polish #6058 : [Enhancement] Adding a build tools module for Apache License

* Polish #6058 : [Enhancement] Adding a build tools module for Apache License
… If its "id" property is blank[Enhancement] Take the "name" property of Dubbo Config as Spring Bean If its "id" property is blank (#6063)

* Polish #6058 : [Enhancement] Adding a build tools module for Apache License

* Polish #6058 : [Enhancement] Adding a build tools module for Apache License

* Polish #6058 : [Enhancement] Adding a build tools module for Apache License

* Polish #6051 : [Enhancement] Take the "name" property of Dubbo Config as Spring Bean If its "id" property is blank

* Polish #6051 : [Enhancement] Take the "name" property of Dubbo Config as Spring Bean If its "id" property is blank
#6070)

* Polish #4830 : [Refactor] Rename the class name of ServiceAnnotationBeanPostProcessor

* Polish #4830 : Remove unused import
* Polish #6007 : [Discussion] @reference@service Naming issues

* Polish #6007 : [Discussion] @reference@service Naming issues

* Polish #6007 : [Discussion] @reference@service Naming issues
* register and subscriber with group name

* polish
…6094)

* 1、configuration.publishConfig returns false,without throw exception

* 1、configuration.getConfigKeys returns empty-list,without throw exception
* Lambda replaced with method reference

* Lambda replaced with method reference
* add new loadbalance strategy

* add note

* Update ShortestResponseLoadBalanceTest.java
hengyunabc and others added 29 commits May 22, 2020 01:01
* pick the first valid interface address before choosing 127.0.0.1
* use interface name as path (#6212)
* support mock impl as spring bean
* fix object attachments iteration bug
<dubbo:registry address="zookeeper://127.0.0.1:2181?backup=127.0.0.1:2181|zookeeper://127.0.0.1:2183"/>
https://help.aliyun.com/noticelist/articleid/1060343604.html?spm=a2c4g.789004748.n2.6.3f576141SGmGhG

漏洞描述

fastjson采用黑白名单的方法来防御反序列化漏洞,导致当黑客不断发掘新的反序列化Gadgets类时,在autoType关闭的情况下仍然可能可以绕过黑白名单防御机制,造成远程命令执行漏洞。经研究,该漏洞利用门槛较低,可绕过autoType限制,风险影响较大。阿里云应急响应中心提醒fastjson用户尽快采取安全措施阻止漏洞攻击。

影响版本

fastjson <=1.2.68

fastjson sec版本 <= sec9

安全版本

fastjson >=1.2.69

fastjson sec版本 >= sec10
(cherry picked from commit 83afabe)

Co-authored-by: oaoit <oaoist@gmail.com>
* readme fix

* readme fix

* polish

Co-authored-by: Huang YunKun <htynkn@gmail.com>
…te the exported URLs for service introspection (#6299)
* fix application cannot exit when use consul registry
* make consul registry suppor ACL
@laddcn laddcn merged commit 3011f07 into laddcn:master Jun 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.