Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | listen to the post_passwordReset hook, backup the old keys and create a new ↵ | Bjoern Schiessle | 2014-11-17 | 1 | -0/+13 |
| | | | | key pair for the user | ||||
* | Fix moving share keys as non-owner to subdir | Vincent Petry | 2014-10-29 | 1 | -32/+26 |
| | | | | | | | | | | | | This fix gathers the share keys BEFORE a file is moved to make sure that findShareKeys() is able to find all relevant keys when the file still exists. After the move/copy operation the keys are moved/copied to the target dir. Also: refactored preRename and preCopy into a single function to avoid duplicate code. | ||||
* | Merge pull request #11137 from owncloud/enc-pregfix | Vincent Petry | 2014-09-23 | 1 | -1/+7 |
|\ | | | | | Fix share key pattern matching | ||||
| * | Fix share key finding algorithm in various cases | Vincent Petry | 2014-09-23 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | Instead of inaccurate pattern matching, use the list of users who we know have access to the file to build the list of share keys. This covers the following cases: - Move/copy files into a subfolder within a share - Unsharing from a user - Deleting files directlry / moving share keys to trashbin | ||||
* | | Merge pull request #11224 from owncloud/fix_recovery_admin_user | Lukas Reschke | 2014-09-23 | 1 | -5/+4 |
|\ \ | | | | | | | first check if a private key exists, if not it is always a recovery szenario | ||||
| * | | first check if a private key exists, if not it is always a recovery szenario | Bjoern Schiessle | 2014-09-22 | 1 | -5/+4 |
| | | | |||||
* | | | Merge pull request #11167 from owncloud/env-movetomountreenableproxy | Morris Jobke | 2014-09-22 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Reenable file proxy when renaming between mount points | ||||
| * | | Reenable file proxy when renaming between mount points | Vincent Petry | 2014-09-18 | 1 | -0/+1 |
| |/ | | | | | | | | | | | | | | | When moving a folder into another mount point, $renamedFiles is empty because that goes over a different mechanism. In such case, this fix makes sure that the file proxy is reenable to avoid breaking the subsequent files that are being moved. | ||||
* / | create backup from all keys before recovery | Bjoern Schiessle | 2014-09-19 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #9754 from owncloud/enc_support_aes_256 | Vincent Petry | 2014-08-13 | 1 | -12/+17 |
|\ | | | | | [encryption] support aes 256 | ||||
| * | support aes 256 | Bjoern Schiessle | 2014-07-23 | 1 | -12/+17 |
| | | |||||
* | | add logout hook to remove keys from session | Bjoern Schiessle | 2014-08-07 | 1 | -1/+8 |
| | | |||||
* | | make the versions and encryption app aware of the copy operation | Bjoern Schiessle | 2014-07-30 | 1 | -8/+35 |
| | | |||||
* | | define type in pre hook | Bjoern Schiessle | 2014-07-18 | 1 | -4/+7 |
|/ | |||||
* | update keys recursively if a folder was moved | Bjoern Schiessle | 2014-07-17 | 1 | -26/+33 |
| | |||||
* | Kill legacy encryption migration | Thomas Müller | 2014-07-08 | 1 | -15/+1 |
| | |||||
* | add owner as parameter for delShareKey | Bjoern Schiessle | 2014-07-04 | 1 | -3/+9 |
| | |||||
* | make sure that the umount hook always contains the path relative to ↵ | Bjoern Schiessle | 2014-07-04 | 1 | -1/+1 |
| | | | | data/user/files | ||||
* | always use oc filesystem for rename operation | Bjoern Schiessle | 2014-06-25 | 1 | -34/+17 |
| | |||||
* | remove unused code | Bjoern Schiessle | 2014-06-18 | 1 | -1/+0 |
| | |||||
* | fix rename of encryption keys | Bjoern Schiessle | 2014-06-18 | 1 | -2/+2 |
| | |||||
* | remove unused variable | Bjoern Schiessle | 2014-06-06 | 1 | -1/+1 |
| | |||||
* | remove encryption keys if user unshares a file | Bjoern Schiessle | 2014-06-06 | 1 | -0/+55 |
| | |||||
* | use oc_preferences instead of oc_encryption to store encyption settings | Bjoern Schiessle | 2014-06-05 | 1 | -2/+1 |
| | |||||
* | workaround to get the unit test going | Thomas Müller | 2014-06-04 | 1 | -4/+6 |
| | |||||
* | Merge pull request #8676 from owncloud/encryption_improvements | Morris Jobke | 2014-06-02 | 1 | -18/+15 |
|\ | | | | | cleanup encryption code, improved return codes | ||||
| * | ceanup encryption code, improved return codes | Bjoern Schiessle | 2014-06-02 | 1 | -18/+15 |
| | | |||||
* | | get mount point from mount manager | Bjoern Schiessle | 2014-05-28 | 1 | -16/+6 |
|/ | |||||
* | Merge pull request #8637 from owncloud/enc_improved_error_handling | Vincent Petry | 2014-05-21 | 1 | -3/+7 |
|\ | | | | | [encryption] improved error handling during password change | ||||
| * | only start migration if the encryption was initialized; allow to overwrite ↵ | Bjoern Schiessle | 2014-05-19 | 1 | -3/+7 |
| | | | | | | | | keys if no files exists | ||||
* | | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 1 | -10/+10 |
|/ | | | | * test case added to avoid adding them later | ||||
* | Fix more missing or broken PHPDoc | Robin McCorkell | 2014-05-16 | 1 | -1/+1 |
| | |||||
* | Fix PHPDoc in /apps | Robin McCorkell | 2014-05-16 | 1 | -1/+1 |
| | |||||
* | remove legacy aka deprecated code: OC_FilesystemView | Thomas Müller | 2014-05-12 | 1 | -10/+10 |
| | |||||
* | some fixes to make the gallery work, this made it necessary to adjust some ↵ | Bjoern Schiessle | 2014-04-23 | 1 | -112/+15 |
| | | | | tests and the encryption code | ||||
* | fix encryption tests after the removal of the shared folder | Bjoern Schiessle | 2014-04-23 | 1 | -11/+11 |
| | |||||
* | don't overwrite keys if rename was done by a stream copy | Bjoern Schiessle | 2014-02-24 | 1 | -4/+13 |
| | |||||
* | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 1 | -12/+17 |
|\ | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * | don't block login forever if we are stuck in the middle of the initial ↵ | Bjoern Schiessle | 2014-02-17 | 1 | -4/+3 |
| | | | | | | | | encryption | ||||
| * | catch errors during initial encryption | Bjoern Schiessle | 2014-02-17 | 1 | -8/+14 |
| | | |||||
* | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 1 | -1/+8 |
|\| | | | | | | | | | Conflicts: lib/private/appconfig.php | ||||
| * | refuse login as long as the initial encryption is running | Bjoern Schiessle | 2014-02-10 | 1 | -1/+8 |
| | | |||||
* | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 1 | -2/+2 |
|/ | |||||
* | move unlink proxy to a hook which handles pre and post conditions | Bjoern Schiessle | 2014-01-31 | 1 | -0/+64 |
| | |||||
* | check if the old owner and the old path is available | Bjoern Schiessle | 2013-12-19 | 1 | -3/+10 |
| | |||||
* | fix rename of shared files | Bjoern Schiessle | 2013-12-19 | 1 | -19/+37 |
| | |||||
* | only create new key on password change if a recovery key exists or if the ↵ | Bjoern Schiessle | 2013-12-06 | 1 | -23/+28 |
| | | | | user don't have any private/public keys | ||||
* | fix path reconstruction for reshares | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | |||||
* | backport of https://github.com/owncloud/core/pull/5513 | Bjoern Schiessle | 2013-10-29 | 1 | -14/+48 |
| | |||||
* | remove debug output | Bjoern Schiessle | 2013-10-22 | 1 | -1/+0 |
| |