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

Conversation

@schiessle
Member

schiessle commented Mar 24, 2017

fixes exchange of shared secret and user data among trusted servers

backport of #3825

schiessle and others added some commits Mar 13, 2017

fix the way we create a new vcard to avoid to have multiple UIDs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
only execute code if exception was thrown by the corresponding contro…
…ller

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
don't add empty values to the vcard
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
use right format for avatars
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Load cert file before syncing addressbooks and contacts
Signed-off-by: Joas Schilling <coding@schilljs.com>
fix tests
calling getAbsoluteBundlePath() in the constructor makes other tests fail

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

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Mar 24, 2017

@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.

mention-bot commented Mar 24, 2017

@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

This comment has been minimized.

Show comment
Hide comment
@codecov-io

codecov-io Mar 24, 2017

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.

codecov-io commented Mar 24, 2017

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

This comment has been minimized.

Show comment
Hide comment
@rugk

rugk Mar 25, 2017

When will a release with this fix published?

rugk commented Mar 25, 2017

When will a release with this fix published?

@MariusBluem

This comment has been minimized.

Show comment
Hide comment
@MariusBluem

MariusBluem Mar 26, 2017

Member

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

Member

MariusBluem commented Mar 26, 2017

@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

2 of 4 checks passed

codecov/patch 33.33% of diff hit (target 57.5%)
Details
codecov/project 57.49% (-0.01%) compared to 6236476
Details
continuous-integration/drone/pr the build was successful
Details
continuous-integration/drone/push the build was successful
Details

@MorrisJobke MorrisJobke deleted the federation-fixes-stable11 branch Mar 29, 2017

@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke

MorrisJobke Mar 29, 2017

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

Member

MorrisJobke commented Mar 29, 2017

@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