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

1126 commits

Author SHA1 Message Date
Morris Jobke
6290ba8299 Merge pull request #4790 from nextcloud/fix-comparisons-in-apps 
Fix comparisons in apps
 2017-08-02 16:28:33 +02:00
Lukas Reschke
f93a82b8b0
Remove explicit type hints for Controller 
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 17:32:03 +02:00
Morris Jobke
6010c4f267 Merge pull request #5877 from nextcloud/typehint_middleware 
Prop argument type for Middleware
 2017-08-01 14:28:16 +02:00
Joas Schilling
80febeae21 Fix comparisons in the sharing app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Roeland Jago Douma
3548603a88
Fix middleware implementations signatures 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Morris Jobke
a309fa7d6b Disable default activity email for incoming shares 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-31 08:19:54 +02:00
Roeland Jago Douma
6d4731024a
Some app fixes of phpstorm inspections 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 11:42:07 +02:00
Morris Jobke
50fc5a1e25 Merge pull request #5823 from nextcloud/improve-error-handling 
Improve error handling for accepting federated shares
 2017-07-21 22:54:14 +02:00
Roeland Jago Douma
86d2fe516e Merge pull request #5753 from nextcloud/fed-unshare-fail-remote 
still remove the federated share even if we cant notify the remote
 2017-07-21 12:45:01 +02:00
Bjoern Schiessle
e78040d250
improved error handling 
check if table was updated successfully and only then send a notification
mail and return "true".

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-21 12:07:32 +02:00
Lukas Reschke
d8ec399454
Run phan over code base 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:11 +02:00
Robin Appelman
7fa02905aa
still remove the federated share even if we cant notify the remote 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-17 14:19:44 +02:00
Stephan Müller
7cf3dc4e29 do not show hyphen in og:title if slogan does not exist 2017-07-14 15:26:44 +02:00
Roeland Jago Douma
08d3cb9107 Merge pull request #5685 from nextcloud/jail-propagator 
Fix propagating changes within jail wrapper
 2017-07-12 12:14:51 +02:00
Robin Appelman
dfe662ad42
Fix propagating changes within jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-11 17:55:04 +02:00
Maxence Lange
6e7be6acfd upstream 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-07-11 13:21:24 +02:00
Joas Schilling
b69ddfba8b
Fix activity emails for accept/decline of remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-10 12:10:36 +02:00
Joas Schilling
90fa27694a
Use PNG version of the icons for shipped activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-20 13:48:51 +02:00
Robin Appelman
c9ef998f17 Merge pull request #5091 from nextcloud/shared-cache-during-init 
dont die if we try to access the shared cache while setting up the shared storage
 2017-06-19 13:47:59 +02:00
Morris Jobke
db14089d6c Merge pull request #5375 from nextcloud/share-folder-for-remote-shares 
Use the share_folder config for remote shares
 2017-06-14 22:42:06 -05:00
Joas Schilling
4f98852f52
Make sure to only add system users once 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-14 15:07:21 +02:00
Joas Schilling
ae693129db
Allow to find local users by their email address 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 18:07:47 +02:00
Joas Schilling
b5beaf7ef4
Use the share_folder config for remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 14:30:25 +02:00
Robin Appelman
ed89034047
dont die if we try to access the shared cache while setting up the shared storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-24 13:56:09 +02:00
Daniel Hansson
119e8474b6 fix for sharing 
Signed-off-by: Daniel Hansson <daniel@techandme.se>
 2017-05-20 16:23:04 +02:00
Joas Schilling
51757716ec
Fix the share type of guest shares when migrating from ownCloud 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-12 09:38:48 +02:00
Joas Schilling
643b4a4ec4
Move the file sharing app to migration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-12 09:38:48 +02:00
Morris Jobke
23cc309606
Handle more error cases 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-02 13:43:48 +02:00
Bjoern Schiessle
9a366dbe2e
add missing translation and other small fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
866e5d6d05
use configured lookup server 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Robin Appelman
ab9a36e872
allow apps to set custom mount types 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-28 09:38:21 +02:00
Morris Jobke
c54a59d51e
Remove unused use statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 19:23:31 -05:00
Lukas Reschke
727688ebd9
Adjust existing bruteforce protection code 
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-14 13:42:40 +02:00
Lukas Reschke
66835476b5
Add support for ratelimiting via annotations 
This allows adding rate limiting via annotations to controllers, as one example:

```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```

Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:16 +02:00
Morris Jobke
31024b7700 Merge pull request #4329 from nextcloud/move-out-shared-folder 
Fix moving files out of a shared folder
 2017-04-12 11:44:26 -05:00
Björn Schießle
b90e91144b Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints 
Discover federatedsharing endpoints
 2017-04-12 16:01:07 +02:00
Robin Appelman
2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-12 14:55:47 +02:00
Morris Jobke
1729e4471f
Update comments to Nextcloud 
* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-11 23:16:27 -05:00
Michael Jobst
81b1dc4930
share api expanded by tags (#26583) 
* share api expanded by tags

* Modified files_sharing JS Unit tests

* modified tests. renamed request parameter. refactoring

* Update Share20OCS.php

Added missing function description

* Update Helper.php

Added missing function description

* Update Helper.php

implicit boolean conversion to !empty()

* Update Share20OCSTest.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-11 11:54:13 -05:00
Roeland Jago Douma
53bca14a27
Do proper DI 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-11 15:04:01 +02:00
Bjoern Schiessle
449011dae7
remove discovery manager in favour of the OCSDiscoveryService 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-11 15:04:01 +02:00
Lukas Reschke
afb5d45705 Merge pull request #4256 from nextcloud/theming 
Move OC_Defaults to OCP\Defaults
 2017-04-11 14:39:46 +02:00
Bjoern Schiessle
cbacca4202
move capabilities to share by mail app 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-10 17:18:13 +02:00
Morris Jobke
5b4adf66e5
Move OC_Defaults to OCP\Defaults 
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:01 -05:00
Bjoern Schiessle
3323d01db1
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Bjoern Schiessle
676a4c781a
update capabilities 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Bjoern Schiessle
b84fd7c361
set expire date for all share types 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c191173d59
allow password protected mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle
0d5147bd49
add new password column to the share table in order to set passwords for share by mails 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:20:49 +02:00
Roeland Jago Douma
4821c00ea8 Merge pull request #4004 from nextcloud/backport-27172 
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
 2017-03-28 21:56:44 +02:00
Robin Appelman
ae3016959e
fix shared storage numeric id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-27 14:05:18 +02:00
Morris Jobke
a5a29ee27a Merge pull request #3953 from nextcloud/downstream-27027 
Ignore NoUserException for shares from ghosts
 2017-03-23 15:26:43 -06:00
Morris Jobke
869ba16273
do not remove the method and only keep the tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 13:10:43 -06:00
Robin Appelman
a12ec5ec77
set cache to failedcache when shared storage init fails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-23 15:01:23 +01:00
Vincent Petry
89c42a76c3
Remove SharedCache::getNumericStorageId to let CacheWrapper do it 
The CacheWrapper will properly forward the call to the wrapped cache.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 00:02:48 -06:00
Roeland Jago Douma
16a0bccefa Merge pull request #3972 from nextcloud/merge-some-more-css 
Merge some CSS files using our SCSS compiler
 2017-03-22 08:46:10 +01:00
Joas Schilling
20a0a18fbd
Fix reshare with user activity message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-21 16:54:28 -06:00
Lukas Reschke
5c7ad6d3ec
Merge some CSS files using our SCSS compiler 
This saves around 4 requests on the average page load.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-21 16:35:31 +01:00
Robin Appelman
0c1b7fdcb5
return failed cache if the shared storage failed to setup 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-20 18:31:34 +01:00
Robin Appelman
f2e981e269
also set nonmaskedstorage in error cases 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-20 18:17:53 +01:00
Joas Schilling
35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956 
Skip null groups in group manager
 2017-03-20 12:27:38 +01:00
Vincent Petry
a4ce440392
Ignore NoUserException for shares from ghosts 
Add unit tests for FailedStorage init from SharedStorage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 01:43:24 -06:00
Maxence Lange
69694012ab shares-circles 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-03-17 18:48:33 -01:00
Joas Schilling
bd97b7d130
Use DI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:23:04 +01:00
Joas Schilling
199405ddc0
Safer queries 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 09:59:56 +01:00
Joas Schilling
0a1135a7cc
Better output 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 09:59:25 +01:00
Jörn Friedrich Dreyer
5155a5288c
Add CleanupRemoteStorages command 
cleanup files, address review

Fix CleanupRemoteStoragesTest tests

Fix test expectation.
Added files count to check filecache deletion.

Sort by numeric id for deterministic test results

Removed precise order test and added storage check

Remove inaccurate removal message check which has a different order on
Oracle.

Added more checks to confirm that existing storages still exist.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-17 00:09:52 -06:00
Vincent Petry
377fdf3860
Skip null groups in group manager (#26871) (#26956) 
* Skip null groups in group manager (#26871)

* Skip null groups in group manager

* Also skip null groups in group manager's search function

* Add more group null checks in sharing code

* Add unit tests for null group safety in group manager

* Add unit tests for sharing code null group checks

* Added tests for null groups handling in sharing code

* Ignore moveShare optional repair in mount provider

In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.

* Adjust null group handing + tests

* Fix new group manager tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-17 00:07:03 -06:00
Lukas Reschke
dd6d2893a6 Merge pull request #3588 from GreenArchon/issue_#3461 
Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs
 2017-02-24 17:25:21 +01:00
Bjoern Schiessle
fe46c6f743
use (int) instead of intval for performance reasons 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-02-22 15:14:36 +01:00
Morris Jobke
02ea84f50f
properly include class 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-21 17:24:40 -06:00
Morris Jobke
8e3d0fecd2
Use intval() for validation of config options 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-21 17:22:06 -06:00
Bjoern Schiessle
869ea38ffe
allow to configure a min-length of search strings for auto-compeltion and a max number for of results returned 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-02-21 18:31:20 +01:00
Frédéric Fortier
cc511ac7b8 Typecast filecache 'storage' as int to return it as documented, fixes #3461 
Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
 2017-02-20 22:23:27 -05:00
Robin Appelman
976cff780b
register cloudidmanager for files_sharing 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:03 +01:00
Robin Appelman
fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:02 +01:00
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