wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
21885 commits 157 branches 562 tags 714 MiB
Commit graph

142 commits

Author SHA1 Message Date
Joas Schilling
efac8ced90 Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself 2014-12-09 09:47:26 +01:00
Joas Schilling
7f7006643f Fix namespace of files_encryption classes and autoload them 2014-12-09 09:47:26 +01:00
Bjoern Schiessle
49cfc30359 upgrade to new folder structure 2014-12-02 16:03:54 +01:00
Bjoern Schiessle
a90606fb14 change private/public key names for consistency reasons 2014-11-26 10:57:47 +01:00
Bjoern Schiessle
266f1a2afa harmonize copyright notice 2014-11-26 10:57:47 +01:00
Bjoern Schiessle
fd86d76f98 new folder structure for keys 
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
 2014-11-26 10:57:47 +01:00
Lukas Reschke
2d2a4741ce Make files non executable 
There is not much sense in having these files marked executable, we should avoid that.
 2014-10-24 11:14:51 +02:00
Vincent Petry
1e631754d7 Fix share key finding algorithm in various cases 
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
 2014-09-23 12:33:07 +02:00
Bjoern Schiessle
4bbdcfbccf support aes 256 2014-07-23 12:14:01 +02:00
Bjoern Schiessle
673b0f5eb9 add owner as parameter for delShareKey 2014-07-04 12:19:59 +02:00
Bjoern Schiessle
618c9fd033 improved error message 2014-06-30 16:28:40 +02:00
Bjoern Schiessle
e4c45b5e26 check if file exists before deleting keys, and add debug output for every 
delete operation
 2014-06-27 23:09:31 +02:00
Bjoern Schiessle
3d0805f27d always use a \OC\Files\View 2014-06-25 12:27:30 +02:00
Bjoern Schiessle
9c45a3196b add unit tests 2014-06-24 10:43:07 +02:00
Bjoern Schiessle
6b85fe819c always use '/' as directory seperator 2014-06-24 09:29:11 +02:00
Bjoern Schiessle
e20bb71a42 remove unused code 2014-06-18 13:26:42 +02:00
Morris Jobke
dc36d30953 Remove all occurences of @brief and @returns from PHPDoc 
* test case added to avoid adding them later
 2014-05-19 17:50:53 +02:00
Robin McCorkell
c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Thomas Müller
e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Bjoern Schiessle
97921d0c25 add function to extract filename from sharekey name + tests 2014-02-03 13:39:05 +01:00
Bjoern Schiessle
4d1086c35f better error detection and don't use glob() 2014-01-31 20:39:11 +01:00
Bjoern Schiessle
9fb71af988 Merge branch 'master' into encryption_enable_public_upload 
Conflicts:
	apps/files_encryption/lib/helper.php
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/keymanager.php
 2013-11-27 15:08:09 +01:00
Bjoern Schiessle
7f3b178d73 some small changes according to the review comments 2013-11-27 11:46:24 +01:00
Bjoern Schiessle
009bbef17e Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 10:34:25 +01:00
Bjoern Schiessle
16b484209c Merge branch 'master' into encryption_work_with_public_gallery 
Conflicts:
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/crypt.php
 2013-11-21 10:33:37 +01:00
Bjoern Schiessle
b27fc42e1f public upload now also works with encryption enabled 2013-11-21 00:23:38 +01:00
Bjoern Schiessle
b9c18d16fe make sure that we always use the correct user id 2013-11-20 23:23:23 +01:00
Bjoern Schiessle
c5cb4206f5 [wip] make encryption work with public gallery sharing 2013-11-20 18:10:56 +01:00
Bjoern Schiessle
0c24c7c420 only check if the key file exists to decide if it is an encrypted file or not. 
This solves problems with external storage which doesn't support fseek
 2013-11-20 11:02:22 +01:00
Bjoern Schiessle
77429c28fd rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does 2013-11-12 16:48:24 +01:00
Bjoern Schiessle
9f10f15fd4 fixing tests for the new part file handling 2013-11-12 10:24:10 +01:00
Bjoern Schiessle
802213f7ec let encryption app detect transfer id in path and handle it correctly 2013-11-11 17:47:59 +01:00
Bjoern Schiessle
71bbb2ea8b check if key exists before reading it 2013-09-25 17:44:05 +02:00
Bjoern Schiessle
93f4dec798 fix part file handling and real size calculation, this should also solve #4581 
Conflicts:
	apps/files_encryption/lib/stream.php
 2013-09-06 16:06:34 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Björn Schießle
9575c2f37c added helper function to escape glob pattern 
Conflicts:

	apps/files_encryption/lib/helper.php
 2013-07-05 16:03:20 +02:00
Björn Schießle
f9c337dd21 only escape glob pattern 2013-07-05 16:00:17 +02:00
Björn Schießle
93730a090b del share keys from correct location 2013-07-05 16:00:08 +02:00
Björn Schießle
3043dbfb95 delete file keys from the correct location 2013-07-05 15:59:46 +02:00
Björn Schießle
eb2587a08f move isSystemWideMountPoint() to util.php 2013-07-05 15:59:29 +02:00
Björn Schießle
f2de4cb342 some performance improvements, check for system wide mounts only once while writing share keys 2013-07-05 15:59:19 +02:00
Björn Schießle
2e56f0e2f8 fix path to OC_Mount_Config 2013-07-05 15:59:06 +02:00
Björn Schießle
3e4dcafa89 handle system wide mount points 2013-07-05 15:58:55 +02:00
Florin Peter
eaa4f92275 added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp' 2013-05-30 22:07:36 +02:00
Florin Peter
e1e1c58969 changed to public log api 2013-05-27 20:51:52 +02:00
Florin Peter
7224fc98b2 replace == with === and replace != with !== 2013-05-27 20:44:38 +02:00
Florin Peter
5d32e214b7 reformat code 2013-05-27 17:26:58 +02:00
Florin Peter
6c8de5ae6d fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00
Björn Schießle
7b07168c46 code clean up; nicer solution to solve the public link share problem if a user is logged in 2013-05-23 21:18:31 +02:00