jknockaert
735f6cc037
fix encryption header error
...
When moving back the pointer to position 0 (using stream_seek), the pointer on the encrypted stream will be moved to the position immediately after the header. Reading the header again (invoked by stream_read) will cause an error, writing the header again (invoked by stream_write) will corrupt the file. Reading/writing the header should therefore happen when opening the file rather than upon read or write. Note that a side-effect of this PR is that empty files will still get an encryption header; I think that is OK, but it is different from how it was originally implemented.
2015-04-24 16:43:16 +02:00
Joas Schilling
4334e77035
Merge pull request #15839 from owncloud/enc_fix_moving_shared_files
...
[encryption] fix moving files to a shared folder
2015-04-24 15:07:36 +02:00
Joas Schilling
1592be117a
Use public interfaces for type hinting
2015-04-24 13:06:03 +02:00
Bjoern Schiessle
24128d1384
only update share keys if the file was encrypted
2015-04-24 10:19:09 +02:00
Bjoern Schiessle
2646bccb83
update share keys if file gets copied
2015-04-23 17:18:48 +02:00
Bjoern Schiessle
2990b0e07e
update share keys if a file is moved to a shared folder
2015-04-23 17:18:48 +02:00
Thomas Müller
b1bb6a3d36
Ignore test folders when checking the code for compliance
2015-04-23 16:59:26 +02:00
Lukas Reschke
ab9ea97d3a
Catch not existing User-Agent header
...
In case of an not sent UA header consider the client as valid
2015-04-23 16:33:51 +02:00
Lukas Reschke
155ae44bc6
Fix collision on temporary files + adjust permissions
...
This changeset hardens the temporary file and directory creation to address multiple problems that may lead to exposure of files to other users, data loss or other unexpected behaviour that is impossible to debug.
**[CWE-668: Exposure of Resource to Wrong Sphere](https://cwe.mitre.org/data/definitions/668.html )**
The temporary file and folder handling as implemented in ownCloud is performed using a MD5 hash over `time()` concatenated with `rand()`. This is insufficiently and leads to the following security problems:
The generated filename could already be used by another user. It is not verified whether the file is already used and thus temporary files might be used for another user as well resulting in all possible stuff such as "user has file of other user".
Effectively this leaves us with:
1. A timestamp based on seconds (no entropy at all)
2. `rand()` which returns usually a number between 0 and 2,147,483,647
Considering the birthday paradox and that we use this method quite often (especially when handling external storage) this is quite error prone and needs to get addressed.
This behaviour has been fixed by using `tempnam` instead for single temporary files. For creating temporary directories an additional postfix will be appended, the solution is for directories still not absolutely bulletproof but the best I can think about at the moment. Improvement suggestions are welcome.
**[CWE-378: Creation of Temporary File With Insecure Permissions](https://cwe.mitre.org/data/definitions/378.html )**
Files were created using `touch()` which defaults to a permission of 0644. Thus other users on the machine may read potentially sensitive information as `/tmp/` is world-readable. However, ownCloud always encourages users to use a dedicated machine to run the ownCloud instance and thus this is no a high severe issue. Permissions have been adjusted to 0600.
**[CWE-379: Creation of Temporary File in Directory with Incorrect Permissions](https://cwe.mitre.org/data/definitions/379.html )**
Files were created using `mkdir()` which defaults to a permission of 0777. Thus other users on the machine may read potentially sensitive information as `/tmp/` is world-readable. However, ownCloud always encourages users to use a dedicated machine to run the ownCloud instance and thus this is no a high severe issue. Permissions have been adjusted to 0700.Please enter the commit message for your changes.
2015-04-23 15:07:54 +02:00
Jenkins for ownCloud
f8f354b351
[tx-robot] updated from transifex
2015-04-23 01:54:51 -04:00
Martin
676e86b314
Improve error messge text for app upgrade try ( #15375 )
2015-04-22 13:24:11 +02:00
Morris Jobke
3e8f6cdba9
Merge pull request #15635 from owncloud/issue/15634-empty-txt-previews
...
Scale up the font on larger previews
2015-04-20 15:55:32 +02:00
Morris Jobke
ce2c8533d9
Merge pull request #15735 from owncloud/fix-visibility
...
Fix visibility of interfaces in \OCP
2015-04-20 14:39:15 +02:00
Lukas Reschke
3959f8ac4e
Merge pull request #15637 from owncloud/migrate-certificate-stuff
...
Migrate personal certificate handling to AppFramework controllers
2015-04-20 13:56:35 +02:00
Lukas Reschke
e9d6807c5c
Merge pull request #15733 from owncloud/remove-oc_backgroundjob
...
Removed OC_BackgroundJob - reduce class overhead
2015-04-20 13:17:58 +02:00
Lukas Reschke
1cc2aefa46
Proper return types
2015-04-20 13:00:02 +02:00
Lukas Reschke
9f61cf60d4
Verify if returned object is an array
...
The error has to be thrown at this point as otherwise errors and notices are thrown since the time cannot be parsed in L60 and L61
2015-04-20 12:58:57 +02:00
Lukas Reschke
ed0b465cf9
Use 403 instead a 50x response
2015-04-20 12:53:40 +02:00
Joas Schilling
6da9e1a742
Fix visibility of public API methods
2015-04-20 12:52:40 +02:00
Lukas Reschke
4ea205e262
Block old legacy clients
...
This Pull Request introduces a SabreDAV plugin that will block all older clients than 1.6.1 to connect and sync with the ownCloud instance.
This has multiple reasons:
1. Old ownCloud client versions before 1.6.0 are not properly working with sticky cookies for load balancers and thus generating sessions en masse
2. Old ownCloud client versions tend to be horrible buggy
In some cases we had in 80minutes about 10'000 sessions created by a single user. While this change set does not really "fix" the problem as 3rdparty legacy clients are affected as well, it is a good work-around and hopefully should force users to update their client
2015-04-20 11:12:17 +02:00
Lukas Reschke
a98b819366
Add version to deprecation notice
...
As requested by @MorrisJobke
2015-04-20 10:30:16 +02:00
Lukas Reschke
f672e120fc
Deprecate unused `\OCP\Response::sendFile`
...
This function is unused in our own code and can be better achieved using the AppFramework. Also very easy to do grave mistaked using this function.
2015-04-20 10:02:34 +02:00
Morris Jobke
9cb260d310
Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage
...
Fixing OCS API namespace usage
2015-04-20 09:43:19 +02:00
Jenkins for ownCloud
75bf03a605
[tx-robot] updated from transifex
2015-04-20 01:54:44 -04:00
Morris Jobke
d4ac7ac723
Merge pull request #15739 from DavidPrevot/symfony-2.7
...
Replace `_method` requirement by {g,s}etMethods()
2015-04-19 23:46:21 +02:00
Georg Ehrke
8f51efc49e
get rid of OC_Geo
2015-04-19 20:16:56 +02:00
David Prévot
7f2f92847b
Replace `_method` requirement by {g,s}etMethods()
...
Make the call compatible with future Symfony version, and avoid
E_USER_DEPRECATED as thrown by the current 2.7.0-beta1:
The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use getMethods() instead. at
…/Symfony/Component/Routing/Route.php#554
The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use the setMethods() method instead or the "methods"
option in the route definition. at
…/Symfony/Component/Routing/Route.php#662
2015-04-19 12:08:29 -04:00
Roeland Douma
d877c1f1e1
Merge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocp
...
Reduce call of legacy wrapper by call the OCP directly
2015-04-19 15:42:07 +02:00
Roeland Douma
3cb5dd68e6
Merge pull request #15737 from owncloud/add-deprecated-version
...
Add version to @deprecated tags
2015-04-19 15:40:53 +02:00
Robin McCorkell
80b892e7ed
Merge pull request #15729 from owncloud/remove-unused-variables
...
Remove unused variables
2015-04-19 12:38:29 +01:00
Jenkins for ownCloud
fd3c1484ad
[tx-robot] updated from transifex
2015-04-19 01:54:41 -04:00
Morris Jobke
c056c52010
Add version to @deprecated tags
2015-04-19 01:04:59 +02:00
Morris Jobke
9b8ebdadf7
Reduce call of legacy wrapper by call the OCP directly
...
* ref #15734
* reduces the call depth, because the private methods just call OCP stuff
2015-04-19 00:29:09 +02:00
Morris Jobke
96a5b65484
Fix visibility of interfaces in \OCP
2015-04-19 00:26:17 +02:00
Morris Jobke
60b8aa2a83
Removed OC_BackgroundJob - reduce class overhead
...
* method code is now in the static public namespace (5 sloc)
2015-04-18 23:37:32 +02:00
Morris Jobke
f6807337a8
Add @since tag to public namespace constants
2015-04-18 23:19:35 +02:00
Thomas Müller
cdf82909b8
Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules
...
Issue/15694 display name of encryption modules
2015-04-18 22:51:15 +02:00
Thomas Müller
b7a4972218
Merge pull request #15728 from owncloud/update-iurlgenerator-doc
...
IUrlGenerator - document linkTo properly
2015-04-18 22:48:09 +02:00
Thomas Müller
d2a31bcd93
Merge pull request #15727 from owncloud/cleanup-db-interface
...
DB: remove unused parameter - was forgotten during the migration to doct...
2015-04-18 22:47:40 +02:00
Thomas Müller
c922b09f26
Merge pull request #15725 from owncloud/l10n-public-interface
...
IL10n - add PHPDoc for $options
2015-04-18 22:46:50 +02:00
Morris Jobke
e837927ad5
fix followup issues with unneeded parameters
2015-04-18 17:02:39 +02:00
Morris Jobke
ccf47f40aa
Remove unused variables
...
* should make scrutinizer a lot more happy
* reduces maybe memory footprint
2015-04-18 16:35:19 +02:00
Morris Jobke
eb62e7cc27
IUrlGenerator - document linkTo properly
...
* parameter $args was there since 6.0.0
* see 61a9098b7d
2015-04-18 16:03:37 +02:00
Morris Jobke
47ecfd98a3
DB: remove unused parameter - was forgotten during the migration to doctrine
...
* 377e9a8677
<- doctrine merge
2015-04-18 15:57:13 +02:00
Morris Jobke
9ffac12986
IL10n - add PHPDoc for $options
...
* added in #11549
* undocumented in the public interface
2015-04-18 15:50:17 +02:00
Morris Jobke
f72dabb4eb
fix wrong variable names in PHPDoc
2015-04-18 14:31:28 +02:00
Morris Jobke
11f29f6d95
add visibility of methods in server container and interface
2015-04-18 14:19:22 +02:00
Joas Schilling
3f3f8c2f99
Fix usage of deprecated private constants
2015-04-18 10:30:02 +02:00
Joas Schilling
4d238c3949
Fix display name of encryption modules
2015-04-18 10:18:58 +02:00
Joas Schilling
6ce1abfa5c
Deprecate the OC_API constants in favor of the OCP ones
2015-04-18 09:29:52 +02:00
Joas Schilling
4e58f4892a
Move constants to OCP\API so apps can use them
2015-04-18 09:29:51 +02:00
Joas Schilling
8cb0d97b10
Merge pull request #15692 from owncloud/log-exception-type-master
...
Write the type of exception to the log - really helpful for exceptions w...
2015-04-18 09:28:48 +02:00
Joas Schilling
5acda185bd
Correctly prefix OC_API with \ since its not in the namespace
2015-04-18 09:12:42 +02:00
Jenkins for ownCloud
37a871127b
[tx-robot] updated from transifex
2015-04-18 01:55:19 -04:00
Morris Jobke
7ab1f807fb
Merge pull request #15691 from owncloud/vobject-sabre2.1
...
Get rid of the obsolete OC_VObject class
2015-04-17 22:33:00 +02:00
Thomas Müller
d9990c2b4e
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager'
2015-04-17 13:55:31 +02:00
Thomas Müller
d671f13f26
Write the type of exception to the log - really helpful for exceptions which hold no message
2015-04-17 13:10:10 +02:00
Vincent Petry
b7e5884b54
Get rid of the obsolete OC_VObject class
...
The class isn't needed any more since the update to Sabre 2.1
2015-04-17 12:55:31 +02:00
Bjoern Schiessle
7d4b1b52d0
always create a new instance of the encryption module
2015-04-17 10:31:33 +02:00
Thomas Müller
f32d97750c
Merge pull request #15679 from owncloud/fix-private-member-access
...
Fix private member access of parent class in ocsresponse
2015-04-17 09:13:54 +02:00
Thomas Müller
852cc6f2c6
Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace
...
Add @since tags to all methods in public namespace
2015-04-17 09:13:04 +02:00
Jenkins for ownCloud
da44df2cfa
[tx-robot] updated from transifex
2015-04-17 01:55:37 -04:00
Morris Jobke
7644950b48
Add @since tags to all methods in public namespace
...
* enhance the app development experience - you can look up the
method introduction right inside the code without searching
via git blame
* easier to write apps for multiple versions
2015-04-16 17:00:08 +02:00
Morris Jobke
1d30efdd73
Fix private member access of parent class in ocsresponse
...
* noticed while checking PHPDoc
2015-04-16 16:54:01 +02:00
Clark Tomlinson
1174ad0681
Merge pull request #15445 from owncloud/enc2_migration
...
add migration script from old encryption to new one
2015-04-16 09:34:47 -04:00
Joas Schilling
c7e5e30b86
Merge pull request #15674 from owncloud/fix-console-check-output
...
Convert error and hint to string before writing to the output
2015-04-16 14:51:29 +02:00
Bjoern Schiessle
b25c06f576
detect system wide mount points correctly
2015-04-16 14:15:04 +02:00
Bjoern Schiessle
67500d5f2f
if we start writing a file from the beginning, size should start by zero; result of floor needs to be casted to int in order to compare it with ->size
2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e3d77c4b01
add migration script from old encryption to new one
2015-04-16 14:15:04 +02:00
Thomas Müller
07243f0482
Convert error and hint to string before writing to the output - fixes https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html
2015-04-16 12:32:17 +02:00
Thomas Müller
bcf65d9c13
Using TRANSACTION_READ_COMMITTED
2015-04-16 11:49:12 +02:00
Jörn Friedrich Dreyer
2e06cf49a5
Merge pull request #15623 from t3chguy/master
...
Redis DB Index via Select
2015-04-16 09:30:07 +02:00
Jenkins for ownCloud
8606b7ca66
[tx-robot] updated from transifex
2015-04-16 01:54:43 -04:00
Vincent Petry
903d52d45f
Merge pull request #15809 from owncloud/view-null-root
...
dont allow using null as view root
2015-04-22 18:10:26 +02:00
Robin Appelman
bd57902d1d
typo
2015-04-22 16:24:37 +02:00
Thomas Müller
750f0bc489
Merge pull request #15799 from owncloud/fix-enc-folder-move
...
Fix enc folder move
2015-04-22 16:04:29 +02:00
Robin Appelman
f391f88d7f
dont allow using null as view root
2015-04-22 14:51:02 +02:00
Morris Jobke
42d9ba0f83
Merge pull request #15787 from owncloud/trash-partfiles
...
Do not trash part files, delete directly
2015-04-22 14:10:26 +02:00
Morris Jobke
a971fa8a90
Merge pull request #15549 from owncloud/jcf-fix-cache-update
...
don't update identical values
2015-04-22 13:34:08 +02:00
Thomas Müller
0042bdd2e7
fix PHPDoc
2015-04-22 13:12:52 +02:00
Thomas Müller
225cde2183
pass KeyStorage via ctor
2015-04-22 13:09:42 +02:00
Thomas Müller
987bc138df
calling renameKeys() on directory level as well - fixes #15778
2015-04-22 12:12:27 +02:00
Thomas Müller
fc4127dd62
add $encryptionModuleId to methods of Keys/IStorage
2015-04-22 11:53:05 +02:00
Björn Schießle
570718fb6b
Merge pull request #15757 from owncloud/enc-fixfeofforlastblock
...
Fix encryption feof to not return too early
2015-04-22 11:32:21 +02:00
Thomas Müller
40fcc7480c
Merge pull request #15734 from owncloud/add-deprecate-tags
...
Add @deprecated to all methods with a proper method in \OCP
2015-04-21 23:57:49 +02:00
Vincent Petry
ffc796edcb
Do not trash part files, delete directly
2015-04-21 18:28:15 +02:00
Bjoern Schiessle
19e8c4fcb1
get dirname from sharePath
2015-04-21 14:58:01 +02:00
Björn Schießle
b0fcf0fa0e
Merge pull request #15636 from owncloud/enc2_performance_improvement
...
[encryption2] set size and unencrypted size to zero at the beginning of a write operation
2015-04-21 11:01:33 +02:00
Vincent Petry
a13088818a
Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more
...
Introduce Storage::getData() to allow storage implementations more contr...
2015-04-20 18:36:23 +02:00
Vincent Petry
76dad297ff
Fix encryption feof to not return too early
...
This is because stream_read will pre-cache the next block which causes
feof($this->source) to return true prematurely. So we cannot rely on it.
Fixed encryption stream wrapper unit tests to actually simulate 6k/8k
blocks to make sure we cover the matching logic.
Added two data files with 8192 and 8193 bytes.
2015-04-20 18:32:40 +02:00
Lukas Reschke
fe2cbc3795
Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound
...
Fix wrong path generation
2015-04-20 16:55:36 +02:00
Thomas Müller
32995ace1c
move permission related code into getMetaData()
2015-04-20 16:50:12 +02:00
Thomas Müller
23f1bdc3d4
Introduce Storage::getMetaData() to allow storage implementations more control over the data array
2015-04-20 14:54:54 +02:00
Thomas Müller
92b60e36de
Introduce Storage::getData() to allow storage implementations more control over the data array
2015-04-20 14:25:39 +02:00
Morris Jobke
0a594cd3a5
Add @deprecated to all methods with a proper method in \OCP
2015-04-20 13:15:45 +02:00
Bjoern Schiessle
7fe0e09d14
set size and unencrypted size to zero on fopen
2015-04-20 11:06:13 +02:00
Morris Jobke
80be3b0c47
Fix wrong path generation
...
* fixes #15742
2015-04-20 11:01:33 +02:00
Michael Telatynski
8ebf9de3f8
Memcache\Redis Add DB Select Functionality
2015-04-15 21:24:38 +01:00
Joas Schilling
1592f25ed0
Scale up the font on larger previews
2015-04-15 14:03:40 +02:00
Morris Jobke
e33e5b425a
Merge pull request #12006 from owncloud/dav-put-storage
...
Work directly on the storage when uploading over webdav
2015-04-15 03:08:52 +02:00
Jenkins for ownCloud
7f3f191ee9
[tx-robot] updated from transifex
2015-04-14 18:19:31 -04:00
Thomas Müller
70480423ff
Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath
...
Adding a final fallback for findBinaryPath
2015-04-15 00:16:56 +02:00
Thomas Müller
1aa368effe
Merge pull request #15592 from owncloud/fix-15590-master
...
Avoid php message "Invalid argument supplied for foreach()"
2015-04-15 00:14:08 +02:00
Björn Schießle
4f0437fbde
Merge pull request #15598 from owncloud/fix-enc-file-size-master
...
Fix file size of encrypted files
2015-04-14 16:48:04 +02:00
Robin Appelman
eeecca04e6
Keep phpdoc updated.
2015-04-14 16:25:52 +02:00
Robin Appelman
308af8b909
pass a stream to the tests
2015-04-14 15:25:52 +02:00
Morris Jobke
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
Olivier Paroz
bb0c09e994
Adding a final fallback for findBinaryPath
2015-04-14 14:06:58 +02:00
Thomas Müller
cbe30f740e
remove calculateUnencryptedSize() - not needed
2015-04-14 13:08:59 +02:00
Thomas Müller
967e882757
return size from cache in case the cache entry is marked as encrypted
2015-04-14 13:08:59 +02:00
Thomas Müller
387984a0d5
preserve filesize on rename after upload
2015-04-14 12:27:12 +02:00
Thomas Müller
88cc52c408
Avoid php message "Invalid argument supplied for foreach()" - refs #15590
2015-04-14 11:00:20 +02:00
Morris Jobke
5f66f867b6
Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace
...
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 21:51:38 +02:00
Morris Jobke
9eff199a17
Merge pull request #15360 from owncloud/cross-storage-move-cache
...
Preserve cache data when doing a cross storage move
2015-04-13 21:48:30 +02:00
Robin Appelman
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
Robin Appelman
addfafd9da
Fix moving mount points
2015-04-13 17:10:02 +02:00
Robin Appelman
caadc8cdd9
reuse cache move logic
2015-04-13 17:10:01 +02:00
Robin Appelman
d7b3a1a35a
preserve cache data when doing a cross storage move
2015-04-13 17:10:01 +02:00
Joas Schilling
71de1d58cd
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 16:34:10 +02:00
Thomas Müller
660aa7ff1e
Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_results
...
cach user folder for file search results
2015-04-13 15:16:07 +02:00
Robin Appelman
c29419e6d7
fix rebase issue
2015-04-13 15:13:03 +02:00
Robin Appelman
0772e3b4c1
Properly handle copy/move failures in cross storage copy/move
2015-04-13 15:13:03 +02:00
Robin Appelman
404773940d
Detect storage full when doing cross storage copy/move
2015-04-13 15:13:03 +02:00
Robin Appelman
d26c6cab90
properly return false if we cant delete the source file
2015-04-13 15:13:03 +02:00
Robin Appelman
c4ec8fbeff
Make getSourcePath accessible for storage wrappers
2015-04-13 15:13:03 +02:00
Robin Appelman
31e94708f8
Improve cross storage copy between local storages
2015-04-13 15:13:02 +02:00
Robin Appelman
8575bb2cb9
Move cross storage copy logic to the storage
2015-04-13 15:13:02 +02:00
Robin Appelman
b302592a64
Small cleanup of rename code
2015-04-13 15:11:03 +02:00
Robin Appelman
2fd44dbde4
rewind and update error message
2015-04-13 14:14:48 +02:00
Robin Appelman
dcfe014103
use our own stream copy instead
2015-04-13 14:13:21 +02:00
Vincent Petry
2822d0579e
Properly add trailing slash to mount point
...
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
Jörn Friedrich Dreyer
b717681e3a
cach user folder for file search results
2015-04-13 11:29:10 +02:00
Morris Jobke
c3fbc2b6fd
Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient
...
Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
2015-04-13 10:30:31 +02:00
Thomas Müller
906b6b7337
Prevent php message: "Trying to get property of non-object at /xxx/lib/private/ocsclient.php#282"
2015-04-13 09:43:45 +02:00
Thomas Müller
8450b6aa2d
Properly import used classes
2015-04-13 09:26:30 +02:00
Lukas Reschke
84041a4fa2
Merge pull request #15541 from owncloud/add-reply-to-support
...
Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
2015-04-12 22:30:35 +02:00
Jens-Christian Fischer
9c95315a9e
clarify the duplication of the $params array
2015-04-12 14:49:18 +02:00
Jens-Christian Fischer
22c6216f5c
don't update identical values
...
The UPDATE oc_filecache statement blindly overwrites identical data.
Databases like Postgres that create a new row on an update
and mark the old one as dead will suffer from the previous
behaviour, as millions of "new" rows are created in the database.
This patch changes the WHERE clause to test for identical
values and not updating if the values in the DB are identical
to the ones being passed.
2015-04-11 18:06:21 +02:00
Lukas Reschke
e3ad99d252
Add "Reply-To" support to sharing mails and refactor code
2015-04-10 17:30:07 +02:00
Lukas Reschke
77afef328d
Merge pull request #15458 from owncloud/web-shell-master
...
Move console application to it's own class - allows reuse in the web shell
2015-04-10 16:33:01 +02:00
Vincent Petry
e512a69a59
Merge pull request #15395 from owncloud/fix-imagepath
...
Fix UrlGenerator::imagePath() for app paths
2015-04-10 16:11:57 +02:00
Thomas Müller
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
Lukas Reschke
a881218fc2
Add "Reply-To" support for mails
2015-04-10 15:05:34 +02:00
Morris Jobke
25dd4ec767
Throw ServerNotAvailableException always
2015-04-10 14:51:21 +02:00
Thomas Müller
a163243e31
Merge pull request #15510 from owncloud/cron-singleuser
...
block cron when in single user mode
2015-04-10 14:38:50 +02:00
Vincent Petry
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
Thomas Müller
a33edcd2f0
Fix singe user mode on public.php - take two
2015-04-10 11:17:33 +02:00
Jörn Friedrich Dreyer
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
Jörn Friedrich Dreyer
b069f33a72
throw exception when backends don't provide a user instead of creating legacy local storages
2015-04-10 09:12:37 +02:00
Morris Jobke
5626a02d69
throw exception if setup is incomplete
2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer
8964c5068c
do not disclose information, show generic error on login page
...
Conflicts:
core/templates/login.php
lib/base.php
2015-04-10 09:12:37 +02:00
Thomas Müller
f05e19348d
Fix single user check in case no user is logged in
2015-04-09 23:47:24 +02:00
Thomas Müller
5abbf6d5b0
Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
...
only create a db entry for the user in case of a name conflict on group share
2015-04-09 23:37:02 +02:00
Lukas Reschke
0bad8f644a
Merge pull request #15511 from owncloud/fix-typos
...
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
Morris Jobke
de4a81f462
Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
...
fixes #15326
2015-04-09 18:41:18 +02:00
Thomas Müller
f7c906902a
Throw an exception in case checkServer() returns errors
2015-04-09 16:42:34 +02:00
Lukas Reschke
b60d5d3d6f
Merge pull request #14540 from owncloud/windows-setup-check
...
Disallow Windows Server in Server Check
2015-04-09 16:38:11 +02:00
Thomas Müller
890a18e1a6
Introduce own console application class
2015-04-09 16:28:53 +02:00
Robin Appelman
8af106cc75
block webdav in single user mode
2015-04-09 15:56:41 +02:00
Lukas Reschke
0abce86b31
Disallow Windows Server in Server Check
...
Will prevent users from use ownCloud on Windows Server 🙈
2015-04-09 15:56:37 +02:00
Jörn Friedrich Dreyer
8af52e3876
fixes #15326
2015-04-09 15:37:00 +02:00
Björn Schießle
0710db77bc
Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
...
Dont create exclude list for generating the share target
2015-04-09 14:51:15 +02:00
Robin Appelman
cbcee34eb0
update tests
2015-04-09 14:46:25 +02:00
Thomas Müller
1d9bd3d31e
Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
...
Check if the key exists, before trying to delete it
2015-04-09 14:45:40 +02:00
Lukas Reschke
ec69f2838c
Fix typos and some other adjustments
2015-04-09 14:09:09 +02:00
Bjoern Schiessle
332ea77865
only create a db entry for the user in case of a name conflict on group share
2015-04-09 11:16:08 +02:00
Joas Schilling
45575d0135
Check if the key exists, before trying to delete it
2015-04-09 10:28:02 +02:00
Lukas Reschke
ba52f6f8fc
Merge pull request #15314 from owncloud/app-categories-15274
...
Add different trust levels to AppStore interface
2015-04-09 10:07:32 +02:00
Morris Jobke
9c76d068c3
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
...
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
Morris Jobke
84ae9532c8
Merge pull request #15448 from owncloud/occ-check-server-env-master
...
Adding check command to validate server environment
2015-04-09 00:07:08 +02:00
Morris Jobke
f3ef17a963
Merge pull request #15490 from owncloud/remove-debug-logging
...
remove unessesary logging of methods instantiation
2015-04-08 21:42:47 +02:00
Morris Jobke
4e60b81264
Merge pull request #14120 from owncloud/dav-statcache
...
Stat cache for DAV storage, improves s2s performance a little bit
2015-04-08 21:09:28 +02:00
Clark Tomlinson
3ffb2d8abd
remove unessesary logging of methods instantiation
2015-04-08 14:46:01 -04:00
Bjoern Schiessle
c379557e1d
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 16:41:20 +02:00
Morris Jobke
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Robin Appelman
6a59502759
Work directly on the storage when uploading over webdav
2015-04-08 14:04:58 +02:00
Morris Jobke
59322a5037
Merge pull request #15333 from owncloud/copy-cross-device
...
fix copying folder across devices
2015-04-08 12:35:15 +02:00
Thomas Müller
f099c9883e
Adding check command to validate server environment - fixes #15429
2015-04-08 00:19:23 +02:00
Morris Jobke
6c327f8331
Merge pull request #14879 from oparoz/fix-preview-caching
...
Introducing the maximum size preview
2015-04-07 18:16:24 +02:00
Thomas Müller
a4483243ac
fixing license headers - encryption code related
2015-04-07 17:02:49 +02:00
Olivier Paroz
74bf9806b0
Introducing the maximum size preview
...
The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over.
One of the fixes required for #12465
2015-04-07 16:45:59 +02:00
Thomas Müller
161d80da5b
In case of encryption exceptions we return 503 - this will allow the client to retry
2015-04-07 14:17:42 +02:00
Lukas Reschke
dd7c491bff
Fix PHPDoc
2015-04-07 13:49:16 +02:00
Lukas Reschke
a2182cde90
Deduplicate code
2015-04-07 13:48:33 +02:00
Thomas Müller
4a70ca665c
respect mount option while encrypting
2015-04-07 13:30:31 +02:00
Thomas Müller
111fbabfb4
PHPDoc cleanup - clean code \o/
2015-04-07 13:30:31 +02:00
Thomas Müller
69e95531f8
comment change as it broke unit tests
2015-04-07 13:30:31 +02:00
Thomas Müller
ba9a797eaa
Encryption storage wrapper is enabled by default - necessary to detect encrypted files even if encryption was disabled after files have been encrypted - prevents data corruption
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
3d7404fe68
add unit tests to the keystorage
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
fe74a0cb4f
implement webdav copy
2015-04-07 13:30:31 +02:00
Thomas Müller
8991272269
Using stream_get_contents in file_get_contents implementation + close handle
2015-04-07 13:30:31 +02:00
jknockaert
ff16e3dbff
Adjusting count on read
2015-04-07 13:30:31 +02:00
jknockaert
02404a6a8c
Fixing encryption stream wrapper seek - thanks @jknockaert
2015-04-07 13:30:30 +02:00
Thomas Müller
104d11ec4c
Fixing encryption storage wrapper tests
2015-04-07 13:30:30 +02:00
Thomas Müller
d9c41b00ab
Introducing trait LocalTempFileTrait
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
fac7ec3fc4
fix re-shares with encryption
2015-04-07 13:30:30 +02:00
Thomas Müller
8ffa6db110
fixing unit tests for stream wrapper
2015-04-07 13:30:30 +02:00
Thomas Müller
9d8c07850d
fixing unencrypted file size
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
a74ee67476
don't wrap share storages
2015-04-07 13:30:30 +02:00
Thomas Müller
664b2bb7af
cleaning up exception mess
2015-04-07 13:30:30 +02:00
Thomas Müller
c9d6ed3d7d
in case the file exists we require the explicit module as specified in the file header - otherwise we need to fail hard to prevent data loss on client side
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
51302d5812
getUidAndFilename() always get uid from path
2015-04-07 13:30:30 +02:00
Thomas Müller
cac83642f2
Finally fixing encryption with public share
2015-04-07 13:30:30 +02:00
Thomas Müller
a57918fb10
Hook: fixing error message in exception case
2015-04-07 13:30:30 +02:00
Thomas Müller
137c135664
file_put_contents has to return the number of written bytes
2015-04-07 13:30:30 +02:00
Thomas Müller
f20844ac89
PHPDoc
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
83cb382b3f
pass file helper to encryption wrapper
2015-04-07 13:30:29 +02:00
Bjoern Schiessle
e4895bda01
add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files
2015-04-07 13:30:29 +02:00
Thomas Müller
a98b7dbf6f
Fix double registration of encryption module
2015-04-07 13:30:29 +02:00
Thomas Müller
35b97ed672
Adding renameKeys to IStorage
2015-04-07 13:30:29 +02:00
Thomas Müller
4db75e3407
Setting up the encryption wrapper in a setup hook - temporarily fixes the wrapping order
2015-04-07 13:30:29 +02:00
Thomas Müller
bf809ac85a
Removing left overs from old encryption app
2015-04-07 13:30:29 +02:00
Thomas Müller
6ccd3ffa23
adding function getSecureRandom(); to IServerContainer
2015-04-07 13:30:29 +02:00
Bjoern Schiessle
0f28d538a0
add session class to handle all session operations
2015-04-07 13:30:28 +02:00
Thomas Müller
1b42b492dc
kill OC_FileProxy 💥
2015-04-07 13:30:28 +02:00
Thomas Müller
dbdd754c3f
Further cleanup of files_encryption
2015-04-07 13:30:28 +02:00
Thomas Müller
00338f9dca
Removing files_encryption left overs
2015-04-07 13:30:28 +02:00
Thomas Müller
99255ff3a9
Fix - public sharing: in case on user is available - get it from the path
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
0eee3a2618
remove unencrypted_size from the cache, size will contain the unencrypted size
2015-04-07 13:30:28 +02:00
Thomas Müller
d185761d31
initializing some variables + update size after writing the headers
2015-04-07 13:30:28 +02:00
Thomas Müller
4441835d18
https://github.com/owncloud/core/pull/15305#discussion_r27382305
...
Conflicts:
lib/private/files/stream/encryption.php
2015-04-07 13:30:28 +02:00
Thomas Müller
90487384f7
initializing some variables
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
0c48b069ba
call end() before closing the file
2015-04-07 13:30:28 +02:00
Thomas Müller
498625ea3a
adding unit tests for stream wrapper
2015-04-07 13:30:28 +02:00
Thomas Müller
a905f641b3
various fixes & start to unit test the encryption storage wrapper
2015-04-07 13:30:28 +02:00
jknockaert
3e6eb28ee3
Applying diff as of https://github.com/owncloud/core/pull/15303
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
a85e2e0bfd
make recovery settings work
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
937efe856d
fix lib/private/encryption/util.php call
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
c266b3b5b7
remove debug code from core
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
c64e0af4fb
check if recovery key exists and encrypt the file with the recovery key if needed
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
2244ea998d
core: documentation fixes
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
cb9980823d
core: small fixes
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
810ca9105c
implement rename and delete of encryption keys
2015-04-07 13:30:27 +02:00
Clark Tomlinson
0c2f9ca849
Updating keystorage movement and fixing hooks
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
506222567e
add deleteKey methods to key storage
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
e2f714263f
fix encryption manager to handle more than one encryption module
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
5bc9ababeb
fix keystorage and add unit tests
2015-04-07 13:30:27 +02:00
Clark Tomlinson
39733c8da1
Initial commit
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
63e7fe608a
create basic interfaces and wrapper to make encryption more modular
2015-04-07 13:30:27 +02:00
Joas Schilling
3bde7c2f67
When guessing the timezone, the offset might only be valid on a given timestamp
2015-04-07 10:13:06 +02:00
Jenkins for ownCloud
95e55aa4ad
[tx-robot] updated from transifex
2015-04-07 01:54:47 -04:00
Jenkins for ownCloud
2bff92ade5
[tx-robot] updated from transifex
2015-04-05 01:54:51 -04:00
Thomas Müller
4996706078
Merge pull request #15338 from owncloud/encryption-mount-option
...
Add mount point to disable the encryption wrapper
2015-04-04 12:51:41 +02:00
Jenkins for ownCloud
9b250baf9e
[tx-robot] updated from transifex
2015-04-04 01:54:43 -04:00
Robin McCorkell
fbb84a518f
Fix UrlGenerator::imagePath() for app paths
2015-04-03 23:42:18 +01:00
Thomas Müller
3bf269e565
Merge pull request #15229 from owncloud/response-setContentLengthHeader
...
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
2015-04-03 22:51:36 +02:00
Thomas Müller
b2b3e1ac94
Merge pull request #15391 from owncloud/fix-language-caching
...
fix caching of preferred language
2015-04-03 22:51:13 +02:00
Thomas Müller
3d2116dfe7
Merge pull request #15386 from oparoz/yaml-cnf-mediatype
...
Introducing media types for yml, yaml, cnf, conf
2015-04-03 22:49:41 +02:00
Robin Appelman
712e478cb2
fix caching of preferred language
2015-04-03 15:36:24 +02:00
Lukas Reschke
25531bad88
Make user names clickable
2015-04-03 13:36:03 +02:00
Lukas Reschke
0816cf9142
Add experimental applications switch
...
Allows administrators to disable or enabled experimental applications as well as show the trust level.
2015-04-03 13:21:24 +02:00
Morris Jobke
a2087f30d1
Merge pull request #15383 from owncloud/fix-exception-message
...
Update exception messages to better reflect and describe the problem
2015-04-03 10:15:23 +02:00
Jenkins for ownCloud
23f1702f24
[tx-robot] updated from transifex
2015-04-03 01:54:53 -04:00
Olivier Paroz
70ec74e88b
Introducing media types for yml, yaml, cnf, conf
2015-04-02 21:37:57 +02:00
Lukas Reschke
fa079a5959
Merge pull request #12314 from oparoz/patch-3
...
Make findBinaryPath compatible with open_basedir
2015-04-02 18:54:03 +02:00
Joas Schilling
a8d1ede347
Fix the exception messages
2015-04-02 18:40:06 +02:00
Thomas Müller
9f58097e4d
Merge pull request #14113 from owncloud/chunking-chunkpartfiles
...
Added part files for when writing chunks
2015-04-02 18:15:27 +02:00
Thomas Müller
4082436419
Merge pull request #15367 from owncloud/pre-setup-hook
...
setup storage wrappers before setting up the filesystem
2015-04-02 17:40:23 +02:00
Morris Jobke
1720fdf5f4
Merge pull request #15346 from oparoz/split-image-provider
...
Split image provider in one sub-class per media type
2015-04-02 13:40:09 +02:00
Robin Appelman
f585994c4b
setup mount manager before wrappers
2015-04-02 13:28:36 +02:00
Olivier Paroz
8ec6dfdbf8
Split image provider in one sub-class per media type
2015-04-02 10:31:24 +02:00
Morris Jobke
82f91c50c7
Merge pull request #15349 from oparoz/limit-bitmap-previews-2
...
The bitmap preview class now takes maxX and maxY into consideration
2015-04-02 10:23:55 +02:00
Thomas Müller
9e5b319ed4
Merge pull request #15362 from owncloud/issue/15359-purge-memcache-console-app-disable
...
Correctly purge the cache when an app is disabled via cli
2015-04-02 09:26:15 +02:00
Joas Schilling
696c750cfe
Fix docs and line breaks
2015-04-02 08:28:42 +02:00
Jenkins for ownCloud
cc96105ebe
[tx-robot] updated from transifex
2015-04-02 01:54:47 -04:00
Robin Appelman
3cb53b7756
setup storage wrappers before setting up the filesystem
2015-04-01 17:12:06 +02:00
Olivier Paroz
1525ecd3dd
The bitmap preview class now takes maxX and maxY into consideration
...
This is a fix for owncloud#13607 and is part of the global programme: owncloud#13609
The image aspect ratio is kept intact.
2015-04-01 15:54:22 +02:00
Joas Schilling
d01cfde982
Correctly purge the cache when an app is disabled via cli
2015-04-01 15:43:38 +02:00
Roeland Jago Douma
288da619b1
Deprecate functions that only call the urlgenerator anyway
2015-04-01 14:32:49 +02:00
Joas Schilling
730efe25a4
Make scrutinizer happy
2015-04-01 12:13:49 +02:00
Pierre Jochem
a1828ff034
More secure proposal
2015-04-01 11:28:53 +02:00
Jenkins for ownCloud
f5c7ba6b81
[tx-robot] updated from transifex
2015-04-01 01:55:33 -04:00
Olivier Paroz
0f01de9f7e
Use getenv to get the paths for `find`
2015-03-31 23:49:21 +02:00
Olivier Paroz
7c41c0c13f
use ExecutableFinder and find in findBinaryPath
...
When using open_basedir, commands such as `which`or `command`can fail
because they might try to look outside of the restricted perimeter.
Symfony's ExecutableFinder can be used instead to look in standard
locations and we can use `find` as a last resort
A better solution would be to adopt a mechanism similar to what has
been done for office documents where a configuration parameter is used
to indicate the path where the executable is to be found.
2015-03-31 23:49:16 +02:00
Robin Appelman
bac9b54bef
Add mount point to disable the encryption wrapper
2015-03-31 16:25:33 +02:00
Robin Appelman
068c624b0d
fix copying folder across devices
2015-03-31 13:50:11 +02:00
Jenkins for ownCloud
1d06d93d27
[tx-robot] updated from transifex
2015-03-31 01:55:55 -04:00
Roeland Jago Douma
0bf06d6691
No injections
2015-03-30 20:07:12 +02:00
Morris Jobke
bf17ac929d
Merge pull request #15169 from rullzer/fix_displayNamesInGroup
...
Groupmanagers displayNamesInGroup should actually search in displaynames
2015-03-30 17:04:09 +02:00
Joas Schilling
b95d12700c
Add logic for getting the user from the rss token to the Manager
2015-03-30 15:23:09 +02:00
Roeland Jago Douma
b0aa17b13f
OCS Fixes to allow setting of password without removing additional settings
...
- Added setPassword to share.php
- Fixed OCS API call
- Added unit tests
2015-03-30 14:00:50 +02:00
Robin McCorkell
4f0abd910c
Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcache
...
Add check for activated local memcache
2015-03-30 11:24:44 +01:00
Jenkins for ownCloud
da55ff630c
[tx-robot] updated from transifex
2015-03-30 01:54:41 -04:00
Lukas Reschke
65202d2a18
Add check for activated local memcache
...
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it.
Fixes https://github.com/owncloud/core/issues/14956
2015-03-28 13:59:22 +01:00
Vincent Petry
d3752ca1e9
Merge pull request #15289 from owncloud/min-upload-limit
...
Require minimum 1 MiB upload limit
2015-03-28 11:34:11 +01:00
Robin McCorkell
ab991458ad
Require minimum 1 MiB upload limit
2015-03-27 23:43:35 +00:00
Robin McCorkell
1511a42da7
Check for relative datadirectory path
2015-03-27 23:29:46 +00:00
Vincent Petry
a32c71d25e
Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"
...
This reverts commit 012016d331
.
2015-03-27 18:50:11 +01:00
Morris Jobke
f4dc9e6bf3
Merge pull request #15155 from owncloud/share-donotreturntrashedfiles
...
Do not return shares for files outside "files"
2015-03-27 17:05:14 +01:00
Thomas Müller
4d12c4a38b
Merge pull request #13938 from owncloud/deprecate-iappconfig
...
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
Thomas Müller
722e50a112
Merge pull request #15240 from owncloud/storage-wrapper-priority
...
add priority to storage wrappers
2015-03-27 15:18:44 +01:00
Thomas Müller
98bc1ad70a
Merge pull request #15265 from owncloud/enc2_fixes
...
core improvements for Encryption 2.0
2015-03-27 14:58:33 +01:00
Morris Jobke
e918bcf212
Merge pull request #15247 from owncloud/fix_group_share_master_backport
...
also call generateTarget for group shares
2015-03-27 14:40:52 +01:00
Vincent Petry
80f83ab5e0
Do not return shares for files outside "files"
2015-03-27 13:25:23 +01:00
Vincent Petry
7ad4dfa201
Merge pull request #15227 from owncloud/ocetag-header
...
Copy Etag header to OC-Etag for sabre calls
2015-03-27 13:10:27 +01:00
Bjoern Schiessle
b5fad75e57
add deleteAllFileKeys to public interface and add "uid" as parameter for the
...
update call
2015-03-27 11:51:53 +01:00
Bjoern Schiessle
c6be1ba8d3
fix check if a file is excluded from encryption or not
2015-03-27 11:51:50 +01:00
Morris Jobke
a62f38a18b
Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure
...
Add some generic default headers as well via PHP
2015-03-27 09:54:40 +01:00
Jenkins for ownCloud
880b31c513
[tx-robot] updated from transifex
2015-03-27 01:56:21 -04:00
Lukas Reschke
9622fbdf29
Filter potential dangerous characters in path name
...
We should not allow / or \ in the postfix here.
2015-03-26 23:17:18 +01:00