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
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
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
Joas Schilling
dcca20a48a
Save the query when we get tags for no objects
2016-03-22 11:13:11 +01:00
Thomas Müller
7426be0937
Merge pull request #23448 from owncloud/issue-22993-soften-exception-on-enable-default-app
...
Do not abort with an exception when a default app can not be enabled
2016-03-22 10:19:59 +01:00
Thomas Müller
da8781e425
Merge pull request #23443 from owncloud/some-more-logging-information
...
Log more information by default
2016-03-22 10:06:32 +01:00
Joas Schilling
24ce4b0f7d
Fix "AutoloadNotAllowedException" when files_sharing is disabled
2016-03-22 08:42:25 +01:00
Thomas Müller
61629ad9ad
Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issue
...
Fix doc issue of cache wrapper
2016-03-21 18:03:35 +01:00
Joas Schilling
444343dc2b
Do not abort with an exception when a default app can not be enabled
2016-03-21 16:31:59 +01:00
Lukas Reschke
7adae4476f
Log more information by default
...
This modifies the logger to add the following logging information by default:
- Request Method
- Request URL
- Current user
2016-03-21 15:48:01 +01:00
Bjoern Schiessle
7b9d53b7ea
no need to calculate the header size, if the first block contain a header we already know the size
2016-03-21 15:47:24 +01:00
Vincent Petry
f28f538029
Do not fire pre/post hooks twice on chunk upload
2016-03-21 15:14:58 +01:00
Robin Appelman
0b0b3253bb
properly use fileinfo objects
2016-03-21 14:20:33 +01:00
Robin Appelman
6031ae1ad4
improve reuse in getUserFolder
2016-03-21 13:53:33 +01:00
Robin Appelman
5e6c905a14
pass the fileinfo to the node if available
2016-03-21 13:53:33 +01:00
Robin Appelman
a98b038300
Query the cache when checking if a node exists
2016-03-21 13:53:33 +01:00
Joas Schilling
e86fd945dd
Fix doc issue of cache wrapper
2016-03-21 10:45:53 +01:00
Thomas Müller
16782484b9
Merge pull request #23349 from owncloud/hardenings
...
Hardenings
2016-03-21 09:45:05 +01:00
Thomas Müller
ef4dc22a6a
Merge pull request #23369 from owncloud/use-raw-path
...
Use raw PATH_INFO
2016-03-21 09:44:27 +01:00
Thomas Müller
b9da594bd9
Merge pull request #23374 from owncloud/fix-htaccess-issues
...
Write .htaccess update only if not already written
2016-03-21 09:43:18 +01:00
Jenkins for ownCloud
35bc315f59
[tx-robot] updated from transifex
2016-03-21 01:55:40 -04:00
Lukas Reschke
6ad957906e
Consistently use rel=noreferrer
...
When linking to external entities we should consistently use rel=noreferrer
2016-03-20 15:27:20 +01:00
Roeland Jago Douma
c6edbfecbe
Move (new) sharing over to composer autoloader
2016-03-20 14:12:36 +01:00
Jenkins for ownCloud
1f1d87d413
[tx-robot] updated from transifex
2016-03-20 01:55:09 -04:00
RealRancor
dee0bbbbce
Exclude lost+found dir in integrity check
2016-03-19 14:08:21 +01:00
Jenkins for ownCloud
9c053ed465
[tx-robot] updated from transifex
2016-03-19 01:55:39 -04:00
Morris Jobke
76455204c0
Inject server root - allows proper testing and separation of concerns
2016-03-18 13:59:44 +01:00
Jenkins for ownCloud
a6c921267e
[tx-robot] updated from transifex
2016-03-18 01:59:00 -04:00
Lukas Reschke
e867a7d54d
Write .htaccess update only if not already written
...
The ownCloud update routine also runs the "updateHtaccess" code in case only an application gets updated. This leads to having entries multiple time in the .htaccess file leading to unpredictable behaviour.
With 9.0 we added the "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" entry to the .htaccess file, this change uses it to ensure that only to the .htaccess gets written if the file has not been modified already. Since the .htaccess modifications are optional this is not a big deal.
Without this change updates of applications can break the rewrite rules (ending in endless redirects) as well as breaking the code integrity checker.
2016-03-17 17:59:28 +01:00
Lukas Reschke
24abe1e1e1
Use raw PATH_INFO
...
PATH_INFO will be empty at this point and thus the logic in base.php did not catch this. Changing this to "getRawPathInfo" will ensure that the path info is properly read.
Fixes https://github.com/owncloud/core/issues/23199
2016-03-17 17:32:38 +01:00
Morris Jobke
23c0f4ff5f
Read available l10n files also from theme folder
...
The old behaviour was that only languages could be used for an app
that are already present in the apps/$app/l10n folder. If there is
a themed l10n that is not present in the apps default l10n folder
the language could not be used and the texts are not translated.
With this change this is possible and also the l10n files are
loaded even if the default l10n doesn't contain the l10n file.
2016-03-17 16:15:37 +01:00
Lukas Reschke
bf017f5c11
Remove unused code
...
This code is not used anymore.
2016-03-17 13:09:23 +01:00
Lukas Reschke
979a3ff830
Escape App ID
...
While all callers do this as well this prevents a misuse of the API by mistake.
2016-03-17 13:09:22 +01:00
Manish Bisht
07e7d4836e
Update oci.php
...
Error Fixed
combined the database errors
Merged Database Errors
2016-03-16 19:21:14 +01:00
Thomas Müller
2f5b929ee9
Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1
...
Ensure that stored version is at least 1 for cross-storage copy
2016-03-16 13:14:36 +01:00
Thomas Müller
5f00724e5b
Merge pull request #23189 from owncloud/require-at-least-libxml-2-7-0
...
Require at least libxml 2.7.0
2016-03-16 13:11:59 +01:00
Lukas Reschke
676041ba7e
Ensure that stored version is at least 1 for cross-storage copy
...
In case of a move operation from an unencrypted to an encrypted
storage the old encrypted version would stay with "0" while the
correct value would be "1". Thus we manually set the value to "1"
for those cases.
See also https://github.com/owncloud/core/issues/23078
2016-03-16 10:36:15 +01:00
Jenkins for ownCloud
631ae2f0f4
[tx-robot] updated from transifex
2016-03-16 01:55:43 -04:00
Thomas Müller
f7140294f2
Merge pull request #23157 from owncloud/remove-share-prop-entries
...
remove old share propagation entries from appconfig
2016-03-15 16:04:17 +01:00
Thomas Müller
27760ae54e
Merge pull request #23164 from owncloud/db-connection-precondition-fix
...
Prevent certain DBs throwing exceptions on same-value updates
2016-03-15 16:03:55 +01:00
Thomas Müller
7b06dd485d
Merge pull request #23250 from owncloud/fix-support-for-php7-in-htaccess
...
Fix several .htaccess and .user.ini related problems
2016-03-15 16:03:18 +01:00
Robin McCorkell
1b2f1cc272
Prevent certain DBs throwing exceptions on same-value updates
...
A PreconditionNotMetException must only be thrown if explicit
preconditions are specified for setValues(), not if the value is merely
the same as was already in the DB.
2016-03-15 13:02:19 +01:00
Thomas Müller
ad9a0804f3
Merge pull request #23226 from owncloud/fix_23190
...
Generate a valid URL for link notification
2016-03-15 12:55:13 +01:00
Robin Appelman
0aa83511a1
remove old share propagation entries from appconfig
2016-03-15 12:50:22 +01:00
Thomas Müller
0f6ea9fd29
Merge pull request #23039 from owncloud/invalid-share-storage
...
dont break when there is an invalid share
2016-03-15 12:15:05 +01:00
Thomas Müller
e9eeb3607f
Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilder-api
...
Correctly escape join statements and use selectAlias
2016-03-15 12:14:17 +01:00