1
0
Fork 0
Commit Graph

13970 Commits

Author SHA1 Message Date
Nextcloud bot adada8b2ee
[tx-robot] updated from transifex 2020-07-09 23:50:49 +00:00
Michael Schuster 8a38e820a6
Merge pull request #2184 from nextcloud/backport/2183/stable-2.6
[stable-2.6] Prevent empty FileMap in local csync to be processed if folder not empty
2020-07-10 01:47:37 +02:00
Dominique Fuchs 475267aff4
Prevent empty FileMap in local csync to be processed if folder not empty
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit d47e570ff3)
(cherry picked from commit f8920f969f)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-10 01:32:09 +02:00
Michael Schuster cba879e2af
Bump version to 2.6.5
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-09 17:58:43 +02:00
Michael Schuster 05e071bafe
Merge pull request #2179 from nextcloud/backport/2168/stable-2.6
[stable-2.6] Display the correct default permissions when creating a share.
2020-07-09 06:18:18 +02:00
Camila 7e4846eeda
Display the correct default permissions when creating a share.
- The default displayed was not in sync with the server because
the client was setting permissions when creating a share while it
should get the default permissions from the server to display it to the
user first.

Signed-off-by: Camila <hello@camila.codes>
(cherry picked from commit d7a1367292)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-09 06:07:25 +02:00
Nextcloud bot bc2244679c
[tx-robot] updated from transifex 2020-07-08 03:39:42 +00:00
Michael Schuster 6320c60d77
Merge pull request #2170 from nextcloud/backport/2153/stable-2.6
[stable 2.6] Asemmar/issue 2137
2020-07-08 03:37:01 +02:00
asemmar abc3d6a271
forgot some indent
Signed-off-by: asemmar <anis.semmar@itron.com>
(cherry picked from commit 628a426d22)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-08 03:30:19 +02:00
asemmar 8cc7fa20d3
fixed bad spelling of word 'retreive' except in sqlite dependancy
Signed-off-by: asemmar <anis.semmar@itron.com>
(cherry picked from commit d5587e386c)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-08 03:29:39 +02:00
Nextcloud bot 016d21dead
[tx-robot] updated from transifex 2020-07-07 03:34:00 +00:00
Michael Schuster 68aa9853c9
Merge pull request #2162 from nextcloud/backport/2127/stable-2.6
[stable-2.6] ConfigFile security: Migrate Proxy password to keychain
2020-07-07 00:23:41 +02:00
Michael Schuster 5db65ad6b8
Cleanup auto pointers and qobject casts, refactor KeychainChunk
Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit f4d83d02f6)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-07 00:17:41 +02:00
Michael Schuster 6e2e1b3650
ProxyAuthHandler: Add template member function execAwait to avoid code duplication
Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit ff631e919f)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-06 23:10:41 +02:00
Michael Schuster 331778c73b Keychain: Use auto deletion in WebFlowCredentials and ConfigFile
- Also make use of the new KeychainChunk::DeleteJob

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit 8503226c44)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-06 23:10:39 +02:00
Michael Schuster 2a6a7fb9d3 Refactor KeychainChunk to use QEventLoop and add DeleteJob class
- Use QEventLoop for synchronous exec()
- Rename startAwait() to exec()
- Add code for auto deletion
- Add new DeleteJob class
- Cleanup, tweaks

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit 42eb3388f8)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-06 23:04:41 +02:00
Michael Schuster 3766f70e43 Refactor ProxyAuthHandler to use QEventLoop
Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit ea95c4bf49)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-06 23:02:33 +02:00
Michael Schuster 6f33740601 ConfigFile security: Migrate Proxy password to keychain
When specified in the config file, the Proxy password will be migrated
to the keychain, for backward compatibility and to allow admins to
overwrite an existing password by rolling out updated config files.

Once migrated to the keychain, the password will be removed from the
config file.

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit 81c644e702)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-06 23:00:10 +02:00
Michael Schuster 03e5fa3d49
KeychainChunk: Add synchronous method startAwait()
Awaits completion with no need to connect some slot to the finished() signal first,
inspired by the ProxyAuthHandler class.

Also add:
- Job dtor to safely erase passwords
- textData() method
- New ctor overloads to work with arbitrary keys (without Account ptrs)

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit 18cbbc5052)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-06 22:54:41 +02:00
Michael Schuster b36c9e6960
Move KeychainChunk class from gui to libsync
Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit 2a3ef044be)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-06 22:54:40 +02:00
Michael Schuster 7f41805bc4
Move QKeychain::NoBackendAvailable error handling to KeychainChunk class
Originally this was in the WebFlowCredentials class. Since we've abstracted everything
from there already, let's also move this in case some other code may use
KeychainChunk::ReadJob prior to WebFlowCredentials.

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit 203a2ce003)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-06 22:53:34 +02:00
Nextcloud bot 7c0cf20901
[tx-robot] updated from transifex 2020-07-06 03:23:26 +00:00
Nextcloud bot babc4aaf3d
[tx-robot] updated from transifex 2020-07-05 03:24:11 +00:00
Nextcloud bot 91db96267f
[tx-robot] updated from transifex 2020-07-04 03:26:26 +00:00
Nextcloud bot a59e5689cb
[tx-robot] updated from transifex 2020-07-03 03:29:01 +00:00
Camila 0dde3172e6 Don't display quota information when the user has no quota.
- The code handling the api response was not up to date with the latest
api changes.
- Unlimited quota display: use qint64 to avoid data loss
- Change total with quota: total holds the quota total and not the storage total.

Signed-off-by: Camila <hello@camila.codes>
2020-07-02 20:28:46 +02:00
Nextcloud bot 7212bdc02f
[tx-robot] updated from transifex 2020-07-02 03:34:39 +00:00
Michael Schuster 4584b78b71
Merge pull request #2147 from nextcloud/backport/2145/stable-2.6
[stable-2.6] Repair and improve logging
2020-07-01 19:45:02 +02:00
Kevin Ottens 7033f16014 Allow to control logFlush from the config file
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-07-01 17:08:41 +00:00
Kevin Ottens d08485331f Allow to control logDir from the config file
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-07-01 17:08:41 +00:00
Kevin Ottens d4cbbebd37 Allow to control logExpire from the config file
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-07-01 17:08:40 +00:00
Kevin Ottens 727c1e9e6c Allow to control log debug from the config file
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-07-01 17:08:40 +00:00
Kevin Ottens 7a7675379d Have a filter rule capturing all of nextcloud debug
This was half broken before that commit and the previous one since some
of the categories would not be captured.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-07-01 17:08:40 +00:00
Kevin Ottens 2bf9742504 Make sure all our logging categories start with nextcloud.
Otherwise it was a bit confusing and annoying for filter rules:
e.g. "nextcloud.sync.*" vs "sync.*".

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-07-01 17:08:40 +00:00
Kevin Ottens 5f1158a8a2 Repair the log message pattern
At last it will become useful again...

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-07-01 17:08:40 +00:00
Kevin Ottens 43e502778f Properly guard io.h since it is Windows only
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-07-01 17:08:40 +00:00
Hannah von Reth f73a90ce26 [Logger] Ensure log file is flushed before crash 2020-07-01 17:08:40 +00:00
Hannah von Reth 64b0cab524 [Logger] Ensure errors are also printed to an attached console 2020-07-01 17:08:40 +00:00
Olivier Goffart 376522bc34 Logger: Remove the thread pointer from the log.
We don't do discovery in a thread or use many threads anymore so this is
just noise.

Also use of QString::sprintf is deprecated, and C cast.
2020-07-01 17:08:40 +00:00
Hannah von Reth f2006d50ce [Logger] Correctly handle message priority
This fixes the flodded sys log.

Fixes: #7453
2020-07-01 17:08:40 +00:00
Hannah von Reth 0d6edf1240 Print critical and fatal messages to stderr
That way we might get a reason why the client crashes (dev setup)
2020-07-01 17:08:39 +00:00
Christian Kamm 94d92c73c2 LogDir: Compress last logfile on restart
For #7353
2020-07-01 17:08:39 +00:00
Dominik Schmidt ea4ae81c08 Make -logfile - work on Windows 2020-07-01 17:08:39 +00:00
Dominik Schmidt c6a360238f Make qFatal() trigger the crash reporter on Windows 2020-07-01 17:08:39 +00:00
Nextcloud bot 445d4d6892
[tx-robot] updated from transifex 2020-07-01 03:24:38 +00:00
Nextcloud bot 0bc4346f30
[tx-robot] updated from transifex 2020-06-30 03:23:58 +00:00
Nextcloud bot a505071589
[tx-robot] updated from transifex 2020-06-29 03:24:24 +00:00
Nextcloud bot cd9de7c340
[tx-robot] updated from transifex 2020-06-26 03:24:40 +00:00
Nextcloud bot 5a6b877695
[tx-robot] updated from transifex 2020-06-25 03:26:03 +00:00
Nextcloud bot 6202df1cd0
[tx-robot] updated from transifex 2020-06-24 03:24:50 +00:00