wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
51670 commits 157 branches 562 tags 714 MiB
Commit graph

609 commits

Author SHA1 Message Date
Roeland Jago Douma
4fad9e4e6b
Merge pull request #18314 from nextcloud/fixFileIdSearch 
Fix ambigious fileID on search
 2019-12-10 11:28:40 +01:00
tobiasKaminsky
41cb214112
fix https://github.com/nextcloud/server/issues/18313 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2019-12-10 09:47:30 +01:00
Roeland Jago Douma
5dba8d318d
Fix search limit to home 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-09 20:38:13 +01:00
Daniel Kesselberg
29575c4d36
Move custom definition logic into method 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-09 12:10:19 +01:00
Daniel Kesselberg
64aba49461
Ensure that we don't merge broken json. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-09 12:09:43 +01:00
Christoph Wurst
5bf3d1bb38
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
Roeland Jago Douma
63cb31542d
Merge pull request #17941 from nextcloud/search-by-owner 
Allow filtering the search results to the users home storage
 2019-12-05 11:04:33 +01:00
Roeland Jago Douma
81b919ed9f
Merge pull request #18163 from nextcloud/fix_file_size 
fix filename size
 2019-12-04 14:15:07 +01:00
Roeland Jago Douma
76b78edd40
Merge pull request #17833 from nextcloud/propagator-no-negative-sizes 
dont set folder size to negative values during propagation
 2019-12-04 11:49:26 +01:00
Greta Doci
1110a93fc4 fix filename size, add comment 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-12-04 11:04:46 +01:00
Robin Appelman
f9e5b33c2b
remove old 'owner' filter 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-12-03 15:20:54 +01:00
Robin Appelman
c62637da8b
Allow filtering the search results to the users home storage 
This is done by adding a

```xml
<d:eq>
    <d:prop>
        <oc:owner-id/>
    </d:prop>
    <d:literal>$userId</d:literal>
</d:eq>
```

clause to the search query.

Searching by `owner-id` can only be done with the current user id
and the comparison can not be inside a `<d:not>` or `<d:or>` statement

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-12-03 13:49:37 +01:00
Roeland Jago Douma
6a940d5c74
Merge pull request #18149 from nextcloud/fix/18148/dont-create-bundle-too-early 
delay creation of the cert bundle
 2019-11-29 09:07:33 +01:00
Arthur Schiwon
0e911d643f
delay creation of the cert bundle 
fixes #18148

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-28 17:00:55 +01:00
Julius Härtl
9eb1554fad
Properly anotate LockedException in files node api 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-28 14:17:15 +01:00
Roeland Jago Douma
0568b01267
Improve etag handling 
Check if values exist before using them

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Arthur Schiwon
fc16b09a2c
Files first to use own GenericEvent 
* those are added to 18 only anyway :)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-26 14:48:59 +01:00
Robin Appelman
74c6beb603
dont set folder size to negative values during propagation 
normally this shouldn't be a problem, but cache/storage desync might cause this
so this adds some failsafe to ensure we dont corrupt the cache further

the minimum value is set to -1 instead of 0 in order to triger a background scan
on the folder and figure out the size properly

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-26 12:05:30 +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
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
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
Roeland Jago Douma
8800a7e890
Fix cache moves 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-18 12:48:00 +01: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
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
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
Robin Appelman
842da3f183
store filecache extension fields 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-13 11:30:44 +01:00
Robin Appelman
d3b6dbc0bc
move more cache logic to querybuilder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-13 11:30:41 +01:00
Roeland Jago Douma
bc9b223e65
Fix DAV mimetype search 
Fixes #15048
Catches the case where a full mimetype is sumbitted in the where like
clause. Before we didn't catch this and it was just forwarded as is
causing invalid queries.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-28 21:56:29 +01:00
Arthur Schiwon
e8095cf737
use OCP\EventDispatcher\Event over Symfony's deprecated Event 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-17 13:31:48 +02:00
Julius Härtl
a9c089064b
Deprecate TemplateManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-16 09:54:17 +02:00
Roeland Jago Douma
5917644536
Merge pull request #17276 from nextcloud/storage-id-eq 
Get single storage id using `eq` instead of `in`
 2019-10-09 15:17:49 +02:00
Roeland Jago Douma
cc6874df19
Merge pull request #17264 from nextcloud/move-from-storage-wrappers 
handle moveFromStorage within the same storage even when storage wrap…
 2019-09-26 15:48:59 +02:00
Robin Appelman
bde791cec9
use eq instead of in for loading single storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-26 15:04:04 +02:00
Robin Appelman
1a8f9b8b1d
log which storage id can't be inserted 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-26 15:04:00 +02:00
Roeland Jago Douma
6ac67011f4
Merge pull request #17262 from nextcloud/objectstore-remove-cache-on-delete 
dont delete cache entries if deleting an object from object store failed
 2019-09-26 11:24:02 +02:00
Robin Appelman
35f317df7b
handle moveFromStorage within the same storage even when storage wrappers are applied to the source storage 
the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that

Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 19:17:06 +02:00
Robin Appelman
733d4b6cca
dont delete cache entries if deleting an object from object store failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 18:09:45 +02:00
Joas Schilling
a4ba2113b2
Fix getById for files in appdata and the root mount 
In case the path we are currently in is inside the appdata_* folder,
the original getById method does not work, because it can only look inside
the user's mount points. But the user has no mount point for the root storage.

So in that case we directly check the mount of the root if it contains
the id. If it does we check if the path is inside the path we are working
in.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-17 11:15:59 +02:00
Arthur Schiwon
20901c59d4
emit file events via Dispatcher, too 
another step to get rid of hooks and emitters

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-09-09 22:56:04 +02:00
Roeland Jago Douma
bf6082e119
Merge pull request #16836 from nextcloud/fix/16724/smb-availability 
Fix SMB availability status + higher delay on auth issues
 2019-09-09 16:50:42 +02:00
Julius Härtl
64fe9bc287
Return the proper jailed path when requesting the root path 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-09-04 13:25:17 +02:00
Arthur Schiwon
43bc31bacb
set a storage availability delay on auth issues to avoid lock out 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-08-22 12:40:15 +02:00
Joas Schilling
323642454a
Undefined variable response when server is no nextcloud anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-08-20 12:54:58 +02:00
Roeland Jago Douma
d14aed1048
Merge pull request #15946 from martink-p/bugxfix/9792/encrypted-external-webdav 
Update Encryption.php
 2019-08-15 10:22:50 +02:00
Roeland Jago Douma
650927a822
Properly return an int in the getId function of the cache 
fixes #16684

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-08-07 20:38:42 +02:00