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

82 commits

Author SHA1 Message Date
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
Joas Schilling
6bc93c7401 Disable the remote sharing notifications until they work properly 2015-09-17 11:14:28 +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
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
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
Joas Schilling
2118713477 Add OCS api to get, accept and decline remote shares 2015-07-03 09:30:49 +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
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
Olivier Paroz
b30515ddda Signature of overriding method should match the parent 2015-06-26 17:45:04 +02:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-05-19 11:23:06 +00:00
Joas Schilling
34181c3aef Correctly send Federate-Cloud Share Feedback against the remote share ID 2015-04-28 14:29:04 +02:00
Joas Schilling
8f7c64253e Correctly generate the feedback URL for remote share 
The trailing slash was added in c78e3c4a7f
to correctly generate the encryption keys
 2015-04-28 11:28:54 +02:00
Vincent Petry
b51b5b64e6 Fix converting Guzzle error codes in s2s storage 2015-04-10 12:12:05 +02:00
Vincent Petry
73afca6207 Catch more exceptions when connecting to remote DAV server 
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
 2015-04-10 12:02:06 +02:00
Vincent Petry
4feb97d8e4 Properly catch guzzle 503 when querying share info 2015-04-09 18:55:28 +02:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Lukas Reschke
5f044ebf1b Add wrapper for Guzzle 2015-03-25 16:04:41 +01:00
Joas Schilling
7de15f3125 *cough* 2015-03-24 17:08:03 +01:00
Morris Jobke
965d97a8f5 Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share 
"Integrity constraint violation" when sharing the same item twice with the same user
 2015-03-24 15:05:58 +01:00
Robin Appelman
be6edd465a Merge pull request #14537 from owncloud/oci-external-share 
Fix external shares without password on oracle
 2015-03-19 16:20:12 +01:00
Joas Schilling
8ebb198ef3 Add a unit test for the naming conflict on the mountpoint name 2015-03-17 16:55:03 +01:00
Joas Schilling
ba3e4ede39 Use insertIfNotExists() instead of manual logic 2015-03-17 16:03:24 +01:00
Joas Schilling
05c4848954 Correctly get the unique mountpoint name when mounting the share 
Previously the mount name was checked for uniqueness prior to inserting the
share. This caused problems, when two shares with the same name where done
or folder, mount point, local share with the same name was done, between
sending and accepting of the remote share
 2015-03-17 16:03:24 +01:00
Lukas Reschke
db033e4e19 Fix PHPDoc and Co. 
Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240
 2015-03-17 10:37:09 +01:00
Vincent Petry
b9d9405135 Fix scanFile signature warnings 2015-03-16 16:45:11 +01:00
Joas Schilling
6a677ce8fe Do not make setupMounts() public just because of testing 2015-03-11 11:10:43 +01:00
Robin Appelman
dcd2d7aff5 Add unit tests for external share mananger 2015-03-10 10:17:53 +01:00
Robin Appelman
c65c717379 Fix external shares without password on oracle 2015-02-27 13:22:57 +01:00
Morris Jobke
06aef4e8b1 Revert "Updating license headers" 
This reverts commit 6a1a4880f0.
 2015-02-26 11:37:37 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Morris Jobke
87b39e8f03 Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage 
Catch storage exception in scanner for remote shares
 2015-01-28 00:31:37 +01:00
Vincent Petry
bd888748bd Merge pull request #13490 from owncloud/fix_reshare_s2s_share 
use uid provided by setupfs hook to mount server2server shares
 2015-01-26 19:54:14 +01:00
Bjoern Schiessle
5ba19ba7fc certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages 2015-01-26 16:58:52 +01:00
Bjoern Schiessle
67da1f7e5a certificate manager only needs the user-id, no need to pass on the complete user object 2015-01-26 16:58:52 +01:00
Bjoern Schiessle
66f0db30b2 use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares 2015-01-26 16:54:50 +01:00
Vincent Petry
d5b61f9afe Prevent double slash in shareinfo request URL 2015-01-26 16:19:38 +01:00
Vincent Petry
f6e644b43f Catch storage exception in scanner for remote shares 
Whenever an exception occurs during scan of a remote share, the share is
checked for availability. If the storage is gone, it will be removed
automatically.

Also, getDirectoryContent() will now skip unavailable storages.
 2015-01-26 13:59:49 +01:00
Bjoern Schiessle
7216983a08 delete all server-to-server shares if a user gets deleted 2015-01-21 17:11:34 +01:00
Vincent Petry
9fbdd1072e Fix webdav mkdir for remote shares 2015-01-21 15:14:57 +01:00
Thomas Müller
87a754c72e avoid $this->cache being null - fixes #13491 2015-01-20 12:38:54 +01:00
Bjoern Schiessle
24993280ed Next step in server-to-server sharing next generation, see #12285 
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
 2014-12-19 15:20:24 +01:00
Robin Appelman
e656af4c83 Root always exists 2014-12-17 16:09:41 +01:00
Lukas Reschke
25a87d4058 Merge pull request #12577 from owncloud/public-mount-api 
Add a public api for apps to add mounts
 2014-12-08 22:57:33 +01:00
Robin Appelman
f4701d7721 Add public api for mount configurations 2014-12-04 16:47:27 +01:00
Bjoern Schiessle
698ecbf308 OCS API for server-to-server sharing 2014-12-04 13:18:13 +01:00
Vincent Petry
ee6d8c9d58 Store curl error message directly 2014-11-04 17:37:15 +01:00
Vincent Petry
768f3979e0 Check for cert bundle existence before using it 2014-11-04 16:44:42 +01:00
Robin Appelman
298011bf29 fix indention 2014-08-31 10:45:11 +02:00