Joas Schilling
54e39d4b93
Fix files sharing legacy as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 11:55:50 +01:00
Bjoern Schiessle
ed55b87b65
add brute force protection for public link authentication
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 18:17:08 +01:00
Bjoern Schiessle
92d7dd4781
allow editing single files shared as public link
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-24 13:41:27 +01:00
Bjoern Schiessle
0c11209d33
allow to access mail shares even if public links are disabled
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-04 21:23:26 +01:00
Vincent Petry
14256d631c
Use group display name in sharing API + UI
2016-12-22 18:35:32 +01:00
Morris Jobke
6789685c4e
Merge pull request #2759 from nextcloud/kill-appconfig-delete-share-link
...
Remove config change hook that deletes link shares (#26612 )
2016-12-22 14:45:20 +01:00
Vincent Petry
000ba6484f
When grouping shares, sort by stime then id ( #26777 )
...
If share times are equal, the first share should still win instead of
having the shares swapped.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:38:33 +01:00
Vincent Petry
9473ab5c19
Remove config change hook that deletes link shares ( #26612 )
...
Seems broken. But also if link shares are not allowed, the link shares
will continue to exist but will be denied.
A future cleanup could be done through a background job.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:18:51 +01:00
Lukas Reschke
6fd421cc3c
Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity
...
Remove leading slash from sharing activity
2016-12-16 13:20:27 +01:00
Lukas Reschke
5b474e72d5
Merge pull request #2673 from nextcloud/shared-scanner-unmasked
...
use unmasked permissions in shared scanner
2016-12-15 15:54:32 +01:00
Joas Schilling
6de0eb0b74
Remove leading slash from sharing activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Robin Appelman
5d0897b8d7
use unmasked permissions in shared scanner
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 14:37:51 +01:00
Roeland Jago Douma
9e353f6289
Fix overwriting parameter
...
Fixes #2641
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 22:28:09 +01:00
Lukas Reschke
edd01e3ce4
Merge pull request #2637 from nextcloud/mount-cache-storageid
...
also compare storage ids when checking for changed mounts
2016-12-13 14:02:49 +01:00
Robin Appelman
bbe24d29ca
reuse cacheentry
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +01:00
Maxence Lange
43374292b1
update phpdoc
...
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
2016-12-12 16:15:13 -01:00
Maxence Lange
9ef8d25e46
Download a file in a subfolder in a sharedlink is not working
...
the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
2016-12-11 18:32:28 -01:00
Robin Appelman
02ee4f958c
apply permissions mask for shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 17:59:02 +01:00
Joas Schilling
b2f46bfa04
Adjust all implementations in the server repo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
Lukas Reschke
9def8225c0
Fix image_src link
...
The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-28 16:20:57 +01:00
Joas Schilling
1c564fd554
Fix placeholder typo in public link activity
...
https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
2016-11-23 21:43:14 +01:00
Morris Jobke
59db9fada2
Merge pull request #2281 from nextcloud/fix-translation
...
Fix language typo
2016-11-23 17:53:21 +01:00
Joas Schilling
14f01dbe33
Fix language typo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
Lukas Reschke
2eca9cc384
Merge pull request #2262 from nextcloud/specify-parameters-on-public-download
...
Specify the parameters on public download
2016-11-23 14:02:38 +01:00
Joas Schilling
a36d26950e
Only do stuff when its a remote-share activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 22:46:18 +01:00
Joas Schilling
e9336dddd5
Specify the parameters on public download
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 20:14:42 +01:00
Roeland Jago Douma
08ef7356f6
Merge pull request #2165 from nextcloud/sharing-activities-update
...
Move file sharing activities to the new API
2016-11-22 10:19:15 +01:00
Lukas Reschke
7b3855a375
Add config switch
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Roeland Jago Douma
15c075eba8
Fix lookup url
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
Roeland Jago Douma
f7f70028d1
Search on lookup server
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:00 +01:00
Lukas Reschke
6c11c54434
Merge pull request #2196 from nextcloud/cache-owner-displayname
...
cache the displayname of the share owner
2016-11-18 13:51:24 +01:00
Robin Appelman
dbd7f6dea6
cache the displayname of the share owner
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-18 11:26:00 +01:00
Robin Appelman
b85459964c
fix getting root entry when not provided by the share provider
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:39 +01:00
Robin Appelman
2f03fcab4a
let the share backend get the node cacheentry to save queries
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:38 +01:00
Robin Appelman
065753f0ae
dont use the source cache/storage until needed
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:38 +01:00
Robin Appelman
30e7c27d86
reuse the known rootinfo in the shared cache when possible
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 14:59:31 +01:00
Joas Schilling
bdaf334c53
Move file sharing activities to the new API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 16:45:08 +01:00
Roeland Jago Douma
965981486f
Fixes not allowed increasing of link share permissions
...
Fixes the following:
1. user0 shares folder with user1 (RO but with sharing permissions)
2. user1 shares by link
3. user1 send 'publicUpload=true' OCS request to the link share
before this increased the permissions of the link share. Which should
not happen.
now: API reponds with an error that the permissions can't be increased.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 20:29:34 +01:00
Joas Schilling
cbc6118f51
Only check the sharing backends for file/folder items
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-10 16:46:01 +01:00
Bjoern Schiessle
25bcd71d02
add activity if a file was shared by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:58:52 +01:00
Bjoern Schiessle
087dab85b4
add activity for share by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00
Roeland Jago Douma
55af6b45f7
More tests
...
* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
Roeland Jago Douma
3822bceea2
Move publicpreview over
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
Morris Jobke
39573e602d
Merge pull request #1978 from nextcloud/remove-send-mail-option
...
Remove send mail option
2016-11-02 22:36:05 +01:00
Bjoern Schiessle
d235c4833f
remove the 'shareapi_allow_mail_notification' setting
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 21:17:05 +01:00
Vincent Petry
7e701504be
Remove upload_limit in files app as it is not needed with PUT upload ( #26069 )
...
The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 20:43:35 +01:00
Bjoern Schiessle
f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:30:38 +01:00
Morris Jobke
ffebc050d0
Merge pull request #1887 from nextcloud/downstream-26370
...
Added functions to check etag of elements - integration tests
2016-11-02 14:57:45 +01:00
Roeland Jago Douma
e5bc45c349
Fix OCS API to be able to remove group shares from self as recipient
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-02 08:49:58 +01:00
Bjoern Schiessle
6e52091c8e
remove unused variable
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:11:30 +01:00
Bjoern Schiessle
6d7520b1e2
unit tests updated and new added
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle
561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle
7436e45c91
if we have a exact match, either for the federated cloud id or for the
...
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
392c8a115f
unified way to display remote shares and mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
8c8a019b7e
show correct display name if we have the user in one of our address books
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
60a3893ca8
improve search for federated cloud ids and email adresses
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
77f74b9780
handle case if no share-by-mail share provider is loaded
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
96c40d14a1
update permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
Bjoern Schiessle
a17c6a485d
add share by mail share provider
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
Bjoern Schiessle
0a6f02801f
introduce share by mail, ui part
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
Morris Jobke
01a85a98f2
Merge pull request #1876 from nextcloud/shareesAPI_email
...
Add ShareesAPI E-mail search
2016-10-25 13:53:59 +02:00
Roeland Jago Douma
a28528a254
Add ShareesAPI E-mail search
...
* Allow to search for SHARE_TYPE_EMAIL (4)
* Added tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 14:59:32 +02:00
Joas Schilling
b130267e58
Import the used classes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-24 14:33:54 +02:00
Roeland Jago Douma
f589f1a1d6
Move files_sharing Controllers => Controller
...
lib/Controller is the default location for controllers. So lets put them
all in there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 11:46:25 +02:00
Roeland Jago Douma
ea07bbc562
Move Share20OCS to ShareAPIController
...
It was already a controller just still residing in its old location.
* Moved ShareAPIController to user plain userID instead of user object
* Moved Share20OCS to ShareAPIController
* Removed initisation of class from Application.php and leave it to the
AppFramework
* Fixed tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 09:52:34 +02:00
Thomas Müller
e0d919bbfc
Adding Open Graph Support for public shares http://ogp.me/
...
In case no preview is available we display the ownCloud logo
Fix unit test
2016-10-21 21:42:40 +02:00
Joas Schilling
246bb9f33d
Move OC\Files\Storage\Shared to the right namespace
2016-10-20 20:27:44 +02:00
Joas Schilling
b112493d1a
Adjust wording to make the separation between sharing and files clearer
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-18 17:18:14 +02:00
Robin Appelman
2de59d8a2a
remove unneeded unlock
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:40 +02:00
Robin Appelman
f63f0aa1ae
get node by path as fallback
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
Robin Appelman
9754724c8b
fix getting recipient share in ocs api
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
Robin Appelman
1b3b816a0a
re-use the share node while formating if we already have it
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:35 +02:00
Robin Appelman
37eded7e7c
Always unlock node after trying to create a share
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:29 +02:00
Joas Schilling
671f16f706
Add icons to activity navigation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 11:38:06 +02:00
Lukas Reschke
498b7399c1
Inject IHTTPClientService
...
Otherwise the unit test execution will do a ton of external HTTP requests which fail and then timeout…
See https://blackfire.io/profiles/compare/3c67acfa-a11e-4aec-bcd4-c945b006f01e/graph for reference
Pretty similar to https://github.com/nextcloud/server/pull/1565
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-29 00:26:20 +02:00
Vincent Petry
118c9d58fe
Fix fed share test call to return proper result
...
Fixes an issue where retrying a previously failed federated share would
not properly reset the availability flag because the return value was
undefined instead of "true".
2016-09-20 12:11:26 +02:00
Vincent Petry
fb52b1af67
Allow increasing permissions for share owner
...
In some cases, the owner of the share is also recipient through a group
share. The owner must still be able to increase permissions in that
situation.
2016-09-13 09:40:59 +02:00
Roeland Jago Douma
ba104233b0
Move remote_shares OCS endpoint to AppFramework
2016-09-09 07:40:33 +02:00
Morris Jobke
c16aefcff5
Merge pull request #1317 from nextcloud/add-sharing-disclaimer
...
Adding a optional disclaimer to the anonymous upload page
2016-09-08 21:18:28 +02:00
Morris Jobke
6bb95de1c5
Adding a optional disclaimer to the anonymous upload page
2016-09-08 18:44:27 +02:00
Robin Appelman
9adf78c155
dont show shares you own in "shared with you"
2016-09-07 18:38:08 +02:00
Roeland Jago Douma
a0af513a4a
Merge pull request #1201 from nextcloud/usermountcache-orphanedshare
...
[master] Usermountcache orphanedshare
2016-08-31 15:07:13 +02:00
Vincent Petry
423378ea17
Added closeCursor in SharedMount numeric id
2016-08-30 19:49:31 +02:00
Vincent Petry
669b0bc2ae
Prevent error with orphaned shares when updating user mount cache
2016-08-30 19:49:23 +02:00
Vincent Petry
ec9fd67bc5
Allow space for federated share id search
2016-08-30 11:11:59 +02:00
Thomas Müller
6c365cb06d
A shared storage is never a home storage - fixes #25582
2016-08-29 14:13:26 +02:00
Roeland Jago Douma
2fdda01b4b
Sharee API to AppFramework
...
* Move to OCSController
* Move to Controller folder
* Use automatic DI
* Use function parameters
* Updated tests
2016-08-26 11:36:09 +02:00
Roeland Jago Douma
a1ed8207e9
HTTPHelper is deprecated
...
Use the IClientService instead
2016-08-24 21:30:39 +02:00
Roeland Jago Douma
352d22e473
Do not error on NotFoundException
...
Since this exception can be thrown when a shared file is in the
trashbin there is no need to spam the log like crazy.
Fixes #938
2016-08-24 08:18:08 +02:00
Robin Appelman
a0c2342c20
prevent infinite recursion while getting storage from mount
2016-08-23 14:52:18 +02:00
Robin Appelman
1e7c108bff
handle failed shares
2016-08-22 12:32:39 +02:00
Robin Appelman
3ed01e8459
Lazy init shared storage
2016-08-22 12:27:56 +02:00
Robin Appelman
95570d607c
reuse existing root id
2016-08-22 12:27:20 +02:00
Roeland Jago Douma
af074eb2b7
Move updateShare and getShares over to use proper parameters
...
* Update tests
2016-08-17 20:45:29 +02:00
Roeland Jago Douma
22e23f3045
Use parameters in createShare
...
* Fix tests
2016-08-17 20:45:27 +02:00
Roeland Jago Douma
9daf41e05a
Add files drop capability for clients
2016-08-13 14:02:09 +02:00
Roeland Jago Douma
ba922c9f73
Merge pull request #807 from nextcloud/ocs_dataresponse
...
OCSController requires DataResponse
2016-08-10 22:36:25 +02:00
Lukas Reschke
67d016833d
Merge pull request #810 from nextcloud/shared-cachethepropagatorinstance
...
Store the shared propagator instance
2016-08-10 17:24:57 +02:00
Roeland Jago Douma
4006763f5b
Move the Share20OCS code over to use the proper DataResponse
2016-08-10 12:40:32 +02:00
Vincent Petry
412b5c5407
Store the shared propagator instance
...
This instead of recreating it for every call.
2016-08-10 10:57:49 +02:00
Robin Appelman
a999420c75
get shared storage storage id without setting up the storage
2016-08-09 15:52:13 +02:00
Lukas Reschke
70eef2a82e
Merge pull request #445 from nextcloud/ocs_share_to_appframework
...
OCS Share API to appframework
2016-08-08 14:59:59 +02:00
Roeland Jago Douma
0556e40d3e
Fix tests
2016-08-05 14:17:32 +02:00
Roeland Jago Douma
d9418c105e
Add OCSShareAPIMiddleware tests
2016-08-05 14:17:32 +02:00
Roeland Jago Douma
4504d7f5e9
DataResponse required ['data' => DATA]
2016-08-05 14:17:31 +02:00
Roeland Jago Douma
7fdc2f32fa
More exceptions
2016-08-05 14:17:31 +02:00
Roeland Jago Douma
3a31b2875b
Add OCSShareAPIMiddleware
...
* This will cleanup the locks after each request
* Move check for enabled share api to the middleware
2016-08-05 14:17:31 +02:00
Roeland Jago Douma
8b160077f1
Throw OCSNotFoundExceptions
2016-08-05 14:17:25 +02:00
Roeland Jago Douma
54f21bccdf
Remove unneeded wrapper
2016-08-05 14:17:25 +02:00
Roeland Jago Douma
a32caa4904
Convert Share API to use the AppFramework
2016-08-05 14:17:25 +02:00
Joas Schilling
f37fa6e45c
Move Share backends to PSR-4 instead of using class path ( #24941 )
2016-08-05 14:13:41 +02:00
Vincent Petry
2404f6a5a7
Make share target consistent when grouping group share with user share
...
In some situations, a group share is created before a user share, and
the recipient renamed the received share before the latter is created.
In this situation, the "file_target" was already modified and the second
created share must align to the already renamed share.
To achieve this, the MountProvider now groups only by "item_source"
value and sorts by share time. This makes it so that the least recent
share is selected as super-share and its "file_target" value is then
adjusted in all grouped shares.
This fixes the issue where this situation would have different
"file_target" values resulting in two shared folders appearing instead
of one.
2016-08-03 10:16:28 +02:00
Vincent Petry
714d7ec936
Improved share grouping readability + fixed test
2016-08-03 10:16:28 +02:00
Roeland Jago Douma
04d5465228
Group shares with same source and target
...
Fixes #24575
Note that this is a very limited solution and eventually we want smarter
merging!
2016-08-03 10:16:28 +02:00
Joas Schilling
4e5fb74773
Do not allow to delete/update group shares as a group member
2016-08-02 10:50:35 +02:00
Joas Schilling
0215b004da
Update with robin
2016-07-21 18:13:58 +02:00
Joas Schilling
813f0a0f40
Fix apps/
2016-07-21 18:13:57 +02:00
Björn Schießle
f7d26e4aa5
Merge pull request #414 from nextcloud/files_sharing_event_dispatcher
...
Files sharing event dispatcher
2016-07-18 16:10:21 +02:00
Roeland Jago Douma
773250be24
Cleanup coding style
2016-07-18 13:35:35 +02:00
Roeland Jago Douma
1c5e082ee1
Add eventdispatcher to public link view
2016-07-18 13:35:35 +02:00
Roeland Jago Douma
ea3035aa0e
Move JS inclusion to Controller
...
* This way we can easier load files conditionally
2016-07-18 13:34:32 +02:00
Roeland Jago Douma
ff54141639
Move SetupFromToken to ShareManager
2016-07-18 10:53:49 +02:00
Morris Jobke
40328114f9
Merge pull request #379 from nextcloud/create_federated_share_on_mount
...
Create federated share on mount
2016-07-18 09:22:48 +02:00
Bjoern Schiessle
dc53788711
remove unused parameter
2016-07-14 16:39:48 +02:00
Joas Schilling
76736731eb
Allow shares with create permissions only aswell
2016-07-14 10:27:29 +02:00
Robin Appelman
d0e6fdba4d
combine if statements
2016-07-08 12:36:15 +02:00
Robin Appelman
f98cb9efa0
Fix type hinting
2016-07-08 12:35:50 +02:00
Robin Appelman
f0b9eba9c2
dont overwrite a variable with a different type
2016-07-08 12:35:23 +02:00
Lukas Reschke
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
Robin Appelman
2a72eff9ee
Fix getting the certificate bundle for dav external storage ( #25274 )
...
* Fix getting the certificate bundle for dav external storages
* Log the original exception in dav external storage
2016-06-27 22:26:43 +02:00
Robin Appelman
88ef163276
handle unavailable fed shares while testing for availability ( #25277 )
...
* More explicit http status codes
* handle unavailable fed shares while testing for availability
2016-06-27 21:34:28 +02:00
Lukas Reschke
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Vincent Petry
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
Vincent Petry
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests
2016-06-22 10:29:40 +02:00
Joas Schilling
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable
2016-06-22 10:29:40 +02:00
Vincent Petry
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
Robin Appelman
bb465a7ab4
Catch exceptions while creating shared mounts ( #25077 )
2016-06-20 22:11:05 +02:00
Vincent Petry
a636078e6c
Make getShareFolder use given view instead of static FS
2016-06-17 11:11:59 +02:00
Robin Appelman
4f02bd1dff
disable cleanFolder for the federated share storage
2016-06-14 17:29:09 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
Vincent Petry
14fde6650c
Merge pull request #25003 from owncloud/fix_ocs_path_response
...
Fix OCS Share API path response
2016-06-10 16:49:50 +02:00
Lukas Reschke
075bf73c80
Prevent access to shareinfo if share if read-only
2016-06-09 15:15:17 +02:00
Bjoern Schiessle
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
Roeland Jago Douma
b0dd0634e3
Bring back sharedstorage hooks
2016-06-09 14:00:02 +02:00
Robin Appelman
e7a55c4fef
handle path not being set in shared cache ( #24993 )
2016-06-09 13:59:59 +02:00
Roeland Jago Douma
4a3c67fdb4
Bring back sharedstorage hooks
2016-06-08 08:19:32 +02:00
Roeland Jago Douma
7c040c0bf9
Show the path relative to the requesting user
...
A share can only be requested by 3 'types' of people
* owner
* initiator
* recipient
So we have to get the path as the current user. Since that is the only
path that has any meaning to the user.
2016-06-07 15:09:19 +02:00
Robin Appelman
7a0254b15b
handle path not being set in shared cache ( #24993 )
2016-06-06 17:01:55 +02:00
Joas Schilling
5c8e0596e6
Allow public upload when the quota is unlimited
2016-06-02 15:27:16 +02:00
Torben Dannhauer
718f0757e4
Fix for #23066 ( #24689 )
2016-05-31 06:53:28 +02:00
Lukas Reschke
aba539703c
Update license headers
2016-05-26 19:57:24 +02:00
Joas Schilling
b72706b450
Move background job to PSR-4
2016-05-25 14:59:59 +02:00
Joas Schilling
3a716ae91c
Move lib/ to PSR-4
2016-05-25 14:59:59 +02:00
Joas Schilling
5001036fd4
Move classes from outside lib/ to PSR-4
2016-05-25 14:59:59 +02:00
Vincent Petry
465cf9fe9b
Merge pull request #24346 from lenz1111/fix_24331
...
Fix: Bugs in shared link with video #24331
2016-05-24 13:49:02 +02:00
Piotr Filiciak
11b2e98a30
video poster
2016-05-24 12:34:37 +02:00
Vincent Petry
adcf942901
Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support
...
Http Range requests support in downloads
2016-05-23 21:01:26 +02:00
Björn Schießle
20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self
2016-05-20 21:15:16 +02:00
Björn Schießle
e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app
2016-05-20 21:15:16 +02:00
Björn Schießle
81e3787f9c
close cursor after select to avoid db lock
2016-05-20 21:15:11 +02:00
Björn Schießle
d23df4cba7
create re-share by owner and propagate unshare and unshare-from self request
...
correctly accross share owner and share initiator
2016-05-20 21:15:11 +02:00
Piotr Filiciak
9999e05660
Http Range requests support in downloads
...
Http range requests support is required for video preview
2016-05-20 18:16:44 +02:00
Roeland Jago Douma
354329acf2
Cleanup Files_Sharing CLASSPATH
...
* OC\Files\Cache\SharedScanner
* OC\Files\Cache\Shared_Cache
* OC\Files\Cache\Shared_Permissions
* OC\Files\Cache\Shared_Updater
* OC\Files\Cache\Shared_Watcher
* OCA\Files\Share\Maintainer
* OCA\Files\Share\Proxy
2016-05-02 16:15:40 +02:00
Roeland Jago Douma
45d618a133
Remove dead code
...
Ancient files_sharing updater code I came across.
2016-05-02 08:20:42 +02:00
Roeland Jago Douma
420b5273b1
There is no need to do old etag propagation
...
Etags are calculated differently now and don't require manual updating.
2016-04-30 10:40:45 +02:00
Robin Appelman
dbfdc6282a
do propagation in a single query
2016-04-25 16:18:59 +02:00
Björn Schießle
e10105474f
move federated sharing settings to the federatedfilesharing app
2016-04-22 14:55:40 +02:00
Björn Schießle
606b756a94
Merge pull request #23918 from owncloud/cruds-for-federated-shares
...
bring back CRUDS permissions for federated shares
2016-04-22 14:50:42 +02:00
Björn Schießle
e906796f99
ask for share-permissions on propfind
2016-04-20 17:47:32 +02:00
Roeland Jago Douma
b53d6598f1
Move moveFromCache to CacheJail
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
f27d7cbf99
Move copy- and moveFromStorage to jail
2016-04-19 14:04:00 +02:00
Robin Appelman
2f1c62ce0b
Only construct the storage when we start using it
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
c98fef8a51
Fix resolve path
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
6123badbfa
Move SharedStorage et al over to the shareManager and jail
2016-04-19 14:04:00 +02:00
Roeland Douma
411fac892a
On mount make sure multiple shares with same target map to unique ones ( #23937 )
...
Scenario:
user0 shares a folder 'foo' with user2
user1 shares a folder 'foo' with user2
user2 logs in
Before: show only the 'foo' from user1
After: show both.
* Added intergration tests
2016-04-14 11:50:27 +02:00
Stefan Weil
16df1c5188
apps: Fix typos (found by codespell) ( #23862 )
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 12:52:51 +02:00
Roeland Jago Douma
db5ea95e29
Add capability to show if group sharing is enabled
...
fixes #23477
Now clients can correct wording to properly reflect who a user can share
with.
2016-04-04 19:35:01 +02:00
Thomas Müller
d4a8d5d2ea
Merge pull request #22998 from owncloud/delay-loading-the-scanner
...
Delay check till scanner is used
2016-03-15 12:16:02 +01:00
Robin Appelman
a8db587b1f
move failedstorage to core
2016-03-11 13:15:45 +01:00
Robin Appelman
3bd6fc797d
dont break when there is an invalid share
2016-03-11 13:15:45 +01:00
Lukas Reschke
80b91264e1
Delay check till scanner is used
...
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
2016-03-09 16:01:53 +01:00
Thomas Müller
30cec687ae
Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-contents
...
Use HTTPClient instead of file_get_contents
2016-03-09 12:20:06 +01:00
Lukas Reschke
c0200bc5c3
Use "hasKey" instead of checking the value
...
If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
2016-03-08 23:24:44 +01:00
Lukas Reschke
8214fae9ae
Use HTTPClient instead of file_get_contents
...
Allows us to catch exceptions like 404's and thus prevents stuff like:
```
{"reqId":"fnmS0hc+fL4+WXKAruo5","remoteAddr":"192.168.39.100","app":"PHP","message":"file_get_contents(http:\/\/ckamm.blaucloud.de\/\/status.php): failed to open stream: HTTP request failed! HTTP\/1.1 404 Not Found\r\n at \/var\/www\/owncloud\/apps\/files_sharing\/lib\/external\/storage.php#260","level":3,"time":"2016-03-08T21:00:33+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/"}
```
2016-03-08 22:13:00 +01:00
Vincent Petry
e5a107cc45
Fix share mounting recursion
2016-03-08 14:46:42 +01:00
Vincent Petry
d8e592d670
Fix archive file name when downloading public share
...
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.
This fix makes sure to trigger the correct logic when no file list was
given.
2016-03-07 11:37:49 +01:00
Lukas Reschke
63bd6b25db
Cache results of testRemoteUrl
...
Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud.
Replaces https://github.com/owncloud/core/pull/22855
2016-03-04 15:13:56 +01:00
Lukas Reschke
c353d51810
Remove Scrutinizer Auto Fixer
2016-03-01 17:48:23 +01:00
Lukas Reschke
933f60e314
Update author information
...
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Thomas Müller
5fe5233f41
Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs
...
Add autodiscovery support to server-to-server sharing implementation
2016-03-01 11:27:28 +01:00
Thomas Müller
73e145cf63
Merge pull request #22728 from owncloud/external-share-testremote
...
use ocs discover endpoint to test remote
2016-03-01 11:27:07 +01:00
Lukas Reschke
9ca1e9c7e9
Only use scanner if remote is an ownCloud
2016-03-01 07:01:52 +01:00
Lukas Reschke
e965dcaebf
/shareinfo is not required
2016-03-01 07:01:52 +01:00
Lukas Reschke
74e47da883
Add missing trailing slash
2016-03-01 07:01:51 +01:00
Robin Appelman
080a62231e
use ocs discover endpoint to test remote
2016-03-01 07:01:51 +01:00
Vincent Petry
11215f4e27
Return -3 for unlimited quota
...
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
2016-02-29 14:36:20 +01:00
Lukas Reschke
59028cced0
Add autodiscovery support to server-to-server sharing
...
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
2016-02-26 09:26:55 +01:00
Robin Appelman
f338329ddf
inject the correct external share manager into the storage
2016-02-25 14:49:25 +01:00
Thomas Müller
d1ef43481d
Merge pull request #22444 from owncloud/fix-federated-share-delete
...
get the actual user instead of a federated cloud id
2016-02-18 16:44:57 +01:00
Vincent Petry
e1dbae1467
Properly trigger testRemote after getting a 404 from remote fed share
...
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
2016-02-18 11:57:03 +01:00
Bjoern Schiessle
8985181305
get the actual user instead of a federated cloud id
...
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
2016-02-18 10:17:00 +01:00
Thomas Müller
e99c4d83dc
Merge pull request #22317 from owncloud/fix_invisible_linkshares
...
Do not allow invisible link shares
2016-02-12 11:10:58 +01:00
Thomas Müller
4d24929e05
Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on-errors
...
Remove notification on unshare and on errors
2016-02-11 14:02:44 +01:00
Roeland Jago Douma
745bfda41f
Fix migration step to avoind invisible shares
2016-02-11 13:29:23 +01:00
Joas Schilling
2263b8b693
Remove the notification if accepting/declining failed because of 404
2016-02-11 10:41:55 +01:00
Joas Schilling
5dc63e34b4
Add translations of unshare activities
2016-02-10 15:42:48 +01:00
Joas Schilling
65e1e4a202
Mark the accept button as primary
2016-02-10 08:40:45 +01:00
Joas Schilling
c769f5775d
Create the actions with the correct ID
2016-02-10 08:40:45 +01:00
Joas Schilling
49dd693d8f
Bring the messages inline
2016-02-10 08:40:45 +01:00
Joas Schilling
3ff88c8c84
Revert "Disable the remote sharing notifications until they work properly"
...
This reverts commit 6bc93c7401
.
Conflicts:
apps/files_sharing/lib/external/manager.php
2016-02-10 08:40:44 +01:00
Robin Appelman
f9f2800016
check share permissions in share controller
2016-02-09 15:03:00 +01:00
Roeland Jago Douma
623a0e4637
Example hook check
2016-02-09 10:36:44 +01:00
Arthur Schiwon
cd68500731
throw hooks when accessing a link share
2016-02-09 00:34:10 +01:00
Roeland Jago Douma
3c4e511792
Update the migration step to include federated shares
...
Now federated shares will also be updated to the flat
reshare model.
2016-02-08 15:11:48 +01:00
Roeland Jago Douma
f4edfb6dfb
Gracefull handle link shares rename hook
...
Fixes #21678
The hook is called on all renames. However when we use a link share
the getUserFolder fails. We now just opt out.
2016-02-05 13:57:57 +01:00
Roeland Jago Douma
453ea6698d
[Share 2.0] Fix public link sharing
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
4d7130ad31
[Share 2.0] Add exceptions to OCP
2016-02-02 14:07:11 +01:00
Thomas Müller
e60b217156
Merge pull request #22015 from owncloud/share-no-permissions
...
Block shares that dont have the correct source permissions
2016-02-02 10:26:06 +01:00
Robin Appelman
e3b5639fc1
Block shares that dont have the correct source permissions
2016-01-29 13:05:53 +01:00
Roeland Jago Douma
6151a0540b
Update the initiator of the share as well in migration
2016-01-28 19:24:23 +01:00
Roeland Jago Douma
b85770d636
Update reshares in batches as not to run out of memory
2016-01-28 19:24:23 +01:00
Björn Schießle
dc8d43575f
upgrade to sharing 2.0, remove hierarchical re-shares
2016-01-28 19:24:23 +01:00
Robin Appelman
1369f2c684
cleanup shared cache
2016-01-28 11:46:43 +01:00
Roeland Jago Douma
34e912ab6b
[Share 2.0] Fix interfaces and comments
...
* Made comments more clear
* Removed unneeded methods
* IShares shareTime is now a proper DateTime object
* IShares getPath -> getNode & setPath -> setNode
* Fix unit tests
2016-01-28 07:54:09 +01:00
Roeland Jago Douma
185b9c6edd
[Share 2.0] Move IShare to OCP
2016-01-27 22:04:37 +01:00
Joas Schilling
ee02165005
Move the notification API to public namespace
2016-01-22 10:32:42 +01:00
Roeland Jago Douma
18421e7e68
Directly get from the server container
...
* Updated unit tests
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
67f5216160
Do not use deprected activities API
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
9467859e42
Get correct path for activity downloads
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
894a88ca51
[Share 2.0] Make public link work without view
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
8734ebe505
[Share 2.0] Make link share download use share manager
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
717697313b
[Share 2.0] Move tests over the sharemanager
...
Nice side effect... pure unit tests!
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
0ebc92c44a
[Share 2.0] Move showing link share to sharing 2.0
2016-01-20 21:12:26 +01:00
Robin Appelman
30d6222e64
handle noopscanner in shared scanner
2016-01-15 15:37:31 +01:00
Robin Appelman
ddbbe1742f
propagate folder size in the same query for write updates
2016-01-15 15:36:52 +01:00
Thomas Müller
6824704699
Merge pull request #21117 from owncloud/owner-file-exists
...
Only return an owner if the file exists + improved getUidAndFilename
2016-01-15 13:31:56 +01:00
Robin Appelman
a3d50ef49a
add watcher interface
2016-01-14 12:54:42 +01:00
Robin Appelman
5fae07f422
add scanner interface
2016-01-14 12:54:42 +01:00
Robin Appelman
6d321f5f6b
Return a class from cache operations instead of an array
2016-01-14 12:54:42 +01:00
Thomas Müller
a5e46226ef
Merge pull request #21615 from owncloud/shared-islocal
...
implement isLocal for shared storage
2016-01-13 10:34:23 +01:00
Thomas Müller
682821c71e
Happy new year!
2016-01-12 15:02:18 +01:00
Robin Appelman
af1e810607
implement isLocal for shared storage
2016-01-11 13:58:22 +01:00
Robin Appelman
300eb54c87
de-deplicate getUidAndFilename
2016-01-11 11:40:58 +01:00
Björn Schießle
c4b65170f2
show display name but internally use the user name
2015-12-14 17:25:10 +01:00
Thomas Müller
54dbe5b8d5
Merge pull request #20989 from owncloud/fix_20769
...
Update parent when moving share into recieved share
2015-12-09 13:07:57 +01:00
Thomas Müller
bc744ff6de
Merge pull request #21038 from owncloud/share-computesharepermissions-notstore
...
Fix (re)share permission checks in a few code paths
2015-12-09 10:04:56 +01:00
Vincent Petry
6e4006d139
Add reshare permission checks
...
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
2015-12-08 13:13:26 +01:00
Joas Schilling
5453daab03
More fixes to the docs
2015-12-08 09:11:50 +01:00
Scrutinizer Auto-Fixer
0f1be1b601
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 20:08:20 +00:00
Roeland Jago Douma
d38949f423
Update parent when moving share into recieved share
...
Fixes #20769
When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.
2015-12-07 16:28:33 +01:00
Scrutinizer Auto-Fixer
97f9213da9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 12:05:27 +00:00
Thomas Müller
df6fc6cc70
Add the user's cloud id to the vCard
2015-12-02 09:14:41 +01:00
Thomas Müller
50f6817ce9
Merge pull request #20439 from owncloud/etag-propagate-in-storage
...
Take submount etag into account for folder etags
2015-11-25 12:49:54 +01:00
Björn Schießle
964fa1fce3
use hooks to auto add server to the list of trusted servers once a federated share was created
2015-11-24 11:34:38 +01:00
Robin Appelman
888df3933d
take the etag of child mounts into account for the folder etag
...
this replaces shared etag propagation
2015-11-19 13:32:00 +01:00
Robin Appelman
1d82d93baa
Implement getOwner for external share storage
2015-11-18 17:08:02 +01:00
Robin Appelman
0397871f7e
Split checkUpdate
2015-11-03 18:23:22 +01:00
Lukas Reschke
8f09d5b67c
Update license headers
2015-10-26 14:04:01 +01:00
Lukas Reschke
13e817e901
Throw exception on `getPath` if file does not exist
...
Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened.
This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs.
While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page.
I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.
2015-10-25 17:58:21 +01:00
Morris Jobke
db25f41da8
handle NoUserException in sharing code
...
* setup LDAP users
* share from an LDAP user
* delete that LDAP user
* log in as share recipient
* before: unhandled NoUserException
* after: NoUserEception is logged and share is not shown anymore
2015-10-22 17:04:36 +02:00
Roeland Jago Douma
ec296b0b7d
Add backgroundjob to expire link shares
...
Simple background job to expire the link shares.
* added unit tests
2015-10-20 08:18:53 +02:00
Thomas Müller
f2889dc6e4
Consolidate webdav code - move all to one app
2015-10-16 13:17:12 +02:00
Thomas Müller
8cbf76755e
Merge pull request #19643 from owncloud/public-download-spinner
...
Set download cookie on public download
2015-10-09 14:10:29 +02:00
Vincent Petry
ececa90709
Set download cookie on public download
2015-10-08 12:50:56 +02:00
Thomas Müller
b2872ef759
Merge pull request #19589 from owncloud/shares-external-mount-provider
...
Move the setup of external share mounts to a mountprovider
2015-10-07 17:46:33 +02:00
Robin Appelman
59cf817308
Merge pull request #19511 from owncloud/etag-share-permissions-update
...
Mark shares as dirty when changing permissions
2015-10-06 18:09:12 +02:00
Robin Appelman
17756ebf5b
fix phpdoc
2015-10-06 16:37:43 +02:00
Robin Appelman
d3c1fcf961
Fix getEtag for roots of shared storages
2015-10-06 16:33:37 +02:00
Vincent Petry
d546c5bb59
Propagate shares etag when group membership changed
2015-10-06 15:02:22 +02:00
Robin Appelman
47c71d8e87
use microtime
2015-10-06 13:00:30 +02:00
Robin Appelman
0817024e6f
Mark shares as dirty when changing permissions
2015-10-06 11:38:41 +02:00
Morris Jobke
8366ce2767
deduplicate @xenopathic
2015-10-06 09:52:19 +02:00
Morris Jobke
b945d71384
update licence headers via script
2015-10-05 21:15:52 +02:00
Robin Appelman
e468b38bd4
sanitize mountpoint
2015-10-05 17:14:39 +02:00
Robin Appelman
e1c562f66b
extract the mount provider from the manager
2015-10-05 16:39:11 +02:00
Robin Appelman
76a528e511
Make the external share manager a mount provider
2015-10-05 16:18:14 +02:00
Thomas Müller
710b7dd81c
Merge pull request #19487 from owncloud/split_share_middleware
...
Split files_sharing middelware
2015-10-05 10:57:11 +02:00
Thomas Müller
ccbdcf0ab3
Merge pull request #19522 from owncloud/activity-395-less-sidebar-text
...
Activity 395 less sidebar text
2015-10-02 12:13:53 +02:00
Roeland Jago Douma
3d2acb5003
sharingcheckmiddleware now handles externalshares as well
...
Added new annotations for the externalsharescontroller class
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired
By default both are required for all functions in the
externalSharesController.
A proper exception is thrown and then a 405 is returned instead of the
default error page. Since it is only an API endpoint this makes more
sense.
Unit tests added and updated
2015-10-02 12:03:53 +02:00
Roeland Jago Douma
dc38e674a5
Split files_sharing middelware
...
Since for external shares there is no need for link shares to be enabled
we should check which controller is actually being called.
This makes sure that in all cases we verify that the files_sharing app
is enabled. But only for the share controller (public shares) we check
if the API is enabled and if links are enabled.
TODO: add checks for federated sharing as well
2015-10-02 11:56:11 +02:00
Joas Schilling
e478d925c3
Fix intendation
2015-10-02 10:01:33 +02:00
Joas Schilling
17ab8e6c39
Use shorter text on the sidebar for files_sharing activities
2015-10-02 10:01:33 +02:00
Roeland Jago Douma
c924b6740a
Do not return unneeded info
2015-10-02 08:11:50 +02:00
Roeland Jago Douma
7310c4166a
Added '../remote_shares' endpoint
...
* list incoming remote shares at 'remote_shares'
* get per share info at 'remote_shares/<ID>'
* delete remote share with a DELETE to 'remote_shares/<ID>'
2015-10-02 07:40:04 +02:00
Lukas Reschke
22e724e829
Only intercept exceptions of type "NotFoundException" instead of any Exception
...
The sharing backend may throw another exception for example when the activity app encounters a problem. Previously this just triggered a 404 error page and the exception got not logged at all. With this change such exceptions get not intercepted and regularly handled as exceptions so that we have meaningful log data. Also the user will be shown a window informing him that an error happened.
Helps to debug cases such as https://github.com/owncloud/core/issues/19465
2015-09-30 13:32:20 +02:00
Vincent Petry
b4998e7d29
Allow public auth to recognize sesssion
...
When a public link password has been input, its auth is stored in the
session.
This fix makes it possible to recognize the session when using public
webdav from the files UI.
2015-09-28 11:52:04 +02:00
Roeland Jago Douma
db02173627
Reflect enabled shareAPI in capabilities
...
If the shareAPI is disabled we not return the other sharing
capabilities.
This allows clients to properly check if sharing is even available.
2015-09-25 20:12:41 +02:00
Thomas Müller
2c37d5f7d8
Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email
...
Publish an activity when sending a share link via email
2015-09-25 13:48:33 +02:00
Robin Appelman
7d53427ee6
only initialize once
2015-09-23 16:22:53 +02:00
Robin Appelman
88f03192ba
Delay listening to owner changes untill we use a share for that owner
2015-09-23 16:22:53 +02:00
Roeland Jago Douma
4dba046712
Respect disabled sharing API settings
...
If the sharing API setting is disabled that sharing check middle ware
should block the request. Thus making link shares unavailable.
Fixes #18970
* Unit test added
* Unit tests updated
2015-09-22 15:12:16 +02:00
Joas Schilling
2e1cfe03e9
Publish an activity when sending a share link via email
2015-09-22 13:09:21 +02:00
Thomas Müller
75425b28df
Merge pull request #18679 from owncloud/add-reshare-activities
...
Add reshare activities for the parent sharee and the original file owner
2015-09-18 11:59:30 +02:00
Thomas Müller
93eb73b0bb
Merge pull request #18986 from owncloud/federated_capabilities
...
Expose federated sharing capabilities to authenticated users
2015-09-18 11:58:54 +02:00
Joas Schilling
6bc93c7401
Disable the remote sharing notifications until they work properly
2015-09-17 11:14:28 +02:00
Joas Schilling
59967599ac
Fix the parameter order in the translation
2015-09-16 06:47:40 +02:00
Joas Schilling
fe8ef0dd36
Add reshare activities for the parent sharee and the original file owner
2015-09-15 17:36:56 +02:00
Roeland Jago Douma
91dfcab055
Expose federated sharing capabilities to authenticated users
2015-09-15 15:10:13 +02:00
Joas Schilling
38001d824b
Move interfaces to private until they are no longer experimental
2015-09-08 09:01:02 +02:00
Joas Schilling
805f1d0096
Scrap the notifications when the share is accepted or declined
2015-09-08 09:01:01 +02:00
Joas Schilling
d191a0dacc
Add notifications for remote shares
2015-09-08 09:01:01 +02:00
Joas Schilling
7af7fdd929
Use context function call instead of static
2015-09-07 14:28:20 +02:00
Roeland Douma
24f5f50b20
Merge pull request #18742 from owncloud/mimetype-updatedb
...
Introduce mimetype DB update occ command
2015-09-06 16:56:35 +02:00
Robin McCorkell
cdf01f0419
Split mimetype handling to new class
2015-09-04 17:28:20 +01:00
Morris Jobke
e1a79cd651
Avoid re-propagation of shares during one propagation run
...
* fix was proposed by @nickvergessen
2015-09-04 16:17:27 +02:00
Robin Appelman
fd7b210654
Delay setting up the filesystem for a share owner untill the share is used
2015-09-03 13:46:08 +02:00
Vincent Petry
6848f25c0d
Merge pull request #18477 from owncloud/fed-alwaysdetectremotechanges
...
Always detect remote changes for fed sharing
2015-08-24 12:17:23 +02:00
Lukas Reschke
0a1d551090
Use IClientService to check for remote ownCloud instances
...
1. Allows to set a timeout (though still not perfect but way better than before)
2. Allows to have unit tests
3. I also added unit tests for the existing controller code
4. Corrected PHPDoc on IClient
2015-08-22 14:39:43 +02:00
Vincent Petry
d658d8dd4e
Always detect remote changes for fed sharing
...
This is even more important now that filesystem_check_changes is 0 by
default.
2015-08-21 15:32:53 +02:00
Robin McCorkell
99b54e102d
Prevent shares being added to oc_storages via availability
2015-08-20 22:43:46 +01:00
Robin McCorkell
6e47661afd
Fix extracting basename from path in sharing
2015-08-18 13:41:47 +01:00
Roeland Jago Douma
dce5d9b5d1
Add public upload to capability
2015-08-14 20:03:32 +02:00
Joas Schilling
70504920e7
Fix default values of sharing capabilities
...
The problem is the UI used a different default than the capabilities.
So when you never touched the config, the setting in admins said "disabled"
while the capabilities said "enabled".
2015-08-13 12:46:52 +02:00
Joas Schilling
acd54fbeda
Merge pull request #16528 from owncloud/activity-302-improve-settings
...
Activity 302 improve settings
2015-08-11 11:24:27 +02:00
Roeland Jago Douma
e84cffc063
Moved core apps to the capabilities manager
...
* Files
* Files_Sharing
* Files_Trashbin
* Files_Versions
2015-08-10 10:45:16 +02:00
Robin Appelman
859da8f0b3
just pass the share instead of searching for it
2015-08-05 15:41:29 +02:00
Robin Appelman
7b70343dc3
fix infinite loops with propagating etags on reshares
2015-08-03 17:33:12 +02:00
Joas Schilling
a1037f1679
Do not use magic strings when there are constants for it
2015-07-22 15:10:34 +02:00
Morris Jobke
2d691c2fb4
Merge pull request #17381 from owncloud/fix_sharing_add_to_group
...
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
Vincent Petry
3d6be69f25
Throw storage not available on guzzle error
...
If the remote server is in maintenance mode, we must throw storage not
available exception instead of not found which might auto-remove the
share.
2015-07-13 18:51:25 +02:00
Thomas Müller
14eef434ff
Merge pull request #17290 from owncloud/remove-readonly-wrapper
...
Replace readonly wrapper with permissions mask
2015-07-06 15:36:11 +02:00
Joas Schilling
4dbc8ab77f
Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activities
...
Improve federated cloud sharing activities
2015-07-06 10:23:33 +02:00
Bjoern Schiessle
763b601e4a
use the correct user if we update the share table
2015-07-03 15:58:52 +02:00
Joas Schilling
2118713477
Add OCS api to get, accept and decline remote shares
2015-07-03 09:30:49 +02:00
Joas Schilling
ddb8cc2303
Use federated cloud id as a parameter type
2015-07-02 13:14:02 +02:00
Vincent Petry
aedf4848f7
Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block
...
Fix duplicated line in doc block
2015-07-02 13:00:22 +02:00
Joas Schilling
aa7c8ad191
Add the item name to the federated sahre activity
2015-07-02 12:28:48 +02:00
Joas Schilling
95faaad5cf
Use the app constant to fix the grouping
2015-07-02 12:27:58 +02:00
Joas Schilling
7e3f8d3ac1
Use the item name when refering to the unaccepted remote share
2015-07-02 12:26:06 +02:00
Joas Schilling
bfcb8ffeb3
Merge pull request #17246 from owncloud/share-lock-owner-parent
...
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
Joas Schilling
a6ea91996c
Fix duplicated line in doc block
2015-07-02 10:24:16 +02:00
Vincent Petry
9c06975bd5
Fix scanFile signature to avoid boring warning
2015-07-01 16:29:11 +02:00
Robin Appelman
dd20cd1995
remove no longer needed readonly wrapper
2015-07-01 15:45:54 +02:00
Robin Appelman
3c0be7d126
only lock the parent folders
2015-07-01 15:10:25 +02:00
Robin Appelman
d6f56ea609
lock parent folders for the owner when locking a shared file as recipient
2015-07-01 15:10:22 +02:00
Vincent Petry
5d3aa36355
Catch more error codes thrown by federated shares
...
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.
This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 11:14:03 +02:00
Morris Jobke
044d2ece07
Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util
...
Move core apps from OC_Log::write to OCP\Util
2015-07-01 08:53:16 +02:00
Morris Jobke
f25b71f70e
Merge pull request #15475 from rullzer/files_sharing_OCP_DB
...
Move files sharing app (mostly) to OCP\DB
2015-07-01 08:53:03 +02:00
Vincent Petry
b55f71ee03
Merge pull request #17083 from owncloud/share-etag-update-target
...
take share target into account when updating recipient etags
2015-06-29 09:10:37 +02:00
Lukas Reschke
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
Olivier Paroz
b30515ddda
Signature of overriding method should match the parent
2015-06-26 17:45:04 +02:00
Thomas Müller
9558562883
Merge pull request #17082 from owncloud/shared-etag-propagate-file
...
Fix etag propagation for single file shares
2015-06-26 12:36:17 +02:00
Robin Appelman
0128a86df1
add some docs
2015-06-25 14:29:40 +02:00
Morris Jobke
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
Robin Appelman
c87ab65081
fix etag propagation for single file shares
2015-06-24 18:16:03 +02:00
Morris Jobke
4f2f8a6f28
[sharing] handle shares of users that aren't available anymore
...
* properly handle the case where an abandoned share is left and
simply skip it
2015-06-23 18:22:36 +02:00
Robin Appelman
5e1865530b
take share target into account when updating recipient etags
2015-06-22 18:21:54 +02:00
Morris Jobke
7550bf0917
Disable video preview if previews are disabled
2015-06-09 17:49:59 +02:00