Commit Graph

11530 Commits

Author SHA1 Message Date
Joas Schilling 178ad23d80
Correctly return an empty string for empty files 2016-04-08 14:50:42 +02:00
Roeland Jago Douma bd3bde2f3b
Set proper permissions on link share
If we do not allow public upload we should limit the permissions on
links shares upon retrieval.

* Added unit test
* Allow fetching federated shares by token as well
2016-04-08 14:17:05 +02:00
Roeland Jago Douma 3fae4c82d2
Remove pre/post_addToGroup hooks for shares
There is no need to perform the checks for unique targets on add to
group as we have to do this all when mounting the shares anyway.
2016-04-08 11:56:38 +02:00
Bjoern Schiessle fbd5c28c39 re-try to send unshare notification if remote server is not available 2016-04-08 11:32:04 +02:00
Stefan Weil b1a856d7b7 lib: Fix typos (found by codespell)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-07 19:51:27 +02:00
Joas Schilling 0de15a86f0 Merge pull request #23773 from owncloud/share_move_delete_user_hook
Migrate post_userDelete hook to share manager
2016-04-07 13:01:10 +02:00
Robin Appelman cdedda99e4 Make lock ttl configurable 2016-04-07 08:24:13 +02:00
Jenkins for ownCloud 1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
Lukas Reschke 9b930cd01d Merge pull request #23766 from owncloud/replace-getid-3
Replace getid3 with ID3Parser
2016-04-06 18:32:18 +02:00
Roeland Douma 93b1768eb7 Merge pull request #23819 from owncloud/move-core-completely-to-psr4
Move OC/Core completely to PSR-4
2016-04-06 13:31:44 +02:00
Roeland Douma 7ed271b168 Merge pull request #23820 from owncloud/move-settings-completely-to-psr4
Move OC/Settings completely to PSR-4
2016-04-06 13:31:05 +02:00
Jenkins for ownCloud de122a9b04 [tx-robot] updated from transifex 2016-04-06 06:47:12 -04:00
Lukas Reschke cc5a2b549e
Replace getid3 with ID3Parser 2016-04-06 12:00:16 +02:00
Lukas Reschke 5a0c936f99
Remove OC/Settings from old autoloader 2016-04-06 11:34:53 +02:00
Lukas Reschke c952adabb5
Remove OC/Core autoloading from old autoloader 2016-04-06 11:34:29 +02:00
Morris Jobke 046506dd14 Merge pull request #23763 from owncloud/do_not_export_share_type_2
Share type 2 is private
2016-04-06 09:40:13 +02:00
Thomas Müller 1bb40b866a Merge pull request #23811 from owncloud/move-settings-and-oc-core-to-composer
Add OC\Core and OC\Settings to composer autoloader
2016-04-05 17:58:07 +02:00
Thomas Müller 60f532882c Merge pull request #23794 from owncloud/handle-null-in-usermanager
Prevent null to be passed into the closure of callForAllUsers
2016-04-05 17:57:39 +02:00
Lukas Reschke 433c0160b6 Move OC\Core and OC\Settings to composer autoloader 2016-04-05 16:47:38 +02:00
Thomas Müller 64d400b5df Prevent null to be passed into the closure of callForAllUsers 2016-04-05 10:26:04 +02:00
Jan-Christoph Borchardt 73a6664ca8 load mobile styles last, fix #19596 2016-04-05 09:47:39 +02:00
Thomas Müller 961bb4c3e3 Merge pull request #23677 from owncloud/db-schema-migration-feedback
Show individual sql schema migration steps during upgrade - on web as…
2016-04-05 09:39:35 +02:00
Morris Jobke 6ecd1d9e86 Fix PHP memory leak in file_get_contents()
* ref https://bugs.php.net/bug.php?id=61961

* ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256

* code is based on the proposal of @chriseqipe

* fixes #20261
2016-04-04 16:48:09 +02:00
Thomas Müller 4b79fb10a2 Fix verbose output of upgrade command - not progressbar in this case and the schema migration test has one progressbar now for all tables - before we had one progressbar for each table 2016-04-04 16:20:53 +02:00
Roeland Jago Douma e0cee43cf0 Migrate post_userDelete hook to share manager
This makes the post_userDelete hook call the sharemanager. This will
cleanup to and from this user.

* All shares owned by this user
* All shares with this user (user)
* All custom group shares
* All link share initiated by this user (to avoid invisible link shares)

Unit tests are added for the defaultshare provider as well as the
federated share provider
2016-04-04 14:15:38 +02:00
Thomas Müller f6cea3c9c4 Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page
In case of exception we return an html page in case the client is a b…
2016-04-04 13:51:23 +02:00
Thomas Müller 1bf4c75e8b Show individual sql schema migration steps during upgrade - on web as well as on the command line 2016-04-04 12:34:18 +02:00
Bernhard Posselt 4887f0f9b5 Add better messages for sometimes obscure exceptions
* add better messages for sometimes obscure exceptions

* fix formatting
2016-04-04 10:55:46 +02:00
Thomas Müller 64d68eb2da Merge pull request #23722 from owncloud/also-hide-password-for-private-key-password-update
Also replace password in updatePrivateKeyPassword
2016-04-04 10:54:59 +02:00
Joas Schilling 1d542e4ed2 Merge pull request #23728 from owncloud/sanitize-more-data-for-config-report
Sanitize more data in config report
2016-04-04 09:47:02 +02:00
Roeland Jago Douma d3959ee152 Share type 2 is private
This was added to the factory for legacy reasons when converting from
old to new sharing code. It is not used anymore so can be deleted. Which
means we no longer expose internal types.
2016-04-04 09:00:06 +02:00
Jenkins for ownCloud deca08a683 [tx-robot] updated from transifex 2016-04-02 01:55:25 -04:00
Lukas Reschke a5f2f22c12 Sanitize more data in config report
This sanitizes the following keys as well:

- `proxyuserpwd`
- `shared_secret` of `log.condition`
- `license-key`
- `password` of `redis`
2016-04-01 13:03:34 +02:00
Lukas Reschke 09b14ceffc Also replace password in updatePrivateKeyPassword
Fixes https://github.com/owncloud/core/issues/23717
2016-04-01 10:32:23 +02:00
Joas Schilling 0235a79b4e Initialise the printcss array 2016-04-01 09:46:15 +02:00
Jenkins for ownCloud cce6194368 [tx-robot] updated from transifex 2016-04-01 01:56:19 -04:00
Thomas Müller 2714dfce21 Merge pull request #23713 from owncloud/small_encryption_fix
make sure that we always remove the file again from the cache after t…
2016-03-31 23:13:52 +02:00
Morris Jobke 902abe33f5 Merge pull request #23676 from owncloud/handle-null-return-getAppInfo
Properly handle return values of OC_App::getAppInfo()
2016-03-31 22:21:50 +02:00
C. Montero Luque 0393e80c7c Merge pull request #16857 from owncloud/printStylesheets
Support for print stylesheets
2016-03-31 22:13:44 +02:00
Bjoern Schiessle e4b451491b make sure that we always remove the file again from the cache after the version was created 2016-03-31 21:52:23 +02:00
Frank Karlitschek f5709b511b Merge pull request #23445 from owncloud/enc_small_improvement
small performance improvement: no need to calculate the header size
2016-03-31 20:38:42 +02:00
Frank Karlitschek 2bff34be56 Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-set
Make sure that the encrypted version is set
2016-03-31 20:37:17 +02:00
Frank Karlitschek fdb59079a2 Merge pull request #23675 from owncloud/fix_encryption_versions_on_external_storages
fix creation of versions of encrypted files on external storages
2016-03-31 20:36:03 +02:00
Frank Karlitschek ba8c81e6d1 Merge pull request #23526 from owncloud/fix_23337
Add setId and setProviderId to IShare interface
2016-03-31 20:07:02 +02:00
Bjoern Schiessle 93ed965cbb fix creation of versions of encrypted files on external storages
in order to create a 1:1 copy of a file if a version gets created
we need to store this information on copyBetweenStorage(). This
allows us to by-pass the encryption wrapper if we read the source file.
2016-03-31 19:24:47 +02:00
Lukas Reschke c427bf3b5d Make sure that the encrypted version is set
The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following:

1. User uploaded a file
2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`.
3. The call when updating the file cache will use the old version.
2016-03-31 18:06:37 +02:00
Jenkins for ownCloud 82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Morris Jobke f5beeec833 Properly handle return values of OC_App::getAppInfo()
* fixes #23668
2016-03-30 23:29:26 +02:00
Roeland Jago Douma d883b877d1 Move OCP\Share over to PSR-4
Touching the code so moving it over to PSR-4
2016-03-30 22:55:03 +02:00
Roeland Jago Douma 2f4294e781 Add setId and setProviderID to the public interface
Fixes #23337

We only allow the id to be set once!
2016-03-30 22:55:03 +02:00
Thomas Müller 66ee9d56fc Merge pull request #23628 from owncloud/avatar-remove
only remove avatars from the folder we store them in
2016-03-30 17:00:09 +02:00
Thomas Müller 748a59db11 Merge pull request #23654 from owncloud/issue-23653-xcache-detection-fails
xcache.var_size with 64M should evaluate to isAvailable
2016-03-30 16:57:02 +02:00
Joas Schilling f1c23a92a4 xcache.var_size with 64M should evaluate to isAvailable 2016-03-30 14:54:56 +02:00
Roeland Jago Douma 9ce5e4b01f Non moveable mount points should always be UPDATE+DELETE shareable
Fixes #23536

The new sharing code is much stricter in checking permissions. However
for non moveable mounts the permissions UPDATE+DELETE are not reported
on the mount point.

This is just a quick fix.

* Updated unit tests
2016-03-30 13:33:16 +02:00
Robin Appelman c22697e09e only remove avatars from the folder we store them in 2016-03-30 10:24:43 +02:00
Jenkins for ownCloud fc708c1e04 [tx-robot] updated from transifex 2016-03-30 01:57:41 -04:00
Thomas Müller 37d32a93d0 Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-short
Fix activity emails always using the short translation
2016-03-29 18:44:16 +02:00
Jenkins for ownCloud dd5bbc31f2 [tx-robot] updated from transifex 2016-03-29 01:55:16 -04:00
Jenkins for ownCloud a092fe3bf8 [tx-robot] updated from transifex 2016-03-28 01:55:08 -04:00
Jenkins for ownCloud 1079554284 [tx-robot] updated from transifex 2016-03-27 01:55:45 -04:00
Jenkins for ownCloud 3e33b686b1 [tx-robot] updated from transifex 2016-03-26 01:55:15 -04:00
C. Montero Luque 4123185d2d Merge branch 'master' into background-scan-unscanned 2016-03-25 13:14:35 +01:00
Jenkins for ownCloud ae97b8e1c2 [tx-robot] updated from transifex 2016-03-25 01:55:47 -04:00
Thomas Müller b966fc2233 Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removal
Lock the mountpoint while removing
2016-03-24 22:43:46 +01:00
Thomas Müller b8812c8cba Merge pull request #23154 from owncloud/avatar-save-failure
dont die when we cant save the resized avatar, log instead
2016-03-24 22:43:17 +01:00
Lukas Reschke 95820fbd5b Add magical regex to catch browsers 2016-03-24 19:02:16 +01:00
Thomas Müller c46f480031 In case of exception we return an html page in case the client is a browser 2016-03-24 19:02:16 +01:00
Robin Appelman 6485d95c5a handle completely unscanned storages in the background scanner 2016-03-24 17:16:21 +01:00
Jörn Friedrich Dreyer c3508df09a add missing var 2016-03-24 12:49:43 +01:00
Thomas Müller 789df4d630 Merge pull request #23542 from owncloud/catch-empty-app-path-oh-we-really-should-use-exceptions-in-the-future
getAppPath can return false
2016-03-24 11:56:43 +01:00
Joas Schilling 3d9863febc Lock the mountpoint while removing 2016-03-24 11:50:17 +01:00
Joas Schilling c0858f42aa Allow the activity app to set the current user when sending emails 2016-03-24 09:36:44 +01:00
Joas Schilling dad98542a5 We are only formatting an object when it's not null 2016-03-24 09:34:19 +01:00
Lukas Reschke 117b3e0a12 getAppPath can return false
Fixes https://github.com/owncloud/core/issues/23533
2016-03-24 09:19:43 +01:00
Lukas Reschke cc8c0b6a90 Check if request is sent from official ownCloud client
There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check)

While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code.
2016-03-24 08:59:56 +01:00
Jenkins for ownCloud 4b3af9dfe7 [tx-robot] updated from transifex 2016-03-24 01:57:28 -04:00
Thomas Müller 6fc92453f3 Merge pull request #23515 from owncloud/issue-22695-wrong-menu-translations
Fix the translations of the User menu
2016-03-23 23:20:00 +01:00
Joas Schilling 6026b67280 Fix the translations of the User menu 2016-03-23 15:34:25 +01:00
Thomas Müller ea07a428f4 Merge pull request #22506 from owncloud/node-get-from-cache
Query the cache when checking if a node exists
2016-03-23 13:08:17 +01:00
Thomas Müller e9d62741e8 Merge pull request #23142 from owncloud/request_properties
Fix analyzer warnings in request.php
2016-03-23 11:03:37 +01:00
Thomas Müller fc18d33ff8 Merge pull request #22895 from owncloud/cleanup_default_share_provider
Remove support for old shares in the default share provider
2016-03-23 11:02:28 +01:00
Thomas Müller efd378814c Merge pull request #23362 from owncloud/fix-l10n-for-themes
Read available l10n files also from theme folder
2016-03-23 09:22:21 +01:00
Thomas Müller 61c5717281 Merge pull request #23463 from owncloud/lets-consistently-use-no-referer
Consistently use rel=noreferrer
2016-03-23 09:14:54 +01:00
Thomas Müller abcee56fe3 Merge pull request #23474 from owncloud/RealRancor-exclude_lost_and_found
Exclude lost+found dir in integrity check
2016-03-23 08:05:27 +01:00
Roeland Jago Douma e6dc80f0f3 Fix warning in request.php
* Added proper @property tags
* RunTimeException => RuntimeException

Makes code analyzers happier
2016-03-23 07:59:20 +01:00
Roeland Jago Douma da1dbb52e4 Remove dead function
This was used when we did not have lazy shares yet. Now that we no
longer support legacy shares this can go.
2016-03-23 07:58:17 +01:00
Roeland Jago Douma b26b8d17eb Remove support for old shares in the default share provider
In 9.0 we converted the old shares to the new shares. So for 9.1 we can
savely remove the fallback code.

This code was required when there was no initiator set.

* Fixed unit tests
2016-03-23 07:58:17 +01:00
Thomas Müller 640e6351f1 Merge pull request #23485 from owncloud/composer_allow_ocp
Allow OCP classes to be PSR-4 as well
2016-03-22 21:28:45 +01:00
Thomas Müller d5be21fe81 Merge pull request #23398 from owncloud/block_group_sharing
Allow blocking of group sharing
2016-03-22 21:28:13 +01:00
Lukas Reschke 1fffc30cf0 Only use the user session if ownCloud is already installed
When installing ownCloud with autotest and MySQL some log entries may be created which will invoke the logging class. IUserSession has a dependency on the database which will make the installation fail => 💣
2016-03-22 17:34:20 +01:00
Thomas Müller 460bafea8a Merge pull request #23484 from owncloud/if-class-is-already-loaded-dont-load-it-again
Dont double load class
2016-03-22 17:25:02 +01:00
Roeland Jago Douma 52826d0e24 Block group sharing in API and in share manager
* Fix tests
2016-03-22 17:13:34 +01:00
Roeland Jago Douma 195efc12eb Add config to sharemanager 2016-03-22 17:13:34 +01:00
Thomas Müller 6aa28037c7 Merge pull request #23437 from owncloud/save-query-when-the-list-is-empty
Save the query when we get tags for no objects
2016-03-22 17:12:24 +01:00
Roeland Jago Douma 5b78c604b5 Move IServerContainter to PSR-4 2016-03-22 16:39:19 +01:00
Roeland Jago Douma f838d24c5d Allos OCP classes to be PSR-4 as well
This adds the OCP namespace to the composer autoloader as well.
This means that now we can use proper PSR-4 filenames in OCP.
2016-03-22 16:31:18 +01:00
Lukas Reschke 8e72e51b21 Dont double load class
If the class already exists we should not load it twice. Since the composer autoloader is also used in core this could otherwise load a file twice.

This leads to problems otherwise with case insensitive operating systems like OS X. We can get rid of this once all file names in OC follow PSR-4, until then we probably need this check.
2016-03-22 16:19:12 +01:00
Thomas Müller ffe57a55d9 Merge pull request #23461 from owncloud/activity-491-autoloading-issue-without-sharing
Fix "AutoloadNotAllowedException" when files_sharing is disabled
2016-03-22 15:12:25 +01:00
Thomas Müller 0cd93a8e72 Merge pull request #23411 from owncloud/new_sharing_to_composer
Move sharing 2.0 to composer autoloader
2016-03-22 15:10:11 +01:00
Lukas Reschke 5d170e0505 Merge branch 'exclude_lost_and_found' of https://github.com/RealRancor/core into RealRancor-exclude_lost_and_found 2016-03-22 12:58:14 +01:00