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

Feature/secure file drop #5327

Merged
merged 1 commit into from
Mar 2, 2023
Merged

Feature/secure file drop #5327

merged 1 commit into from
Mar 2, 2023

Conversation

allexzander
Copy link
Contributor

No description provided.

@allexzander
Copy link
Contributor Author

@tobiasKaminsky The reason for me closing this is that I am in an intermediate step right now and don't want anyone to use a non-working version.

@allexzander allexzander reopened this Jan 16, 2023
@codecov
Copy link

codecov bot commented Jan 16, 2023

Codecov Report

Merging #5327 (59686c8) into master (33e1a90) will increase coverage by 1.01%.
The diff coverage is 62.14%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5327      +/-   ##
==========================================
+ Coverage   57.84%   58.86%   +1.01%     
==========================================
  Files         141      143       +2     
  Lines       18149    18312     +163     
==========================================
+ Hits        10498    10779     +281     
+ Misses       7651     7533     -118     
Impacted Files Coverage Δ
src/libsync/account.cpp 35.85% <0.00%> (-0.34%) ⬇️
src/libsync/account.h 36.84% <ø> (ø)
src/libsync/bulkpropagatorjob.cpp 73.18% <ø> (ø)
src/libsync/bulkpropagatorjob.h 50.00% <ø> (ø)
src/libsync/clientsideencryption.h 30.76% <ø> (ø)
src/libsync/discoveryphase.h 25.00% <ø> (ø)
src/libsync/encryptfolderjob.cpp 0.00% <0.00%> (ø)
src/libsync/propagateuploadencrypted.cpp 0.00% <0.00%> (ø)
src/libsync/propagatorjobs.h 0.00% <0.00%> (ø)
src/libsync/syncfileitem.h 42.37% <ø> (ø)
... and 17 more

@allexzander allexzander force-pushed the feature/secure-file-drop branch 2 times, most recently from f10af82 to 97720ee Compare January 18, 2023 17:16
@allexzander allexzander marked this pull request as ready for review January 20, 2023 09:36
Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

Not a ton of comments, and mostly small ones

src/gui/socketapi/socketapi.cpp Outdated Show resolved Hide resolved
src/gui/socketapi/socketapi.cpp Outdated Show resolved Hide resolved
src/libsync/updatefiledropmetadata.cpp Outdated Show resolved Hide resolved
@allexzander allexzander modified the milestone: 3.7.0 Jan 24, 2023
@allexzander allexzander force-pushed the feature/secure-file-drop branch from 9769a52 to c205eb5 Compare January 26, 2023 12:06
@allexzander allexzander force-pushed the feature/secure-file-drop branch 2 times, most recently from ca563db to 6380275 Compare January 26, 2023 16:23
src/libsync/account.cpp Show resolved Hide resolved
src/libsync/updatefiledropmetadata.h Outdated Show resolved Hide resolved
src/libsync/discovery.cpp Show resolved Hide resolved
@allexzander allexzander force-pushed the feature/secure-file-drop branch from 6380275 to d7325b2 Compare January 31, 2023 09:26
@allexzander allexzander requested a review from mgallien January 31, 2023 09:27
@allexzander allexzander force-pushed the feature/secure-file-drop branch 4 times, most recently from fb2e649 to cb3ff79 Compare February 10, 2023 09:48
@allexzander allexzander force-pushed the feature/secure-file-drop branch 3 times, most recently from df448fd to 01de752 Compare February 15, 2023 10:21
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

please add automated tests especially for the new job class UpdateFileDropMetadata

src/gui/filedetails/sharemodel.cpp Show resolved Hide resolved
src/gui/filedetails/sharemodel.cpp Outdated Show resolved Hide resolved
src/gui/socketapi/socketapi.cpp Outdated Show resolved Hide resolved
src/libsync/clientsideencryption.cpp Show resolved Hide resolved
src/libsync/updatefiledropmetadata.h Outdated Show resolved Hide resolved
src/libsync/updatefiledropmetadata.cpp Show resolved Hide resolved
src/libsync/updatefiledropmetadata.cpp Show resolved Hide resolved
src/libsync/updatefiledropmetadata.cpp Outdated Show resolved Hide resolved
src/libsync/updatefiledropmetadata.cpp Outdated Show resolved Hide resolved
src/libsync/updatefiledropmetadata.cpp Outdated Show resolved Hide resolved
@allexzander allexzander force-pushed the feature/secure-file-drop branch from 01de752 to 4652d8c Compare February 17, 2023 09:59
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

src/libsync/bulkpropagatorjob.h Outdated Show resolved Hide resolved
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

src/libsync/propagatorjobs.h Outdated Show resolved Hide resolved
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

src/libsync/propagateremotemove.h Show resolved Hide resolved
src/libsync/owncloudpropagator.h Show resolved Hide resolved
src/libsync/owncloudpropagator.h Show resolved Hide resolved
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

src/libsync/bulkpropagatorjob.h Show resolved Hide resolved
@github-actions github-actions bot dismissed stale reviews from themself February 22, 2023 17:40

No clang-tidy warnings found so I assume my comments were addressed

@allexzander allexzander force-pushed the feature/secure-file-drop branch 7 times, most recently from 0006522 to 7d637e5 Compare February 24, 2023 10:48
@allexzander allexzander requested a review from mgallien February 24, 2023 12:39
test/syncenginetestutils.cpp Outdated Show resolved Hide resolved
test/syncenginetestutils.cpp Show resolved Hide resolved
qCDebug(lcUpdateFileDropMetadataJob) << "Metadata Received, Preparing it for the new file." << json.toVariant();

// Encrypt File!
_metadata = new FolderMetadata(propagator()->account(), json.toJson(QJsonDocument::Compact), statusCode);
Copy link
Collaborator

Choose a reason for hiding this comment

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

@alex ?

src/libsync/clientsideencryptionjobs.cpp Show resolved Hide resolved
src/libsync/clientsideencryption.h Outdated Show resolved Hide resolved
src/gui/socketapi/socketapi.h Outdated Show resolved Hide resolved
src/gui/filedetails/sharemodel.cpp Outdated Show resolved Hide resolved
@allexzander allexzander requested a review from mgallien March 1, 2023 13:46
@allexzander allexzander force-pushed the feature/secure-file-drop branch from 030f80a to 59686c8 Compare March 2, 2023 17:13
…iles' when syncing E2EE folders.

Signed-off-by: alex-z <blackslayer4@gmail.com>
@allexzander allexzander force-pushed the feature/secure-file-drop branch from 59686c8 to b6ba1fe Compare March 2, 2023 18:29
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5327-b6ba1fe0d61326d24b7c3700531f1a32db6736da-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarcloud
Copy link

sonarcloud bot commented Mar 2, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot C 1 Security Hotspot
Code Smell A 54 Code Smells

48.3% 48.3% Coverage
0.0% 0.0% Duplication

@allexzander allexzander merged commit abe9221 into master Mar 2, 2023
@allexzander allexzander deleted the feature/secure-file-drop branch March 2, 2023 19:26
@mgallien mgallien added this to the 3.8.0 milestone Mar 21, 2023
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.

5 participants