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
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
d8ec399454
Run phan over code base
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
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
7cf3dc4e29
do not show hyphen in og:title if slogan does not exist
2017-07-14 15:26:44 +02:00
08d3cb9107
Merge pull request #5685 from nextcloud/jail-propagator
...
Fix propagating changes within jail wrapper
2017-07-12 12:14:51 +02:00
dfe662ad42
Fix propagating changes within jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 17:55:04 +02:00
6e7be6acfd
upstream
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 13:21:24 +02:00
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
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
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
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
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
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
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
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
119e8474b6
fix for sharing
...
Signed-off-by: Daniel Hansson <daniel@techandme.se>
2017-05-20 16:23:04 +02:00
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
643b4a4ec4
Move the file sharing app to migration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
23cc309606
Handle more error cases
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 13:43:48 +02:00
9a366dbe2e
add missing translation and other small fixes
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
866e5d6d05
use configured lookup server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
ab9a36e872
allow apps to set custom mount types
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 09:38:21 +02:00
c54a59d51e
Remove unused use statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
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
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
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
b90e91144b
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
...
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
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
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
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
53bca14a27
Do proper DI
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
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
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
cbacca4202
move capabilities to share by mail app
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 17:18:13 +02:00
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
3323d01db1
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
676a4c781a
update capabilities
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
b84fd7c361
set expire date for all share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
c191173d59
allow password protected mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
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
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
ae3016959e
fix shared storage numeric id
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 14:05:18 +02:00
a5a29ee27a
Merge pull request #3953 from nextcloud/downstream-27027
...
Ignore NoUserException for shares from ghosts
2017-03-23 15:26:43 -06:00
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
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
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
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
20a0a18fbd
Fix reshare with user activity message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-21 16:54:28 -06:00
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
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
f2e981e269
also set nonmaskedstorage in error cases
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:17:53 +01:00
35f6b8716e
Merge pull request #3884 from nextcloud/downstream-26956
...
Skip null groups in group manager
2017-03-20 12:27:38 +01:00
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
69694012ab
shares-circles
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
bd97b7d130
Use DI
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:23:04 +01:00
199405ddc0
Safer queries
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:56 +01:00
0a1135a7cc
Better output
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:25 +01:00
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
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
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
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
02ea84f50f
properly include class
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:24:40 -06:00
8e3d0fecd2
Use intval() for validation of config options
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:22:06 -06:00
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
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
976cff780b
register cloudidmanager for files_sharing
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
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
54e39d4b93
Fix files sharing legacy as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 11:55:50 +01:00
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
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
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
14256d631c
Use group display name in sharing API + UI
2016-12-22 18:35:32 +01:00
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
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
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
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
5b474e72d5
Merge pull request #2673 from nextcloud/shared-scanner-unmasked
...
use unmasked permissions in shared scanner
2016-12-15 15:54:32 +01:00
6de0eb0b74
Remove leading slash from sharing activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
5d0897b8d7
use unmasked permissions in shared scanner
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 14:37:51 +01:00
9e353f6289
Fix overwriting parameter
...
Fixes #2641
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 22:28:09 +01:00
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
bbe24d29ca
reuse cacheentry
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +01:00
43374292b1
update phpdoc
...
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
2016-12-12 16:15:13 -01:00
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
02ee4f958c
apply permissions mask for shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 17:59:02 +01:00
b2f46bfa04
Adjust all implementations in the server repo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
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
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
59db9fada2
Merge pull request #2281 from nextcloud/fix-translation
...
Fix language typo
2016-11-23 17:53:21 +01:00
14f01dbe33
Fix language typo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
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
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
e9336dddd5
Specify the parameters on public download
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 20:14:42 +01:00
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
7b3855a375
Add config switch
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
15c075eba8
Fix lookup url
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
f7f70028d1
Search on lookup server
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:00 +01:00
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
dbd7f6dea6
cache the displayname of the share owner
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-18 11:26:00 +01:00
Roeland Jago Douma
Bjoern Schiessle
Lukas Reschke
Robin Appelman
Stephan Müller
Maxence Lange
Joas Schilling
Morris Jobke
Daniel Hansson
Michael Jobst
Roeland Jago Douma
Vincent Petry
Jörn Friedrich Dreyer
Frédéric Fortier
Maxence Lange