536e187e51
add locking to the storage api
2015-06-01 13:22:56 +02:00
f9d04f62a8
Merge pull request #16440 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-05-19 22:12:35 +02:00
d832c4ae23
Fix unexisting class and broken doc
2015-05-19 15:27:50 +02:00
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
dd3d0194a6
Move files sharing app (mostly) to OCP\DB
2015-05-18 11:06:23 +02:00
7a8072e958
Move core apps from OC_Log::write to OCP\Util
2015-05-18 10:57:52 +02:00
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
3b1dde7005
dont go trough the view when renaming/copying on shared storages
2015-05-12 17:09:37 +02:00
90d8e4bc00
Merge pull request #15815 from owncloud/unshare-etag-propagate
...
Update etag of direct parent on unshare
2015-05-11 13:42:20 +02:00
d9746d8abd
Fix PHPDoc for the ext. share controller
2015-05-04 18:06:16 +02:00
760ce3bd63
Fix DeleteOrphanedSharesJob
...
* remove unneeded use statements
* the the interval properly in the constructor
* set the log level to debug (from info) - fixes #16036
2015-05-04 13:58:58 +02:00
34181c3aef
Correctly send Federate-Cloud Share Feedback against the remote share ID
2015-04-28 14:29:04 +02:00
65fbb5eda0
Update etag of direct parent on unshare
...
Only call dirname() once instead of twice when propagating etags to the
recipient's parent folders.
2015-04-28 13:11:23 +02:00
8f7c64253e
Correctly generate the feedback URL for remote share
...
The trailing slash was added in c78e3c4a7f
2015-04-28 11:28:54 +02:00
5304afbecb
dont pass floats as timestamp to the changepropagator
2015-04-27 15:18:25 +02:00
32067f9e80
use microtime to prevent race conditions
2015-04-27 14:07:16 +02:00
2e897f05b1
triger propagation for webdav uploads
...
use post hooks for share etag propagator
2015-04-27 14:07:16 +02:00
45784f213f
fix propagation when renaming a directly reshared folder
2015-04-27 14:07:16 +02:00
f488624e5f
minor fixes
2015-04-27 14:07:16 +02:00
526ea3fcba
add rename hook for propagation
2015-04-27 14:07:16 +02:00
77fbb4125b
propagate changes up reshares
2015-04-27 14:07:16 +02:00
8cb40f6043
Make sure the owner mountpoints are setup
2015-04-27 14:07:16 +02:00
30ad56813a
propagate etags for all user of a share
2015-04-27 14:07:15 +02:00
57f49391dc
remove unneeded readonlycache
2015-04-22 20:07:54 +02:00
03b7f1d015
use the permissions mask cache wrapper instead of the read only cache
2015-04-22 15:28:06 +02:00
fcc1b9b3cc
Thou shalt not corrupt the answer of a cache request
2015-04-18 12:33:43 +02:00
82cab25762
Merge pull request #13360 from owncloud/cross-storage-move
...
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +02:00
0f21303b75
a bit more phpdoc
2015-04-14 12:35:53 +02:00
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
8688660825
check that we know the parent
2015-04-13 17:10:02 +02:00
6b5daca7b7
check for source cache
2015-04-13 17:10:02 +02:00
d4c91dc835
add missing return for shared
2015-04-13 15:13:03 +02:00
d726db7459
Implement move/copyFromStorage for shared storage
2015-04-13 15:13:03 +02:00
b51b5b64e6
Fix converting Guzzle error codes in s2s storage
2015-04-10 12:12:05 +02:00
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
4feb97d8e4
Properly catch guzzle 503 when querying share info
2015-04-09 18:55:28 +02:00
08a9d1d2dc
Remove unused $toRemove
2015-04-09 12:34:19 +02:00
461302244e
Keep shares when deleting shared folders
...
The share entries will be linked with the fileid while they are kept in
the trashbin.
In the future a background just will scrape orphaned shares and delete
them.
2015-04-09 10:16:40 +02:00
17b141337a
Delete orphaned shares in a background job
2015-04-08 10:47:55 +02:00
60d8a39f03
store init status per user
2015-04-07 13:30:30 +02:00
de4ec21c39
work arround to make sure that shares are initialized only once
2015-04-07 13:30:30 +02:00
0eee3a2618
remove unencrypted_size from the cache, size will contain the unencrypted size
2015-04-07 13:30:28 +02:00
2b81d0f237
Move core apps from private to public functions
...
Apps still use OC_Helper and OC_Util functions even when public ones are
already available. Sometimes the public one is even used in the same
file.
2015-04-01 12:06:04 +02:00
4c9c73bef9
Correct the app name for sharing events
2015-03-30 15:14:31 +02:00
cfe241a959
Merge pull request #13964 from rullzer/capabilities
...
Add OCS sharing info to capabilities - take 2
2015-03-30 10:06:05 +02:00
d082e37270
Merge pull request #15244 from owncloud/use_default_share_folder
...
always fall back to default share folder
2015-03-26 22:39:04 +01:00
e8109f0bc3
Merge pull request #13802 from owncloud/share-partfilepermissions
...
Fix share permission checks
2015-03-26 22:01:05 +01:00
a3592534ef
always fall back to default share folder
2015-03-26 21:56:44 +01:00
7bff0681fe
Merge pull request #15001 from owncloud/kill-share-proxy
...
Replace share proxy with a hook
2015-03-26 21:20:05 +01:00
1be7da4a57
replace share proxy with hook
2015-03-26 19:56:57 +01:00
071a339593
Remove IDE autocomplete fail
...
🙈 *cough* *cough*
2015-03-26 19:39:15 +01:00
b585d87d9d
Update license headers
2015-03-26 11:44:36 +01:00
5f044ebf1b
Add wrapper for Guzzle
2015-03-25 16:04:41 +01:00
1db177b841
Merge pull request #15055 from owncloud/share-activity-grouping
...
Group sharing activities by user/group and file respectively
2015-03-24 20:23:36 +01:00
7de15f3125
*cough*
2015-03-24 17:08:03 +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
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
7776e088d6
Group sharing activities by user/group and file respectively
2015-03-20 09:49:33 +01: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
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
c2315aa015
Fix shared storage permission checks
2015-03-18 19:56:31 +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
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
47af533183
Move mimetype check from template to controller
2015-03-16 12:45:18 +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
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
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
4322287fc3
Fix size propagation over shared storage boundary
2015-03-05 22:23:47 +01: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
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
2015-02-26 11:37:37 +01:00
5bb0889b30
Remove uneeded assignment
...
'files' is neither used in the controller or the template
2015-02-24 19:50:23 +01:00
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01: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
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
1bb6de7c1b
Merge pull request #13425 from owncloud/phpdoc_cleanup
...
Cleanup of PHPDoc return types
2015-02-10 01:14:00 +01:00
a67627140c
Revert "Add OCS sharing info to capabilities"
2015-02-07 00:12:26 +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
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
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
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
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
73a058e301
by default send mail for new server-to-server share
2015-01-23 21:59:07 +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
9fbdd1072e
Fix webdav mkdir for remote shares
2015-01-21 15:14:57 +01:00
87a754c72e
avoid $this->cache being null - fixes #13491
2015-01-20 12:38:54 +01:00
374ddbff55
show animated gifs on public sharing page
2015-01-19 16:20:06 +01:00
2b99fc76ec
Cleanup of PHPDoc return types
2015-01-16 20:30:43 +00: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
9d0915013b
Merge pull request #13352 from owncloud/hhvm-array-key
...
HHVM: Do not use key() on array as the result depends on the internal array pointer.
2015-01-15 01:06:45 +00:00
b4a52e889a
Do not use key() on array as the result depends on the internal array pointer.
2015-01-15 00:48:10 +01:00
a9f0582e3e
Use source storage permissions when scanning shared storage
2015-01-14 18:11:23 +01:00
25806346c2
remove deprecated code - fixes #13119
2015-01-14 13:56:49 +01:00
d50e70ba3a
set accept to 1 (=true) for all server-to-server shares on update, at this point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table
2015-01-13 17:24:00 +01:00
01c83158bb
Fix source path when share is a mount point
...
Whenever an external storage mount point is shared directly, its path is
empty which causes a leading slash to appear in the source path.
This fix removes the bogus leading slash in such situation.
2015-01-08 11:46:11 +01:00
70dcebbf92
Correctly return false when translating a foreign activity
2015-01-07 15:02:25 +01:00
8c48be453e
only send activity if we have a valid path and the file is readable
2014-12-23 13:32:54 +01:00
3afcc71764
Make sure the path passed to the activity manager is normalized
2014-12-22 18:50:00 +01:00
393deb5961
add activity if public shared file/folder was downloaded
2014-12-22 18:50:00 +01:00
510488ad3e
Merge pull request #12942 from owncloud/favs-missingsharedsubdirs
...
Fix issues with searchByTag in shared storage
2014-12-21 10:38:34 +01:00
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
49318b4d93
Merge pull request #12896 from owncloud/drop-deprecated
...
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
11b3aa2dbe
Fix issues with searchByTag in shared storage
2014-12-18 17:27:56 +01:00
e656af4c83
Root always exists
2014-12-17 16:09:41 +01:00
d41082f4d6
first step to drop \OCP\Config:: in favour of IConfig
2014-12-17 11:12:37 +01:00
4b57892c4e
Merge pull request #12778 from owncloud/searchbytags2
...
Added searchByTags to view, storage and cache
2014-12-12 14:27:19 +01:00
46def69574
Specify list of activity parameters for sharing extension
2014-12-12 11:41:01 +01:00
15ecb28d50
Make $userId mandatory for searchByTags
...
$userId is now a mandatory parameter for searchByTags.
Also fixed some places in the code where the argument was missing (Node
API and View)
2014-12-12 11:18:35 +01:00
25dde7e93b
Added searchByTags to view, storage and cache
2014-12-11 17:38:50 +01:00
3026cdbc80
Merge pull request #12549 from owncloud/shared-cache-non-existing
...
Dont return cached date in shared cache when the file doesn't exist
2014-12-10 08:49:40 +01:00
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
f4701d7721
Add public api for mount configurations
2014-12-04 16:47:27 +01:00
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
ce10b93519
Dont return cached date in shared cache when the file doesn't exist
2014-12-02 15:28:11 +01:00
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
e6a7022037
Merge pull request #12410 from owncloud/no_session_for_public_share_key
...
don't store private public-share-key in session
2014-11-25 22:26:40 +01:00
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
1d33503487
we no longer need to keep the session open for encryption
2014-11-25 13:37:11 +01:00
6fb2477fb7
Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate
...
Don't disclose relative directory path for single shared files of user
2014-11-25 10:09:16 +01:00
8589079590
Close session only if encryption app is not enabled
...
Fixes https://github.com/owncloud/core/issues/12389
2014-11-24 15:02:49 +01:00
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
cbb9caf030
Merge pull request #12226 from owncloud/remove-phpass
...
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
a6ebb17610
Remove unused variable and make Scrutinizer happy.
2014-11-18 18:52:00 +01:00
f3ab4f3faf
Don't disclose relative directory path for single shared files of user
...
The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.
However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)
This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
2014-11-18 18:51:57 +01:00
1b85f40cbe
$file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned.
...
This feature only exists on master.
2014-11-18 17:14:26 +01:00
8595b76df2
Remove phpass and migrate to new Hasher interface
...
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
fad621140b
Added download size on public sharing
2014-11-14 16:26:59 +01:00
988c85d292
Refactor file sharing public link handling
...
fixes download issue introduced by #10755
Conflicts:
apps/files_sharing/public.php
2014-11-14 16:26:59 +01:00
7ecd220715
Setup shared mounts for the correct user when setting up the filesystem for the non-logged in user
2014-11-06 18:31:40 +01:00
Robin Appelman
Thomas Müller
Joas Schilling
Scrutinizer Auto-Fixer
Roeland Jago Douma
Bjoern Schiessle
Morris Jobke
Lukas Reschke
Vincent Petry
Olivier Paroz
Jenkins for ownCloud
Robin Appelman
Joas Schilling
Georg Ehrke
Robin McCorkell
Andreas Fischer
Jörn Friedrich Dreyer
Vincent Cloutier