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

568 commits

Author SHA1 Message Date
Bjoern Schiessle
fb88aba8f4 some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
a86d97295e fix encryption tests after the removal of the shared folder 2014-04-23 12:54:25 +02:00
Lukas Reschke
e704bc2bf0 Merge pull request #7807 from sarciszewski/patch-1 
Update crypt.php
 2014-04-11 19:19:02 +02:00
Vincent Petry
a6de5efbab Merge pull request #7978 from owncloud/enc_cleanup 
there is no need to re-calculate the shares after a touch
 2014-04-02 18:23:33 +02:00
Morris Jobke
1782dcbb50 Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled 
always encrypt files to owner
 2014-04-02 13:20:51 +02:00
Björn Schießle
c45793033d Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook 
move check if a file should be encrypted to the pre hook
 2014-04-01 13:56:46 +02:00
Bjoern Schiessle
c578ab68fe there is no need to re-calculate the shares after a touch 2014-03-31 18:24:53 +02:00
Bjoern Schiessle
8e34812393 always encrypt files to owner 2014-03-31 18:19:48 +02:00
Bjoern Schiessle
aa867ad647 don't call getFileInfo() to avoid to open the same file twice 2014-03-31 15:29:16 +02:00
Bjoern Schiessle
8ebb1f15d3 move check if a file should be encrypted to the pre hook 2014-03-31 15:29:16 +02:00
Bjoern Schiessle
b9100bc2de don't write file if opening a stream to encrypt the data fails 2014-03-28 12:02:49 +01:00
Scott Arciszewski
09cc020535 Update crypt.php 
Use a 256-bit random value
 2014-03-24 08:57:33 -04:00
Vincent Petry
37af74efb3 Merge pull request #7655 from owncloud/shared-unencryptedsize 
Fixed warning when browsing Shared folder
 2014-03-21 12:28:27 +01:00
Scott Arciszewski
36da3bc359 Update crypt.php 
A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit?

Also, 183 bytes = 1464 bits.

Here's a safe alternative: 2048 bits, with comment-code sanity
 2014-03-19 13:31:51 -04:00
Thomas Müller
bbbbb033f3 in case of phpunit executions calling header() and exit() is too bad 2014-03-14 18:20:33 +01:00
Vincent Petry
022d76c7bb Fixed warning when browsing Shared folder 
The virtual "Shared" folder doesn't have an unencrypted_size field.
This fix adds a check to prevent warnings in the log.
 2014-03-10 17:25:16 +01:00
Vincent Petry
48d63a6278 Return unencrypted_size of folder when queried 
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
 2014-03-07 14:59:09 +01:00
Bjoern Schiessle
fbd8c00a89 don't create files folder, let ownCloud core handle it 2014-03-05 12:44:02 +01:00
Björn Schießle
61bc76fdd6 Merge pull request #7454 from owncloud/enc_remember_fopen_mode 
[enc] remember original fopen access type in pre-proxy
 2014-02-28 09:57:58 +01:00
Vincent Petry
fefd724858 Fixed wrong field name 
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.

Fixes #7467
 2014-02-27 23:53:29 +01:00
Bjoern Schiessle
4ace1a273d remember original fopen access type in pre-proxy because sometimes they change 
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
 2014-02-27 14:16:03 +01:00
Bjoern Schiessle
86b3cdc132 close encryption session after decryption was finished 2014-02-26 17:18:38 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1 Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
 2014-02-19 09:31:54 +01:00
Thomas Müller
c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/migration/content.php
 2014-02-18 18:31:33 +01:00
Thomas Müller
1e84d6b14b Merge pull request #7190 from owncloud/appconfig-legacy-apps 
Remove usage of legacy OC_Appconfig
 2014-02-18 18:10:22 +01:00
Lukas Reschke
3b1083f46e Merge pull request #7176 from owncloud/style 
Some style fixes
 2014-02-18 17:30:26 +01:00
Bjoern Schiessle
f2f5769df7 catch errors during decryption 2014-02-17 10:03:57 +01:00
Bjoern Schiessle
2ab062193a catch errors during initial encryption 2014-02-17 09:58:46 +01:00
Thomas Müller
9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/appconfig.php
 2014-02-14 23:03:27 +01:00
icewind1991
2a7509ee50 Merge pull request #6748 from owncloud/fileinfo 
Add a FileInfo class which holds all info of a file ...
 2014-02-14 15:16:39 +01:00
Robin Appelman
181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Bart Visscher
1fb5f96c37 Style fixes 2014-02-12 09:09:51 +01:00
Joas Schilling
b330d07b51 Fix more documentation failes 
Issue #7111
 2014-02-08 11:47:55 +01: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
bef58f5361 don't expect OC_FilesystemView, this is depreciated 2014-01-31 20:39:52 +01:00
Bjoern Schiessle
4d1086c35f better error detection and don't use glob() 2014-01-31 20:39:11 +01:00
Bjoern Schiessle
5610842e56 move unlink proxy to a hook which handles pre and post conditions 2014-01-31 20:38:35 +01:00
Robin Appelman
4e2b52a376 merge master into fileinfo 2014-01-29 16:33:27 +01:00
Bjoern Schiessle
83878b9a7d only update file cache with the unenecrypted size when the file was written 2014-01-24 16:01:00 +01:00
Bjoern Schiessle
b489d6b0af fix infinite loop if folder and subfolder has the same name 2014-01-22 17:15:01 +01:00
Robin Appelman
5cb08bb9cb Merge branch 'master' into fileinfo 
Conflicts:
	tests/lib/files/cache/cache.php
 2014-01-17 14:47:29 +01:00
Robin Appelman
299bb4d99d remove more is_array from encryption 2014-01-17 14:38:14 +01:00
Robin Appelman
ec7c339930 Don't use is_array on FileInfo 2014-01-17 12:56:17 +01:00
Bjoern Schiessle
f4179a3f5a don't try to encrypt/decrypt cache chunks or files in the trash bin 2014-01-15 14:29:33 +01:00
Björn Schießle
6a3e38266f Merge pull request #6507 from owncloud/enc_fix_getUser 
[encryption] fix getUser Helper
 2013-12-19 11:09:41 -08:00
Bjoern Schiessle
517a55a437 tests added 2013-12-19 19:43:57 +01:00
Björn Schießle
f0da7b20c1 Merge pull request #6517 from owncloud/fix_6510 
[encryption] fix rename of shared files
 2013-12-19 10:19:09 -08:00
Bjoern Schiessle
165542f27d fix rename of shared files 2013-12-19 17:29:38 +01:00
Vincent Petry
06dec2632f Merge pull request #6512 from owncloud/master-failingoracletests 
Removed numRows usage from encryption app
 2013-12-19 08:22:44 -08:00