Skip to content

Initialize the user before transfer-ownership #37038

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.

Sign up for GitHub

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

Jump to bottom
Merged
micbar merged 3 commits into from
Mar 4, 2020
Merged

Initialize the user before transfer-ownership #37038

micbar merged 3 commits into from
Mar 4, 2020

Conversation

@jvillafanez
Copy link
Member

@jvillafanez jvillafanez commented Feb 27, 2020 •
edited
Loading

Description

Initialize the user's FS if he hasn't logged in yet before transferring files to him.

Related Issue

https://github.com/owncloud/enterprise/issues/3819

Motivation and Context

Transfer was failing silently. The command output didn't show any error but the transfer failed

How Has This Been Tested?

  1. Create 2 users, user1 and user2 (local users)
  2. Upload some files to user1
  3. Without having logged in once with user2, execute occ files:transfer-ownership user1 user2
  4. Files are transferred correctly to the user2

Checked also with master-key encryption but not user-key encryption

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

@jvillafanez jvillafanez self-assigned this Feb 27, 2020
@update-docs
Copy link

update-docs bot commented Feb 27, 2020

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@jvillafanez
Copy link
Member Author

jvillafanez commented Feb 27, 2020

@phil-davis could you check the failing test? It seems to be caused by https://github.com/owncloud/core/blob/master/tests/lib/UtilTest.php#L388 and https://github.com/owncloud/core/blob/master/tests/lib/UtilTest.php#L411

I think the $config->deleteSystemValue('skeletondirectory'); isn't being called due to the expected exception being thrown in those tests. This causes the system value not being properly reset, which affects this PR's tests.

@codecov
Copy link

codecov bot commented Feb 27, 2020 •
edited
Loading

Codecov Report

Merging #37038 into master will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #37038   +/-   ##
=========================================
  Coverage     64.75%   64.76%           
+ Complexity    19138    19136    -2     
=========================================
  Files          1270     1270           
  Lines         74912    74913    +1     
  Branches       1329     1328    -1     
=========================================
+ Hits          48513    48517    +4     
+ Misses        26008    26006    -2     
+ Partials        391      390    -1
Flag Coverage Δ Complexity Δ
#javascript 54.18% <ø> (+0.01%) 0.00 <ø> (ø)
#phpunit 65.94% <100.00%> (+<0.01%) 19136.00 <1.00> (-2.00) ⬆️
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Storage/Wrapper/Checksum.php 97.05% <0.00%> (-2.95%) 26.00% <0.00%> (+1.00%) ⬇️
lib/private/Files/View.php 84.83% <0.00%> (ø) 389.00% <0.00%> (ø%)
lib/private/Share20/Manager.php 96.30% <0.00%> (ø) 273.00% <0.00%> (ø%)
lib/private/Console/Application.php 0.00% <0.00%> (ø) 23.00% <0.00%> (ø%)
lib/private/Setup/AbstractDatabase.php 0.00% <0.00%> (ø) 11.00% <0.00%> (-1.00%)
lib/private/Share/MailNotifications.php 96.19% <0.00%> (ø) 33.00% <0.00%> (ø%)
apps/dav/lib/DAV/FileCustomPropertiesBackend.php 89.32% <0.00%> (ø) 33.00% <0.00%> (ø%)
core/js/shareitemmodel.js 80.51% <0.00%> (+0.41%) 0.00% <0.00%> (ø%)
core/Command/App/Enable.php 100.00% <0.00%> (+12.12%) 5.00% <0.00%> (-3.00%) ⬆️

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 f055592...da6ac38. Read the comment docs.

@phil-davis phil-davis mentioned this pull request Feb 27, 2020
Merged
11 tasks
@phil-davis
Copy link
Contributor

phil-davis commented Feb 27, 2020

@jvillafanez I pushed a commit that should fix that. Let's see how CI goes!

I also put the fix into a separate PR #37041 because it would be good to fix that UtilTest straight away, rather than waiting until this PR gets finished.

I wonder how many other places in the unit tests have "cleanup" code in a test case after an expected exception? Cleanup code should all go in the tearDown() method.

@phil-davis
Copy link
Contributor

phil-davis commented Feb 28, 2020

@jvillafanez If you pull this branch locally, rebase and force push, it should get rid of that 2nd commit - the UtilTest fixes are now merged in master

@jvillafanez jvillafanez force-pushed the fix_transfer_unlogged_user branch from bce30f8 to 29652e6 Compare February 28, 2020 11:24
@jvillafanez
Copy link
Member Author

jvillafanez commented Feb 28, 2020

I'll add the changelog entry after the review.

I have my doubts about including and using the --force-user-init. The only use case I see for the option is that you want to verify the destination user has logged in at least once. However, I think that normally you just want to transfer to that user.
I mean, we can remove the option and initialize the user without user confirmation.

@micbar
Copy link
Contributor

micbar commented Feb 28, 2020

@carlos @pako81 Can you confirm?

@pako81
Copy link

pako81 commented Feb 28, 2020 •
edited
Loading

Having the --force-user-init input option would be maybe more transparent for the admin, to at least give him/her the information that the destination user has not log in yet.

On the other hand, final admin's aim is to just transfer files so, yes, I do agree with @jvillafanez in that we could probably get rid of it. My2c.

phil-davis
phil-davis reviewed Mar 4, 2020
View reviewed changes
@jvillafanez jvillafanez force-pushed the fix_transfer_unlogged_user branch from 4696d88 to da6ac38 Compare March 4, 2020 08:42
@micbar
Copy link
Contributor

micbar commented Mar 4, 2020

@jvillafanez Please update the title and the top post with the new approach.

Rest looks fine IMO

@jvillafanez jvillafanez changed the title Check if the target user has logged in and include an option to force Check if the target user has logged in Mar 4, 2020
@jvillafanez jvillafanez changed the title Check if the target user has logged in Initialize the user before transfer-ownership Mar 4, 2020
@jvillafanez
Copy link
Member Author

jvillafanez commented Mar 4, 2020

Done

@micbar micbar merged commit 5bd724b into master Mar 4, 2020
@delete-merged-branch delete-merged-branch bot deleted the fix_transfer_unlogged_user branch March 4, 2020 13:14
@davitol davitol mentioned this pull request Mar 31, 2020
Closed
43 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@phil-davis phil-davis phil-davis left review comments

@sharidas sharidas Awaiting requested review from sharidas

+1 more reviewer

@micbar micbar micbar approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jvillafanez jvillafanez

Labels

3 - To Review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jvillafanez @phil-davis @micbar @pako81