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

1062 commits

Author SHA1 Message Date
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
fe5f512272 added tests for the delete hooks if the trash bin is disabled 2014-02-01 20:08:23 +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
Vincent Petry
f09c19c316 Replaced time() with uniqid() to make sure the file name is unique 
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)

This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.
 2014-01-21 16:31:58 +01:00
Bjoern Schiessle
1df6bf997a add link to documentation 2014-01-17 14:56:15 +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
6b69c52037 updated description of the files encryption app 2014-01-17 11:08:49 +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
Jenkins for ownCloud
6be2dee5bc [tx-robot] updated from transifex 2014-01-08 01:55:41 -05:00
Jenkins for ownCloud
095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud
e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud
71c829f92a [tx-robot] updated from transifex 2013-12-28 01:55:35 -05:00
Jenkins for ownCloud
64a001edab [tx-robot] updated from transifex 2013-12-27 01:55:35 -05:00
Jenkins for ownCloud
dbbd99db09 [tx-robot] updated from transifex 2013-12-24 01:55:40 -05:00
Jenkins for ownCloud
f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05: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
552d0a6feb check if the old owner and the old path is available 2013-12-19 18:40:40 +01: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
Björn Schießle
079f1a6f41 Merge pull request #6495 from owncloud/enc_fseek_fallback 
Added fseek fallback to the encryption app
 2013-12-19 07:09:07 -08:00
Bjoern Schiessle
fe7fb66ef8 we can also have a path user/cache/... 2013-12-19 15:58:10 +01:00
Vincent Petry
963ee31efb Removed numRows usage from encryption app 
numRows on Oracle always seem to return 0.

This fix removes numRows usage from the encryption and sharing app.

This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
 2013-12-19 15:51:24 +01:00
Bjoern Schiessle
df0c1fe7f3 add test for the stream wrapper to read encrypted files from the system folder /tmp 2013-12-18 17:07:35 +01:00
Bjoern Schiessle
f9ec3a7124 test for isEncryptedPath() 2013-12-18 16:39:34 +01:00
Bjoern Schiessle
4f8ae789ae extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek 2013-12-18 15:43:50 +01:00
Bjoern Schiessle
d9668977cd implement ftell stream wrapper and fix return value from fseek stream wrapper 2013-12-18 15:41:40 +01:00
Thomas Müller
930a46e8e2 Merge pull request #6469 from owncloud/enc_cleanup 
remove duplicated code
 2013-12-18 05:21:42 -08:00
Björn Schießle
22a6bf9e5a Merge pull request #6474 from owncloud/enc_detect_encrypted_files 
reliable detect encrypted files
 2013-12-17 09:12:02 -08:00
Bjoern Schiessle
9a94c07553 remove unused method tail() 2013-12-17 16:19:00 +01:00
Bjoern Schiessle
c955381d56 fall back to getLocalFile if storage doesn't support fseek 2013-12-17 16:18:05 +01:00
Bjoern Schiessle
69b89454a4 reliable detect encrypted files 2013-12-17 15:53:25 +01:00
Jenkins for ownCloud
a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Bjoern Schiessle
83417d69be remove duplicated code 2013-12-17 11:28:05 +01:00
Björn Schießle
4ae148cebd Merge pull request #6183 from owncloud/enc_tests 
enable more encryption tests
 2013-12-16 08:46:52 -08:00
Bjoern Schiessle
95892c8be9 update file cache for target file 2013-12-16 16:05:24 +01:00
Bjoern Schiessle
cdd816c930 only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted 2013-12-16 16:05:24 +01:00
Bjoern Schiessle
6d489e0474 call set password hook because it doesn't get triggered during test execution and fix paths 2013-12-16 16:00:16 +01:00
Jenkins for ownCloud
77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Jenkins for ownCloud
6aab1ebf44 [tx-robot] updated from transifex 2013-12-09 06:40:22 -05:00
Jenkins for ownCloud
079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
Björn Schießle
575a68074f Merge pull request #6220 from owncloud/debug_oracle_errors 
cherry-picks from #5884, just for debugging purpose
 2013-12-06 10:00:04 -08:00
Bart Visscher
40f148cc6c Don't try to encrypt a file when the temp file isn't created 2013-12-06 17:01:13 +01:00
Bjoern Schiessle
9ff231590c set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again 2013-12-06 16:11:41 +01:00
Bjoern Schiessle
9371944e43 fix typo 2013-12-06 12:20:42 +01:00
Bjoern Schiessle
58c0117c3d only create new key on password change if a recovery key exists or if the user don't have any private/public keys 2013-12-06 12:20:31 +01:00
Bjoern Schiessle
8082ef2073 show change password form if key couldn't be decrypted 2013-12-06 12:20:22 +01:00
Bjoern Schiessle
85467b973a add method to check if users private/public key exists 2013-12-06 12:20:14 +01:00
Jenkins for ownCloud
7e702f294f [tx-robot] updated from transifex 2013-12-04 18:14:17 -05:00
Bjoern Schiessle
b919a65432 enable more tests 2013-12-04 17:43:38 +01:00
Morris Jobke
36bc6b871f Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)." 
This reverts commit efbf18652c.
 2013-12-04 13:27:38 +01:00
Jenkins for ownCloud
83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Andreas Fischer
efbf18652c Adjust files_encryption requirements to the new core requirement (PHP 5.3.8). 2013-11-29 20:34:57 +01:00
Jenkins for ownCloud
1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Arthur Schiwon
ee78d48186 loginname is not necessarily username 2013-11-28 13:26:31 +01:00
Vincent Petry
a1d2f0f516 Merge pull request #6094 from owncloud/enc_fix_reshares 
fix path reconstruction for reshares
 2013-11-28 01:41:34 -08:00
Bjoern Schiessle
efe7c4075a fix path reconstruction for reshares 2013-11-27 23:26:04 +01:00
Morris Jobke
55d7cf8ffd improve encryption message 2013-11-27 23:07:19 +01:00
Bjoern Schiessle
d9729168f9 some small js fixes 2013-11-27 22:42:03 +01:00
Bjoern Schiessle
0219b8b3b9 add spinner to the template so that it can be loaded in time 2013-11-27 22:36:47 +01:00
Bjoern Schiessle
e0924a5f07 switch to large spinner 2013-11-27 21:58:38 +01:00
Bjoern Schiessle
1536c7ea58 switch from "name" attribute to "id" 2013-11-27 17:01:21 +01:00
Bjoern Schiessle
1065c33543 Merge branch 'master' into encryption_initial_enc_indicator 2013-11-27 16:44:06 +01:00
Bjoern Schiessle
060e0ad0cd with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter 2013-11-27 15:35:32 +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
Thomas Müller
5b7b053634 Merge pull request #5976 from owncloud/encryption_work_with_public_gallery 
Encryption work with public gallery
 2013-11-27 04:25:54 -08:00
Bjoern Schiessle
7f2bdb0e97 typo fixed 2013-11-27 12:25:04 +01:00
Bjoern Schiessle
7f3b178d73 some small changes according to the review comments 2013-11-27 11:46:24 +01:00
Bjoern Schiessle
7240d349da Merge branch 'master' into encryption_initial_enc_indicator 2013-11-26 19:15:53 +01:00
Bjoern Schiessle
c7e1fe50c2 added a small version of the dark loading gif, looks nicer on the blue background 2013-11-26 17:14:16 +01:00
Jenkins for ownCloud
fb7aa2f014 [tx-robot] updated from transifex 2013-11-26 10:47:07 -05:00
Bjoern Schiessle
0617e06f69 use POST instead of GET 2013-11-26 11:38:49 +01:00
Bjoern Schiessle
35a6ad255d fix typo in var name 2013-11-26 11:38:45 +01:00
Jenkins for ownCloud
dc67c7efa9 [tx-robot] updated from transifex 2013-11-26 04:04:05 -05:00
Bjoern Schiessle
8974107b4e remove debug output 2013-11-25 23:57:08 +01:00
Bjoern Schiessle
d6fb2afa85 show a message at the log-in screen if inital encryption take place 2013-11-25 23:49:05 +01:00
Bjoern Schiessle
49038545f8 Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery 2013-11-25 10:29:53 +01:00
Bjoern Schiessle
9c4b8ae54c fix typo in comment 2013-11-25 10:29:05 +01:00
Thomas Mueller
2a465fb20f Merge branch 'master' into encryption_work_with_public_gallery 2013-11-24 23:20:46 +01:00
Jenkins for ownCloud
ba0e09adce [tx-robot] updated from transifex 2013-11-24 00:14:51 -05:00
Jenkins for ownCloud
5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Bjoern Schiessle
6443e570c2 Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 16:00:21 +01:00
Bjoern Schiessle
d2e6f7d979 check HTTP Referer to check if we come from public.php or from a internal page. 
Necessary to detect public access also if a user is logged in.
 2013-11-21 15:57:49 +01:00
Bjoern Schiessle
87f2696e6a Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 11:18:53 +01:00
Bjoern Schiessle
c7dc6dc2c2 fix getFileKey() call 2013-11-21 11:11:15 +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
18c80e47b6 Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 
Conflicts:
	apps/files_encryption/lib/stream.php
 2013-11-21 10:24:47 +01:00
Bjoern Schiessle
2b361ea085 better distinction between userID and keyId 2013-11-21 10:09:07 +01:00
Bjoern Schiessle
b27fc42e1f public upload now also works with encryption enabled 2013-11-21 00:23:38 +01:00
Bjoern Schiessle
318db64b2d adapt tests to the new code 2013-11-20 23:27:42 +01:00