Commit Graph

2462 Commits

Author SHA1 Message Date
Roeland Jago Douma 3d2acb5003 sharingcheckmiddleware now handles externalshares as well
Added new annotations for the externalsharescontroller class
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired

By default both are required for all functions in the
externalSharesController.

A proper exception is thrown and then a 405 is returned instead of the
default error page. Since it is only an API endpoint this makes more
sense.

Unit tests added and updated
2015-10-02 12:03:53 +02:00
Roeland Jago Douma dc38e674a5 Split files_sharing middelware
Since for external shares there is no need for link shares to be enabled
we should check which controller is actually being called.

This makes sure that in all cases we verify that the files_sharing app
is enabled. But only for the share controller (public shares) we check
if the API is enabled and if links are enabled.

TODO: add checks for federated sharing as well
2015-10-02 11:56:11 +02:00
Joas Schilling e478d925c3 Fix intendation 2015-10-02 10:01:33 +02:00
Joas Schilling 17ab8e6c39 Use shorter text on the sidebar for files_sharing activities 2015-10-02 10:01:33 +02:00
Roeland Jago Douma c924b6740a Do not return unneeded info 2015-10-02 08:11:50 +02:00
Jenkins for ownCloud 3b4592718a [tx-robot] updated from transifex 2015-10-02 01:54:51 -04:00
Roeland Jago Douma c3e7d324c5 Extend share info
The data from the share_external is not to much. Thus we enrich this
data with info from the filecache.

This allows endpoints using this to actually show usefull information.

The filecache might not be up to date but that is a sacrifice we need to
make in terms of speed. Else the number of remote PROPFINDS grows
lineary with the number of remote shares wich will make this endpoint
practically unusable.
2015-10-02 07:41:57 +02:00
Roeland Jago Douma 0d3009951f Made routes remote_shares only again
Since we need a unique id to accept/reject shares for now we keep the
pending shares under remote_shares.

* remote_shares/pending lists pending shares
* PUT/DELETE to remote_shares/pending/<ID> will accept/reject the share
2015-10-02 07:40:53 +02:00
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
Roeland Jago Douma 4a62021141 Move OCS endpoint ../remote_share to ../pending_shares 2015-10-02 07:39:58 +02:00
Jenkins for ownCloud 50874de1ca [tx-robot] updated from transifex 2015-10-01 01:54:55 -04:00
Thomas Müller d6e3195b38 Merge pull request #19421 from owncloud/fix_19382
Do noy allow empty urls to be submitted in "add to your owncloud"
2015-09-30 22:17:18 +02:00
Thomas Müller 1d8c10cf63 Merge pull request #19468 from owncloud/fix-36-vs-32-previews
Change small thumbnails to 32 px
2015-09-30 15:47:34 +02:00
Morris Jobke 2d1214d21d adjust style of disabled button 2015-09-30 15:28:28 +02:00
Roeland Jago Douma 08fd4b38f8 Do noy allow empty urls to be submitted in "add to your owncloud"
Fixes #19382
2015-09-30 13:55:13 +02:00
Lukas Reschke 22e724e829 Only intercept exceptions of type "NotFoundException" instead of any Exception
The sharing backend may throw another exception for example when the activity app encounters a problem. Previously this just triggered a 404 error page and the exception got not logged at all. With this change such exceptions get not intercepted and regularly handled as exceptions so that we have meaningful log data. Also the user will be shown a window informing him that an error happened.

Helps to debug cases such as https://github.com/owncloud/core/issues/19465
2015-09-30 13:32:20 +02:00
Morris Jobke 1051a3c6f5 Change small thumbnails to 32 px
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
2015-09-30 10:49:48 +02:00
Thomas Müller 580a961020 Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabled
Allow ajax requests on public webdav interface
2015-09-29 13:21:50 +02:00
Jenkins for ownCloud aa3596a410 [tx-robot] updated from transifex 2015-09-29 01:55:02 -04:00
Vincent Petry d47d240a35 Still show share link when recipient but no share permission
This makes it possible for the recipient to still trigger the sidebar
and share tab to see information about the share.

In the case where the file is not shared and no permissions exists, no
action icon will be displayed.
2015-09-28 16:23:33 +02:00
Thomas Müller 72024ad201 Merge pull request #19404 from owncloud/files-sidebar-sorttabs
Fix tabs order in files sidebar
2015-09-28 12:55:38 +02:00
Thomas Müller d007c32907 Merge pull request #19402 from owncloud/public-recognizeauthsession
Allow public webdav auth to recognize sesssion
2015-09-28 12:53:33 +02:00
Vincent Petry 5e4a52d3c2 Fix tabs order in files sidebar 2015-09-28 12:30:12 +02:00
Vincent Petry b4998e7d29 Allow public auth to recognize sesssion
When a public link password has been input, its auth is stored in the
session.
This fix makes it possible to recognize the session when using public
webdav from the files UI.
2015-09-28 11:52:04 +02:00
Jenkins for ownCloud 60f123193b [tx-robot] updated from transifex 2015-09-28 05:07:18 -04:00
Thomas Müller 9a010cc8ce Merge pull request #19379 from owncloud/remove-auth-button-border
remove border around button of password protected link confirmation
2015-09-28 10:13:05 +02:00
Jan-Christoph Borchardt c7f7747b48 remove border around button of password protected link confirmation 2015-09-28 09:30:09 +02:00
Olivier Paroz 46475b8114 Switch from Math.floor() to Math.ceil() when sending the dimension to Preview
Fixes #18203
2015-09-27 12:46:25 +02:00
Hendrik Leppelsack 0ae931ed57 fix sidebar spinner 2015-09-25 20:48:47 +02:00
Roeland Jago Douma db02173627 Reflect enabled shareAPI in capabilities
If the shareAPI is disabled we not return the other sharing
capabilities.

This allows clients to properly check if sharing is even available.
2015-09-25 20:12:41 +02:00
Thomas Müller 2c37d5f7d8 Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email
Publish an activity when sending a share link via email
2015-09-25 13:48:33 +02:00
Thomas Müller 846b826867 Merge pull request #18517 from owncloud/17753_to_master
Fix preview of old file on public upload conflicts
2015-09-24 15:20:00 +02:00
Thomas Müller 30377e958f Merge pull request #18834 from owncloud/delay-listen-owner-changes
Delay listening to owner changes untill we use a share for that owner
2015-09-24 15:06:27 +02:00
Robin Appelman 7d53427ee6 only initialize once 2015-09-23 16:22:53 +02:00
Robin Appelman 88f03192ba Delay listening to owner changes untill we use a share for that owner 2015-09-23 16:22:53 +02:00
Joas Schilling 19e7a08cbf Do not allow user enumeration if the config is disabled 2015-09-23 15:11:02 +02:00
Roeland Jago Douma 4dba046712 Respect disabled sharing API settings
If the sharing API setting is disabled that sharing check middle ware
should block the request. Thus making link shares unavailable.
Fixes #18970

* Unit test added
* Unit tests updated
2015-09-22 15:12:16 +02:00
Joas Schilling 2e1cfe03e9 Publish an activity when sending a share link via email 2015-09-22 13:09:21 +02:00
Vincent Petry c8a6fea1b4 Allow ajax requests on public webdav interface
Whenever outgoing shares are disabled, still allow ajax requests to make
it possible to use the Webdav interface in the public link page.

Please note that disabling outgoing shares isn't strong anyway as
someone could abuse the ajax endpoints to access files anyway. To
properly disable remote sharing, public link sharing must be disabled
too.
2015-09-22 12:19:56 +02:00
Lukas Reschke 36ce254ffd Move dummy backend to Tests namespace 2015-09-22 11:01:11 +02:00
Jenkins for ownCloud 7b483dfcbe [tx-robot] updated from transifex 2015-09-21 01:54:41 -04:00
Olivier Paroz 04b14df35c Fix preview of old file on public upload conflicts 2015-09-20 12:38:21 +02:00
Jenkins for ownCloud bbd1e99605 [tx-robot] updated from transifex 2015-09-20 01:54:48 -04:00
Thomas Müller 75425b28df Merge pull request #18679 from owncloud/add-reshare-activities
Add reshare activities for the parent sharee and the original file owner
2015-09-18 11:59:30 +02:00
Thomas Müller 93eb73b0bb Merge pull request #18986 from owncloud/federated_capabilities
Expose federated sharing capabilities to authenticated users
2015-09-18 11:58:54 +02:00
Thomas Müller 0c37a28a60 Merge pull request #19087 from owncloud/disable-remote-share-notifications-for-now
Disable remote share notifications for now
2015-09-18 11:58:20 +02:00
Thomas Müller c18156a4fe Merge pull request #19121 from owncloud/sidebar-design-details
fix Files sidebar layout of Versions and Sharing
2015-09-17 18:03:56 +02:00
Joas Schilling 5eddde6486 Add a Sabre plugin that emits an event for apps 2015-09-17 13:59:27 +02:00
Jan-Christoph Borchardt 3eeea852b3 fix sidebar Sharing layout a bit 2015-09-17 13:18:03 +02:00
Thomas Müller 4cff2f1ab3 Merge pull request #19046 from owncloud/issue-18924-throw-error-on-invalid-page
Throw an error when the page count or perPage setting is invalid
2015-09-17 13:02:14 +02:00
Joas Schilling 6bc93c7401 Disable the remote sharing notifications until they work properly 2015-09-17 11:14:28 +02:00
Joas Schilling 9e1cd6d873 Change the order of the buttons 2015-09-17 11:14:27 +02:00
Jenkins for ownCloud 91365a8969 [tx-robot] updated from transifex 2015-09-17 01:57:20 -04:00
Jenkins for ownCloud 0155bcf278 [tx-robot] updated from transifex 2015-09-17 01:55:25 -04:00
Thomas Müller afc7eeacaf Merge pull request #18185 from owncloud/share-dialog-files-sidebar
Share dialog files sidebar
2015-09-16 09:40:53 +02:00
Vincent Petry 996639f4fb More unit tests for share dialog 2015-09-16 07:23:29 +02:00
Vincent Petry 886f1ed660 Update JS unit tests for share dialog (WIP) 2015-09-16 07:23:29 +02:00
Vincent Petry e90065881d Bring back the share icon and update its status
Display share icon in file list row.
Update share icon status when the sharing state changed.
2015-09-16 07:23:28 +02:00
Arthur Schiwon 6d832359b6 fix allow upload checkbox appeareance 2015-09-16 07:23:28 +02:00
Arthur Schiwon 9fe6d7c568 implements setting and removing password for link shares, including forced ones 2015-09-16 07:23:28 +02:00
Arthur Schiwon 5fad379bf1 remove obsolete file action 2015-09-16 07:23:27 +02:00
Arthur Schiwon 258a2e2696 now you even can share 2015-09-16 07:23:27 +02:00
Arthur Schiwon ce1b0c650e show link share 2015-09-16 07:23:27 +02:00
Vincent Petry f709022559 Fix share permissions for share tab 2015-09-16 07:23:26 +02:00
Vincent Petry 018d07b3e5 Add share dialog into share tab 2015-09-16 07:23:26 +02:00
Arthur Schiwon edd163a611 refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability 2015-09-16 07:23:25 +02:00
Joas Schilling 59967599ac Fix the parameter order in the translation 2015-09-16 06:47:40 +02:00
Joas Schilling fe8ef0dd36 Add reshare activities for the parent sharee and the original file owner 2015-09-15 17:36:56 +02:00
Joas Schilling 754850f473 Fix status code 2015-09-15 15:51:54 +02:00
Roeland Jago Douma 91dfcab055 Expose federated sharing capabilities to authenticated users 2015-09-15 15:10:13 +02:00
Joas Schilling aa8b1b2894 Throw an error when the page count or perPage setting is invalid 2015-09-15 15:04:04 +02:00
Joas Schilling 665716095b Fix parameter name to match the specs 2015-09-15 12:14:14 +02:00
Jenkins for ownCloud 211a243784 [tx-robot] updated from transifex 2015-09-14 01:55:35 -04:00
Jenkins for ownCloud ca921fa1e7 [tx-robot] updated from transifex 2015-09-13 01:55:24 -04:00
Jenkins for ownCloud 9860a79441 [tx-robot] updated from transifex 2015-09-12 01:55:35 -04:00
Jenkins for ownCloud ee1b57d15d [tx-robot] updated from transifex 2015-09-11 01:55:26 -04:00
Lukas Reschke fb717f254f Merge pull request #18699 from owncloud/notification-manager
Notification manager
2015-09-10 15:26:36 +02:00
Jenkins for ownCloud 0ef7b84d77 [tx-robot] updated from transifex 2015-09-10 01:54:52 -04:00
Jenkins for ownCloud bf01c3d72a [tx-robot] updated from transifex 2015-09-09 01:54:49 -04: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
Joas Schilling d191a0dacc Add notifications for remote shares 2015-09-08 09:01:01 +02:00
Jenkins for ownCloud d044884cfa [tx-robot] updated from transifex 2015-09-08 01:55:56 -04:00
Morris Jobke f3e6e0121d Merge pull request #18876 from owncloud/missing-context-on-update-file-target
Use context function call instead of static
2015-09-07 16:41:41 +02:00
Joas Schilling 7af7fdd929 Use context function call instead of static 2015-09-07 14:28:20 +02:00
Jan-Christoph Borchardt 004de1425e Merge pull request #18630 from owncloud/files-combineuploadbutton
Combine upload action into the "New" menu
2015-09-07 14:03:57 +02:00
Jenkins for ownCloud 53a0009e7b [tx-robot] updated from transifex 2015-09-07 01:55:04 -04:00
Roeland Douma 24f5f50b20 Merge pull request #18742 from owncloud/mimetype-updatedb
Introduce mimetype DB update occ command
2015-09-06 16:56:35 +02:00
Jenkins for ownCloud f3b8634058 [tx-robot] updated from transifex 2015-09-05 01:55:18 -04:00
Robin McCorkell cdf01f0419 Split mimetype handling to new class 2015-09-04 17:28:20 +01:00
Morris Jobke e1a79cd651 Avoid re-propagation of shares during one propagation run
* fix was proposed by @nickvergessen
2015-09-04 16:17:27 +02:00
Jenkins for ownCloud 4100b151cc [tx-robot] updated from transifex 2015-09-04 01:55:31 -04:00
Vincent Petry 1f9974894d Merge pull request #18810 from owncloud/shared-mount-delay-setup
Delay setting up the filesystem for a share owner untill the share is used
2015-09-03 15:09:57 +02:00
Morris Jobke 2b9c34d756 Merge pull request #18781 from owncloud/move-background-job-registration-to-install-update
Move background job registration to install update
2015-09-03 14:55:07 +02:00
Robin Appelman fd7b210654 Delay setting up the filesystem for a share owner untill the share is used 2015-09-03 13:46:08 +02:00
Lukas Reschke ac7d2efbe3 Collapse HTML code for federated code 2015-09-03 11:57:48 +02:00
Joas Schilling 49b98abc25 Move registration of background job to install/update 2015-09-02 19:26:22 +02:00
Björn Schießle 39bd4ea8f2 Merge pull request #18234 from owncloud/ocs_api_for_sharees_list
Add OCS API for sharees list
2015-09-01 17:09:57 +02:00
Roeland Jago Douma d54b497ade Return permissions and expiration on create share responses
Updated and added unit tests
2015-08-30 15:42:19 +02:00
Roeland Jago Douma 2aff11c80b Actually validate the expire date on share
* Added more intergration tests
2015-08-30 10:31:43 +02:00
Roeland Jago Douma fc64ea670d Allow to directly set the expireDate on a new (link)share
Since this extends the API we now properly parse the date. We only
accept valid ISO 8601 Dates (YYYY-MM-DD).

Currently this only works for link shares (it is just ignored for other
shares). Since we do not have user/group/federated expiring shares yet.

* Tests added
2015-08-29 12:39:47 +02:00
Vincent Petry 59273a8863 Combine upload action into the "New" menu
Refactored the new menu to be encapsulated in the NewFileMenu JS class
2015-08-28 17:27:48 +02:00
Morris Jobke 062fd37f74 Merge pull request #18577 from owncloud/action-details
file action detail style fixes
2015-08-26 16:28:40 +02:00
Thomas Müller 40203d7d1e Remove languages which are no longer maintained on transifex 2015-08-26 12:19:24 +02:00
Joas Schilling 199d1dc239 Bring the coverage back to 100% 2015-08-26 11:54:25 +02:00
Joas Schilling 2a6e676048 Adjust tests 2015-08-26 11:54:25 +02:00
Joas Schilling aa2a894eb0 Fix performance issues of the sharees api 2015-08-26 11:54:25 +02:00
Joas Schilling ac8941f6ac Manually query for the last id 2015-08-26 11:54:25 +02:00
Joas Schilling f4186d3dfc Fix wrong value for datetime field 2015-08-26 11:54:25 +02:00
Joas Schilling 937586a3f0 Rename file to match the class name 2015-08-26 11:54:25 +02:00
Joas Schilling 6b69e7b1da Add tests for "getShareesForShareIds()" 2015-08-26 11:54:25 +02:00
Joas Schilling 83b88c9a26 Do not return the current user himself 2015-08-26 11:54:25 +02:00
Joas Schilling 0227cfff08 Take a list of share IDs instead of the user and group names 2015-08-26 11:54:25 +02:00
Joas Schilling 5c4fbf5191 Inject the logger as well 2015-08-26 11:54:25 +02:00
Joas Schilling a0ab7a2578 Add all possible links next, prev, first and last 2015-08-26 11:54:25 +02:00
Joas Schilling c6ed40c9f8 Make shareType an array 2015-08-26 11:54:24 +02:00
Joas Schilling 068a81897e Add tests for "search()" 2015-08-26 11:54:24 +02:00
Joas Schilling 327c47a989 Do not use deprecated method in new code 2015-08-26 11:54:24 +02:00
Joas Schilling 3f64e9423b Split logic and global usage and add tests for "searchSharees()" 2015-08-26 11:54:24 +02:00
Joas Schilling a66aa1fe02 Filter the sharees with the existing shares 2015-08-26 11:54:24 +02:00
Joas Schilling 4b08783946 Use SearchResultSorter 2015-08-26 11:54:24 +02:00
Joas Schilling 16e5c15c28 Add tests for "getRemote()" 2015-08-26 11:54:24 +02:00
Joas Schilling ad450d4f0e Add tests for "getGroups()" 2015-08-26 11:54:24 +02:00
Joas Schilling be257bc9cc Add tests for "getUsers()" 2015-08-26 11:54:24 +02:00
Joas Schilling 9b0058d2b0 Move test file to subdir 2015-08-26 11:54:24 +02:00
Roeland Jago Douma b2fbecc39f Empty skeleton for tests 2015-08-26 11:54:24 +02:00
Roeland Jago Douma 8a5c1e6d4d Sort sharees
To ensure that pagination is working properly we need to make sure the
shares are always in the same order.

Sorting is first done by label (catches most instances)
If there is a user and a group with the same label we sort by shareType
If there are multiple users with the same label we sort those by
shareWith
2015-08-26 11:54:24 +02:00
Roeland Jago Douma 98301210a9 Start of OCS Share API sharees endpoint 2015-08-26 11:54:23 +02:00
Morris Jobke 202af1e322 fix unit tests 2015-08-26 11:39:22 +02:00
Jenkins for ownCloud 90e11ee005 [tx-robot] updated from transifex 2015-08-26 04:10:42 -04:00
Morris Jobke 1ca638cfbd Merge pull request #18564 from owncloud/fix-transifex-sync
Update slug
2015-08-25 22:00:52 +02:00
Jenkins for ownCloud 2171cc02c3 [tx-robot] updated from transifex 2015-08-25 12:39:10 -04:00
Thomas Müller 5cf3170e89 don't load gs-share 2015-08-25 16:49:40 +02:00
Thomas Müller fcde0234b7 Simply hide sharing buttons for IE8 - fixes #18011 2015-08-25 16:05:57 +02:00
Vincent Petry 6848f25c0d Merge pull request #18477 from owncloud/fed-alwaysdetectremotechanges
Always detect remote changes for fed sharing
2015-08-24 12:17:23 +02:00
Vincent Petry fe568ab64d Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxy
Use client service to work behind proxy for checks for remote ownCloud instances
2015-08-24 11:05:14 +02:00
Jan-Christoph Borchardt 0f10e2c1fe fix horizontal scrollbar in personal settings caused by federated cloud ID section 2015-08-24 09:36:44 +02:00
Lukas Reschke 0a1d551090 Use IClientService to check for remote ownCloud instances
1. Allows to set a timeout (though still not perfect but way better than before)
2. Allows to have unit tests
3. I also added unit tests for the existing controller code
4. Corrected PHPDoc on IClient
2015-08-22 14:39:43 +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
Robin McCorkell 99b54e102d Prevent shares being added to oc_storages via availability 2015-08-20 22:43:46 +01:00
Joas Schilling 4314c8fc6f Use an IEvent object instead of a huge parameter list 2015-08-19 17:44:57 +02:00
Joas Schilling e985dcc5a0 Send the file id when dealing with remote share responses 2015-08-19 17:44:57 +02:00
Thomas Müller d9172a1907 Merge pull request #14401 from owncloud/ux-s2s-ldap
allow login names to be used for s2s with LDAP users
2015-08-19 08:31:27 +02:00
Morris Jobke 08aaa334cc Merge pull request #18389 from owncloud/fix-17770
Fix extracting basename from path in sharing
2015-08-18 16:22:02 +02:00
Robin McCorkell 6e47661afd Fix extracting basename from path in sharing 2015-08-18 13:41:47 +01:00
Vincent Petry 22b63ecd12 Load missing JS dep in public link page 2015-08-18 11:35:21 +02:00
Morris Jobke 5b7143885d Merge pull request #18318 from owncloud/files-sidebar-fixtabs
Improve right sidebar tabs behavior
2015-08-16 12:53:50 +02:00
Roeland Jago Douma dce5d9b5d1 Add public upload to capability 2015-08-14 20:03:32 +02:00
Vincent Petry e2549fa660 Improve right sidebar tabs behavior
Tab heads are not rendered if only one tab.

The tab contents is updated on-demand. This means that if a tab is not
visible it is not rendered at first. If the tab was already rendered
through switching, its model will not get updated until the next time it
becomes visible. This will prevent needless rerendering of invisible tab
contents, especially considering that some tabs might need extra ajax
requests.
2015-08-14 16:51:04 +02:00
Thomas Müller ddc7f668e5 Merge pull request #18271 from owncloud/issue-18261-sharing-capabilities-use-wrong-default
Fix default values of sharing capabilities
2015-08-14 12:23:06 +02:00