Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update licence headers via script | Morris Jobke | 2015-10-05 | 3 | -1/+3 |
| | |||||
* | versions should always use the keys of the original file, no need to create ↵ | Bjoern Schiessle | 2015-10-01 | 1 | -2/+24 |
| | | | | new one | ||||
* | use correct variable | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | | | | wow ... just wow ... | ||||
* | Revert "use correct variable" | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | | | | This reverts commit 52cbaff061b93cb1a5e81623e58e14867c818810. | ||||
* | use correct variable | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | | | wow ... just wow ... | ||||
* | Merge pull request #18423 from owncloud/occ_encrypt_all | Björn Schießle | 2015-08-28 | 1 | -29/+15 |
|\ | | | | | occ command line tool to encrypt all files | ||||
| * | copy always file by file to encrypt/decrypt it if needed | Bjoern Schiessle | 2015-08-26 | 1 | -29/+15 |
| | | |||||
* | | Implement password authentication mechanisms | Robin McCorkell | 2015-08-19 | 1 | -0/+4 |
|/ | | | | | | | | | | | Introduces the basic password authentication mechanism, along with a mechanism based on ownCloud credentials stored in the user session. Change to lib/private is an extension of PermissionsMask, as isSharable() override was missing. Session credentials auth mechanism now disables sharing on applied storages, as credentials will not be available. | ||||
* | Merge pull request #13641 from owncloud/cache-storage-status | Vincent Petry | 2015-08-07 | 2 | -0/+480 |
|\ | | | | | Store storage availability in database | ||||
| * | Store storage availability in database | Robin McCorkell | 2015-07-20 | 2 | -0/+480 |
| | | | | | | | | | | | | | | | | Storage status is saved in the database. Failed storages are rechecked every 10 minutes, while working storages are rechecked every request. Using the files_external app will recheck all external storages when the settings page is viewed, or whenever an external storage is saved. | ||||
* | | always update file cache, the cache can handle partial data correctly if the ↵ | Bjoern Schiessle | 2015-07-31 | 1 | -5/+4 |
| | | | | | | | | file doesn't already exists in the file cache | ||||
* | | Merge pull request #17902 from owncloud/fix_17898 | Vincent Petry | 2015-07-27 | 1 | -1/+2 |
|\ \ | | | | | | | get header size before we open the file to avoid locking exception | ||||
| * | | get header size before we open the file to avoid locking exception | Bjoern Schiessle | 2015-07-27 | 1 | -1/+2 |
| |/ | |||||
* / | Only set is encrypted when encryption is enabled | Joas Schilling | 2015-07-23 | 1 | -1/+1 |
|/ | |||||
* | set targetIsEncrypted to true if file cache indicates that we try to read a ↵ | Bjoern Schiessle | 2015-07-17 | 1 | -0/+1 |
| | | | | encrypted file | ||||
* | make sure that we always detect legacy files correctly | Bjoern Schiessle | 2015-07-17 | 1 | -15/+94 |
| | |||||
* | Perform the filesize only when the file exists | Joas Schilling | 2015-06-30 | 1 | -2/+6 |
| | | | | | Regression from 95602d4069a1eb9a45e1d08edeecc0d5b90e01ca and 9b336765b69bf7b7e2cd67a824862411b249aa4d | ||||
* | Merge pull request #17163 from owncloud/update-licenses | Lukas Reschke | 2015-06-27 | 1 | -0/+3 |
|\ | | | | | Update license headers | ||||
| * | update license headers and authors | Morris Jobke | 2015-06-25 | 1 | -0/+3 |
| | | |||||
* | | Correctly check if the real file exists, otherwise try the part file | Joas Schilling | 2015-06-26 | 1 | -2/+6 |
|/ | |||||
* | make sure that we always read the header from the original file | Bjoern Schiessle | 2015-06-23 | 1 | -3/+5 |
| | |||||
* | Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master | Thomas Müller | 2015-06-02 | 1 | -1/+7 |
|\ | | | | | Fix get local file encryption master | ||||
| * | Only return cached files if existing | Thomas Müller | 2015-05-06 | 1 | -1/+4 |
| | | |||||
| * | Only use cached files in case encryption is enabled - in any other case let ↵ | Thomas Müller | 2015-05-05 | 1 | -1/+4 |
| | | | | | | | | the underlying storage handle this accordingly - refs #16061 #16062 and others | ||||
* | | add changeLock to the storage api | Robin Appelman | 2015-06-01 | 2 | -0/+18 |
| | | |||||
* | | add locking to the storage api | Robin Appelman | 2015-06-01 | 2 | -0/+40 |
| | | |||||
* | | Only use quota stream wrapper on "files" | Vincent Petry | 2015-05-28 | 1 | -3/+5 |
| | | | | | | | | | | Prevent using the quota stream wrapper on trashbin folders and other metadata folders | ||||
* | | Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages | Vincent Petry | 2015-05-28 | 1 | -22/+58 |
|\ \ | | | | | | | [encryption] fix move versions between storages | ||||
| * | | copy keys before we move a file between storages to make sure that the new ↵ | Bjoern Schiessle | 2015-05-22 | 1 | -22/+58 |
| | | | | | | | | | | | | target file reuses the old file key, otherwise versions will break | ||||
* | | | only request encryption module for files which are not excluded | Bjoern Schiessle | 2015-05-27 | 1 | -55/+59 |
| | | | |||||
* | | | Merge pull request #16516 from owncloud/fix-phpdoc-trait | Joas Schilling | 2015-05-22 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | Fix PHPDoc | ||||
| * | | Fix PHPDoc | Lukas Reschke | 2015-05-22 | 1 | -0/+4 |
| | | | | | | | | | | | | Use correct parameters | ||||
* | | | use copy when doing a crossStorageCopy on the same storage | Robin Appelman | 2015-05-19 | 1 | -0/+8 |
|/ / | |||||
* | | Merge pull request #16399 from owncloud/enc_rmdir_fix | Clark Tomlinson | 2015-05-18 | 1 | -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 path | Bjoern Schiessle | 2015-05-18 | 1 | -2/+6 |
| | | | |||||
* | | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 1 | -0/+24 |
|/ / | |||||
* | | delete all file keys doesn't need the encryption module as parameter; ↵ | Bjoern Schiessle | 2015-05-13 | 1 | -4/+23 |
| | | | | | | | | implement rmdir; getFileKeyDir should also work for part files and complete directories | ||||
* | | use hooks to update encryption keys instead of the storage wrapper if a file ↵ | Bjoern Schiessle | 2015-05-11 | 1 | -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 name | Joas Schilling | 2015-05-06 | 1 | -4/+4 |
| | | |||||
* | | update 'encrypted'-flag in file cache according to the storage settings | Bjoern Schiessle | 2015-05-06 | 1 | -6/+42 |
| | | |||||
* | | move/copy from storage | Bjoern Schiessle | 2015-05-06 | 1 | -7/+67 |
| | | |||||
* | | unit tests | Bjoern Schiessle | 2015-05-06 | 1 | -1/+1 |
| | | |||||
* | | check if encryption is enbaled before we start moving keys | Bjoern Schiessle | 2015-05-06 | 1 | -24/+29 |
| | | |||||
* | | make sure that we keep the correct encrypted-flag and the (unencrypted)size ↵ | Bjoern Schiessle | 2015-05-05 | 1 | -0/+4 |
|/ | | | | if a file gets copied | ||||
* | Merge pull request #15886 from owncloud/fix-15848-master | Thomas Müller | 2015-04-27 | 1 | -1/+4 |
|\ | | | | | Adjust isLocal() on encryption wrapper | ||||
| * | fixes #15848 | Thomas Müller | 2015-04-27 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #15860 from owncloud/enc_fallback_old_encryption | Thomas Müller | 2015-04-27 | 1 | -6/+20 |
|\ \ | |/ |/| | [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 Schiessle | 2015-04-27 | 1 | -6/+20 |
| | | | | | | | | encrypted file without a header | ||||
* | | Make getDefaultModuleId public and get module protected | Joas Schilling | 2015-04-27 | 1 | -4/+2 |
|/ | |||||
* | Use public interfaces for type hinting | Joas Schilling | 2015-04-24 | 1 | -12/+12 |
| |