mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
53,605 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

162 Commits

Author SHA1 Message Date
Bjoern Schiessle a176a1f318
implement unshare notification 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle fab4e561f4
send reshare over OCM API 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle 41a1528888
implement decline share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle 8889e14c7c
implement accept share notification 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle bbce8c3ea1
adjust to latest api version 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle db428ea547
send accept share notification (WIP) 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle a3948e8a12
use new API to send a federated share if possible 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle 21e64ec7f4
implement receiving of federated shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Bjoern Schiessle 5cfe20675d
start implementing federated sharing 2.0 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Arthur Schiwon 38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Morris Jobke 093cd01ac2
Fix DI for federated file sharing controller 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 13:49:28 +02:00
Morris Jobke dd34cb7540
Less deprecated calls to OCP\Util::writeLog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-22 20:41:49 +02:00
Roeland Jago Douma f4fd0224db
Do not use \OCP\DB anymore 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-26 14:40:23 +02:00
Morris Jobke 4cbcf6f920
Remove old code to be compatible with Nextcloud 9 and before 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 14:21:12 +01:00
Morris Jobke eb51f06a3b
Use ::class statement instead of string 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 12:03:47 +01:00
Joas Schilling c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value 
Return value immediately instead of assigning to a one-time variable
 2018-01-26 10:15:39 +01:00
Morris Jobke 0a56d2185e
Return value immediately instead of assigning to a one-time variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 00:02:03 +01:00
Morris Jobke 4dbee99b7b
Remove useless return statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:50:40 +01:00
Morris Jobke 2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Morris Jobke 55532f19d9
Cleanup OC_User and OCP\User 
* mainly removes deprecated methods and old static code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-16 18:39:11 +01:00
Morris Jobke 0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Lukas Reschke d321e9792e
Add |null to PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Bjoern Schiessle 8b3dfcc429
use OCSv2 to make sure that the error also arrives at the web front-end 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-21 12:09:13 +02:00
Allan Nordhøy de6b7668c1 sent, an invitation, - successful 2017-07-14 17:28:57 +02:00
Joas Schilling 33cb45d4a3
Fix owner cloud id in unshare activity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-10 12:20:56 +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
Marin Treselj 3470d0a44e
Simplified Nextcloud logo icon 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-02 14:14:49 +02:00
Arthur Schiwon da53162656
We're on 13 now… 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-26 11:03:41 +02:00
Arthur Schiwon 1ace1657b6
adapt federatedfilesharing 
also drops IE8 switch

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Bjoern Schiessle 7c2d473d76
add new config switched for the global scale architecture 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-29 18:19:28 +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
Roeland Jago Douma ad24b86013 Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations 
Adjust existing bruteforce protection code
 2017-04-19 09:27:23 +02:00
Morris Jobke 10290eb006 Merge pull request #2834 from nextcloud/accesListToShareManager 
Access list to share manager
 2017-04-15 13:06:24 -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
Joas Schilling 629b7c0fc3
Adjust docs and make !$currentAccess simpler 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:52 +02:00
Joas Schilling 3c1365c0d1
Fix returned paths for remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:51 +02:00
Joas Schilling 4bcb7d88b5
Return the token as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:51 +02:00
Joas Schilling 91e650791d
Return the paths for the users without setting them all up 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:50 +02:00
Roeland Jago Douma 12afd7d1d5
Add mail element to access list 
* Each provider just returns what they have so adding an element won't
require changing everything
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:50 +02:00
Roeland Jago Douma 2cbac3357b
Offload acceslist creation to providers 
* This allows for effective queries.
* Introduce currentAccess parameter to speciy if the users needs to have
currently acces (deleted incomming group share). (For notifications)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:50 +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
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
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
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
Robin Appelman a555672f21
properly quota table names in getSharesInFolder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-10 17:59:40 +02:00
Bjoern Schiessle 78f0b5c19f
simplify return statement 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-10 09:44:23 +02:00
Bjoern Schiessle 9afd160e66
allow to disable upload to lookup server, by default it is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 16:30:07 +02:00
Robin Appelman 1c59240894
Add api to change the remote of an incoming federated share 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-10 14:45:40 +01:00
Joas Schilling 0be2921966
Fix DI of the cloud id manager into apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-14 12:47:46 +01:00
Robin Appelman f6cd5200a2
clean cloud ids 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-09 13:31:06 +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
Bjoern Schiessle 3882a8d648
some code cleanup while working on the file 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-19 10:12:46 +01:00
Bjoern Schiessle cd8104dfb0
add brute force protection to 'mount public link' operation 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-19 10:12:46 +01:00
Joas Schilling b31d621840
Add an icon to the federated sharing notification 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-28 17:23: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
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
Bjoern Schiessle 4623b70cc9
catch all exception and return a user friendly exception message 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 18:05:14 +01:00
Bjoern Schiessle 76b1dee499
use https by default if no protocol is given. Only use unsecure connection if it is explicitely given 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 10:44:55 +01:00
Roeland Jago Douma fc4d0a86ef
Fix merging backend results 
* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 12:16:05 +01:00
Roeland Jago Douma ce7eb02685
Add remoteprovider getsharesinfolder function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-31 20:26:11 +01:00
Robin Appelman 3692769b0a
Add getShareTypesInFolder to optimize folder listening 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-10-31 15:55:40 +01:00
Joas Schilling cf2d1b2427
Move federated share notifications to ROS 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-20 12:14:59 +02:00
Joas Schilling 6f8f78b07a
Fix some more sniffs 2016-09-12 16:48:11 +02:00
Roeland Jago Douma 2812755359
Move federated sharing routes to the federatedfilesharingapp 
* Move routes to app
* Move routes over to the AppFramework
* Fix tests

There is plenty of stuff to fix properly here. But out of scope for now.
 2016-08-28 21:26:33 +02:00
Roeland Jago Douma a1ed8207e9
HTTPHelper is deprecated 
Use the IClientService instead
 2016-08-24 21:30:39 +02:00
Arthur Schiwon 5696c8aa35
adjust federatedfilesharing 2016-08-11 15:13:40 +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
Bjoern Schiessle f8a531c06c
don't convert link share to federated share if outgoing federated shares are forbidden 2016-07-14 20:48:45 +02:00
Bjoern Schiessle c7f6461c53
rename SaveToNextcloudController to MountPublicLinkController 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 56d3100f44
adjust copyright notices 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 55b990b544
allow to mount public link from Nextclouds <= 9 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 5bbba490c4
move some stuff over to the federatedfilesharing app 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 2f23054b01
s/ownCloud/Nextcloud 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 33a685bc41
continue to accept the URL of the remote server instead of the federated cloud id 2016-07-14 16:39:48 +02:00
Björn Schießle f5d0b464a7
create a real federated share if a user add a public link to his ownCloud 
this way the owner sees all mounted public links and control them individually
 2016-07-14 11:22:35 +02:00
Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Vincent Petry ba95297c5c Merge pull request #25262 from owncloud/fed-sharing-error 
Only save federated share after remote server is notified
 2016-07-01 16:20:39 +02:00
Lukas Reschke 6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Robin Appelman 646c90cc4a Log reason why we removed the fed share 2016-06-27 16:38:47 +02:00
Robin Appelman 8d32e1d35b Handle exceptions thrown while trying to notify remote server of a fed share 2016-06-27 14:28:12 +02:00
Lukas Reschke 7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Robin Appelman 040c541138 Remove a fed share from the local table before trying to notify the remote server 2016-06-23 14:19:55 +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
Bjoern Schiessle 9eaccaf2b1
s/ownCloud/Nextcloud 2016-06-20 14:20:48 +02:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Joas Schilling 3a716ae91c
Move lib/ to PSR-4 2016-05-25 14:59:59 +02:00
Björn Schießle bc8f659d06
add missung return value 2016-05-20 21:15:16 +02:00
Björn Schießle 06b6e2bff5
improved error messages 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 92fa0c7dfd
fall back to old re-sharing behaviour in case the remote server doesn't support flat-reshares 2016-05-20 21:15:16 +02:00
Björn Schießle 2dc26aada7
update share permissions 2016-05-20 21:15:15 +02:00
Björn Schießle 7b25839bd5
use share initiator as fall back to access the file 
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
 2016-05-20 21:15:15 +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
Björn Schießle 8f87e1104d
use query builder for getShare and add tests 2016-05-20 21:15:11 +02:00
Björn Schießle 5a1641bed2
move request handler for federated shares to the federated sharing app 2016-05-20 21:15:08 +02:00
Joas Schilling 8dc25321d3
Move FederatedFileSharing to PSR-4 2016-05-18 15:28:50 +02:00