chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-09-18 22:24:49 +02:00
Code Activity
13,240 Commits 4 Branches 173 Tags
v2.5.3-rc2
Commit Graph

6222 Commits

Author SHA1 Message Date
Olivier Goffart
b10edfecfc Workaround MSVC bug with enum in bitfield 
MSVC stores the enum as signed in the bitfield (contrary to the C++ spec)
Which means that once we store a value such as SyncFileItem::DetailError
in a bitfield, we get a negative value back, then of course, further
comparison fails.
 2017-12-15 14:18:45 +01:00
Tomaz Canabrava
43332d3ac7 [CSE] Properly update UI status to encrypted / decrypted 2017-12-15 14:00:42 +01:00
Julius Härtl
49a16ffb4b Fix build on windows 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-12-15 10:59:14 +01:00
Klaas Freitag
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
Christian Kamm
298f1ab570 Disable stack protection for mingw win32 builds in 2.4 
Mingw builds could have it enabled! But we need to ship libssp and test
this more. For the upcoming 2.4 release it should be disabled.
 2017-12-15 09:16:59 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
56028759d5 Merge branch 'master' into clientSideEncryptionV3 2017-12-14 20:47:05 +01:00
Roeland Jago Douma
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
Tomaz Canabrava
82c07236c1 [CSE] Add new method "infoForFolderId" 
we need to query the model for the subfolderinfo, but we don't
have the model index, we have the folder id. this returns it.
 2017-12-14 14:39:07 +01:00
Olivier Goffart
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
Julius Härtl
1cedb1919f Integrate libcloudproviders support 
This commit integrates support for libcloudproviders
desktop integration API. If build with the library it
will check on startup if the DBus interface is available
and then use it instead of the legacy status icon.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-12-14 11:19:25 +01:00
Roeland Jago Douma
fe4bb52a6d Merge remote-tracking branch 'oc/master' into oc_up 2017-12-14 10:27:11 +01:00
Christian Kamm
f40cceaf04 Share link: Adjust design of folder sharing permissions #6192 2017-12-14 08:34:44 +01:00
Tomaz Canabrava
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
rockihack
5cc3b526e8 stack-protector is not supported on hppa. 
(cherry picked from commit 8a963a67f2)
 2017-12-13 11:28:22 +01:00
rockihack
1b2a8ba6b0 Enable stack-protector-strong on Windows and macOS. 
(cherry picked from commit 586fd346ea)
 2017-12-13 11:28:22 +01:00
rockihack
8a963a67f2 stack-protector is not supported on hppa. 2017-12-13 11:27:48 +01:00
rockihack
586fd346ea Enable stack-protector-strong on Windows and macOS. 2017-12-13 11:27:48 +01:00
Christian Kamm
e5ed8fc90a Merge remote-tracking branch 'origin/2.4' 2017-12-13 11:03:24 +01:00
Markus Goetz
75676f8830 Notifications: Propagate "Dismiss" as DELETE to server #5922 
(cherry picked from commit e86416fff7)
 2017-12-13 11:00:40 +01:00
Tomaz Canabrava
9916583ffa [CSE] More verbose output 2017-12-12 21:50:30 +01:00
Roeland Jago Douma
25734afd39 First base64 decode 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-12 21:42:37 +01:00
Tomaz Canabrava
ea3558faf6 [CSE] Fix strings 2017-12-12 21:29:06 +01:00
Tomaz Canabrava
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
Tomaz Canabrava
aca298ca64 [CSE] Be explicit that async encryption uses publicKey 2017-12-12 20:14:31 +01:00
Tomaz Canabrava
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
Tomaz Canabrava
f6f078d1ee [CSE] Rename Variable 2017-12-12 16:15:05 +01:00
Tomaz Canabrava
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
Tomaz Canabrava
0a58ea76e5 [CSE] Start the work with an existing metadata 2017-12-12 15:35:53 +01:00
Olivier Goffart
02283fc686 Merge pull request #6224 from owncloud/deprecated 
Remove use of deprecated Qt API
 2017-12-12 11:48:04 +01:00
Tomaz Canabrava
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
Tomaz Canabrava
33b1fcfe66 Merge branch 'master' into clientSideEncryptionV3 2017-12-12 10:46:43 +01:00
Christian Kamm
dcf0baa9de Journal: 64bit inodes, fix storing uint64s generally 
In addition to using the right function when retrieving inodes this
*also* fixes a more general bug ownsql had with storing uint64 values
that didn't fit into an int64.
 2017-12-12 10:30:54 +01:00
Olivier Goffart
bae00358b9 Merge pull request #6219 from owncloud/config 
Move config and remove most dependencies form the sync engine.
 2017-12-11 17:10:18 +01:00
Olivier Goffart
d517d92f6c FolderWizard: don't use deprecated API 2017-12-08 16:16:06 +01:00
Olivier Goffart
71dcf7fc37 SSLButton: Removes some call to deprecated functions 2017-12-08 16:16:02 +01:00
Olivier Goffart
0a59faf03d OcsJob: Use QUrlQuery 
Qurl::setEncodedQueryItems is deprecated.
 2017-12-08 16:15:48 +01:00
Olivier Goffart
7bd48b1327 cmd: remove usage of deprecated qInstallMsgHandler 2017-12-08 16:15:48 +01:00
Olivier Goffart
8c652e061d Remove uses of deprecated QString::fromAscii 2017-12-08 16:15:48 +01:00
Olivier Goffart
a4816d6a8c Updater: use QUrlQuery 
QUrl::addQueryItem is deprecated
 2017-12-08 16:15:47 +01:00
Olivier Goffart
1a503d54f6 Remove usage of deprecated qSort 2017-12-08 16:15:47 +01:00
Olivier Goffart
263668b1cb Remove use of deprecated translate call 2017-12-08 16:15:38 +01:00
Olivier Goffart
3df65460f5 Remove usage of QString::null 
Replaces by "QString()"
 2017-12-08 16:15:22 +01:00
Olivier Goffart
74672d493d Utility: use QUrlQuery 
For QUrl::setQuery is deprecated in Qt5
 2017-12-08 16:15:17 +01:00
Tomaz Canabrava
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
Tomaz Canabrava
a08a32ceca [CSE] Fetch the metadata for the upload. 2017-12-08 10:32:05 +01:00
Tomaz Canabrava
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
Olivier Goffart
f1b7d506ae csync_exclude: fix compilation of non-test builds 2017-12-08 09:43:26 +01:00
Tomaz Canabrava
70d562668c [CSE] Add handling for side-by-side uploads. 2017-12-07 21:51:42 +01:00