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

1140 commits

Author SHA1 Message Date
Roeland Jago Douma
4a2f9fab66
Move over OCSShareAPIMIddleware to pure DI 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-16 22:53:09 +02:00
Joas Schilling
4d40eb61b4
List share download activity under sharing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-10-10 08:43:54 +02:00
John Molakvoæ (skjnldsv)
ff895abac0
Fix shares read permissions 
A user with reshare permissions on a file is now able to get any share
of that file (just like the owner).

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 21:40:30 +02:00
John Molakvoæ (skjnldsv)
b1069b29fa
Add checks for whether a user with access to a share can delete it 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:11 +02:00
John Molakvoæ (skjnldsv)
f02cff1304
Extract check for whether a user with access to a share can edit it 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:11 +02:00
John Molakvoæ (skjnldsv)
c49469c4d8
Prevent non owners to update others link shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 08:19:07 +02:00
John Molakvoæ (skjnldsv)
c8d50538b8
Use same settings for mail share as link shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 08:19:07 +02:00
Joas Schilling
15d39c48e6
Merge pull request #17021 from nextcloud/bye-spreed-hello-talk 
Bye Spreed namespace, hello Talk!
 2019-09-11 14:59:37 +02:00
Joas Schilling
858b18e34a
Bye Spreed namespace, hello Talk! 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-05 15:32:58 +02:00
Joas Schilling
70807a74c7
Correctly check for new default root 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-04 09:28:58 +02:00
Julius Härtl
64c63bb00b
Properly initialize the CacheJail for sharing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-09-03 18:07:59 +02:00
John Molakvoæ (skjnldsv)
b557f52c22
Add expiration event for shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-08-21 08:30:17 +02:00
Joas Schilling
85a80b05ac
Unify the permission checking in one place only 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-03 16:34:00 +02:00
Joas Schilling
7aa26b28a8
Correctly check share permissions when updating a re-sub-share 
Before this change the node you shared was checked for permissions.
This works when you reshare the folder that was shared with you.
However when you reshared a subfolder (e.g. as public link),
you could afterwards update the permissions and grant
create+update permissions although the share you receive was read-only.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-06-27 15:27:30 +02:00
tobiasKaminsky
b65a59568e
add "askForPassword" on capabilities for sharing 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2019-05-13 20:09:00 +02:00
Morris Jobke
2565e16770
Fix public upload by also load the semaphore method 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-05-07 23:48:06 +02:00
Daniel Calviño Sánchez
dfe9e3fb2e Do not allow JavaScript "eval" in the public share auth page with Talk 
Talk no longer uses JavaScript "eval", so the Content Security Policy
can now be configured to prevent its use in the public share
authentication page when the password is protected by Talk.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-04-10 16:46:19 +02:00
Maxence Lange
749fdab3b0 do not returns shared_with === currentUser 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-04-01 11:17:05 -01:00
Maxence Lange
0166990f01 fixing share format 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-03-31 10:40:14 -01:00
Maxence Lange
efbadf0cf2 issue during last push 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-03-31 10:40:14 -01:00
Maxence Lange
44c1feb938 returns reshares in API 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-03-31 10:40:14 -01:00
Morris Jobke
4b49e2eb52
Fix unnecessary boolean cast 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-06 10:12:58 +01:00
Morris Jobke
fde4c54136
Merge pull request #13790 from fretn/master 
Fix for crashing occ files:scan
 2019-03-06 10:12:14 +01:00
Christoph Wurst
e930a0ccbe
Search sharees on lookup server when explicitly requested by user 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-26 19:44:49 +01:00
Morris Jobke
ee68e8f47e
Merge pull request #13514 from nextcloud/fix-public-grid-toggle 
Fix grid toggle button on public page
 2019-02-25 21:18:42 +01:00
Christoph Wurst
f3023aaa85
Show sharing recommendations 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-25 07:25:21 +01:00
John Molakvoæ (skjnldsv)
ee2c45d60d
Fix grid toggle button on public page 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-02-21 09:17:57 +01:00
Julius Härtl
2ec5e2b588
Fix writable public folder share 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-02-19 10:18:26 +01:00
Roeland Jago Douma
0e72d38747
Catch Request exception in testRemoteUrl 
Else the background job fails hard if the remote has for example an
invalid certificate.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-15 23:06:21 +01:00
Jonas Sulzer
3a5d634ccc
add myself as @author 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:39:01 +01:00
Jonas Sulzer
e2ec22c43d
code styling 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:39:00 +01:00
Jonas Sulzer
5756d96ab9
restructure code 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:39:00 +01:00
Jonas Sulzer
30d4024d9d
only show "Add to your Nextcloud" on share link if federation is activated 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:38:31 +01:00
fretn
7efcd11b8e Fix for crashing occ files:scan 
when $share === false then (int)$share['share_type'] will always be equal to (int)0

which results in following crash:

[root@server nextcloud] sudo -u apache php occ files:scan someuser
The current PHP memory limit is below the recommended value of 512MB.
Starting scan for user 1 out of 1 (someuser)
An unhandled exception has been thrown:
TypeError: Argument 1 passed to OC\OCS\DiscoveryService::discover() must be of the type string, null given, called in /var/www/html/nextcloud/apps/files_sharing/lib/External/Manager.php on line 382 and defined in /var/www/html/nextcloud/lib/private/OCS/DiscoveryService.php:65
Stack trace:
0 /var/www/html/nextcloud/apps/files_sharing/lib/External/Manager.php(382): OC\OCS\DiscoveryService->discover(NULL, 'FEDERATED_SHARI...')
1 /var/www/html/nextcloud/apps/files_sharing/lib/External/Manager.php(527): OCA\Files_Sharing\External\Manager->sendFeedbackToRemote(NULL, NULL, NULL, 'decline')
2 /var/www/html/nextcloud/apps/files_sharing/lib/External/Storage.php(216): OCA\Files_Sharing\External\Manager->removeShare('files/Someth...')
3 [internal function]: OCA\Files_Sharing\External\Storage->checkStorageAvailability()
4 /var/www/html/nextcloud/lib/private/Files/Storage/Wrapper/Wrapper.php(505): call_user_func_array(Array, Array)
5 [internal function]: OC\Files\Storage\Wrapper\Wrapper->__call('checkStorageAva...', Array)
6 /var/www/html/nextcloud/lib/private/Files/Storage/Wrapper/Wrapper.php(505): call_user_func_array(Array, Array)
7 /var/www/html/nextcloud/apps/files_sharing/lib/External/Scanner.php(89): OC\Files\Storage\Wrapper\Wrapper->__call('checkStorageAva...', Array)
8 /var/www/html/nextcloud/apps/files_sharing/lib/External/Scanner.php(44): OCA\Files_Sharing\External\Scanner->scanAll()
9 /var/www/html/nextcloud/lib/private/Files/Utils/Scanner.php(245): OCA\Files_Sharing\External\Scanner->scan('', true, 3)
10 /var/www/html/nextcloud/apps/files/lib/Command/Scan.php(172): OC\Files\Utils\Scanner->scan('/someuser', true, NULL)
11 /var/www/html/nextcloud/apps/files/lib/Command/Scan.php(249): OCA\Files\Command\Scan->scanFiles('someuser', '/someuser', false, Object(Symfony\Component\Console\Output\ConsoleOutput), false, true, false)
12 /var/www/html/nextcloud/3rdparty/symfony/console/Command/Command.php(251): OCA\Files\Command\Scan->execute(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
13 /var/www/html/nextcloud/core/Command/Base.php(162): Symfony\Component\Console\Command\Command->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
14 /var/www/html/nextcloud/3rdparty/symfony/console/Application.php(946): OC\Core\Command\Base->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
15 /var/www/html/nextcloud/3rdparty/symfony/console/Application.php(248): Symfony\Component\Console\Application->doRunCommand(Object(OCA\Files\Command\Scan), Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
16 /var/www/html/nextcloud/3rdparty/symfony/console/Application.php(148): Symfony\Component\Console\Application->doRun(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
17 /var/www/html/nextcloud/lib/private/Console/Application.php(213): Symfony\Component\Console\Application->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
18 /var/www/html/nextcloud/console.php(96): OC\Console\Application->run()
19 /var/www/html/nextcloud/occ(11): require_once('/var/www/html/n...')
20 {main}[root@server nextcloud]

Signed-off-by: fretn <frederikdelaere+github@gmail.com>
 2019-01-24 11:45:53 +01:00
Julius Härtl
3828283c01
Add caching headers for public previews 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-02 22:27:46 +01:00
Joas Schilling
ee545d6840
Fix typo in "incoming" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-05 11:27:38 +01:00
Morris Jobke
d8314b102e
Merge pull request #12624 from nextcloud/bugfix/noid/validate-all-rich-objects 
Validate all rich objects
 2018-12-04 22:48:54 +01:00
Morris Jobke
cae600d205
Merge pull request #12628 from nextcloud/bugfix/act-317/missing-activity-for-user-self-unshare 
Parse activity when a user self-unshares a file
 2018-11-30 10:14:26 +01:00
Robin Appelman
2c1f6331a4
Add interface to allow storages from opting out of encryption 
As opposed to hard-coding a list of excluded storages

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-29 16:31:34 +01:00
Bjoern Schiessle
1518671ad8
add capabilities for multiple share links 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-26 14:44:59 +01:00
Joas Schilling
72f8a58f89
Parse activity when a user self-unshares a file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-23 13:21:52 +01:00
Joas Schilling
99bcc1363e
Fix wrong used type 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-23 12:39:02 +01:00
Roeland Jago Douma
a343a60a68
Handle permission in update of share better 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-20 09:42:01 +01:00
John Molakvoæ (skjnldsv)
1deda8fd65
Rollback to default list view 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-15 20:29:10 +01:00
Morris Jobke
79681ef3d9
Merge pull request #12398 from nextcloud/fix/12378 
change "Download" to "Download all files" for shared folders
 2018-11-13 17:21:09 +01:00
Jonas Sulzer
1f237c7e25
change "Download" to "Download all files" for shared folders 
fixes #12378

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2018-11-10 19:10:31 +01:00
Joas Schilling
bb352fb667
Use the defined func()->count() instead of manual counting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 15:44:45 +01:00
Morris Jobke
7940a79a41
Merge pull request #12324 from nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares 
Add "password" parameter to the response data of link shares
 2018-11-07 16:29:05 +01:00
Morris Jobke
9669d451e3
Reduce function calls 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:19:20 +01:00
Michael Weimann
c572c669e5
Adapts the code to the new master state 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:20 +01:00