1790 commits

Author	SHA1	Message	Date
Roeland Jago Douma	b34708da29	Move help URL also to CMAKE ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2019-01-31 11:28:46 +01:00
Roeland Jago Douma	0c21852bc3	No need to overwrite customMedia in the theme ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2019-01-31 11:28:46 +01:00
Roeland Jago Douma	944f9e9668	Move wizard options to CMAKE as well ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2019-01-31 11:28:38 +01:00
Roeland Jago Douma	5c2996deb7	Use the provided updater URL ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2019-01-31 09:52:16 +01:00
Roeland Jago Douma	8b64db6344	Merge branch 'master' into fix/566/do_not_read_system_exclude	2018-11-27 11:19:20 +01:00
Roeland Jago Douma	6cc496633f	Do not read system exclude list if user exclude is present ... For #566 Since we only showed the user exclude list (and some extra items) the system exclude list was still used. This copies over the system exclude list (if it isn't there). If it fails we use the system one still. However if you now remove items from your own list it will really be gone. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-11-19 15:35:32 +01:00
Roeland Jago Douma	1d0bf08a1c	Do not fetch activities if they are not enabled ... Fixes #788 Fixes #834 If the activity app is not enabled we should not try to fetch the activities at all. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-11-19 14:13:51 +01:00
J-P Nurmi	1af9bf8abc	libsync: run clang-tidy modernize-use-nullptr	2018-11-12 18:46:39 +01:00
J-P Nurmi	0d1c15a768	libsync: run clang-tidy modernize-use-override	2018-11-12 18:43:58 +01:00
J-P Nurmi	48acaec66f	libsync: search'n'replace "Q_DECL_OVERRIDE" with "override"	2018-11-12 18:39:50 +01:00
Roeland Jago Douma	3a0c7f64c0	Use a format that supports alpha channels for avatars ... If we use the source format it can result in fully black images. As the basic generated avatar doesn't have an alpha channel. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-11-09 13:01:28 +01:00
Aleksandr Borisenko	bb2d31a2bd	Removed explicit initialization; Fixed RAND_bytes not found	2018-11-08 11:24:39 +03:00
Roeland Jago Douma	af8a2819be	Merge pull request #768 from nextcloud/fix/766/copy_over_old_windows_config ... Copy over config file to new location on windows	2018-11-02 21:01:22 +01:00
Roeland Jago Douma	e01cb108e1	Merge pull request #754 from kevin147147/patch-1 ... theming for general settings ui	2018-11-02 10:08:18 +01:00
Roeland Jago Douma	188a1a6e24	Copy over config file to new location on windows ... Fixes #766 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-11-01 15:02:31 +01:00
Roeland Jago Douma	5cfdc71ca5	Merge branch 'master' into upstream/pr/6671	2018-10-31 21:13:10 +01:00
Roeland Jago Douma	ef3aeb65cc	Merge pull request #658 from nextcloud/upstream/pr/6698 ... OAuth: Fix infinite loop when the refresh token is expired	2018-10-30 23:04:09 +01:00
kevin147147	30032f9c0c	i18n for general settings ui	2018-10-30 17:32:52 +01:00
Dominik Schmidt	cddb9aa8ba	Support higher resolution theme icons	2018-10-23 23:07:17 +02:00
Roeland Jago Douma	f3529e3dd7	Merge branch 'master' into upstream/pr/6674	2018-10-23 21:43:13 +02:00
Roeland Jago Douma	c37186cc56	Merge branch 'master' into upstream/issue/6581	2018-10-23 21:08:51 +02:00
Roeland Jago Douma	1c8307f264	Merge branch 'master' into fix-issue-268	2018-10-23 12:04:14 +02:00
Roeland Jago Douma	156308c72e	Merge branch 'master' into upstream/issue/6581	2018-10-21 14:19:07 +02:00
Roeland Jago Douma	2dc7ff7332	Merge branch 'master' into upstream/pr/6360	2018-10-19 16:13:09 +02:00
Camila San	45ff3385c7	Uses QByteArray to store private key. ... Removes QSslkey. See #268 Signed-off-by: Camila San <hello@camila.codes>	2018-10-15 00:21:08 +02:00
Olivier Goffart	08e4ba3363	Data-Fingerprint: Fix backup detection when fingerprint is empty ... Add a test to test the data fingerprint feature make me realize it was broken. The code was relying in the distinction between empty and null QByteArray, but this was a bad idea as this difference is lost when going through QString.	2018-09-10 20:44:03 +02:00
Olivier Goffart	3b2c6d2202	OAuth: Fix infinite loop when the refresh token is expired ... The server reply with a code 400 when the token is invalid, the client was understanding this error as a network error, and was retying again with the same token. Instead, we must rely on what the json is saying, even if the reply is not a 200 code. Issue https://github.com/owncloud/enterprise/issues/2777	2018-09-10 20:22:40 +02:00
Christian Kamm	5b228d1afd	Do not require server replies to contain an mtime ... The check was added for #6317 in commit 13eb64584f. We did see missing mtimes in replies in tests with live servers though. Possibly those were old incomplete responses cached in the stat cache?	2018-09-10 17:33:53 +02:00
Christian Kamm	cba0627a9c	Ensure GETFileJob notices finishing #6581 ... It could happen that readyRead was emitted for incoming data while the download was not yet finished. Then the network job could finish with no more data arriving - so readyRead wasn't emitted again. To fix this, the finished signal also gets connected to the readyRead slot.	2018-09-09 11:50:00 +02:00
Roeland Jago Douma	c4d7f97e00	Add legal notice button to about dialog ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-08-02 22:17:11 +02:00
Christian Kamm	d549c77af6	Issues: Show link to conflicts doc if there are some #6396 ... The link url is themed.	2018-07-03 10:18:18 +02:00
Roeland Jago Douma	ce545b1e47	propage*encrypted Q_UNUSED ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-07-02 12:45:44 +02:00
Roeland Jago Douma	e871359453	Remove unneeded ; ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-07-02 11:03:58 +02:00
Roeland Jago Douma	b952fa64ee	Restore logger installation ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-07-02 11:01:52 +02:00
Roeland Jago Douma	d2b75cabb2	Remove default trademark text ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-29 21:36:18 +02:00
Roeland Jago Douma	595cbfaa16	Update urls ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-28 12:46:47 +02:00
Camila San	4c7b7dfcaa	Restores previous text in the about section. ... Signed-off-by: Camila San <hello@camila.codes>	2018-06-28 12:33:40 +02:00
Olivier Goffart	c5ace2338c	Theme: unify ownCloudTheme and Theme classes ... The goal is to avoid confusion described in issue #6422 by removing duplicates between the Theme and owncloudTheme. - Use the about from ownCloudTheme everywhere - Create default applicationIcons() and condifFileName() that should work everywhere - trayFolderIcon was removed as it is not used - the helpUrl from the default Theme now points to the owncloud client documentation. Before there was no help entry by default for branded client if the function was not overriden. - Do not merge functions that would otherwise break compatibility with theme that did not override them. For example colors or customMedia.	2018-06-28 12:33:39 +02:00
Roeland Jago Douma	48a6ef37b2	Add a button to E2E accounts to show the mnemonic ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-21 19:52:27 +02:00
Julius Härtl	4ba40a6ce1	Move information icon to warning icon ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-06-20 16:06:19 +02:00
Roeland Jago Douma	f7bf8c7577	Thread local storage don't work properly on OSX ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-14 21:26:07 +02:00
Christian Kamm	d304fcbda7	Rename local discovery option for clarity ... It's using full relative filepaths, not just dir paths.	2018-06-11 14:50:01 +02:00
Roeland Jago Douma	dc41f8a16e	Fix windows build ... * Reorder openssl header import * not => ! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-06-08 16:53:56 +02:00
Olivier Goffart	7c9ec4a55a	Credentials: Retry fetching from the keychain in case the keychain is still starting ... When owncloud is restored, at boot time, it might be started before the crendential manager. So if we detect an error, wait 10 seconds and hopefully it'd be loaded by then. Issues: #4274, #6522	2018-06-07 15:18:40 +02:00
Christian Kamm	5f793c151c	Upload: Adjust timeout for final job based on size #6527 ... Some servers have virus scanners and the like that can delay the response of the final chunked upload assembly significantly, often breaking the current 5min (!) timeout. See owncloud/enterprise#2480 for details.	2018-06-07 09:38:16 +02:00
Christian Kamm	4fa762b5ce	Propagation: Connection closed is a normal error #6516 ... Because it sometimes appears in conjunction with server bugs and we don't want to halt all syncing for other files in these cases.	2018-06-07 09:12:46 +02:00
Olivier Goffart	14ff3534a8	Fix compilation warning ... propagateuploadng.cpp:500:10: warning: lambda capture 'this' is not used [-Wunused-lambda-capture]	2018-06-07 08:53:12 +02:00
Christian Kamm	d9640dd79e	PropagateUpload: Fix miscount in abort() #6516 ... Previously it tried to abort even jobs that had already finished, which was not going to work as they wouldn't emit finished() again. Also, in some cases the abortCount would never go to zero and that case wasn't well documented.	2018-06-07 08:53:12 +02:00
Christian Kamm	96126a53d3	PropagateUpload: Remove unused PropagateUploadFileCommon::abort	2018-06-07 08:53:10 +02:00
Markus Goetz	367d0c39e8	Logging: Avoid the word "Error" ... The old code printed "QNetworkReply::NoError"	2018-06-06 20:24:32 +02:00
Olivier Goffart	073a5184cb	Use std::chrono::milliseconds to represent milliseconds	2018-06-06 17:26:53 +02:00
Olivier Goffart	012c638d4e	Uploads: Don't delete unexisting chunks ... Since commit 4dc49ff3, we store an entry in the upload info table even for non chunked uploads. However, if this fails we don't want to remove non-existant stale chunks if the upload fails. Without this commit, we would send a DELETE command to clean non-existant chunks in the dav/uploads/ namespace.	2018-06-06 09:52:02 +02:00
Markus Goetz	de1032ebd7	Q_UNUSED: Sprinkle around	2018-06-05 20:45:51 +02:00
Christian Kamm	4a81ae75cf	Logging: Add persistent auto-logdir option #6442	2018-06-05 20:07:53 +02:00
Christian Kamm	428cfc5e1c	LogDir: Compress log when switching files #6442	2018-06-05 20:07:53 +02:00
Christian Kamm	09f83f4fa9	SyncJournal: Clear etag filter before sync ... Before, we only cleared the _avoidReadFromDbOnNextSyncFilter *after* a sync which meant that we had to sync twice after selective sync setup. Now, we clear the filter *before* a sync as well which allows the actual next sync to write the correct etags to the db again - instead of only the sync after that one. Also expand on comments and rename _avoidReadFromDbOnNextSyncFilter to _etagStorageFilter.	2018-06-05 12:00:20 +02:00
Christian Kamm	c57e4dcf03	Blacklisting must prevent parent etag updates #6411	2018-06-05 10:12:11 +02:00
Roeland Jago Douma	4bd6f2b26d	Merge pull request #323 from nextcloud/upstream/upload-finished-flag ... Upload: Simplify 'finished' flag	2018-06-04 17:14:17 +02:00
Roeland Jago Douma	3a1dc44ec8	Merge pull request #320 from nextcloud/upstream/issue/6403 ... propagateuploadv1: don't finalize after a done()	2018-06-04 17:12:52 +02:00
Roeland Jago Douma	c49597d9d8	Merge pull request #319 from nextcloud/upstream/issue/4424 ... Folder: normalize the local path.	2018-06-04 16:02:49 +02:00
Roeland Jago Douma	321e8c0264	Merge pull request #317 from nextcloud/upstream/issue/3146 ... SslButton: Add HTTP/2 info #3146	2018-06-04 16:01:44 +02:00
Olivier Goffart	393f6c2310	SyncEngine: remove the "CSync" wording from the error messages ... They are confusing for the user. Example in issue #6274	2018-06-04 15:41:38 +02:00
Olivier Goffart	5f30177bfc	CSync: Remove unused error codes ... None of the removed ERRNO code were ever set. So none of the removed error hapenned anymore	2018-06-04 15:41:38 +02:00
Olivier Goffart	15e93c8a31	CSync: reconcile never returns an error	2018-06-04 15:41:38 +02:00
Olivier Goffart	be29fc2f69	csync: remove CSYNC_PARAM_ERROR ... It does not make sense to report such error to the user. Its goal was to show invalid use of the csync API, but this is now done with asserts.	2018-06-04 15:41:38 +02:00
Olivier Goffart	0443f8dd4d	csync: Simplify csync_walk_local_tree/csync_walk_remote_tree ... Small refactoring	2018-06-04 15:41:38 +02:00
Roeland Jago Douma	f96206705a	Merge pull request #315 from nextcloud/upstream/pr/6379 ... Discovery: Error if properties are missing #6317	2018-06-03 19:58:21 +02:00
Roeland Jago Douma	1262cbf4ef	Merge pull request #314 from nextcloud/upstream/pr/6373 ... Make sure ignored and conflict files show up in the issues tab even with partial local discovery	2018-06-02 20:20:19 +02:00
Olivier Goffart	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
Olivier Goffart	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
Olivier Goffart	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
Roeland Jago Douma	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
Roeland Jago Douma	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
Roeland Jago Douma	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
Julius Härtl	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
Roeland Jago Douma	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
Roeland Jago Douma	36572b79c3	Merge pull request #298 from nextcloud/upstream/no-shibboleth ... NO_SHIBBOLETH: Fix warning	2018-05-17 15:38:04 +02:00
Christian Kamm	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
Olivier Goffart	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
Olivier Goffart	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
Markus Goetz	434f093f98	SslButton: Add HTTP/2 info #3146	2018-05-16 20:10:51 +02:00
Christian Kamm	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
Christian Kamm	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
Christian Kamm	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
Christian Kamm	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
Christian Kamm	01f83ff398	ProgressInfo: Add information for local vs remote discovery	2018-05-16 16:45:13 +02:00
Christian Kamm	8077748c9d	slotFolderDiscovered: Fix 'local' always being false ... It was unused, so no harm done.	2018-05-16 16:44:36 +02:00
Christian Kamm	687b6f5655	Discovery: Error if properties are missing #6317	2018-05-16 16:42:20 +02:00
Christian Kamm	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
Christian Kamm	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
Markus Goetz	e82869d10e	HTTP2: Only from Qt 5.9.4 #6285	2018-05-15 19:23:11 +02:00
Olivier Goffart	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
Christian Kamm	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
Markus Goetz	d33692cdc7	NO_SHIBBOLETH: Fix warning	2018-05-15 18:31:12 +02:00
Christian Kamm	ad750f569c	Tray: Change icon for unresolved conflicts #6277	2018-05-15 17:58:10 +02:00
Oleg Solovyov	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
Roeland Jago Douma	c763a6e7fb	Show webview with page ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-05-02 22:50:48 +02:00
Camila Ayres	64cbc88474	Merge pull request #251 from nextcloud/clientSideEncryptionV4 ... Client side encryption v4.	2018-04-26 19:56:55 +02:00
Adrien	8e52f1237b	Fix Use of Deprecated trUtf8	2018-04-19 12:02:26 +02:00
Tomaz Canabrava	7432d6a814	Merge branch 'master' into clientSideEncryptionV4	2018-04-10 16:18:58 +02:00
Daniel Nicoletti	3e05bd1da0	Do not detach encrypted files vector	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	3eb3535d0f	Fix downloading NEW encrypted files	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	defe2d7631	Fix matching encrypted data for downloading	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	b12066f1aa	Properly remove encryption data from JSON of deleted file	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	a9208f6581	Remove unused encrypted property	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	6e63a538b7	Make sure bool _currentLockingInProgress is first defined to false	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	a7a8de8787	Fix matching encrypted file for download	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	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
Daniel Nicoletti	c0ef36b8fa	Use QUuid to generate random names	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	60fc5d6dd4	Fix upload of existing encrypted files by matching only filename	2018-04-09 13:23:52 +02:00
Daniel Nicoletti	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
Tomaz Canabrava	b4b3e422de	Handle gracefully failures in file decryption	2018-03-27 09:18:54 +02:00
Tomaz Canabrava	ed6f56257e	Dont use new with QFiles.	2018-03-26 22:18:07 +02:00
Tomaz Canabrava	461aeca200	Do not crash when failing to decrypt the metadata	2018-03-26 22:02:46 +02:00
Tomaz Canabrava	6c88367ac6	Do not crash if there was an error encrypting the file.	2018-03-26 21:44:46 +02:00
Tomaz Canabrava	5fe9717598	Potentially fix crash acessing a deleted pointer.	2018-03-26 21:37:13 +02:00
Tomaz Canabrava	ec28465e01	Correctly handle systems without client side encryption	2018-03-26 20:51:14 +02:00
Tomaz Canabrava	11684682e6	Return empty metadata in case of error, Display error to the user.	2018-03-25 22:31:49 +02:00
Tomaz Canabrava	96115be0c6	Unlock folder in case of error	2018-03-25 21:54:08 +02:00
Camila San	2e4472a4db	Enables server notifications by default. ... Signed-off-by: Camila San <hello@camila.codes>	2018-03-03 22:44:24 +01:00
Camila San	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
Camila San	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
Camila San	112c5e10b6	Removes Server Activities option from General settings. ... Signed-off-by: Camila San <hello@camila.codes>	2018-02-26 12:02:34 +01:00
Camila San	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
Tomaz Canabrava	7da0764b8d	Don't class what's not a class	2018-02-18 01:23:59 +01:00
Tomaz Canabrava	176a42a062	Return the error reported by openssl	2018-02-18 01:13:23 +01:00
Tomaz Canabrava	5faeca1b82	Move BIO2ByteArray to annonymous namespace ... This has no use outside of the clientsidenecryption.cpp	2018-02-18 01:04:44 +01:00
Camila San	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
Camila San	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
Daniel Nicoletti	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
Roeland Jago Douma	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
Roeland Jago Douma	d85c2bf025	Fix building on windows ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-30 11:10:03 +01:00
Roeland Jago Douma	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
Tomaz Canabrava	dcc9ac7d2e	[Buildfix] Fix build from last merge	2018-01-29 14:17:52 +01:00
Tomaz Canabrava	d24a1e542e	Merge branch 'master' into clientSideEncryptionV3	2018-01-29 14:06:12 +01:00
Tomaz Canabrava	682bb2ad43	[CSE] Save the encrypted name relation on downloads	2018-01-28 23:50:12 +01:00
Tomaz Canabrava	e8849a2cf9	[CSE] Save the relation of the file / encrypted file names on the db	2018-01-28 22:26:07 +01:00
Tomaz Canabrava	e9a7a56359	[CSE] Store the encrypted file name on the SyncFilePtr	2018-01-28 18:37:01 +01:00
Roeland Jago Douma	48bce4c6b0	Merge remote-tracking branch 'oc/master' into oc_up	2018-01-25 11:17:04 +01:00
Roeland Jago Douma	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
Roeland Jago Douma	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
Olivier Goffart	72b9beb79c	Merge remote-tracking branch 'origin/2.4' ... Conflicts: shell_integration/nautilus/syncstate.py	2018-01-23 14:08:15 +01:00
Roeland Jago Douma	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
Christian Kamm	d831369f86	Protocol: Remove entries for auto resolved conflicts #6316	2018-01-23 12:01:22 +01:00
Roeland Jago Douma	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
Roeland Jago Douma	bb85e2ab2c	Reuse existing EncryptedFile ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-23 11:36:15 +01:00
Olivier Goffart	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
Roeland Jago Douma	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
Tomaz Canabrava	cae6bbc853	[CSE] Start the download process	2018-01-22 14:08:32 +01:00
Tomaz Canabrava	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
Tomaz Canabrava	5d6817e165	[CSE] Save the tag while encrypting.	2018-01-21 21:49:24 +01:00
Tomaz Canabrava	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
Tomaz Canabrava	2d872f2a8d	[CSE] Add missing files	2018-01-21 21:26:05 +01:00
Tomaz Canabrava	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
Tomaz Canabrava	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
Tomaz Canabrava	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
Olivier Goffart	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
Christian Kamm	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
Roeland Jago Douma	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
Roeland Jago Douma	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
Olivier Goffart	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
Olivier Goffart	5d0aa5f039	Remove unused c_path	2018-01-13 13:58:17 +01:00
Olivier Goffart	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
Olivier Goffart	3ddd4b6f16	Get rid of csync_log ... We use Qt's debugging code everywhere	2018-01-13 13:58:17 +01:00
Olivier Goffart	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
Olivier Goffart	9613f6437d	Merge remote-tracking branch 'origin/2.4' ... Conflicts: src/libsync/networkjobs.cpp	2018-01-11 10:46:50 +01:00
Christian Kamm	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
Christian Kamm	e389fcaecb	Avatars: Use old location for servers <10 #6279	2018-01-09 11:34:56 +01:00
Daniel Nicoletti	a7ee1a95a6	Download and decrypt file if parent folder is marked as encrypted	2018-01-08 21:08:31 +01:00
Daniel Nicoletti	3abbbab6a0	Faster way to detecting CSE capability	2018-01-08 21:08:31 +01:00
Daniel Nicoletti	e2c895e61f	Fix encrypted file location on the server	2017-12-29 17:28:35 +01:00
Daniel Nicoletti	ca92c46970	Add category logging to PropagateUploadEncrypted	2017-12-29 17:28:35 +01:00
Daniel Nicoletti	50916bcda5	Mark ClientSideEncryption::isFolderEncrypted() as const	2017-12-29 17:28:35 +01:00
Daniel Nicoletti	fdc96d3a4f	Fix deprecated use of QUrl::setQueryItems()	2017-12-29 17:28:35 +01:00
Daniel Nicoletti	e06e04ee93	Fix parsing list of encrypted folders	2017-12-29 17:28:35 +01:00
Daniel Nicoletti	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
Tomaz Canabrava	efc039863b	[CSE] Tons of debugs.	2017-12-24 17:08:04 +01:00
Tomaz Canabrava	da9f1c412d	[CSE] Remove debug	2017-12-24 16:36:57 +01:00
Tomaz Canabrava	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
Tomaz Canabrava	60ef722b60	[CSE] Update the metadata when a file is being uploaded.	2017-12-22 23:05:39 +01:00
Tomaz Canabrava	e70bf44aaf	[CSE] Fix the generation of the data for the update Metadata	2017-12-22 22:39:45 +01:00
Tomaz Canabrava	124a7253a4	[CSE] Create job to Update Metadata	2017-12-22 22:02:16 +01:00
Roeland Jago Douma	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
Roeland Jago Douma	0dc7831336	Key is already base64 decoded ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-12-21 09:49:31 +01:00
Tomaz Canabrava	b72113a53d	[CSE] Prepare the beginning of the upload. ... I still need to send the metadata.	2017-12-21 00:35:23 +01:00
Tomaz Canabrava	df5fd3fbe6	[CSE] More debug output, fix input file path	2017-12-21 00:00:27 +01:00
Tomaz Canabrava	7be5f0a736	[CSE] Update the finished signal	2017-12-20 23:36:49 +01:00
Tomaz Canabrava	d87648c99a	[CSE] Use the metadata as pointer.	2017-12-20 23:30:51 +01:00
Tomaz Canabrava	25d58ccd58	Revert "Store metadata keys as keys" ... This commit broke decryption. This reverts commit b9f094cd94.	2017-12-20 23:16:42 +01:00
Tomaz Canabrava	dd0528037d	[CSE] Generate a random name for the temporary file	2017-12-20 23:09:28 +01:00
Tomaz Canabrava	7e83f0591b	[CSE] Create the Encrypted File on Disk	2017-12-20 22:32:38 +01:00
Tomaz Canabrava	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
Tomaz Canabrava	20198c5c7b	Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3	2017-12-20 22:11:46 +01:00
Roeland Jago Douma	3c301a8282	Add missing FolderMetadata functions ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-12-20 22:08:57 +01:00
Roeland Jago Douma	74bc9213c5	Generate encrypted metadata on the fly ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-12-20 22:04:26 +01:00
Tomaz Canabrava	679bb1f18e	[CSE] Expose EncryptionHelper	2017-12-20 21:33:25 +01:00
Tomaz Canabrava	14b18b146d	Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3	2017-12-20 21:29:54 +01:00
Roeland Jago Douma	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
Roeland Jago Douma	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
Roeland Jago Douma	c35b57cfba	Parse the files in the metadata ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-12-20 20:49:16 +01:00
Tomaz Canabrava	1e899f4172	[CSE] Do not create QPointer from raw pointers	2017-12-20 20:00:59 +01:00
Tomaz Canabrava	0347cf4e9e	[CSE] Store the sharing keys in memory	2017-12-20 19:40:58 +01:00
Roeland Jago Douma	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
Roeland Jago Douma	b924ad7282	Lower mnemonic when generating password ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2017-12-20 15:41:38 +01:00
Roeland Jago Douma	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
Roeland Jago Douma	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
Roeland Jago Douma	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
Tomaz Canabrava	ab89231ca2	[CSE] Remove unused debug	2017-12-20 00:25:56 +01:00
Tomaz Canabrava	d26ade1870	[CSE] Fix the result of the decryption ... However the text still looks like encrypted.	2017-12-20 00:25:39 +01:00
Tomaz Canabrava	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
Tomaz Canabrava	494ae31de9	[CSE] Fix correct json object	2017-12-19 23:09:39 +01:00
Tomaz Canabrava	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
Tomaz Canabrava	5609a1dbe8	[CSE] Remove old debug code so I can focus.	2017-12-19 17:02:23 +01:00
Tomaz Canabrava	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
Tomaz Canabrava	b9cdc8e922	[CSE] Fix the url to delete the metadata	2017-12-17 21:19:32 +01:00
Christian Kamm	83e94c3ec7	Fix compile after rebase	2017-12-15 18:05:44 +01:00
Christian Kamm	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
Christian Kamm	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
Tomaz Canabrava	2e516dfc67	Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3	2017-12-15 15:05:51 +01:00
Tomaz Canabrava	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
Tomaz Canabrava	5607e27f20	[CSE] Actually save the http response result	2017-12-15 14:25:57 +01:00
Tomaz Canabrava	43332d3ac7	[CSE] Properly update UI status to encrypted / decrypted	2017-12-15 14:00:42 +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
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
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
Roeland Jago Douma	fe4bb52a6d	Merge remote-tracking branch 'oc/master' into oc_up	2017-12-14 10:27:11 +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
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
Olivier Goffart	8c652e061d	Remove uses of deprecated QString::fromAscii	2017-12-08 16:15:48 +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
Tomaz Canabrava	70d562668c	[CSE] Add handling for side-by-side uploads.	2017-12-07 21:51:42 +01:00