Roeland Jago Douma
d09f8c7423
Merge pull request #17939 from nextcloud/fix/token-insert-conflict-handling
...
Handle token insert conflicts
2019-11-26 19:47:59 +01:00
Roeland Jago Douma
b607e3e6f4
Merge pull request #17948 from nextcloud/enh/check-if-property-is-bool
...
Make isXXX available for bool properties only
2019-11-26 12:25:36 +01:00
Christoph Wurst
0299ea0a96
Handle token insert conflicts
...
Env-based SAML uses the "Apache auth" mechanism to log users in. In this
code path, we first delete all existin auth tokens from the database,
before a new one is inserted. This is problematic for concurrent
requests as they might reach the same code at the same time, hence both
trying to insert a new row wit the same token (the session ID). This
also bubbles up and disables user_saml.
As the token might still be OK (both request will insert the same data),
we can actually just check if the UIDs of the conflict row is the same
as the one we want to insert right now. In that case let's just use the
existing entry and carry on.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-26 12:07:12 +01:00
Joas Schilling
06f97c0fd0
Fix autocomplete suggestions with numeric user ids
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-26 09:19:49 +01:00
Roeland Jago Douma
0fab27f459
Merge pull request #18108 from nextcloud/refactor/strict-credential-store
...
Add return type hint to credential store and make it strict
2019-11-26 08:08:10 +01:00
Nextcloud bot
123c4aa4e0
[tx-robot] updated from transifex
2019-11-26 02:15:57 +00:00
blizzz
b1dffc5c2d
Merge pull request #17896 from nextcloud/fix/noid/consider-create-group-result
...
take group creation result into consideration
2019-11-25 17:16:40 +01:00
Christoph Wurst
128a460d7b
Add return type hint to credential store and make it strict
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-25 15:59:55 +01:00
Roeland Jago Douma
c7d5b8fc49
Merge pull request #18079 from nextcloud/fixes/phpcs
...
Some php-cs fixes
2019-11-25 14:07:00 +01:00
Arthur Schiwon
cdf8c16942
reformat Setup.php
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
Arthur Schiwon
f0ff8b0307
reformat code for @skjnldsv <3
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
Arthur Schiwon
7ff15c9756
fix documentation, get and createGroup may return null
...
* also have stricter checks in place
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
Arthur Schiwon
7b1eedb11e
take group creation result into consideration
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:20 +01:00
Roeland Jago Douma
daa636260f
Merge pull request #18073 from nextcloud/harden/cache/watcher
...
Harden watcher
2019-11-25 10:06:04 +01:00
Nextcloud bot
4f2837017c
[tx-robot] updated from transifex
2019-11-23 02:16:07 +00:00
Roeland Jago Douma
68748d4f85
Some php-cs fixes
...
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +01:00
Roeland Jago Douma
9a64759af5
Harden watcher
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 13:38:16 +01:00
Nextcloud bot
0d7f55aae9
[tx-robot] updated from transifex
2019-11-22 02:16:16 +00:00
Roeland Jago Douma
5c4b2a2436
Merge pull request #18029 from nextcloud/feature/public-post-login-event
...
Make the post login event public
2019-11-21 12:39:42 +01:00
Nextcloud bot
37ef64d24e
[tx-robot] updated from transifex
2019-11-21 02:16:02 +00:00
Roeland Jago Douma
2eb24fcf42
Merge pull request #18009 from nextcloud/bugfix/noid/install-with-mysql-8.0.4+
...
Fix installing with MySQL 8.0.4+
2019-11-20 21:51:16 +01:00
Joas Schilling
77d814d35f
Fix installing with MySQL 8.0.4+
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-20 19:43:31 +01:00
Roeland Jago Douma
da25ed997e
Do not check for updates if we have no internet
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-20 19:30:59 +01:00
Christoph Wurst
535000aac6
Make the post login event public
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-20 18:43:09 +01:00
Roeland Jago Douma
d625d8bd1e
Merge pull request #17824 from nextcloud/fix/dav/catch_forbidden
...
Catch forbidden http status code
2019-11-20 12:32:00 +01:00
Joas Schilling
6ad54f3f27
Merge pull request #17850 from nextcloud/bugfix/noid/mark-spreed-as-active-on-call-urls
...
Mark "Talk" active on /call/token URLs
2019-11-20 10:33:45 +01:00
Nextcloud bot
afa0f2c0d8
[tx-robot] updated from transifex
2019-11-20 02:16:19 +00:00
Daniel Kesselberg
9055f46351
Make phan happy ;)
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-11-19 16:16:26 +01:00
Nextcloud bot
9707fcf4fe
[tx-robot] updated from transifex
2019-11-19 02:17:47 +00:00
Roeland Jago Douma
ccc0a5e0d5
Merge pull request #16828 from nextcloud/feature/noid/accept-incoming-shares
...
🔗 ☑️ Accept all incoming shares
2019-11-18 20:11:20 +01:00
Roeland Jago Douma
e16321368f
Fixes
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-18 16:11:03 +01:00
Roeland Jago Douma
5320f08cd2
Merge pull request #17765 from nextcloud/filecache-extension
...
Upload time and Creation time
2019-11-18 15:29:49 +01:00
Roeland Jago Douma
8800a7e890
Fix cache moves
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-18 12:48:00 +01:00
blizzz
bb77c1447b
Merge pull request #17965 from nextcloud/fix/noid/strict-controller-userid
...
Fixes a 500 without userid
2019-11-18 12:10:17 +01:00
Roeland Jago Douma
a184e350d7
Merge remote-tracking branch 'origin/master' into filecache-extension
2019-11-18 11:06:17 +01:00
Nextcloud bot
7bb3c0201c
[tx-robot] updated from transifex
2019-11-18 02:15:57 +00:00
Roeland Jago Douma
c08e803db3
Catch forbidden http status code
...
If you try to do something on a DAV mount (external or federated share)
that is not allowed. We should not mark the storage as not available but
just fail somewhat gracefully.
Now by catching this and just properly returning the operation will just
fail (and notify the user) which is already a lot better then marking
the storage as unavailable and doing boom.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-17 09:11:15 +01:00
Arthur Schiwon
0a1937208f
Fixes a 500 without userid
...
plus cleanup of unused use statements
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-16 01:10:19 +01:00
Daniel Kesselberg
a27c10daa6
Make isXXX available for bool properties only
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-11-16 00:39:48 +01:00
Christian Oliff
417fd12d3a
HTTPS link to https://en.wikipedia.org/wiki/Server-sent_events
...
prevents a redirect
2019-11-15 16:19:28 +09:00
Arthur Schiwon
af6c788efc
pass through ServerNotAvailableException on app init
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-14 17:20:14 +01:00
Nextcloud bot
c952bec11d
[tx-robot] updated from transifex
2019-11-14 02:16:16 +00:00
Arthur Schiwon
2efe8aad38
relax dependency on GenericEvent, instead stay compatible with old events
...
* also fixes tagging events
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-13 14:23:39 +01:00
Robin Appelman
f2724992fc
cast ctime and utime
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:56 +01:00
Robin Appelman
4c97181128
filter out empty filecache extension values
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:52 +01:00
Roeland Jago Douma
b36f08be43
Update autoloaders
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-13 12:39:49 +01:00
Robin Appelman
066faaec05
fix folder delete
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:46 +01:00
Robin Appelman
43fa746ad9
dont create empty filecache extended rows
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:43 +01:00
Robin Appelman
136c4ef925
dont expose metadata etag for now
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:36 +01:00
Robin Appelman
1b6e647b63
expose filecache extension data in FileInfo
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:32 +01:00