aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/files
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-05-193-13/+0
| | |/ / / | |/| | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* / | | | Fix unexisting class and broken docJoas Schilling2015-05-191-1/+1
|/ / / /
* | | | Merge pull request #16412 from owncloud/jknockaert-patch-1Björn Schießle2015-05-181-1/+1
|\ \ \ \ | |/ / / |/| | | fix #16356
| * | | fix #16356jknockaert2015-05-181-1/+1
| | | |
* | | | Merge pull request #16399 from owncloud/enc_rmdir_fixClark Tomlinson2015-05-181-2/+6
|\ \ \ \ | |/ / / |/| | | [encryption] only try to delete file keys if it is a valid path
| * | | only try to delete file keys if it is a valid pathBjoern Schiessle2015-05-181-2/+6
| | | |
* | | | Merge pull request #15980 from owncloud/jknockaert-patch-1Björn Schießle2015-05-181-9/+7
|\ \ \ \ | |_|_|/ |/| | | fix bug #15973
| * | | fix #15973jknockaert2015-04-301-9/+7
| | |/ | |/| | | | Rework of stream_seek handling; there where basically two bugs: 1. seeking to the end of the current file would fail (with SEEK_SET); and 2. if seeking to an undefined position (outside 0,unencryptedSize) then newPosition was not defined. I used the opportunity to simplify the code.
* | | a new approach to display the error messageBjoern Schiessle2015-05-181-0/+24
| |/ |/|
* | delete all file keys doesn't need the encryption module as parameter; ↵Bjoern Schiessle2015-05-131-4/+23
| | | | | | | | implement rmdir; getFileKeyDir should also work for part files and complete directories
* | Merge pull request #16269 from owncloud/master-fix-16179Morris Jobke2015-05-121-2/+6
|\ \ | | | | | | Check if cURL supports the desired features
| * | Check if cURL supports the desired featuresLukas Reschke2015-05-121-2/+6
| | | | | | | | | | | | | | | | | | Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour. Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.
* | | use hooks to update encryption keys instead of the storage wrapper if a file ↵Bjoern Schiessle2015-05-111-7/+1
|/ / | | | | | | | | | | gets renamed/restored, as long as we are in the storage wrapper the file cache isn't up-to-date
* | Fix missing types on doc block and deduplicate the method nameJoas Schilling2015-05-061-4/+4
| |
* | update 'encrypted'-flag in file cache according to the storage settingsBjoern Schiessle2015-05-062-6/+47
| |
* | move/copy from storageBjoern Schiessle2015-05-061-7/+67
| |
* | unit testsBjoern Schiessle2015-05-061-1/+1
| |
* | check if encryption is enbaled before we start moving keysBjoern Schiessle2015-05-061-24/+29
| |
* | Merge pull request #16070 from owncloud/enc_update_file_cache_on_copyMorris Jobke2015-05-061-0/+4
|\ \ | | | | | | make sure that we keep the correct encrypted-flag and the (unencrypted)size
| * | make sure that we keep the correct encrypted-flag and the (unencrypted)size ↵Bjoern Schiessle2015-05-051-0/+4
| |/ | | | | | | if a file gets copied
* / improve phpdoc of cache classesRobin Appelman2015-05-053-29/+139
|/
* Merge pull request #14764 from owncloud/shared-etag-propagateMorris Jobke2015-04-283-1/+12
|\ | | | | Propagate etags across shared storages
| * fix propagation when renaming a directly reshared folderRobin Appelman2015-04-271-0/+4
| |
| * Make the change propagator an emitterRobin Appelman2015-04-272-1/+8
| |
* | Merge pull request #15886 from owncloud/fix-15848-masterThomas Müller2015-04-271-1/+4
|\ \ | | | | | | Adjust isLocal() on encryption wrapper
| * | fixes #15848Thomas Müller2015-04-271-1/+4
| |/
* | Merge pull request #15860 from owncloud/enc_fallback_old_encryptionThomas Müller2015-04-272-14/+36
|\ \ | |/ |/| [encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
| * fall back to the ownCloud default encryption module and aes128 if we read a ↵Bjoern Schiessle2015-04-272-14/+36
| | | | | | | | encrypted file without a header
* | Make getDefaultModuleId public and get module protectedJoas Schilling2015-04-271-4/+2
|/
* fix unit testsBjoern Schiessle2015-04-241-4/+10
|
* Update encryption.phpjknockaert2015-04-241-1/+2
|
* fixed namejknockaert2015-04-241-1/+1
|
* Update encryption.phpjknockaert2015-04-241-8/+8
|
* fix encryption header errorjknockaert2015-04-241-13/+16
| | | 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.
* Use public interfaces for type hintingJoas Schilling2015-04-241-12/+12
|
* only update share keys if the file was encryptedBjoern Schiessle2015-04-241-4/+10
|
* update share keys if file gets copiedBjoern Schiessle2015-04-231-3/+3
|
* update share keys if a file is moved to a shared folderBjoern Schiessle2015-04-231-7/+21
|
* Merge pull request #15809 from owncloud/view-null-rootVincent Petry2015-04-221-0/+6
|\ | | | | dont allow using null as view root
| * typoRobin Appelman2015-04-221-1/+1
| |
| * dont allow using null as view rootRobin Appelman2015-04-221-0/+6
| |
* | Merge pull request #15799 from owncloud/fix-enc-folder-moveThomas Müller2015-04-221-20/+10
|\ \ | |/ |/| Fix enc folder move
| * pass KeyStorage via ctorThomas Müller2015-04-221-16/+9
| |
| * calling renameKeys() on directory level as well - fixes #15778Thomas Müller2015-04-221-7/+3
| |
| * add $encryptionModuleId to methods of Keys/IStorageThomas Müller2015-04-221-4/+5
| |
* | Merge pull request #15549 from owncloud/jcf-fix-cache-updateMorris Jobke2015-04-221-1/+8
|\ \ | |/ |/| don't update identical values
| * clarify the duplication of the $params arrayJens-Christian Fischer2015-04-121-1/+2
| |
| * don't update identical valuesJens-Christian Fischer2015-04-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #15757 from owncloud/enc-fixfeofforlastblockBjörn Schießle2015-04-221-0/+4
|\ \ | | | | | | Fix encryption feof to not return too early
| * | Fix encryption feof to not return too earlyVincent Petry2015-04-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.