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

Federation fixes stable11 #4029

Merged
merged 6 commits into from
Mar 29, 2017
Merged

Federation fixes stable11 #4029

merged 6 commits into from
Mar 29, 2017

Conversation

schiessle
Copy link
Member

fixes exchange of shared secret and user data among trusted servers

backport of #3825

schiessle and others added 6 commits March 24, 2017 14:35
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
…ller

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Joas Schilling <coding@schilljs.com>
calling getAbsoluteBundlePath() in the constructor makes other tests fail

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@mention-bot
Copy link

@schiessle, thanks for your PR! By analyzing the history of the files in this pull request, we identified @nickvergessen, @rullzer and @LukasReschke to be potential reviewers.

@codecov-io
Copy link

Codecov Report

Merging #4029 into stable11 will decrease coverage by <.01%.
The diff coverage is 33.33%.

@@              Coverage Diff               @@
##             stable11    #4029      +/-   ##
==============================================
- Coverage        57.5%   57.49%   -0.01%     
- Complexity      19500    19510      +10     
==============================================
  Files            1211     1211              
  Lines           72678    72693      +15     
  Branches         1235     1235              
==============================================
+ Hits            41792    41798       +6     
- Misses          30886    30895       +9
Impacted Files Coverage Δ Complexity Δ
apps/dav/lib/CardDAV/SyncService.php 44.16% <5.26%> (-2.69%) 34 <7> (+6)
.../federation/lib/Middleware/AddServerMiddleware.php 86.66% <50%> (-5.65%) 4 <0> (+1)
apps/dav/lib/CardDAV/Converter.php 74.62% <88.88%> (+1.61%) 23 <0> (+3) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6236476...d44913e. Read the comment docs.

@rugk
Copy link

rugk commented Mar 25, 2017

When will a release with this fix published?

@MariusBluem
Copy link
Member

@rugk Next maintainance of Nextcloud 11 (11.0.3) was not announced yet, but you can expect it in the coming weeks.

@MorrisJobke MorrisJobke merged commit ca08ab9 into stable11 Mar 29, 2017
@MorrisJobke MorrisJobke deleted the federation-fixes-stable11 branch March 29, 2017 00:11
@MorrisJobke
Copy link
Member

@rugk Next maintainance of Nextcloud 11 (11.0.3) was not announced yet, but you can expect it in the coming weeks.

The plan is 10th April - https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants