Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge from master #1

Merged
merged 1,116 commits into from
Jun 27, 2020
Merged

merge from master #1

merged 1,116 commits into from
Jun 27, 2020

Conversation

aquariuspj
Copy link
Owner

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 integration-test in test module.
  • 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.

hengyunabc and others added 30 commits January 6, 2020 11:11
…0.14 or higher version of cxf #5140 (#5154)

* 改为使用soapTransferFactory

* 改为使用soapTransferFactory作为destinationFactory

* 使用soapTransferFactory替代原来的HttpTransforFactory

* 修复codestyle检查错误

* 增加SoapAction配置的处理,使wsdl文件可以正常显示operation对应的soapAction值

* 修改SoapAction配置类的名称

Co-authored-by: sthe9 <he_junjun@163.com>
Co-authored-by: Ian Luo <ian.luo@gmail.com>
* Fix timeout bug when publish config to nacos

* Add test case for publishConfig info
…UID into the registry when the token was set to true; added the missing dubbo-remoting-etcd3 and dubbo-registry-eureka modules in dubbo-all / pom.xml (#5697)
…5682)

* fixes Provider and Consumer default config do not work

* create new instance if there isn't one.
chickenlj and others added 28 commits May 27, 2020 13:58
* 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
* fix publish null value when use consul config center
@aquariuspj
Copy link
Owner Author

merge from master

@aquariuspj aquariuspj merged commit b2dc3cb into aquariuspj:master Jun 27, 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.