8c33f05e93
Merge the two tests into one
2015-03-24 17:26:38 +01:00
7de15f3125
*cough*
2015-03-24 17:08:03 +01:00
2370af62ea
Merge pull request #14998 from rullzer/ocs_api_new_url
...
OCS API should return fancy OC url
2015-03-24 17:04:31 +01:00
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
d46b7d73e7
when the path doesnt exist show a proper error page
2015-03-24 12:21:25 +01:00
e2453d78c0
Properly catch whether a share is `null`
...
Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory.
To test this perform the following steps:
* Share file in owncloud 7 (7.0.4.2)
* Delete the parent folder of the shared file
* The share stays is in the DB and the share via the sharelink is inaccessible. (which is good)
* Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones)
* Optional Step: Logout, Reset Browser Session, etc.
* Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL.
* Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file)
* No exception is thrown and no error is logged.
This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8.
Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so.
Fixes https://github.com/owncloud/core/issues/15097
2015-03-24 11:21:58 +01:00
a79d973005
[tx-robot] updated from transifex
2015-03-22 01:55:21 -04:00
bdde2156da
Added extra unit test
2015-03-21 09:47:07 +01:00
9ce8e1ddc7
OCS API should return fancy OC url
...
* Also use the URLGenerator
2015-03-21 09:47:06 +01:00
afa8872955
Merge pull request #14857 from owncloud/preview-provider-registration-in-manager
...
Preview provider registration in manager
2015-03-20 16:34:22 +01:00
67160e0861
Do not automatically add "update" permission to shared mounts
...
In the past it seems the update permission was needed to be able to
rename shared mounts, but it doesn't seem to be the case any more.
Removing the "update" permission that used to be added automatically
fixes the read-only permission check when trying to overwrite a
read-only file over WebDAV.
2015-03-20 12:33:59 +01:00
eef5851a67
Fix share permission related unit tests
2015-03-20 11:30:51 +01:00
7776e088d6
Group sharing activities by user/group and file respectively
2015-03-20 09:49:33 +01:00
e8680e6637
[tx-robot] updated from transifex
2015-03-20 01:55:23 -04:00
5f7b3a4dbe
Rename must be possible with update-only permission
...
and this as long as the rename is done within the same folder.
2015-03-19 21:55:56 +01:00
857b22c61b
Merge pull request #15025 from rullzer/ocs_respect_enforced_date
...
Ocs respect enforced date
2015-03-19 17:06:04 +01:00
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
dd3307dd19
Added unit test
...
Tests added to make sure that removing an expire date when this is
enforced is not allowed.
2015-03-19 10:47:09 +01:00
e40b0701d7
[tx-robot] updated from transifex
2015-03-19 01:55:06 -04:00
c2315aa015
Fix shared storage permission checks
2015-03-18 19:56:31 +01:00
8a95bf18b7
[tx-robot] updated from transifex
2015-03-18 01:55:22 -04:00
f4b6f3cfd1
fix unit tests
2015-03-17 18:55:44 +01:00
8ebb198ef3
Add a unit test for the naming conflict on the mountpoint name
2015-03-17 16:55:03 +01:00
ba3e4ede39
Use insertIfNotExists() instead of manual logic
2015-03-17 16:03:24 +01:00
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
9e2ebf2dce
Cache \OC\URLGenerator::imagePath
...
\OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching.
2015-03-17 12:35:47 +01:00
db033e4e19
Fix PHPDoc and Co.
...
Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240
2015-03-17 10:37:09 +01:00
b9d9405135
Fix scanFile signature warnings
2015-03-16 16:45:11 +01:00
3052b9571e
Fix controller test
2015-03-16 12:45:18 +01:00
47af533183
Move mimetype check from template to controller
2015-03-16 12:45:18 +01:00
4c4c0fa120
Use the PreviewManager where possible
2015-03-16 12:44:10 +01:00
454a2563bc
[tx-robot] updated from transifex
2015-03-12 01:55:59 -04:00
ec31ee9117
Mark functions private
2015-03-11 16:30:54 +01:00
cf25e6f569
Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view
...
Allow iframes from same domain in share view
2015-03-11 15:13:59 +01:00
e9a003fe21
Slight better formatting
2015-03-11 15:11:50 +01:00
09ee297356
New array syntax
2015-03-11 15:02:55 +01:00
c985186246
Added new header
2015-03-11 15:02:55 +01:00
af76716775
Now added enabled element
...
This change allows for more generic parsing for the capabilities.
2015-03-11 15:02:55 +01:00
0bf1152a51
Added route again
2015-03-11 15:02:55 +01:00
39b0f0725e
Add file_sharing info to capabilities
...
Display the capabilities regarding file sharing in the capabilities API.
This will allow the clients to provide users a better experince.
2015-03-11 15:02:55 +01:00
0f3e36fdfd
Adding a more meaningful message for sabre dav exception - fixes #14516
2015-03-11 11:53:31 +01:00
6a677ce8fe
Do not make setupMounts() public just because of testing
2015-03-11 11:10:43 +01:00
dcd2d7aff5
Add unit tests for external share mananger
2015-03-10 10:17:53 +01:00
48243a2949
Allow iframes from same domain in share view
...
This is required because the PDF Viewer itself is embedded using an iframe from the same domain. The default policy is blocking this.
Going on further, we have to come up with a solution in the future how to handle previews by applications, one example might be that they call their own endpoint and not the generic share page to allow applications to have full control over how to display previews.
Anyways, to test this behaviour use a decent newer browser (such as Chrome 41) and share a PDF file, obviously the PDF viewer needs to be enabled as well. Without this patch publicly shared PDF files should not get previewed and an error is thrown. (if it isn't then your browser is probably not obeying our Content-Security-Policy and you might consider switching to another one ;))
2015-03-10 10:06:15 +01:00
94b7fa17c5
Merge pull request #14720 from owncloud/fix-shareetagpropagation
...
Fix size propagation over shared storage boundary
2015-03-09 16:24:06 +01:00
ec19d9c267
Add unit test for size propagation across share boundaries
2015-03-09 12:56:22 +01:00
73c2157171
[tx-robot] updated from transifex
2015-03-07 01:54:37 -05:00
4322287fc3
Fix size propagation over shared storage boundary
2015-03-05 22:23:47 +01:00
4436a9ce35
Shares should have a least read permission
...
* Throw 400 when a share is created or updated without read permissions
* Added unit tests
2015-03-01 17:13:17 +01:00
ff85d38c2a
[tx-robot] updated from transifex
2015-03-01 01:54:38 -05:00
42f6448da2
[tx-robot] updated from transifex
2015-02-28 01:55:32 -05:00
c65c717379
Fix external shares without password on oracle
2015-02-27 13:22:57 +01:00
f72f9e0159
Merge pull request #14530 from owncloud/revert-14403
...
Revert "Updating license headers"
2015-02-27 00:39:29 -08:00
d20061e5b1
[tx-robot] updated from transifex
2015-02-27 01:55:28 -05:00
1777609d47
Merge pull request #14532 from owncloud/defaultvalueforremoteid
...
Add default value for remote_id
2015-02-26 16:46:12 +01:00
80e5ad3131
Bump up files_sharing version for schema update
2015-02-26 15:04:15 +01:00
7b2b74d731
Merge pull request #14473 from owncloud/remove-uneeded-assignment
...
Remove uneeded assignment
2015-02-26 14:01:21 +01:00
ba71ee6059
Add default value for remote_id
...
Fixes SQLite migration with non-null column.
2015-02-26 12:09:21 +01:00
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
2015-02-26 11:37:37 +01:00
adc986f3e4
Merge pull request #14502 from owncloud/failing-mysql-master-tests
...
Failing mysql master tests
2015-02-26 01:48:37 -08:00
8a4fddeb4a
[tx-robot] updated from transifex
2015-02-26 01:55:50 -05:00
fca4628a5c
Show 404 page when accessing empty share URL
...
Testplan:
- [ ] Without: Accessing `public.php?service=files&t=` throws an exception
- [ ] With: No exception thrown and 404 page displayed.
Fixes https://github.com/owncloud/core/issues/14231
2015-02-25 17:29:12 +01:00
ac5bb97d04
Reset the group backend aswell
2015-02-25 16:03:12 +01:00
993d89b3cc
Extend the class so the Filesystem is cleaned up
2015-02-25 16:03:10 +01:00
695f43a1ed
Merge pull request #10735 from owncloud/use_remote_addr
...
Use getRemoteAddress which supports reverse proxies
2015-02-25 13:24:39 +00:00
799e144b04
Merge pull request #14151 from owncloud/update-sabre2.1
...
Sabre Update to 2.1
2015-02-25 02:21:55 -08:00
b3de86d851
Remove locks plugin.
...
Reasoning:
- a WebDAV server is not required to implement locking support
- WebDAV Locking is know to break the sync algorithm
- the current lock implementation is known to be broken (locks are not moved if a file is moved, locks on shared files don't work)
2015-02-25 10:30:47 +01:00
31f881415b
[tx-robot] updated from transifex
2015-02-25 01:55:51 -05:00
5bb0889b30
Remove uneeded assignment
...
'files' is neither used in the controller or the template
2015-02-24 19:50:23 +01:00
165afb004b
Use getRemoteAddress which supports reverse proxies
...
Breaking change for 8.1 wiki (Security > Administrators):
The log format for failed logins has changed and uses now the remote address and is considering reverse proxies for such scenarios when configured correctly.
2015-02-24 11:49:40 +01:00
9f6dcb9d3e
Sabre Update to 2.1
...
- VObject fixes for Sabre\VObject 3.3
- Remove VObject property workarounds
- Added prefetching for tags in sabre tags plugin
- Moved oc_properties logic to separate PropertyStorage backend (WIP)
- Fixed Sabre connector namespaces
- Improved files plugin to handle props on-demand
- Moved allowed props from server class to files plugin
- Fixed tags caching for files that are known to have no tags
(less queries)
- Added/fixed unit tests for Sabre FilesPlugin, TagsPlugin
- Replace OC\Connector\Sabre\Request with direct call to
httpRequest->setUrl()
- Fix exception detection in DAV client when using Sabre\DAV\Client
- Added setETag() on Node instead of using the static FileSystem
- Also preload tags/props when depth is infinity
2015-02-23 22:27:23 +01:00
4290e1990e
Merge pull request #13829 from owncloud/appmanager-list
...
Better caching for enabled apps
2015-02-23 16:03:32 +01:00
df3c73de72
Merge pull request #14403 from owncloud/update-license-headers
...
Update license headers
2015-02-23 13:53:16 +01:00
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
f63b09faca
[tx-robot] updated from transifex
2015-02-23 01:55:10 -05:00
ef09e5d395
[tx-robot] updated from transifex
2015-02-22 01:54:42 -05:00
906c0e7798
[tx-robot] updated from transifex
2015-02-21 01:54:38 -05:00
79ef5eda96
[tx-robot] updated from transifex
2015-02-20 01:55:01 -05:00
837365fff2
Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins
...
Activity/225 sharing extension
2015-02-18 14:46:58 +01:00
0833a6e332
Correctly create activities for public downloads
2015-02-17 17:26:03 +01:00
5394a81c05
Dont fatal error test when encryption is enabled
2015-02-17 15:05:29 +01:00
31c0cce092
[tx-robot] updated from transifex
2015-02-15 01:54:31 -05:00
2f851ff8bb
[tx-robot] updated from transifex
2015-02-14 01:54:42 -05:00
b768a70616
Use filterNotificationTypes to filter the types and group the methods
2015-02-13 11:30:36 +01:00
9ccfbc14f6
Copy sharing related activity code to Files_Sharing activity extension
2015-02-13 11:16:43 +01:00
e929d43bb6
[tx-robot] updated from transifex
2015-02-12 01:54:41 -05:00
124e48aec0
[tx-robot] updated from transifex
2015-02-10 01:55:06 -05:00
1bb6de7c1b
Merge pull request #13425 from owncloud/phpdoc_cleanup
...
Cleanup of PHPDoc return types
2015-02-10 01:14:00 +01:00
e2d4b3c123
[tx-robot] updated from transifex
2015-02-09 01:54:53 -05:00
60e771685e
[tx-robot] updated from transifex
2015-02-08 01:54:53 -05:00
4bf7b2c130
[tx-robot] updated from transifex
2015-02-07 01:54:35 -05:00
a67627140c
Revert "Add OCS sharing info to capabilities"
2015-02-07 00:12:26 +01:00
0b421e821b
Merge pull request #13692 from rullzer/capabilities
...
Add OCS sharing info to capabilities
2015-02-06 16:46:47 -05:00
988027fdca
[tx-robot] updated from transifex
2015-02-06 15:26:04 -05:00
fe2aca5aa8
Updated unit tests
2015-02-06 12:13:53 +01:00
3be3e20c0f
Bit better formatting when using json output
2015-02-06 10:55:33 +01:00
d4e361db44
Updated sharing capabilities
...
Moved to files_sharing
Added more capabilities.
Tried to order to capabilities more OO style
2015-02-06 10:33:08 +01:00
bd60abbefc
[tx-robot] updated from transifex
2015-02-06 01:57:07 -05:00
9adff77040
[tx-robot] updated from transifex
2015-02-05 01:54:49 -05:00
bcae79a85a
Split up unit tests
2015-02-04 15:49:20 +01:00
083ebca812
Added unit test to test getCapabilities for files_sharing
2015-02-04 14:56:31 +01:00
0452fde212
Converted getCapabilities to non static function
2015-02-04 14:56:31 +01:00
4801d9c02a
Use single quotes
2015-02-04 14:56:31 +01:00
ea1f726b7d
Only return capabilities if they are set
2015-02-04 14:56:31 +01:00
b3ea849a87
Added capabilities whether a server allows public links
...
This fixes #13673 .
It now lists link sharing, passwords enforced, and if public uploads are
allowed.
2015-02-04 14:56:31 +01:00
77e9c212ed
[tx-robot] updated from transifex
2015-02-04 01:55:49 -05:00
a24d73aa0c
Merge pull request #13837 from owncloud/endless-redirect
...
Add callCheck to testremote.php
2015-02-03 11:28:15 +01:00
6aef13fb07
[tx-robot] updated from transifex
2015-02-03 01:54:50 -05:00
4270188252
Add callCheck to testremote.php
...
Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service.
2015-02-02 19:39:41 +01:00
800829d93d
[tx-robot] updated from transifex
2015-02-02 01:54:32 -05:00
a3067b3b9f
[tx-robot] updated from transifex
2015-02-01 01:54:33 -05:00
c877fbdac8
[tx-robot] updated from transifex
2015-01-31 01:54:39 -05:00
f4d20dc1f3
[tx-robot] updated from transifex
2015-01-30 01:55:06 -05:00
5c8e5e223d
Merge pull request #13728 from owncloud/federated_cloud
...
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:54:19 +01:00
8a091629dc
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:05:39 +01:00
65871ffea3
[tx-robot] updated from transifex
2015-01-29 01:54:35 -05:00
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
acec40fe5a
Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix
...
Call final unlink in trash wrapper's storage
2015-01-27 17:05:38 +01:00
1add2f3f58
Merge pull request #13679 from owncloud/public-disablesharejsplugin
...
Disable JS plugin for sharing in public mode
2015-01-27 09:33:38 +01:00
182b1937bb
Only reload file list after remote share accept request returns
...
When accepting a remote share, an ajax request is sent to the server.
Only once this request returns should the file list be reloaded.
2015-01-26 21:22:22 +01:00
efcd89cb18
Do not disclose share owner in public file list
2015-01-26 19:55:48 +01:00
86689ef400
Disable JS plugin for sharing in public mode
...
This removes the logic that registers the share action and modifies the
rows. Share actions aren't needed in the public file list.
2015-01-26 19:55:48 +01:00
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
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
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
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
d5b61f9afe
Prevent double slash in shareinfo request URL
2015-01-26 16:19:38 +01:00
5376b0b123
Add back exit()
2015-01-26 16:07:28 +01:00
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
a698637e91
[tx-robot] updated from transifex
2015-01-25 01:54:38 -05:00
73a058e301
by default send mail for new server-to-server share
2015-01-23 21:59:07 +01:00
1a06edd712
Unregister trashbin storage wrapper at the end of tests
...
Some more tests that uses the storage wrapper now remove it afterwards
2015-01-23 15:36:09 +01:00
7216983a08
delete all server-to-server shares if a user gets deleted
2015-01-21 17:11:34 +01:00
8ba42abbe4
Merge pull request #13432 from owncloud/animate_gifs_public_sharing
...
show animated gifs on public sharing page
2015-01-21 17:09:46 +01:00
9921308c62
Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog
...
External share dialog must properly read entered password
2015-01-21 16:51:56 +01:00
c48307027c
Fixed external cache test namespace
2015-01-21 15:52:56 +01:00
9fbdd1072e
Fix webdav mkdir for remote shares
2015-01-21 15:14:57 +01:00
f3d696599a
Add unit test for external share JS dialog
...
Moved external share JS code into a small plugin to make it testable.
Added unit test for the external share dialog logic + ajax calls.
2015-01-21 11:26:54 +01:00
23ea45760f
External share dialog must properly read entered password
2015-01-21 11:26:36 +01:00
b8ab21d3ad
[tx-robot] updated from transifex
2015-01-21 01:55:15 -05:00
87a754c72e
avoid $this->cache being null - fixes #13491
2015-01-20 12:38:54 +01:00
2ac015256f
[tx-robot] updated from transifex
2015-01-20 01:54:37 -05:00
374ddbff55
show animated gifs on public sharing page
2015-01-19 16:20:06 +01:00
15ae6b47ed
replace hook with storage wrapper
2015-01-19 09:16:15 +01:00
3404bd8cdd
[tx-robot] updated from transifex
2015-01-19 01:54:31 -05:00
60c4cb1dd6
[tx-robot] updated from transifex
2015-01-17 01:54:40 -05:00
2b99fc76ec
Cleanup of PHPDoc return types
2015-01-16 20:30:43 +00:00
a65f666834
[tx-robot] updated from transifex
2015-01-16 01:55:51 -05:00
9b7c1a0093
Merge pull request #13347 from owncloud/share-scanpermissionsfromsource
...
Use source storage permissions when scanning shared storage
2015-01-15 11:15:15 +01:00
4c233fef2a
[tx-robot] updated from transifex
2015-01-15 01:54:41 -05:00
Joas Schilling
Morris Jobke
Robin Appelman
Lukas Reschke
Jenkins for ownCloud
Roeland Jago Douma
Thomas Müller
Vincent Petry
Robin Appelman
Joas Schilling
Robin McCorkell
Frank Karlitschek
Bjoern Schiessle
Georg Ehrke