Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | replace \OC:: with \OC::->getSession() | Bjoern Schiessle | 2014-11-25 | 1 | -2/+2 | |
| | ||||||
* | don't store private public-share-key in session | Bjoern Schiessle | 2014-11-25 | 1 | -17/+10 | |
| | ||||||
* | remove unused variable | Bjoern Schiessle | 2014-11-25 | 1 | -1/+0 | |
| | ||||||
* | Fix file upload to ext storage when recovery key is enabled | Vincent Petry | 2014-11-20 | 1 | -9/+21 | |
| | | | | | | | | Fixes an issue when uploading files to external storage when recovery keys are enabled The Util class only works with real users, so instantiating it with the virtual recovery key user or public key user can cause issues. | |||||
* | listen to the post_passwordReset hook, backup the old keys and create a new ↵ | Bjoern Schiessle | 2014-11-17 | 2 | -0/+13 | |
| | | | | key pair for the user | |||||
* | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 1 | -0/+1 | |
|\ | | | | | Issue/10991 Make unit tests pass on windows | |||||
| * | Fix single run of encryption tests and usages of uniqid() and fopen() | Joas Schilling | 2014-11-17 | 1 | -0/+1 | |
| | | ||||||
* | | Merge pull request #12027 from owncloud/cleanup_exceptions | Vincent Petry | 2014-11-10 | 4 | -90/+34 | |
|\ \ | | | | | | | [encryption] clean up encryption exceptions | |||||
| * | | clean up encryption exceptions | Bjoern Schiessle | 2014-11-07 | 4 | -90/+34 | |
| | | | ||||||
* | | | only set the values we need and make sure that we write the file info for both | Bjoern Schiessle | 2014-11-07 | 1 | -3/+7 | |
| | | | | | | | | | | | | | | | the real file and the part file, because some information from the part file might be needed later | |||||
* | | | also try to get file info from part file | Bjoern Schiessle | 2014-11-07 | 1 | -2/+2 | |
|/ / | ||||||
* | | throw exception if private key is missing | Bjoern Schiessle | 2014-11-05 | 2 | -0/+13 | |
| | | ||||||
* | | still try to encrypt files, even if the session is not initialized. The ↵ | Bjoern Schiessle | 2014-11-04 | 1 | -2/+1 | |
|/ | | | | stream wrapper will throw an error which is better than silently continue. | |||||
* | Merge pull request #11659 from jknockaert/master | Vincent Petry | 2014-10-30 | 1 | -38/+54 | |
|\ | | | | | rework getFileSize | |||||
| * | initialisation of cipher | jknockaert | 2014-10-28 | 1 | -1/+1 | |
| | | ||||||
| * | small fix | jknockaert | 2014-10-20 | 1 | -0/+1 | |
| | | ||||||
| * | bugfixes | jknockaert | 2014-10-20 | 1 | -5/+6 | |
| | | ||||||
| * | ok; still some bugs that had to be fixed | jknockaert | 2014-10-20 | 1 | -39/+35 | |
| | | ||||||
| * | small fix | jknockaert | 2014-10-19 | 1 | -1/+2 | |
| | | ||||||
| * | rework getFileSize | jknockaert | 2014-10-19 | 1 | -28/+45 | |
| | | ||||||
* | | Add type hinting to functions | Lukas Reschke | 2014-10-24 | 1 | -4/+6 | |
| | | | | | | | | It's only reasonable to have proper type hinting here which might even help us to catch bugs. | |||||
* | | Make files non executable | Lukas Reschke | 2014-10-24 | 3 | -0/+0 | |
| | | | | | | | | There is not much sense in having these files marked executable, we should avoid that. | |||||
* | | make tests compatible with hook based skeleton generation | Jörn Friedrich Dreyer | 2014-10-20 | 1 | -1/+1 | |
|/ | ||||||
* | fixing usage of EncryptionException | Thomas Müller | 2014-10-17 | 1 | -3/+4 | |
| | ||||||
* | we also encrypt/decrypt files in the versions folder for previews and if ↵ | Bjoern Schiessle | 2014-10-06 | 1 | -3/+8 | |
| | | | | encryption is enabled/disabled | |||||
* | Merge pull request #11137 from owncloud/enc-pregfix | Vincent Petry | 2014-09-23 | 2 | -37/+63 | |
|\ | | | | | Fix share key pattern matching | |||||
| * | Fix share key finding algorithm in various cases | Vincent Petry | 2014-09-23 | 2 | -37/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | fix typo | Volkan Gezer | 2014-09-19 | 1 | -1/+1 | |
| | | ||||||
* | | make sure that we really catch the files folder only | Bjoern Schiessle | 2014-09-19 | 1 | -1/+1 | |
| | | ||||||
* | | create backup from all keys before recovery | Bjoern Schiessle | 2014-09-19 | 1 | -0/+16 | |
|/ | ||||||
* | Remove passing by reference to allow for proper GC | Vincent Petry | 2014-09-12 | 1 | -1/+1 | |
| | | | | | | | | | | | The garbage collector in PHP 5.3.10 does not properly release the file handle when calling fclose() due to the fact that it is passed by reference. This has the side-effect of preventing file locks to be released as well when the files_locking app is enabled. This fix removes the useless passing by reference and now the file handle and file lock are freed properly. | |||||
* | kill OC::$session | Jörn Friedrich Dreyer | 2014-08-29 | 1 | -11/+11 | |
| | | | | | | | | | | | | maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession restore order os OC::$session and OC::$CLI remove unneded initialization of dummy session write back session when $useCustomSession is true log warning when deprecated app is used | |||||
* | Merge pull request #9754 from owncloud/enc_support_aes_256 | Vincent Petry | 2014-08-13 | 7 | -60/+304 | |
|\ | | | | | [encryption] support aes 256 | |||||
| * | update existing unit tests | Bjoern Schiessle | 2014-07-23 | 1 | -1/+1 | |
| | | ||||||
| * | support aes 256 | Bjoern Schiessle | 2014-07-23 | 7 | -60/+304 | |
| | | ||||||
* | | fix detection of system wide mount points | Bjoern Schiessle | 2014-08-12 | 1 | -8/+33 | |
| | | ||||||
* | | add logout hook to remove keys from session | Bjoern Schiessle | 2014-08-07 | 2 | -0/+9 | |
| | | ||||||
* | | make the versions and encryption app aware of the copy operation | Bjoern Schiessle | 2014-07-30 | 1 | -1/+3 | |
|/ | ||||||
* | introduce some encryption exceptions and catch additional error cases | Bjoern Schiessle | 2014-07-16 | 3 | -25/+69 | |
| | ||||||
* | Kill legacy encryption migration | Thomas Müller | 2014-07-08 | 4 | -187/+2 | |
| | ||||||
* | Merge pull request #9453 from owncloud/enc_fix_wrong_file_size | Frank Karlitschek | 2014-07-06 | 1 | -2/+2 | |
|\ | | | | | [encryption] always take unencrypted size | |||||
| * | always take unencrypted size | Bjoern Schiessle | 2014-07-04 | 1 | -2/+2 | |
| | | ||||||
* | | add owner as parameter for delShareKey | Bjoern Schiessle | 2014-07-04 | 1 | -6/+7 | |
|/ | ||||||
* | Merge pull request #9240 from owncloud/enc_check_if_file_exists | Björn Schießle | 2014-06-30 | 1 | -19/+45 | |
|\ | | | | | [encryption] check if file still exists before removing encryption keys | |||||
| * | improved error message | Bjoern Schiessle | 2014-06-30 | 1 | -7/+8 | |
| | | ||||||
| * | check if file exists before deleting keys, and add debug output for every | Bjoern Schiessle | 2014-06-27 | 1 | -15/+40 | |
| | | | | | | | | delete operation | |||||
* | | normalize path before comparison to make sure that we always find the mount ↵ | Bjoern Schiessle | 2014-06-27 | 1 | -1/+2 | |
|/ | | | | point | |||||
* | always use a \OC\Files\View | Bjoern Schiessle | 2014-06-25 | 2 | -44/+25 | |
| | ||||||
* | always use oc filesystem for rename operation | Bjoern Schiessle | 2014-06-25 | 1 | -0/+24 | |
| | ||||||
* | add unit tests | Bjoern Schiessle | 2014-06-24 | 1 | -1/+1 | |
| |