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

9091 commits

Author SHA1 Message Date
jknockaert
238302ee7d fixed name 2015-04-24 16:44:00 +02:00
jknockaert
1756562501 Update encryption.php 2015-04-24 16:44:00 +02:00
jknockaert
735f6cc037 fix encryption header error 
When moving back the pointer to position 0 (using stream_seek), the pointer on the encrypted stream will be moved to the position immediately after the header. Reading the header again (invoked by stream_read) will cause an error, writing the header again (invoked by stream_write) will corrupt the file. Reading/writing the header should therefore happen when opening the file rather than upon read or write. Note that a side-effect of this PR is that empty files will still get an encryption header; I think that is OK, but it is different from how it was originally implemented.
 2015-04-24 16:43:16 +02:00
Joas Schilling
4334e77035 Merge pull request #15839 from owncloud/enc_fix_moving_shared_files 
[encryption] fix moving files to a shared folder
 2015-04-24 15:07:36 +02:00
Joas Schilling
1592be117a Use public interfaces for type hinting 2015-04-24 13:06:03 +02:00
Bjoern Schiessle
24128d1384 only update share keys if the file was encrypted 2015-04-24 10:19:09 +02:00
Bjoern Schiessle
2646bccb83 update share keys if file gets copied 2015-04-23 17:18:48 +02:00
Bjoern Schiessle
2990b0e07e update share keys if a file is moved to a shared folder 2015-04-23 17:18:48 +02:00
Thomas Müller
b1bb6a3d36 Ignore test folders when checking the code for compliance 2015-04-23 16:59:26 +02:00
Jenkins for ownCloud
f8f354b351 [tx-robot] updated from transifex 2015-04-23 01:54:51 -04:00
Vincent Petry
903d52d45f Merge pull request #15809 from owncloud/view-null-root 
dont allow using null as view root
 2015-04-22 18:10:26 +02:00
Robin Appelman
bd57902d1d typo 2015-04-22 16:24:37 +02:00
Thomas Müller
750f0bc489 Merge pull request #15799 from owncloud/fix-enc-folder-move 
Fix enc folder move
 2015-04-22 16:04:29 +02:00
Robin Appelman
f391f88d7f dont allow using null as view root 2015-04-22 14:51:02 +02:00
Morris Jobke
42d9ba0f83 Merge pull request #15787 from owncloud/trash-partfiles 
Do not trash part files, delete directly
 2015-04-22 14:10:26 +02:00
Morris Jobke
a971fa8a90 Merge pull request #15549 from owncloud/jcf-fix-cache-update 
don't update identical values
 2015-04-22 13:34:08 +02:00
Thomas Müller
0042bdd2e7 fix PHPDoc 2015-04-22 13:12:52 +02:00
Thomas Müller
225cde2183 pass KeyStorage via ctor 2015-04-22 13:09:42 +02:00
Thomas Müller
987bc138df calling renameKeys() on directory level as well - fixes #15778 2015-04-22 12:12:27 +02:00
Thomas Müller
fc4127dd62 add $encryptionModuleId to methods of Keys/IStorage 2015-04-22 11:53:05 +02:00
Björn Schießle
570718fb6b Merge pull request #15757 from owncloud/enc-fixfeofforlastblock 
Fix encryption feof to not return too early
 2015-04-22 11:32:21 +02:00
Thomas Müller
40fcc7480c Merge pull request #15734 from owncloud/add-deprecate-tags 
Add @deprecated to all methods with a proper method in \OCP
 2015-04-21 23:57:49 +02:00
Vincent Petry
ffc796edcb Do not trash part files, delete directly 2015-04-21 18:28:15 +02:00
Bjoern Schiessle
19e8c4fcb1 get dirname from sharePath 2015-04-21 14:58:01 +02:00
Björn Schießle
b0fcf0fa0e Merge pull request #15636 from owncloud/enc2_performance_improvement 
[encryption2] set size and unencrypted size to zero at the beginning of a write operation
 2015-04-21 11:01:33 +02:00
Vincent Petry
a13088818a Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more 
Introduce Storage::getData() to allow storage implementations more contr...
 2015-04-20 18:36:23 +02:00
Vincent Petry
76dad297ff Fix encryption feof to not return too early 
This is because stream_read will pre-cache the next block which causes
feof($this->source) to return true prematurely. So we cannot rely on it.

Fixed encryption stream wrapper unit tests to actually simulate 6k/8k
blocks to make sure we cover the matching logic.

Added two data files with 8192 and 8193 bytes.
 2015-04-20 18:32:40 +02:00
Lukas Reschke
fe2cbc3795 Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound 
Fix wrong path generation
 2015-04-20 16:55:36 +02:00
Thomas Müller
32995ace1c move permission related code into getMetaData() 2015-04-20 16:50:12 +02:00
Morris Jobke
3e8f6cdba9 Merge pull request #15635 from owncloud/issue/15634-empty-txt-previews 
Scale up the font on larger previews
 2015-04-20 15:55:32 +02:00
Thomas Müller
23f1bdc3d4 Introduce Storage::getMetaData() to allow storage implementations more control over the data array 2015-04-20 14:54:54 +02:00
Morris Jobke
ce2c8533d9 Merge pull request #15735 from owncloud/fix-visibility 
Fix visibility of interfaces in \OCP
 2015-04-20 14:39:15 +02:00
Thomas Müller
92b60e36de Introduce Storage::getData() to allow storage implementations more control over the data array 2015-04-20 14:25:39 +02:00
Lukas Reschke
3959f8ac4e Merge pull request #15637 from owncloud/migrate-certificate-stuff 
Migrate personal certificate handling to AppFramework controllers
 2015-04-20 13:56:35 +02:00
Lukas Reschke
e9d6807c5c Merge pull request #15733 from owncloud/remove-oc_backgroundjob 
Removed OC_BackgroundJob - reduce class overhead
 2015-04-20 13:17:58 +02:00
Morris Jobke
0a594cd3a5 Add @deprecated to all methods with a proper method in \OCP 2015-04-20 13:15:45 +02:00
Lukas Reschke
1cc2aefa46 Proper return types 2015-04-20 13:00:02 +02:00
Lukas Reschke
9f61cf60d4 Verify if returned object is an array 
The error has to be thrown at this point as otherwise errors and notices are thrown since the time cannot be parsed in L60 and L61
 2015-04-20 12:58:57 +02:00
Joas Schilling
6da9e1a742 Fix visibility of public API methods 2015-04-20 12:52:40 +02:00
Bjoern Schiessle
7fe0e09d14 set size and unencrypted size to zero on fopen 2015-04-20 11:06:13 +02:00
Morris Jobke
80be3b0c47 Fix wrong path generation 
* fixes #15742
 2015-04-20 11:01:33 +02:00
Lukas Reschke
a98b819366 Add version to deprecation notice 
As requested by @MorrisJobke
 2015-04-20 10:30:16 +02:00
Lukas Reschke
f672e120fc Deprecate unused \OCP\Response::sendFile 
This function is unused in our own code and can be better achieved using the AppFramework. Also very easy to do grave mistaked using this function.
 2015-04-20 10:02:34 +02:00
Morris Jobke
9cb260d310 Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage 
Fixing OCS API namespace usage
 2015-04-20 09:43:19 +02:00
Jenkins for ownCloud
75bf03a605 [tx-robot] updated from transifex 2015-04-20 01:54:44 -04:00
Morris Jobke
d4ac7ac723 Merge pull request #15739 from DavidPrevot/symfony-2.7 
Replace `_method` requirement by {g,s}etMethods()
 2015-04-19 23:46:21 +02:00
Georg Ehrke
8f51efc49e get rid of OC_Geo 2015-04-19 20:16:56 +02:00
David Prévot
7f2f92847b Replace _method requirement by {g,s}etMethods() 
Make the call compatible with future Symfony version, and avoid
E_USER_DEPRECATED as thrown by the current 2.7.0-beta1:

The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use getMethods() instead. at
…/Symfony/Component/Routing/Route.php#554

The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use the setMethods() method instead or the "methods"
option in the route definition. at
…/Symfony/Component/Routing/Route.php#662
 2015-04-19 12:08:29 -04:00
Roeland Douma
d877c1f1e1 Merge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocp 
Reduce call of legacy wrapper by call the OCP directly
 2015-04-19 15:42:07 +02:00
Roeland Douma
3cb5dd68e6 Merge pull request #15737 from owncloud/add-deprecated-version 
Add version to @deprecated tags
 2015-04-19 15:40:53 +02:00