11946 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
Daniel Nicoletti	080c5ea678	Better explanation for encryption passphrase ... FIXES: #149	2018-02-02 17:27:58 +01:00
Roeland Jago Douma	c04d1f1f69	Make different program so it doesn't mess with existing config ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-30 11:53:52 +01:00
Roeland Jago Douma	f8d805d78b	Use NC windows installer images ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-30 11:25:46 +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	f4a50e88f5	[CSE] Ignore renames for downloaded files. ... - TODO: Fix the incorrect "filename has been removed" popup. The file is not removed, just the popup shows.	2018-01-28 23:59:53 +01:00
Tomaz Canabrava	682bb2ad43	[CSE] Save the encrypted name relation on downloads	2018-01-28 23:50:12 +01:00
Tomaz Canabrava	d38e5e1529	[CSE] Bypass rename if it's e2e ... The client tracks the files in server and locally, but the names of the files differ in the server, but we do *not* wanna rename the files to the server one, we wanna keep it as is if it's an encrypted file.	2018-01-28 23:48:51 +01:00
Tomaz Canabrava	7b123650da	[CSE] Search for name, not mangled name.	2018-01-28 23:48:25 +01:00
Tomaz Canabrava	0c94142c97	[CSE] More debug output	2018-01-28 23:47:58 +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
Roeland Jago Douma	11946d9ef8	Bump ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-28 20:21:12 +01:00
Roeland Jago Douma	3c084bb6eb	Bump drone image ... * Bump to 16.04 since 14.04 doesn't auto build here due to openssl fu * No more gcc7 since gcc5 is new enough Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-28 20:10:04 +01:00
Tomaz Canabrava	e9a7a56359	[CSE] Store the encrypted file name on the SyncFilePtr	2018-01-28 18:37:01 +01:00
Tomaz Canabrava	a003d216a5	[CSE] Implementation of the setE2eRelation ... This call creates a new entry on the database for e2e.	2018-01-28 18:05:28 +01:00
Tomaz Canabrava	32eaaa0601	[CSE] GetMangledName implementation	2018-01-28 17:50:10 +01:00
Tomaz Canabrava	be817748f8	[CSE] Reset the new Queries on close	2018-01-28 17:46:20 +01:00
Tomaz Canabrava	b909bb6977	[CSE] Change the Database to handle Encrypted Files ... Create a table to hold the information between the real file name and the fake file name	2018-01-28 16:41:07 +01:00
Roeland Jago Douma	040507fce6	Merge pull request #135 from nextcloud/oc_up ... Merge upstream changes	2018-01-25 20:31:35 +01:00
Roeland Jago Douma	e2e99da446	Bump appimage drone image ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-25 14:31:14 +01:00
Julius Härtl	bcb9553925	Use Qt5DBus_FOUND instead of the old WITH_DBUS ... WITH_DBUS was removed in 257d8142b1 Signed-off-by: Julius Härtl <jus@bitgrid.net>	2018-01-25 14:18:03 +01:00
Roeland Jago Douma	aa7e47f525	Fix new icon naming ... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	2018-01-25 12:19:51 +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	84b26e0d4d	Merge pull request #133 from nextcloud/fix-notification-dismiss-button ... Uses QString::number to get a string equivalent of the notification_id number	2018-01-24 19:29:21 +01:00
Julius Härtl	3d162745af	Merge pull request #131 from nextcloud/nextcloud_subdir ... If status.php fails check <server>/nextcloud/status.php	2018-01-24 17:59:48 +01:00
Camila San	7a69e19e4d	Uses QString::number to get a string equivalent of the notification_id number. ... This fixes the bug reported #117. Signed-off-by: Camila San <hello@camila.codes>	2018-01-24 17:29:45 +01:00
Olivier Goffart	02988229b1	FolderStatusModel: don't use deprecated QModelIndex::child ... Was deprecated in Qt 5.8. (IMHO this show that child can be usefull and I am not sure the deprecation was justified)	2018-01-24 10:23:03 +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
Olivier Goffart	883080b557	Windows shell extension: port to the new protocol	2018-01-23 14:02:56 +01:00
Christian Kamm	ebfac84c69	Shell integration: Make nautilus work with multiselections ... Previously no menu would ever be shown if more than one file is selected. Now the GET_MENU_ITEMS command is sent with all selected files as an argument - similar to what is done for the dolphin integration.	2018-01-23 14:02:56 +01:00
Christian Kamm	3c2622d2de	Shell integration: Update nautilus for GET_MENU_ITEMS	2018-01-23 14:02:56 +01:00
Olivier Goffart	982c591ec9	SocketApi: add a way to disable menu entries	2018-01-23 14:02:56 +01:00
Olivier Goffart	1782ae3c08	SocketAPI: Make it easier to add or remove item in the action menu ... By making it dynamic. So far only the dolphin shell extension have been ported	2018-01-23 14:02:56 +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	72363155d8	Nautilus integration: Work with python2 and python3	2018-01-23 12:30:58 +01:00
Olivier Goffart	f254ee3211	Nautilus shell integration: Port to Python 3	2018-01-23 12:30:58 +01:00
Christian Kamm	59f2e0634e	Protocol: Correct sorting by size #6326 ... Previously we were sorting by size string, where "6 MB" < "3 KB".	2018-01-23 12:02:16 +01:00
Christian Kamm	32bb1e6763	ProtocolItem: Use accessors over magic numbers	2018-01-23 12:02:16 +01:00