4d7617d64b
Propagator: remove a bunch of code related to the 'Shared' directory
...
This no longer exists since the owncloud server 7.0 which we no longer
allow to connect to
2018-06-01 13:17:20 +02:00
8484b493e4
ConnectionValidator: change the minimum server version
...
Forbit connection with server older than 7.0. These server did not have
permission.
Also warn for anything older than 9.1. 9.0 is end of life according to
https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
2018-06-01 13:17:11 +02:00
311307e8cb
Move ClientProxy and ConnecitonValidator to gui
...
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
2018-05-31 21:56:55 +02:00
c6ef8eec0a
Merge pull request #305 from nextcloud/upstream/pr/6363
...
SyncEngine: Use separate state for two unicode conversions
2018-05-30 08:04:05 +02:00
86741de622
Merge pull request #299 from nextcloud/upstream/pr/6349
...
Don't delete contents behind directory junctions #6322
2018-05-30 08:03:04 +02:00
1dc3c156d4
Merge pull request #304 from nextcloud/upstream/pr/6364
...
Conflicts: Add user name to conflict file name #6325
2018-05-18 13:56:14 +02:00
0283e1bfaa
Merge pull request #295 from nextcloud/upstream/pr/6329
...
Tray: Change icon for unresolved conflicts #6277
2018-05-18 08:53:49 +02:00
33555292ae
Merge pull request #301 from nextcloud/upstream/pr/6353
...
HTTP2: Only from Qt 5.9.4 #6285
2018-05-17 15:39:09 +02:00
36572b79c3
Merge pull request #298 from nextcloud/upstream/no-shibboleth
...
NO_SHIBBOLETH: Fix warning
2018-05-17 15:38:04 +02:00
a2675b559b
Upload: Simplify 'finished' flag
...
* Sometimes there was 'finished' and '_finished'
* Make each done() call automatically set _finished to true
2018-05-16 20:57:26 +02:00
ad276a4bce
Folder: normalize the local path.
...
We otherwise normalize all path in the C form, so we must have
the Folder's path normalized the same. Or all comparizon will fail
(such as knowing if a file from the SocketAPI or the FilesystemWatcher
are part of the folder)
Issue #4424
2018-05-16 20:26:09 +02:00
3506c52be9
propagateuploadv1: don't finalize after a done()
...
Should fix an assert when "Server does not support X-OC-MTime"
(Which only happens with owncloud 5)
Issue #6403
2018-05-16 20:23:47 +02:00
434f093f98
SslButton: Add HTTP/2 info #3146
2018-05-16 20:10:51 +02:00
a0d5e31423
INSTRUCTION_IGNORE now carries a direction
...
This allows IssuesWidget to selectively wipe only the 'Up' ignores
during selective local discovery.
2018-05-16 16:48:31 +02:00
800f1ace0c
SyncResult: Make sure the number of conflicts is correct #6226
...
If the SyncResult incorrectly believes that there are no conflicts, the
tray icon won't be correct and there will be no warning about unresolved
conflicts on the account.
Nevertheless, it's pretty awkward that the IssuesWidget is better
informed about pending conflicts than the Folder itself. This kind of
backwards data flow is very confusing.
Unfortunately the only alternative I see is to either keep track of
this information in two places (also in Folder), or create a common
data-holding class that can serve as a model instance for the issues
view as well as provide data directly to the Folder - which would
have been a much larger change.
2018-05-16 16:47:27 +02:00
75194d1821
SyncEngine: Make "local discovery?" question available
...
Also fix the minor bug that was mentioned and add tests.
2018-05-16 16:46:40 +02:00
2defaf099d
Issues tab: Invalidate issues selectively #6226
...
Everything is invalidated later: after discovery, not before. In
addition entries that should only be invalidated when new local
discovery is done have that behavior now.
2018-05-16 16:45:39 +02:00
01f83ff398
ProgressInfo: Add information for local vs remote discovery
2018-05-16 16:45:13 +02:00
8077748c9d
slotFolderDiscovered: Fix 'local' always being false
...
It was unused, so no harm done.
2018-05-16 16:44:36 +02:00
687b6f5655
Discovery: Error if properties are missing #6317
2018-05-16 16:42:20 +02:00
f244cc4d4a
SyncEngine: Use separate state for two unicode conversions
...
It's unlikely that there were interaction effects but still seems safer
to use different conversion state for the path and rename_path.
2018-05-15 22:44:10 +02:00
17d174e6fa
Conflicts: Add user name to conflict file name #6325
...
For the case of uploading conflict files only.
2018-05-15 22:38:35 +02:00
e82869d10e
HTTP2: Only from Qt 5.9.4 #6285
2018-05-15 19:23:11 +02:00
88347a985f
Adjust the Move To Trash patch
...
(PR #6265 )
- Remove the UI completely
- Move the #ifdef inside the FileSystem::moveToTrash function, so it is easier to
implement on other platforms
- Q_OS_UNIX includes mac, so we need to disable it. (not using Q_OS_LINUX because of
other BSD that uses XDG spec as well
- Translate the error messages
- Add a couple of doc comments
2018-05-15 19:10:41 +02:00
2d1d651fcd
Don't delete contents behind directory junctions #6322
...
QFileInfo::isSymLink() does detect reparse points that are symlinks but
returns false for junctions. The new function FileSystem::isJunction()
can detect those and is used to not recursively delete files inside
directories that are junctions.
See also https://bugreports.qt.io/browse/QTBUG-45344 and the
discussion in the PR https://codereview.qt-project.org/#/c/113019/ .
2018-05-15 18:42:44 +02:00
d33692cdc7
NO_SHIBBOLETH: Fix warning
2018-05-15 18:31:12 +02:00
ad750f569c
Tray: Change icon for unresolved conflicts #6277
2018-05-15 17:58:10 +02:00
f9fe24feb9
Move remote-deleted files to trash
...
Squashed from https://github.com/owncloud/client/pull/6265
Linux only, Hidden option, disabled by default
2018-05-15 17:23:38 +02:00
c763a6e7fb
Show webview with page
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-02 22:50:48 +02:00
64cbc88474
Merge pull request #251 from nextcloud/clientSideEncryptionV4
...
Client side encryption v4.
2018-04-26 19:56:55 +02:00
8e52f1237b
Fix Use of Deprecated trUtf8
2018-04-19 12:02:26 +02:00
7432d6a814
Merge branch 'master' into clientSideEncryptionV4
2018-04-10 16:18:58 +02:00
3e05bd1da0
Do not detach encrypted files vector
2018-04-09 13:23:52 +02:00
3eb3535d0f
Fix downloading NEW encrypted files
2018-04-09 13:23:52 +02:00
defe2d7631
Fix matching encrypted data for downloading
2018-04-09 13:23:52 +02:00
b12066f1aa
Properly remove encryption data from JSON of deleted file
2018-04-09 13:23:52 +02:00
a9208f6581
Remove unused encrypted property
2018-04-09 13:23:52 +02:00
6e63a538b7
Make sure bool _currentLockingInProgress is first defined to false
2018-04-09 13:23:52 +02:00
a7a8de8787
Fix matching encrypted file for download
2018-04-09 13:23:52 +02:00
d3b6aacf3f
Fix merging remote and local trees when e2e files are involved
...
When populating the tree from the filesystem we need to fill
the e2eMangledName from DB and we when trying to find another
match on the oposite tree we need to take in account that names
don't match and search with the mangled name information
2018-04-09 13:23:52 +02:00
c0ef36b8fa
Use QUuid to generate random names
2018-04-09 13:23:52 +02:00
60fc5d6dd4
Fix upload of existing encrypted files by matching only filename
2018-04-09 13:23:52 +02:00
d5ab642e46
Fix sync status running when encryption data is missing
...
When a file on the server of an encrypted folder do
not have a matching entry on the JSON metadata, we
need to report an error and be done with the job
so that Sync status is not "running".
This eventually should cause the file to be removed
from the server as it can not be recovered anymore.
2018-04-09 13:23:52 +02:00
b4b3e422de
Handle gracefully failures in file decryption
2018-03-27 09:18:54 +02:00
ed6f56257e
Dont use new with QFiles.
2018-03-26 22:18:07 +02:00
461aeca200
Do not crash when failing to decrypt the metadata
2018-03-26 22:02:46 +02:00
6c88367ac6
Do not crash if there was an error encrypting the file.
2018-03-26 21:44:46 +02:00
5fe9717598
Potentially fix crash acessing a deleted pointer.
2018-03-26 21:37:13 +02:00
ec28465e01
Correctly handle systems without client side encryption
2018-03-26 20:51:14 +02:00
11684682e6
Return empty metadata in case of error, Display error to the user.
2018-03-25 22:31:49 +02:00
96115be0c6
Unlock folder in case of error
2018-03-25 21:54:08 +02:00
2e4472a4db
Enables server notifications by default.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-03-03 22:44:24 +01:00
3c778980df
Makes sure JsonApiJob::finished won't throw a JSON error when status code is 304.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-03-03 22:24:16 +01:00
621596f45a
Saves notifications ETag response header to use to request only new notifications.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-03-01 22:19:04 +01:00
112c5e10b6
Removes Server Activities option from General settings.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-02-26 12:02:34 +01:00
1a0edc1cd0
Sync activities notifications are never shown unless there is an error. Server activities and notifications are off by default.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-02-23 12:08:37 +01:00
7da0764b8d
Don't class what's not a class
2018-02-18 01:23:59 +01:00
176a42a062
Return the error reported by openssl
2018-02-18 01:13:23 +01:00
5faeca1b82
Move BIO2ByteArray to annonymous namespace
...
This has no use outside of the clientsidenecryption.cpp
2018-02-18 01:04:44 +01:00
ab7185a6c7
Changes notification text in the checkboxes and adds tooltips with explanation about it.
...
- Changes the configuration name in ConfigFile and GeneralSettings
accordingly with the new text.
- Makes sure the user sees error and conflict messages even if the
setting is disabled.
Signed-off-by: Camila San <hello@camila.codes>
2018-02-15 20:21:35 +01:00
bfc7aa16c6
Adds option to toggle display of Sync and Activity notifications.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-02-14 20:38:15 +01:00
99117078f3
Remove table for e2e and add an e2eMangledName column ( #169 )
...
If the code was not complex enough syncing two tables
already started to give UNIQUE constrains errors on
simple sync operations, this also adds initial support
remote delete of an encrypted file
2018-02-12 12:50:51 +01:00
1eb7ba72f0
Use standardized filename
...
See https://github.com/nextcloud/end_to_end_encryption_rfc/issues/13
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-09 11:40:06 +01:00
d85c2bf025
Fix building on windows
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-30 11:10:03 +01:00
296f46356e
If the metadata is empty we should store (and not update).
...
Android only creates the metadata file when the first encrypted file is
added. We assumed it would be there.
This hacky code makes us store the metadata if there wasn't any yet.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-29 22:04:50 +01:00
dcc9ac7d2e
[Buildfix] Fix build from last merge
2018-01-29 14:17:52 +01:00
d24a1e542e
Merge branch 'master' into clientSideEncryptionV3
2018-01-29 14:06:12 +01:00
682bb2ad43
[CSE] Save the encrypted name relation on downloads
2018-01-28 23:50:12 +01:00
e8849a2cf9
[CSE] Save the relation of the file / encrypted file names on the db
2018-01-28 22:26:07 +01:00
e9a7a56359
[CSE] Store the encrypted file name on the SyncFilePtr
2018-01-28 18:37:01 +01:00
48bce4c6b0
Merge remote-tracking branch 'oc/master' into oc_up
2018-01-25 11:17:04 +01:00
4892b0ec43
Properly fill EncryptedFile
...
* Add a mimetype (mobile clients need this)
* Add the tag unencoded as we encode it when we send the metadata
already
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-23 21:31:00 +01:00
21d55c3321
No sharing in metadata yet and PEM as PKCS#8
...
* Don't store the metadata yet this crashes android
- Yes android should be fixed but for now this is quicker ;)
* QSslKey exports PEM as PKCS#1
- This is not handled properly on android so use PKCS#8 helper
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-23 21:02:52 +01:00
72b9beb79c
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
shell_integration/nautilus/syncstate.py
2018-01-23 14:08:15 +01:00
7ce009ef49
If status.php fails check <server>/nextcloud/status.php
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-23 13:43:44 +01:00
d831369f86
Protocol: Remove entries for auto resolved conflicts #6316
2018-01-23 12:01:22 +01:00
a2b8724adf
Hacky way to drop duplicates (we should really use the fileid!)
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-23 11:58:05 +01:00
bb85e2ab2c
Reuse existing EncryptedFile
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-23 11:36:15 +01:00
c3dbb20ce3
Logger: --logdebug only show owncloud's debug message
...
Recent Qt version show way too many debug messages, spamming the console.
So filter only messages that comes from the client.
2018-01-22 21:13:15 +01:00
33beb7aade
Don't generate values after we use them
...
* Pregerenate IV
* Pregenerate key
* Pregenerate filename
TODO:
- Reuse existing file entries and update (we might need logic in the
metadatahandling to do this properly).
2018-01-22 15:24:54 +01:00
cae6bbc853
[CSE] Start the download process
2018-01-22 14:08:32 +01:00
cf2fa2ea35
[CSE] Get the tag of the encrypted file to feed the metadata
...
Also, change the logging cattegory
2018-01-21 21:59:19 +01:00
5d6817e165
[CSE] Save the tag while encrypting.
2018-01-21 21:49:24 +01:00
261cedce3f
[CSE] Do not quit if encryption fails
...
It's much more reasonable to return failure and handle it.
2018-01-21 21:40:53 +01:00
2d872f2a8d
[CSE] Add missing files
2018-01-21 21:26:05 +01:00
009562da1e
[CSE] Remove lambas with lambdas
...
It's hard to reason with lambdas with lambdas, so transform
them into actuall signal / slot calls.
2018-01-21 21:25:06 +01:00
d5a76ea70d
[CSE] Remove the DecryptionJob
...
Transform it into an Static function - it was blocking anyway
and this way it's easier to transform it into a thread in the
future.
2018-01-21 21:24:02 +01:00
4a2d0ab9e9
[CSE] Move code to display minemonic out of the libsync
...
The libsync should not contain Qt Widget related code.
2018-01-21 19:50:40 +01:00
b8539eb329
Get rid of the StopWatch in the PropagateUpload job
...
For issue #6318
The StopWatch is using memory, and we are not really using it.
2018-01-19 13:37:48 +01:00
b9c7aa8df3
Sync: Deal with file/folder conflicts #6312
...
Previously conflicts with a different type on both ends lead to sync
errors. Now they are handled in the expected way: the local item gets
renamed and the remote item gets propagated downwards.
This also adds a unittest for the TYPE_CHANGE case. That one looks like
parts of it might be unified with CONFLICT cases.
2018-01-19 09:47:49 +01:00
6d613fb4d5
Quick and dirty way of showing the mnemonic for now
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-18 22:10:55 +01:00
5722d29e42
Double encode the metadatakeys
...
This is required by a misunderstanding of the RFC.
You need to resetup your test user.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-15 11:26:06 +01:00
3ae327ea8e
Modernize out CMakeLists.txt
...
Mainly uses target_include_directories instead of include_directories
so libraries public include directory get automatically added when adding
the target in target_link_library
2018-01-13 13:58:17 +01:00
5d0aa5f039
Remove unused c_path
2018-01-13 13:58:17 +01:00
1c11778693
Remove the unusued csync_file_locked_or_open test in csync_reconcile
...
It is unused. Also remove the corresponding error code
2018-01-13 13:58:17 +01:00
3ddd4b6f16
Get rid of csync_log
...
We use Qt's debugging code everywhere
2018-01-13 13:58:17 +01:00
257d8142b1
Build system: Get rid of QtVersionAbstraction.cmake
...
Use modern cmake with target_link_libraries and Qt5:: that
automatically add the include path and compile flags
2018-01-13 13:58:17 +01:00
9613f6437d
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/libsync/networkjobs.cpp
2018-01-11 10:46:50 +01:00
883deb1c5d
Fix potential crash in Composite job destruction
...
Sentry:
https://sentry.io/owncloud/desktop-win-and-mac/issues/427476987/
2018-01-09 13:53:57 +01:00
e389fcaecb
Avatars: Use old location for servers <10 #6279
2018-01-09 11:34:56 +01:00
a7ee1a95a6
Download and decrypt file if parent folder is marked as encrypted
2018-01-08 21:08:31 +01:00
3abbbab6a0
Faster way to detecting CSE capability
2018-01-08 21:08:31 +01:00
e2c895e61f
Fix encrypted file location on the server
2017-12-29 17:28:35 +01:00
ca92c46970
Add category logging to PropagateUploadEncrypted
2017-12-29 17:28:35 +01:00
50916bcda5
Mark ClientSideEncryption::isFolderEncrypted() as const
2017-12-29 17:28:35 +01:00
fdc96d3a4f
Fix deprecated use of QUrl::setQueryItems()
2017-12-29 17:28:35 +01:00
e06e04ee93
Fix parsing list of encrypted folders
2017-12-29 17:28:35 +01:00
a63d34f870
Prepend "nextcloud" for all logging categories
...
Thus making easier to exclude logging from kio, qt
and only enable "nextcloud.*"
2017-12-28 17:33:10 -02:00
efc039863b
[CSE] Tons of debugs.
2017-12-24 17:08:04 +01:00
da9f1c412d
[CSE] Remove debug
2017-12-24 16:36:57 +01:00
06c34ed617
[CSE] Assorted fixes
...
- Unlock the folder even on error
- Use the correct name of the file for upload
2017-12-24 16:30:39 +01:00
60ef722b60
[CSE] Update the metadata when a file is being uploaded.
2017-12-22 23:05:39 +01:00
e70bf44aaf
[CSE] Fix the generation of the data for the update Metadata
2017-12-22 22:39:45 +01:00
124a7253a4
[CSE] Create job to Update Metadata
2017-12-22 22:02:16 +01:00
65dfc47ac7
Set public key once certificate is retrieved
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-21 10:20:03 +01:00
0dc7831336
Key is already base64 decoded
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-21 09:49:31 +01:00
b72113a53d
[CSE] Prepare the beginning of the upload.
...
I still need to send the metadata.
2017-12-21 00:35:23 +01:00
df5fd3fbe6
[CSE] More debug output, fix input file path
2017-12-21 00:00:27 +01:00
7be5f0a736
[CSE] Update the finished signal
2017-12-20 23:36:49 +01:00
d87648c99a
[CSE] Use the metadata as pointer.
2017-12-20 23:30:51 +01:00
25d58ccd58
Revert "Store metadata keys as keys"
...
This commit broke decryption.
This reverts commit b9f094cd94
2017-12-20 23:16:42 +01:00
dd0528037d
[CSE] Generate a random name for the temporary file
2017-12-20 23:09:28 +01:00
7e83f0591b
[CSE] Create the Encrypted File on Disk
2017-12-20 22:32:38 +01:00
3760b86e07
[CSE] Mobe fileEncryption to a static function
...
and I'll move all of those to a namespace latter.
2017-12-20 22:28:01 +01:00
20198c5c7b
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-12-20 22:11:46 +01:00
3c301a8282
Add missing FolderMetadata functions
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 22:08:57 +01:00
74bc9213c5
Generate encrypted metadata on the fly
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 22:04:26 +01:00
679bb1f18e
[CSE] Expose EncryptionHelper
2017-12-20 21:33:25 +01:00
14b18b146d
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-12-20 21:29:54 +01:00
5e23ca9658
FolderMetaData: store metadataKeys in a QMap
...
* This allows us to pick the right key for files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 21:25:27 +01:00
b9f094cd94
Store metadata keys as keys
...
Don't store them base64 encoded. But store them directly useable
2017-12-20 21:17:41 +01:00
c35b57cfba
Parse the files in the metadata
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 20:49:16 +01:00
1e899f4172
[CSE] Do not create QPointer from raw pointers
2017-12-20 20:00:59 +01:00
0347cf4e9e
[CSE] Store the sharing keys in memory
2017-12-20 19:40:58 +01:00
fc73ad7476
Salt should not be hardcoded
...
We append the salt (just like the IV) to the ciphertext of the private
key. This means we also have to split it off properly.
This breaks compartibility with currently stored keys on your server.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 16:07:33 +01:00
b924ad7282
Lower mnemonic when generating password
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 15:41:38 +01:00
4551bbe0e0
Forget key + cert + mnemonic on account removal
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 15:35:23 +01:00
a48a3e0acc
Cleanup old functions
...
Those functions had no use anymore since we store the key and cert in
the keychain. Removed them so we don't use them by accident.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 13:41:13 +01:00
ee281963fe
Base64 magic:
...
* metadata keys: bin -> b64 -> enc -> b64
* sharing metadat: string -> b64 -> enc -> b64
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-20 10:22:35 +01:00
ab89231ca2
[CSE] Remove unused debug
2017-12-20 00:25:56 +01:00
d26ade1870
[CSE] Fix the result of the decryption
...
However the text still looks like encrypted.
2017-12-20 00:25:39 +01:00
a1e6901ecc
[CSE] Decrypt correctly the metadata
...
There's a bug that's returning an empty bytearray, need to look
into that.
2017-12-20 00:20:27 +01:00
494ae31de9
[CSE] Fix correct json object
2017-12-19 23:09:39 +01:00
a02246dc65
[CSE] Fix Metadata bugs p1
...
The RFC was misleading, I took the chance to fix a few
inconsistencies regarding the QJsonDocument.
2017-12-19 22:47:05 +01:00
5609a1dbe8
[CSE] Remove old debug code so I can focus.
2017-12-19 17:02:23 +01:00
aa36cc4a5c
[CSE] Reduce probability of conflicts when rebasing
...
Creates a new file/class to handle upload,
propagateuploadencrypted.h/cpp. This should have all the logic to deal
with the encryption and upload.
2017-12-17 22:38:43 +01:00
b9cdc8e922
[CSE] Fix the url to delete the metadata
2017-12-17 21:19:32 +01:00
83e94c3ec7
Fix compile after rebase
2017-12-15 18:05:44 +01:00
a7c0cfc8eb
Upload conflict files #4557
...
If the server has the 'uploadConflictFiles' capability conflict
files will be uploaded instead of ignored.
Uploaded conflict files have the following headers set during upload
OC-Conflict: 1
OC-ConflictBaseFileId: 172489174instanceid
OC-ConflictBaseMtime: 1235789213
OC-ConflictBaseEtag: myetag
when the data is available. Downloads accept the same headers in return
when downloading a conflict file.
In the absence of server support clients will identify conflict files
through the file name pattern and attempt to deduce the base fileid.
Base etag and mtime can't be deduced though.
The upload job for a new conflict file will be triggered directly from
the job that created the conflict file now. No second sync run is
necessary anymore.
This commit does not yet introduce a 'username' like identifier that
automatically gets added to conflict file filenames (to name the files
foo_conflict-Fred-1345.txt instead of just foo_conflict-1345.txt).
2017-12-15 18:03:53 +01:00
8eebc53728
Unify item type enum
...
Previously, there was csync_ftw_type_e and SyncFileItem::Type. Having
two enums lead to a bug where Type::Unknown == Type::File that went
unnoticed for a good while.
This patch keeps only a single enum.
2017-12-15 18:02:04 +01:00
2e516dfc67
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-12-15 15:05:51 +01:00
250c8ff1bf
[CSE] Add job to delete metadata
...
This is needed for the correct functioning of the Set Folder
as Decrypted
2017-12-15 15:02:43 +01:00
5607e27f20
[CSE] Actually save the http response result
2017-12-15 14:25:57 +01:00
43332d3ac7
[CSE] Properly update UI status to encrypted / decrypted
2017-12-15 14:00:42 +01:00
3b96097cf6
Config: Look for exclude file in a relative path.
...
If the application binary is not installed in /usr/bin the client
with this patch considers to check the relative location
../../etc/owncloud-client/ to find the system exclude.
This is an important bit for AppImage based packages of the client,
as this runs from a temporar mountpoint and the system file can not
be found under /etc.
2017-12-15 09:54:40 +01:00
99b4381591
Don't try to decrypt twice
...
The DecryptMetaDataKeys already base64 decoded
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 23:11:40 +01:00
69a201a62d
Percentencode the json we send so special chars don't cause trouble
...
The + sign was lost in transfer.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 23:11:07 +01:00
56028759d5
Merge branch 'master' into clientSideEncryptionV3
2017-12-14 20:47:05 +01:00
be3afd1291
Add FileEncryptJob and FileDecryptJob
...
This handles encryption and decryption of files.
Just create the job and start off.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 16:54:56 +01:00
4dc49ff3b0
SyncEngine: Recover when the PUT reply (or chunkin's MOVE) is lost
...
This can happen if the upload of a file is finished, but we just got
disconnected right before recieving the reply containing the etag.
So nothing was save din the DB, and we are not sure if the server
recieved the file properly or not. Further local update of the file
will cause a conflict.
In order to fix this, store the checksum of the uploading file in
the uploadinfo table of the local db (even if there is no chunking
involved). And when we have a conflict, check that it is not because
of this situation by checking the entry in the uploadinfo table.
Issue #5106
2017-12-14 11:56:12 +01:00
fe4bb52a6d
Merge remote-tracking branch 'oc/master' into oc_up
2017-12-14 10:27:11 +01:00
c592871f94
[CSE] Do not handle b64 inside of the decrypt function
...
the decrypt function should deal with the raw data always.
2017-12-13 16:37:52 +01:00
9916583ffa
[CSE] More verbose output
2017-12-12 21:50:30 +01:00
25734afd39
First base64 decode
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-12 21:42:37 +01:00
ea3558faf6
[CSE] Fix strings
2017-12-12 21:29:06 +01:00
159c0e138f
[CSE] Add a DecryptAsync method
...
Also, cleanup a bit of the old calls. One particular difference
is that I used to set padding to 1 and it should actually be
PKCS1_OAEP_PADDING
2017-12-12 21:23:02 +01:00
aca298ca64
[CSE] Be explicit that async encryption uses publicKey
2017-12-12 20:14:31 +01:00
2127b2629d
[CSE] Move encryption related network jobs to its own file
...
Move encryption related network jobs to it's own file,
the original file was starting to be just way too big.
2017-12-12 19:36:47 +01:00
f6f078d1ee
[CSE] Rename Variable
2017-12-12 16:15:05 +01:00
ce37235cc4
[CSE] Retrieve the Private Key from the KeyChain
...
This fixes one thing and exposes a bug.
the MetadataKeys are not being correctly unencrypted.
2017-12-12 16:09:49 +01:00
0a58ea76e5
[CSE] Start the work with an existing metadata
2017-12-12 15:35:53 +01:00
02283fc686
Merge pull request #6224 from owncloud/deprecated
...
Remove use of deprecated Qt API
2017-12-12 11:48:04 +01:00
e6f835d138
[CSE] Unlock the folder after a lock
...
This makes sure the folder will be unlocked for next tests
2017-12-12 11:26:54 +01:00
33b1fcfe66
Merge branch 'master' into clientSideEncryptionV3
2017-12-12 10:46:43 +01:00
8c652e061d
Remove uses of deprecated QString::fromAscii
2017-12-08 16:15:48 +01:00
263668b1cb
Remove use of deprecated translate call
2017-12-08 16:15:38 +01:00
3df65460f5
Remove usage of QString::null
...
Replaces by "QString()"
2017-12-08 16:15:22 +01:00
74672d493d
Utility: use QUrlQuery
...
For QUrl::setQuery is deprecated in Qt5
2017-12-08 16:15:17 +01:00
0a83d3e743
[CSE] Fix reading the public key for the metadata
...
This broke when we started to use QSslKey and the Qt Keychain
framework.
2017-12-08 11:24:22 +01:00
a08a32ceca
[CSE] Fetch the metadata for the upload.
2017-12-08 10:32:05 +01:00
6745777ca3
[CSE] Save folder id and token for the lock
...
So we can unlock it later. - perhaps we should store this
on the disk or something, to make it harder to lose.
2017-12-08 10:19:56 +01:00
70d562668c
[CSE] Add handling for side-by-side uploads.
2017-12-07 21:51:42 +01:00
ccd8cff4db
[CSE] Try to lock repeteadly the folder if needed.
...
The upload is made in an event loop with more than one
upload at the same time, this confuses the hell out of the
folder locking mechanism.
We need to lock the folder and ask the other trials to try
again in a few seconds in the future to give time for the
uploader to actually upload the current file that's locking
the folder.
2017-12-07 21:31:20 +01:00
9f678652f8
[CSE] Lock the folder to upload a file.
2017-12-07 20:52:54 +01:00
76916b6c48
[CSE] Request the Folder ID.
2017-12-07 19:39:30 +01:00
4878e824e5
[CSE] Fix reading encrypted status of folders.
2017-12-07 19:04:12 +01:00
893ca66af8
[CSE] Fix indentation
...
Parts of the code are indented by spaces, other parts by tabs.
This needs to run in the whole codebase.
2017-12-07 18:12:25 +01:00
19120fde9f
[CSE] Don't query for files on GetFolderEncryptStatusJob
...
The request for folders whas also replying for files.
2017-12-07 18:10:14 +01:00
7fe4dd2163
[CSE] Renane GetFolderEncryptStatus to GetFolderEncryptStatusJob
...
it's a network job after all
2017-12-07 18:06:55 +01:00
4581d708ff
Account: remove dependency with ConfigFile
...
Part of #6213
2017-12-07 17:39:16 +01:00
e0a14cac5b
ConfigFile: use QStandardPaths::AppConfigLocation for the config file
...
Also use appName instead of appNameGui in order to compute the path
Issue: #2245
The reason is to respect the XDG spec on Unix (#1601 ) and might help
on windows roaming profiles (#684 )
2017-12-07 17:39:16 +01:00
ac844a2a45
AbstractNetworkJob: move the httpTimeout from the propagator to the network job
...
Remove one dependency from the config file for the sync engine.
Part of issue #6213
2017-12-07 17:39:16 +01:00
7230fa6b4f
SyncOptions: move to its own file
...
It does not really belong in the discoveryphase.h as it is used also for
propagator option.
Also use C++11 style member initializer
2017-12-07 17:35:38 +01:00
863e86138f
[CSE] Pass the folder to the GetEncryptionStatus
...
Sometimes we are only interested in folders.
2017-12-07 17:32:35 +01:00
7ab127ad53
Excludes: Refactor for pending improvements
...
Make ExcludedFiles something that is instantiated outside of
the CSYNC context and then given to it as a hook.
ExcludedFiles still lives in csync_exclude and the internal
workings haven't been touched.
2017-12-07 14:38:21 +01:00
dd91f4a86e
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/csync/csync.cpp
2017-12-07 09:37:50 +01:00
ceac18c554
Reconcile: Rename maps are consistent with update phase #6212
...
For duplicate file ids the update phase and reconcile phase determined
the rename mappings independently. If they disagreed (due to different
order of processing), complicated misbehavior would result.
This patch fixes it by letting reconcile try to use the mapping that the
update phase has computed first.
2017-12-06 16:42:11 +01:00
ed5385faa3
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/libsync/connectionvalidator.cpp
src/libsync/networkjobs.cpp
2017-12-05 15:58:13 +01:00
66aecb9626
[CSE] Handle normal uploads in CSE enabled instances
2017-12-04 22:45:10 +01:00
6f35cbff6b
[CSE] Fetch the Folder information for encryption status
2017-12-04 22:27:13 +01:00
387737d908
[CSE] Start to create the upload logic.
2017-12-04 21:33:43 +01:00
8c4928d9f6
Merge branch 'uploadImprovements' into clientSideEncryptionV3
2017-12-03 18:15:33 +01:00
35eb071874
[uploadImprovements] use the new struct on PropagateUploadNg
...
use the new struct on PropagateUploadNg to make the algorithm
more future proof.
2017-11-28 22:58:52 +01:00
a64bd6059b
[uploadImprovements] fix struct hole
2017-11-28 22:22:37 +01:00
a623b14209
[uploadImprovements] use the new struct info in PropagateUploadV1
...
Add a new member for the UploadFileInfo in PropagateUploadCommon
to hold the full file path - as it can change if we use a temporary
file to upload.
Adapt propagateuploadv1 to use the new calls.
2017-11-28 22:17:29 +01:00
f609336bfc
Split file to upload from the file on disk
...
They can be conceptually equal - I can upload the file
on disk, and that's what I do right now. But if we want
to accept filters in the future, filters that change
the file on disk like shrinking an image, the current
information used is wrong and we need a way to separate those.
This patch introduces a new struct that holds the *actual*
file that will be uploaded, be it a temporary one or
the original file.
2017-11-28 21:28:06 +01:00
2cacf2547e
Merge branch 'master' into clientSideEncryptionV3
2017-11-28 20:12:57 +01:00
0f60deb043
Store and retrieve keys in keychain
...
* Store privatekey, certificate and mnemonic in keychain
* Retrieve private + public key from server
- ask for mnemonic to decrypt private key
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-28 12:36:35 +01:00
c4d3d0987d
[CSE] Find the start of the upload
2017-11-27 22:20:24 +01:00
47b5cd0fbb
[CSE] Shows correctly Encrypt / Decrypt in the menu
2017-11-27 21:19:54 +01:00
dd903d447f
[CSE] Store the encryption status without the webdav url
...
The Folder information on the desktop client doesn't
knows about the webdav layout aparently.
2017-11-27 21:09:13 +01:00
d2d2df4c75
[CSE] Try to find the webdav url of a folder.
2017-11-27 21:06:38 +01:00
ffb9f69cf6
Start with moving data to the keychain
...
* Check for cert + privateKey in keychain
* Work with QSslKey and QSslCertificate
* Abstract reading the BIO's a bit more
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-27 16:21:53 +01:00
74c4d27ea0
Indent
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-27 16:12:56 +01:00
e3050f7456
[CSE] Pass by reference, return by value.
...
Also, Do not create variables in the heap to change it's value
via reference, prefer an aggregation value. use a Typedef to
fully specify what you want in return.
2017-11-27 15:21:29 +01:00
9cbe795045
Move more encryption functions to encryption helper
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-25 21:43:15 +01:00
e0fbdfe175
Remove obsolete encryption functions
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-25 15:50:47 +01:00
753d7addb4
libsync: Fix compilation with TOKEN_AUTH_ONLY
...
This means we cannot use QtGui in libsync.
So this mostly disable the avatar from the account and the avatarjob
Note that there is one logic change: in ConnectionValidator::slotUserFetched
we do the avatar job even if the user is empty. Otherwise we would end up in
a invalid state. This restore the 2.3.x behavior that was broken in
commit e05d6bfcdc
2017-11-25 12:57:16 +01:00
12adff76e2
Properly decrypt private key and send it to the server
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-24 22:10:28 +01:00
6d145a676b
Added EncryptionHelper
...
This is to move generic encryption methods out of the main code and into
small helper functions. So we don't scatter the encryption code all over
the place.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-24 21:05:21 +01:00
45d9323653
[CSE] Update encryption status when folder is updated
2017-11-23 16:55:12 +01:00
57e0d7abcb
[CSE] Fix pointer to e2e
...
Qt expects things to be pointers even if they are stack
variables.
2017-11-23 16:54:45 +01:00
72809ef5b1
csync_update: ignore remote files that cannot be encoded
...
This is mainly for linux, whose local is not UTF-8.
For example, in latin1, it is not possible to encode emoji or chinese character.
If there are such character in the filename, Qt would just save the file using
the replacement character ('?'). Then, on the next sync, client would rename
the files using this replacement character.
Avoid this by ignoring the files which cannot be downloaded because the
filename cannot be represented with the user's locale
Relates to issue #5676 and #5719
2017-11-23 12:51:28 +01:00
e9907bc8ae
AvatarJob improvements
...
* Drop AvatarJob2
* Allow AvatarJob to retrieve different sizes and users
* Make creating a circular avatar into a function
(maybe all avatars should be made into that shape in the first place)
2017-11-21 16:33:03 +01:00
d949ec6877
Protocol: Introduce context menu with "open in browser" #6121
...
To do this conveniently a bunch of functionality that's common to
IssueWidget and ProtocolWidget is moved to ProtocolItem.
Also the convenience function to asynchronously retrieve the private
link url is moved from the socket api to the network jobs.
2017-11-21 12:42:10 +01:00
a118419f0c
[CSE] buildfix, use the correct type.
2017-11-21 09:55:44 +01:00
d31aa7836a
[CSE] Add job to find what folders are encrypted.
...
This still needs to be correctly setuped in the call chain.
The job returns a QVariantMap with the folder-webdav-url
and the encrypted status.
2017-11-20 21:38:17 +01:00
34e6534813
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-11-20 18:01:48 +01:00
6d464d9dc6
Merge branch 'master-nextcloud' into clientSideEncryptionV3
2017-11-20 18:00:58 +01:00
9878559002
Move to NC theme
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-20 15:46:18 +01:00
aafe7c4732
Merge remote-tracking branch 'origin/2.4'
2017-11-20 11:54:56 +01:00
480932a58a
Checksum: Ignore unkown OC-Checksum header when downloading...
...
And if there are several checksums, pick the "best" one.
The case of several checksum was reported in
https://github.com/nextcloud/client_theming/issues/213
2017-11-20 10:51:15 +01:00
e694ffcd03
PropagateDownload: Adjustments to skipping downloads #6153
...
Previously we required matching mtimes but that's actually
unnecessary when the question is about whether to skip the
download. We will still update the file's metadata.
Also, adjust behavior when the checksum is weak (Adler32):
in these cases we still depend on equal mtimes.
2017-11-16 13:31:54 +01:00
9394fe6e84
Use openssl functions to get random words
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-16 10:45:57 +01:00
9a1ea67a35
Theme: Update the wizard size on high dpi screen
...
Issue #6156
2017-11-15 10:46:08 +01:00
bff24ffd2f
PropagateDownload: Fix GET with redirects #6159
...
The GET jobs were redirected, but the custom incremental handling
in readyRead didn't propagate to the follow-up job.
2017-11-15 10:11:15 +01:00
b0f986c740
Private links: Account for overwritehost #6146
...
Retrieve ocs/v1.php/config to determine the desired host and build the
private link urls with that instead.
2017-11-14 12:14:11 +01:00
3ae2071129
DetermineAuth: Remove concept of Unknown #6148
...
This restores 2.3 behavior. Some servers reply 404 to GETs and PROPFINDs
to the remote.php/webdav/ url and used to work. Being more picky would
break them.
2017-11-14 12:10:35 +01:00
14aeb6921b
[CSE] Fix invalid memory access
2017-11-13 18:15:08 +01:00
a0f0e5617a
[CSE] Move the e2e object to the Account
...
This is important as a lot of the code would start
to rely in direct access to the client side encryption
and there are different keys for different accounts.
2017-11-13 17:22:09 +01:00
6351c01ee7
[CSE] Remember the token for folders
2017-11-13 17:04:02 +01:00
22a2ab8999
[CSE] Start to send the metadata to the server
2017-11-13 16:46:30 +01:00
4755b8c8a3
[CSE] More warnings
2017-11-12 13:03:52 +01:00
19d64e6308
[CSE] Remove warnings
2017-11-12 12:55:12 +01:00
685ceacace
[CSE] Memleaks
2017-11-11 16:25:38 +01:00
ee4a848d9a
[CSE] Correctly Unlock the Folder
...
Wireshark is love, and life.
2017-11-06 20:58:30 +01:00
7290cf2813
[CSE] Adjust the CN accordingly to the server
2017-11-06 20:57:50 +01:00
9af6e29f42
DetermineAuthType: Adjustments for tight firewalls #6135
...
With some firewalls we can't GET /remote.php/webdav/. Here we keep the
GET request to detect shibboleth through the redirect pattern but then
use PROPFIND to figure out the http auth method.
Currently we prefer OAuth to Shibboleth to Basic auth.
This also restores the fallback behavior of assuming basic auth
when no auth type can be determined.
2017-11-06 13:09:10 +01:00
131fd4e483
Fix encryptJSON and descryptJSON
...
Now working with tag
Basically we called EVP_*Update to much which resulted in weird output.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-03 18:00:05 +01:00
be9cd358d4
[CSE] Bypass Qt DELETE Bug
...
It appears that Qt implementation of the DELETE http request
does not send bodyData, and we need that for Nextcloud.
Currently I changed the http request on the server side
to accept a POST instead of a DELETE, so I can actually
develop.
Also, I already poked the Qt developers that did this code.
2017-11-03 17:00:28 +01:00
6ad6852045
[CSE] Cleanup - remove commented metadata.
2017-11-03 16:59:39 +01:00
5514f14e88
[CSE] Get and send the lock - token
2017-11-03 15:12:12 +01:00
b53003792f
[CSE] Removed lambdas for Metadata / Lock / Unlock
2017-11-03 12:34:30 +01:00
6facd29663
[CSE] Start to break the lambdas
...
Lambda within a lambda is a terrible idea,
Use default signal / slot connections with a
method instead.
2017-11-03 12:00:25 +01:00
d7e05c9b05
[CSE] Comment out broken code.
...
But why it's broken?
2017-11-03 11:20:44 +01:00
c9d5a9cea2
HttpCreds: Don't create empty client cert keychain entries #5752
...
This doesn't do anything about deleting the client cert keychain
entries when the whole account is removed though.
2017-11-03 10:28:56 +01:00
8e3e3a4575
Be java compatible and store the tag at the end of the cipher text
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-02 12:39:42 +01:00
8d537fdd3c
[CSE] Get Metadata from the server
2017-11-01 18:32:33 +01:00
4a66cf11d2
[CSE] Send Metadata to the server
2017-11-01 18:21:30 +01:00
2698759525
[CSE] Implement the Folder Unlock api job
2017-11-01 17:54:17 +01:00
1b1add5ead
[CSE] Add api to lock file
2017-11-01 17:36:54 +01:00
6ac44f05cd
Credentials: Namespace windows cred keys #6125
...
The application name is prepended to the key. QtKeychain doesn't
do that automatically on the platform.
2017-11-01 17:03:30 +01:00
e5fdcd2f38
[CSE] Add TODO:
2017-11-01 16:48:19 +01:00
ef2529ca44
[CSE] Set padding to 0 for the Rsa encryption
...
Also, commented out the finalization of the decrypt operation
because that was messing with the encryption. There's something
wrong here but I need to get this working and I can fix stuff
later.
2017-11-01 16:13:17 +01:00
1a891423e5
[CSE] Call the decryption function to test.
2017-11-01 15:48:40 +01:00
41ebcd0b7e
[CSE] Decryption of the metadata blob
2017-11-01 15:29:14 +01:00
77ec3b086d
[CSE] Remember to finalize encryption
2017-11-01 15:24:19 +01:00
88d87bf0ca
[CSE] Convert encrypted bitearray to Base64
...
also, start the decrypt.
2017-11-01 14:46:32 +01:00
eb43fa1459
[CSE] Internal metadata encryption working
2017-10-31 17:52:01 +01:00
8793fdbc69
[CSE] Remember to actually use the correct variable
2017-10-31 16:06:01 +01:00
4bb7ebb6aa
[CSE] Convert the base64 data to raw, for the decyrption
2017-10-31 13:17:22 +01:00
3628f3739d
[CSE] Start the decryption of the metadata
2017-10-31 13:06:20 +01:00
b28b4705de
[CSE] Correctly store the encrypted metadata
...
Missing the conversion to base64.
2017-10-31 12:07:47 +01:00
c7d9abbea3
[CSE] Rework pubkeyPath to be able to fetch pubKey
2017-10-30 20:02:55 +01:00
a986532442
[CSE] Generate a random password for the metadata.
2017-10-30 19:08:03 +01:00
cf56d58241
[CSE] Start the encryption of the metadataKey
2017-10-30 19:05:55 +01:00
c695c50c33
[CSE] Implement the empty metadata
...
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2017-10-30 15:40:05 +01:00
5420741edb
Merge branch 'master' into clientSideEncryptionV3
2017-10-30 11:21:36 +01:00
05c1bfb6cf
Merge remote-tracking branch 'origin/2.4'
2017-10-27 10:29:31 +02:00
10c6951438
Windows: Add a setting to enable/disable the explorer navigation pane integration
...
Issue #5295
2017-10-24 16:10:53 +02:00
238f0b3610
Add note
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 15:53:17 +02:00
817baf292d
Use EVP_aes_128_gcm
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 15:51:53 +02:00
ca6fa7b341
Update decryp function
...
* Do not use AAD
* Do not try to decrypt the last 16 bytes as Android adds the tag there
by default
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 15:51:53 +02:00
bacbf337d2
Update encryption function
...
* Do not use padding
* Do not use the ADD data
* Append the tag to the ciphertext to be compatible with Android
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 15:51:53 +02:00
ee63b36ed3
SyncFileStatusTracker: Detect changed in the shared flag
...
... even if the file is not changed.
We get an UPDATE_METADATA in that case, so make sure we let the
SyncFileStatusTracker know about it.
That means we need to filter out UPDATE_METADATA in the other listeners
of this signal.
Issue #6098
2017-10-24 15:50:14 +02:00
35d28294cd
SyncEngine: remove SyncEngine::syncItemDiscovered
...
It is unused.
2017-10-24 15:50:14 +02:00
e85a339d94
Local discovery: Use db instead of filesystem
...
We mostly trust the file watchers meaning that we don't re-scan the
local tree if we have done that recently and no file watcher events
have arrived. If the file watchers invalidate a subtree, we rescan
only that subtree.
Since we're not entirely sure the file watchers are reliable, we still
do full local discoveries regularly (1h by default). There is a config
file setting as well as an environment variable to control the interval.
2017-10-24 10:00:20 +02:00
476fe66043
[CSE] Add beginnign of the code to deal with the metadata
2017-10-23 21:06:26 +02:00
23f5bb7ed9
[CSE] Move network jobs out of networkjobs.h
...
Since those networkjobs are all about client side
encryption, mvoe them to clientsideencryption.h
This will help with fewer conflicts with the origin.
2017-10-23 21:06:26 +02:00
a9761a8976
Use qEnvironmentVariable* instead of qgetenv when appropriate
...
Now that we use Qt5, we should do that. It is slightly more efficient
and declares the intent.
(Modified using clazy)
2017-10-19 13:57:49 +02:00
1a47052aa3
[CSE] Remove unused function
...
This is already being called from somwhere else.
2017-10-18 21:51:39 +02:00
e0988f482c
[CSE] Build fix
...
- change the name of one Qt Message Handler
- changed parameter from int to QString
2017-10-18 21:51:39 +02:00
d83e8819ce
[CSE] SetEncryptionFlagApiJob
...
This new job sets the Encryption Flag in a folder.
2017-10-18 21:51:39 +02:00
623eb29845
[CSE] Helper functions for the URL's
2017-10-18 21:51:39 +02:00
1436d5bac1
[CSE] Better debug output
2017-10-18 21:51:39 +02:00
0b50afe915
[CSE] Correctly Set's the client as connected
...
If we manage to encrypt and upload the private key
to the server, the client is in it's connected state.
2017-10-18 21:51:39 +02:00
cfb6e3be8c
[CSE] Send the Private Key to the server
2017-10-18 21:51:38 +02:00
78136a10b0
[CSE] Debug statements to help find the encrypt error
2017-10-18 21:51:38 +02:00
08dfe86f37
[CSE] Adjust the calls to ent-to-end encryption
...
We changed the name.
2017-10-18 21:51:38 +02:00
0f1480728e
[cse] Use fake data to verify the encryption
...
beware, this is broken.
2017-10-18 21:51:38 +02:00
ba3d2a61d5
[cse] Call the encrypt and decrypt functions on fake data
2017-10-18 21:51:38 +02:00
e0d368cbb3
[cse] Update the encrypt and decrypt algorithm to GCM
2017-10-18 21:51:38 +02:00
4f7265c04f
[aes] Create the Decrypt function.
2017-10-18 21:51:38 +02:00
6b53b4f257
[cse] Add the crypt method, based on OpenSSL Wiki
2017-10-18 21:51:38 +02:00
77c0309e02
[cse] use PKCS5_PBKDF2_HMAC_SHA1 on the random-word passphrase
2017-10-18 21:51:38 +02:00
5395fc56b1
[cse] Start the encryption algorithm for the Private Key
2017-10-18 21:51:38 +02:00
fd00e180f5
[aes] fix out of bounds access.
2017-10-18 21:51:38 +02:00
418401a33c
[cse] new method, getUnifiedString
...
Enter a string list, return a string.
2017-10-18 21:51:38 +02:00
2111aeaac1
[cse] Add wordlist & related methods.
2017-10-18 21:51:37 +02:00
69c709714d
[cse] Save signed key on disk
2017-10-18 21:51:37 +02:00
090336c928
[cse] Correctly send the CSR
...
finally.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2017-10-18 21:51:37 +02:00
307dfd195c
[cse] Call the CSR job.
...
There's something wrong on the CSR job that I need to discover.
2017-10-18 21:51:37 +02:00
304231811d
[cse] Start the job to sign the public key.
2017-10-18 21:51:37 +02:00
ecb05020a9
[cse] Do not save the certificate on disk
...
Store it on memory, and discard it as soon as no longer
needed.
2017-10-18 21:51:37 +02:00
d2992d92ba
[cse] Generate the CSE
...
I still need to send it to the server. It's been a long
learning with the OpenSSL library.
2017-10-18 21:51:37 +02:00
c358980448
[cse] Link Against OpenSSL
...
For some reason, this was working untill I added a call
to X509_REQ_get_subject_name, then the linking suddenly
stopped working (even tougth I'm using a ton of other
OpenSSL calls)
Force to link against 1.0
2017-10-18 21:51:37 +02:00
42a3098595
[cse] s/scr/csr
2017-10-18 21:51:37 +02:00
58e2e6b30b
[cse] Generate the public / private keys and store locally
...
Now I need to understand what the hell I need to do
to send this to the server.
2017-10-18 21:51:37 +02:00
8c342cb1dd
[cse] Generate the KeyPair
...
Not stored anywhere yet, but it's correctly running.
2017-10-18 21:51:37 +02:00
17693a75e5
[cse] Request public key from server
...
This is the first step needed to properly communicate.
Next, get private key.
2017-10-18 21:51:37 +02:00
f4bbec1019
[bugfix] Return the error code, don't discard it.
2017-10-18 21:51:37 +02:00
29b64640fa
[cse] Start to fetch the basics to fetch the key from the server
2017-10-18 21:51:37 +02:00
3f4d915a17
[cse] Add files to handle client side encryption
...
This will be the responsible for encryption,
decryption and talking with the server.
2017-10-18 21:51:36 +02:00
7e2085375f
[cse] Invalid read of 1
2017-10-18 21:51:36 +02:00
1c85f94b00
[cse] Use server capabilities to query for cse
2017-10-18 21:51:36 +02:00
920047fa70
[CSE] Remove uneeded includes
2017-10-18 21:51:36 +02:00
5b51346e83
[CSE] New Network Job: DeleteApiJob
...
This network job does a DELETE http request on a URL. It's the
second class that does basically the same, but this one returns
the http return code, and it's set to do a api call.
2017-10-18 21:51:36 +02:00
9870f39dcb
[CSE] Fetch file-id for subfolders
...
File id is a must if we want to call any API.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2017-10-18 21:51:36 +02:00
9318c487b9
[CSE] Display menu for encrytp / decryot folders
...
If the server supports client syde encryption, display
a menu on right click that should display encrypt and decrypt.
ideally it would show the encrypt if the folder is decrypted, and
decrypt if the folder is encrypted but currently there's no way
for the client to know that.
2017-10-18 21:51:36 +02:00
1c32f6bb2e
[CSE] Check the server for client side encryption
...
Call the apps api and check if the response has
the client_side_encryption key.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2017-10-18 21:51:36 +02:00
bf39343920
Sync: Add capability for invalid filename regexes #6092
2017-10-17 17:15:49 +02:00
b2a8ffc577
Abort: Fix crash with early aborts
...
_chunkCount could be 0, leading to a floating point exception
I also added initializers for several uninitialized integers in the
upload jobs.
2017-10-17 09:44:52 +02:00
e2711224ed
Propagator: Avoid duplicate async abort
2017-10-17 09:44:52 +02:00
111bb485ec
UploadNG: Avoid div-by-zero for super fast uploads
2017-10-17 09:44:52 +02:00
e10775d34f
Fix paused sync file move issue #5949
...
Dont abort final chunk immedietally
Use sync and async aborts
2017-10-17 09:44:52 +02:00
f598ac89ac
HttpCreds: Fix retry after wrong password #5989
...
This is an ugly solution.
2017-10-13 14:24:37 +02:00
01c2ffe2ae
PropagateDownload: Read Content-md5 header #6088
2017-10-11 09:06:23 +02:00
315e38e814
Use display-name from the ocs call in the settings dialog
2017-10-06 10:59:20 +02:00
3a1a56c7ad
Excludes: During directory traversal, use QRegularExpression
...
On Mac, this halves the time spent in csync_excluded_traversal
when using check_csync_excluded_performance. A similar performance
increase is seen on linux.
2017-10-05 10:19:48 +02:00
800b9cf167
SyncEngine: _hasNoneFiles should be set when there are INSTRUCTION_UPDATE_METADATA
2017-09-28 11:15:36 +02:00
d68b07dfc7
Fix encoding of version string
2017-09-27 12:06:49 +02:00
a2ce739192
Set CMAKE_INSTALL_RPATH as RPATH for installed executables
2017-09-27 09:13:44 +02:00
844bfc5f25
Move the --version output text to Theme #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-09-27 09:13:44 +02:00
13e0cc6b50
Use QDateTime::currentDateTimeUtc instead of the non utc version
...
QDateTime::currentDateTime is terribly slow.
2017-09-26 16:14:17 +02:00
54c522c861
SyncJournalDb: Reimplement the db_is_empty logic from csync
...
This reduces the initial sync local discovery time from
2.0 to 0.6 seconds in LargeSyncBench on my machine.
2017-09-26 11:03:23 +02:00
a034ee894c
Use SyncJournalDb in csync
...
This gets rid of the csync_statedb sqlite layer and use
the same code and same connection as the rest of the SyncEngine.
Missing functions are added to SyncJournalDb and change a few minor
things (like changing SyncJournalFileRecord::_modtime to be an int64
instead of a QDateTime, like it was in csync).
2017-09-26 11:03:23 +02:00
6f46764daa
SyncJournalDB: Allow callers of getFileRecord if the query failed
...
The current implementation would return the same value whether the query failed
or if no row would be found. This is something that is currently checked by csync
and needs to be provided if we want to use SyncJournalDB there.
Adjusted all call sites to also check the return value even though they
could still just rely on rec.isValid(), but makes it more explicit as to what
happens for database errors in those cases, if we ever want to gracefully handle
them.
2017-09-26 11:03:23 +02:00
090abdee87
bandwidthmanager: Fix unregistering devices on delete
...
from the destroyed signal, qobject_cast won't work because the object
is already destroyed. One must use reinterpret_cast then
2017-09-25 12:56:20 +02:00
ce04a76b17
PropagateUpload: Fix another non-normalized connect that appears while profiling
2017-09-25 12:49:55 +02:00
0cec6f08ca
OAuth2: Fix double slash in URL
...
We need to use concatPath to avoid possible double '/' in the URLs if the
account url() ends with '/'.
This has become even more of a problem since commit
d1b8370a4a
2017-09-23 10:10:40 +02:00
Olivier Goffart