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

[stable10] Auto accept incoming federated shares from trusted servers #34206

Merged
merged 1 commit into from
Feb 7, 2019

Conversation

VicDeo
Copy link
Member

@VicDeo VicDeo commented Jan 21, 2019

Backport of #33980

For 10.1.1+

Description

All incoming shares from remote servers are accepted automatically when:

  • federation app autoAddServers config option is set to '0' (default)
    occ config:app:set federation auto_accept_trusted --value '0'
  • federatedfilesharing app auto_accept_trusted config option is set to 'yes'
    occ config:app:set federatedfilesharing auto_accept_trusted --value 'yes'
  • remote server is listed as trusted in the federation app

Related Issue

Closes #27653 https://github.com/owncloud/enterprise/issues/3051

How Has This Been Tested?

By acceptance test

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@VicDeo VicDeo added this to the development milestone Jan 21, 2019
@VicDeo VicDeo self-assigned this Jan 21, 2019
@codecov
Copy link

codecov bot commented Jan 21, 2019

Codecov Report

Merging #34206 into stable10 will increase coverage by <.01%.
The diff coverage is 56.75%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34206      +/-   ##
==============================================
+ Coverage       63.48%   63.48%   +<.01%     
- Complexity      19111    19112       +1     
==============================================
  Files            1264     1264              
  Lines           75159    75194      +35     
  Branches         1288     1288              
==============================================
+ Hits            47712    47736      +24     
- Misses          27069    27080      +11     
  Partials          378      378
Flag Coverage Δ Complexity Δ
#javascript 53.31% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 64.57% <56.75%> (ø) 19112 <5> (+1) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/federation/lib/AppInfo/Application.php 20.96% <0%> (-2.25%) 8 <1> (-2)
apps/federatedfilesharing/lib/AdminPanel.php 100% <100%> (ø) 4 <1> (ø) ⬇️
...s/federatedfilesharing/lib/AppInfo/Application.php 45.45% <100%> (+0.45%) 6 <0> (ø) ⬇️
.../federatedfilesharing/templates/settings-admin.php 85.71% <50%> (-14.29%) 0 <0> (ø)
...ederatedfilesharing/lib/FederatedShareProvider.php 60.53% <63.63%> (+0.29%) 84 <3> (+3) ⬆️
...eratedfilesharing/lib/Controller/OcmController.php 66.26% <0%> (+0.2%) 30% <0%> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 98.27% <0%> (+1.72%) 29% <0%> (ø) ⬇️
apps/encryption/lib/Session.php 100% <0%> (+1.96%) 22% <0%> (ø) ⬇️
apps/encryption/templates/settings-admin.php 94.11% <0%> (+5.88%) 0% <0%> (ø) ⬇️

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 eff0996...6537308. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jan 21, 2019

Codecov Report

Merging #34206 into stable10 will increase coverage by <.01%.
The diff coverage is 56.75%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34206      +/-   ##
==============================================
+ Coverage       63.48%   63.48%   +<.01%     
- Complexity      19111    19112       +1     
==============================================
  Files            1264     1264              
  Lines           75159    75194      +35     
  Branches         1288     1288              
==============================================
+ Hits            47712    47736      +24     
- Misses          27069    27080      +11     
  Partials          378      378
Flag Coverage Δ Complexity Δ
#javascript 53.31% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 64.57% <56.75%> (ø) 19112 <5> (+1) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/federation/lib/AppInfo/Application.php 20.96% <0%> (-2.25%) 8 <1> (-2)
apps/federatedfilesharing/lib/AdminPanel.php 100% <100%> (ø) 4 <1> (ø) ⬇️
...s/federatedfilesharing/lib/AppInfo/Application.php 45.45% <100%> (+0.45%) 6 <0> (ø) ⬇️
.../federatedfilesharing/templates/settings-admin.php 85.71% <50%> (-14.29%) 0 <0> (ø)
...ederatedfilesharing/lib/FederatedShareProvider.php 60.53% <63.63%> (+0.29%) 84 <3> (+3) ⬆️
...eratedfilesharing/lib/Controller/OcmController.php 66.26% <0%> (+0.2%) 30% <0%> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 98.27% <0%> (+1.72%) 29% <0%> (ø) ⬇️
apps/encryption/lib/Session.php 100% <0%> (+1.96%) 22% <0%> (ø) ⬇️
apps/encryption/templates/settings-admin.php 94.11% <0%> (+5.88%) 0% <0%> (ø) ⬇️

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 eff0996...6537308. Read the comment docs.

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@VicDeo VicDeo merged commit bf6af3b into stable10 Feb 7, 2019
@delete-merged-branch delete-merged-branch bot deleted the stable10-implement-27653-2 branch February 7, 2019 13:03
@PVince81 PVince81 modified the milestones: development, QA Apr 12, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Apr 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants