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

4088 commits

Author SHA1 Message Date
Joas Schilling
0db311c9db Only update the htaccess ErrorDocument links when they are not set yet 2015-06-23 16:45:56 +02:00
Morris Jobke
c86e129ce9 [updater] keep maintenance active on failure and mark failure in red 2015-06-23 14:45:53 +02:00
Björn Schießle
cce841c665 Merge pull request #17045 from owncloud/enc_improvements 
encryption improvements
 2015-06-23 14:30:21 +02:00
Morris Jobke
1ba9fd3ada [upgrade] print update message before running the update code 
* otherwise you don't know during which app update something failed
 2015-06-23 13:13:44 +02:00
Bjoern Schiessle
95602d4069 make sure that we always read the header from the original file 2015-06-23 11:41:21 +02:00
Morris Jobke
fe42553e8a [updater] propagate error case properly 
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
 2015-06-23 10:03:27 +02:00
Morris Jobke
fdd01cf15c Added error message on initMountpoints exception 2015-06-23 09:54:03 +02:00
Joas Schilling
738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Joas Schilling
2b7e5f841a Merge spliteUserRemote with fixRemoteUrlInShareWith 2015-06-22 15:25:23 +02:00
Bjoern Schiessle
d38a378b8c make sure that we split username and server address at the first '@' from the right to allow usernames containing '@' 2015-06-22 15:25:23 +02:00
Björn Schießle
a88b370dc8 Merge pull request #12546 from oparoz/patch-1 
Send the mime icon if we can't generate a preview
 2015-06-22 13:55:17 +02:00
Lukas Reschke
4d23e06097 Fix undefined offset 
There are cases where no trusted host is specified such as when installing the instance, this lead to an undefined offset warning in the log right after installing. (when another domain than localhost or 127.0.0.1 was used)
 2015-06-22 12:28:07 +02:00
Thomas Müller
c74c8eff3a Enable x-sendfile only if we do not lock the file system 2015-06-22 12:07:53 +02:00
Thomas Müller
ced15c44b4 Merge pull request #16657 from owncloud/view-emit-path 
emit hooks from a view as long as the path is inside the default root
 2015-06-22 11:29:11 +02:00
Bernhard Posselt
7fe5ab4d4a Merge pull request #17056 from owncloud/appframework-type-cast 
Allow multiple whitespace in type hints in AppFramework
 2015-06-22 10:35:28 +02:00
Robin McCorkell
04b6f67f07 Allow multiple whitespace in type hints in AppFramework 
Type hints such as `@param bool     $doSomething` will now correctly get
parsed, allowing for alignment of docblock parameters if the app developer so
wishes.
 2015-06-20 23:52:01 +01:00
Lukas Reschke
1ead0b6f95 Use proper type 
This is a string
 2015-06-19 21:00:42 +02:00
Lukas Reschke
00a65e30ce Request approved state for disabled apps with ocsid 
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.

With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.

Fixes https://github.com/owncloud/core/issues/17003
 2015-06-19 19:04:54 +02:00
Olivier Paroz
ba3b6f9be4 Remove unneeded returns from private cropping methods 2015-06-19 15:07:49 +02:00
Morris Jobke
7e046d0595 Fix naming of param in private/server.php 2015-06-19 10:23:04 +02:00
Joas Schilling
6adddb3095 Merge pull request #16889 from owncloud/group-sorting-fixes 
Only sort by group name when LDAP is involved
 2015-06-19 08:29:25 +02:00
Vincent Petry
6697f9524c Merge pull request #16963 from owncloud/fileinfo-lock 
Acquire read lock when getting file or directory info
 2015-06-18 18:27:20 +02:00
Vincent Petry
0b34d888e6 Merge pull request #17017 from owncloud/cache-update-write-lock 
update the file cache within the write lock
 2015-06-18 18:27:02 +02:00
Robin Appelman
17be0993b4 remove unneeded normalize 2015-06-18 15:33:44 +02:00
Robin Appelman
6018567df2 unlock the file if the file doesnt exists 2015-06-18 15:26:17 +02:00
Robin Appelman
d7960d5db6 dont update the cache on rename fail 2015-06-18 14:45:13 +02:00
Robin Appelman
2a50dbd1a1 update noopscanner 2015-06-18 14:42:48 +02:00
Robin Appelman
3e54696f7f extends phpdoc 2015-06-18 14:30:25 +02:00
Robin Appelman
3526b352dc update the file cache within the write lock 2015-06-18 13:47:03 +02:00
Olivier Paroz
64f0fd0889 Remove unneeded returns from private cropping methods 2015-06-18 13:30:10 +02:00
Olivier Paroz
8193e1d7c1 Move media type icon preview creation to its own method 2015-06-18 13:24:15 +02:00
Vincent Petry
a9bca9e3aa Lock file before download 
This will throw a LockedException if a concurrent request is currently
touching that file.
 2015-06-18 12:05:26 +02:00
Olivier Paroz
13617a0475 Send the mime icon if we can't generate a preview 2015-06-18 11:35:08 +02:00
Morris Jobke
6856316122 Fix return value for OCP PHPDoc 2015-06-17 15:47:45 +02:00
Robin Appelman
72eedda16c use old cache data when locked 2015-06-17 14:13:10 +02:00
Robin Appelman
24f0151f81 handle locked exceptions when getting file/directory info in sabre 2015-06-17 14:13:10 +02:00
Vincent Petry
a89bb1d383 Merge pull request #16988 from owncloud/fix-avatar-fail 
Fix remaining avatar problems
 2015-06-17 13:20:29 +02:00
Lukas Reschke
70ca0102f5 Fix PHPDoc annotations 2015-06-17 11:57:12 +02:00
Thomas Müller
d2305f2527 Merge pull request #16729 from owncloud/scanner-read-lock 
keep a read lock while scanning a file or folder
 2015-06-17 11:52:54 +02:00
Vincent Petry
102c6ffc41 Normalize path in View's lock methods 2015-06-16 17:03:12 +02:00
Vincent Petry
e5d34a2733 Merge pull request #16892 from owncloud/lock-returnfullpath 
Rethrow LockedException with full path
 2015-06-16 16:47:10 +02:00
Lukas Reschke
829f6474ff Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-completion 
Load the update information asyncroniously to fix the page load speed
 2015-06-16 11:41:44 +02:00
Joas Schilling
497fe93b6c Do not return backends but add a method to check for one 2015-06-16 11:31:04 +02:00
Joas Schilling
171f86ca2e Only sort by group name when LDAP is involved 2015-06-16 11:10:00 +02:00
Joas Schilling
7d8b728066 Merge pull request #16832 from owncloud/memcache-fail 
Throw exception if memcache misconfigured or missing
 2015-06-16 11:00:18 +02:00
Joas Schilling
60005bea19 Merge pull request #16943 from owncloud/sabre-convertinvalidpath 
Convert invalid path exception to sabre exception on MOVE
 2015-06-16 10:49:22 +02:00
Vincent Petry
0e3a3dd5d7 Rethrow LockedException with full path 
Because the path is converted to md5 from the original exception,
rethrow the exception with the correct full path
 2015-06-16 10:48:31 +02:00
Lukas Reschke
15ba2a4100 Reintroduce user cache 
This was required by avatars and was broken with https://github.com/owncloud/core/pull/16200

Fixes https://github.com/owncloud/core/issues/16942
 2015-06-15 17:54:48 +02:00
Vincent Petry
1f91e9e65d Convert invalid path exception to sabre exception on MOVE 2015-06-15 17:49:11 +02:00
Robin Appelman
4b181f73ca phpdoc 2015-06-15 15:41:52 +02:00
Robin Appelman
567df226e5 fix check if hooks should be emited in runHooks 2015-06-15 15:07:48 +02:00
Robin Appelman
9c0d69a3b2 ensure normalized path form when changing locks 2015-06-15 14:32:29 +02:00
Robin Appelman
a4f808b11d properly unlock in case of failed fopen 2015-06-15 14:32:29 +02:00
Robin Appelman
7d72f7d8ce keep a read lock while scanning a file or folder 2015-06-15 14:32:29 +02:00
Thomas Müller
911c43e5f9 Merge pull request #16727 from owncloud/file-put-content-lock 
add proper locking to file_put_contents when using streams
 2015-06-15 14:22:06 +02:00
Thomas Müller
de3ed8e077 Merge pull request #16821 from owncloud/compare-and-delete-locking-watch 
Compare and delete locking watch
 2015-06-15 14:09:06 +02:00
Thomas Müller
b8ab6fb68d Merge pull request #16915 from aidanamavi/add-opus-mimetype 
Added Opus Mimetype Support
 2015-06-15 13:27:44 +02:00
Thomas Müller
b6165b6865 Merge pull request #16912 from owncloud/webdav-smalltransferlockfix 
Webdav PUT small file lock must be shared during hooks
 2015-06-15 11:30:59 +02:00
Robin Appelman
2fb8a76705 add recursive copy polyfill for storage backends 2015-06-14 15:15:21 +02:00
Aidan Amavi
89a7aefad5 Added Opus Mimetype Support 
Added Opus audio mimetype support.
 2015-06-13 04:39:37 -04:00
Vincent Petry
4497aa4c68 Webdav PUT small file lock must be shared during hooks 
Fixed code path for Webdav PUT of small files to use shared locks during
hook execution, and exclusive during the file operation

This makes it possible for versions to be copied by accessing the file
in a post_write hook.
 2015-06-12 18:52:18 +02:00
Robin Appelman
a9ff242f6a switch to using watch to implement cas and cad on redis 2015-06-12 17:28:09 +02:00
Robin Appelman
520a741876 clear memcache keys in locking 2015-06-12 17:28:09 +02:00
Robin Appelman
ac9f998abd add compare-and-delete to the memcache interface 2015-06-12 17:28:09 +02:00
Robin Appelman
1bc56a99e9 compare-and-set and compare-and-delete using lua scripts for redis 2015-06-12 17:28:09 +02:00
Vincent Petry
446f628136 Merge pull request #16886 from owncloud/webdav-verify-path-again 
verify path when getting a node for sabredav
 2015-06-12 16:45:20 +02:00
Jan-Christoph Borchardt
bb0ea6336d Merge pull request #16888 from owncloud/feature/fix-titles 
fixing setting page titles
 2015-06-12 14:54:42 +02:00
Vincent Petry
3b08b26589 Throw exception if memcache misconfigured or missing 
Instead of falling back to null memcache, throw exceptions.
Also throw file locking specific exceptions in case the class is not
available.
 2015-06-12 12:33:06 +02:00
Joas Schilling
5586b2db09 Don't use limit on explode to have only 1 code path 2015-06-12 11:58:26 +02:00
Joas Schilling
a7d2b3b9ae Add return value to lock methods and check it in tests 2015-06-12 11:41:05 +02:00
Joas Schilling
caf16b083e Only lock files in data/username/files/ 2015-06-12 11:09:38 +02:00
Clark Tomlinson
62286f00a1 fixing setting page titles 2015-06-11 11:39:34 -04:00
Robin Appelman
05cecb101d verify path when getting a node for sabredav 2015-06-11 17:11:33 +02:00
Vincent Petry
f13a2d9251 Revert "verify path when getting a node for sabredav" 2015-06-11 15:25:06 +02:00
Robin Appelman
4d10dab813 verify path when getting a node for sabredav 2015-06-11 14:12:04 +02:00
Joas Schilling
4582d14832 Order all use statements correctly 2015-06-11 11:29:27 +02:00
Joas Schilling
05f1ff8715 Correctly import NullCache class 2015-06-11 10:48:30 +02:00
Thomas Müller
3090348bf7 Null -> NullCache 2015-06-11 00:44:13 +02:00
Thomas Müller
48e915c7be Revert "Null -> NullCache" 
This reverts commit ff24554e76.
 2015-06-11 00:40:26 +02:00
Thomas Müller
ff24554e76 Null -> NullCache 2015-06-11 00:34:03 +02:00
Joas Schilling
580155abe7 Load the update information asyncroniously to fix the page load speed 2015-06-10 12:11:05 +02:00
Thomas Müller
9d90421e62 Merge pull request #16803 from owncloud/issue/16801-group-reshare-part-file-enc-keys 
Check if the part files has keys when the original file does not
 2015-06-09 11:41:36 +02:00
Victor Dubiniuk
c7c6556187 Do not use digits in random index names 2015-06-08 19:02:07 +03:00
Thomas Müller
64c9c27f7e Merge pull request #16382 from oparoz/providers-are-responsible-for-the-size-of-their-preview 
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
 2015-06-08 16:14:35 +02:00
Joas Schilling
e6681857d2 Check if the part files has keys when the original file does not 2015-06-08 15:42:38 +02:00
Olivier Paroz
3d0a523217 Make sure we have a resource before measuring its size 2015-06-08 15:10:29 +02:00
Thomas Müller
97a3d8c313 Fix login handler for file cache - fixes #16795 2015-06-08 14:13:38 +02:00
Thomas Müller
a968b8409d Merge pull request #16158 from owncloud/mountprovider-after-setup 
Call newly registered mount providers after the filesystem is setup
 2015-06-08 13:42:02 +02:00
Thomas Müller
f051b7381b Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount 
Sort user groups by group name and hide the user count
 2015-06-08 12:11:22 +02:00
Olivier Paroz
71d65cb713 Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly 
* introduces a method in OC_Image which doesn't stretch images when trying to make them fit in a box
* adds the method to all key providers so that they can do their job, as expected by the Preview class
* improves the caching mechanism of Preview in order to reduce I/O and to avoid filling the available disk space
* fixes some long standing issues
* **contains mostly tests**
 2015-06-06 16:25:04 +02:00
Lukas Reschke
ca10ee4d0d Merge pull request #16771 from owncloud/fix-storage-full-message 
Add owner to the storage stats to enable better notifications
 2015-06-05 20:09:55 +02:00
Morris Jobke
3b188d0b72 Merge pull request #16768 from owncloud/add-missing-mime-types 
Adding mimetype x-h for header files
 2015-06-05 20:08:34 +02:00
Lukas Reschke
cbb15f3cbd Merge pull request #16767 from owncloud/webdav-preventdeleteroot 
Prevent deleting Webdav root
 2015-06-05 19:56:20 +02:00
Morris Jobke
62ae39208a Add owner to the storage stats to enable better notifications 
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
 2015-06-05 18:21:41 +02:00
Thomas Müller
5481a846c2 Adding mark down mime type mkd - fixes https://github.com/owncloud/files_texteditor/issues/45 2015-06-05 17:11:14 +02:00
Thomas Müller
5d93353a02 Adding mimetype x-h for header files - fixes https://github.com/owncloud/files_texteditor/issues/70 2015-06-05 16:57:01 +02:00
Vincent Petry
6ae5ae2e31 Prevent deleting Webdav root 2015-06-05 16:55:09 +02:00
Thomas Müller
85d1ca11d4 Merge pull request #16765 from owncloud/fix-chunked-upload-jenkins 
Fix chunked upload jenkins
 2015-06-05 16:20:33 +02:00
Thomas Müller
5e60795962 Bring back OC\Cache\File - fixes #16760 2015-06-05 14:21:17 +02:00
Joas Schilling
1df95ea1ca Fix "@throws" tags on doc blocks 2015-06-05 13:55:59 +02:00
Vincent Petry
06dda427f3 Validate path in getChild 2015-06-05 12:08:18 +02:00
Joas Schilling
bb0cb0aaec Merge pull request #15895 from owncloud/dav-getremoteetag 
Get etag from remote OC server
 2015-06-03 17:20:25 +02:00
Robin Appelman
bcf13aff6f change lock back to shared before updating the cache 2015-06-03 17:18:50 +02:00
Robin Appelman
6b0874203d add proper locking to file_put_contents when using streams 2015-06-03 17:18:50 +02:00
Clark Tomlinson
00742a9d68 Merge pull request #16721 from owncloud/fix-grammar-enc-module 
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/t…
 2015-06-03 09:54:50 -04:00
Thomas Müller
5dc5b7f86d Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user. 2015-06-03 15:00:56 +02:00
Thomas Müller
259b6ac2c1 Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/translate/#en_GB/lib/50330746 2015-06-03 14:56:18 +02:00
Thomas Müller
739c3f01aa Merge pull request #16434 from owncloud/persist-maintenance-state 
Persist the state of the maintenance after an upgrade
 2015-06-03 13:56:17 +02:00
Thomas Müller
69d1e7aaf4 Merge pull request #16687 from owncloud/issue-16113-redis-minimum-version 
Check for redis to be 2.2.5+
 2015-06-03 13:55:26 +02:00
Morris Jobke
e3440863bc Merge pull request #16708 from owncloud/enc_fix_move_to_trash 
make sure that we always use the correct owner for both source and target
 2015-06-03 13:49:46 +02:00
Vincent Petry
6ab38be40e Translate invalid path exception to sabre exception for files 2015-06-03 12:22:31 +02:00
Bjoern Schiessle
7eb2b31e34 make sure that we always use the correct owner for both source and target 2015-06-03 11:59:06 +02:00
Morris Jobke
259937680b Merge pull request #16667 from owncloud/issue-16510-fix-encryption-with-s2s-shares 
Add tests for the storage wrapper and fix the wrapping
 2015-06-02 16:42:32 +02:00
Joas Schilling
bdc82dcfb9 Check for redis to be 2.2.5+ 2015-06-02 15:42:48 +02:00
Robin Appelman
a9455be14a more hints 2015-06-02 14:16:37 +02:00
Robin Appelman
0497534a6e more type hints 2015-06-02 14:07:55 +02:00
Robin Appelman
8926bca0c7 phpdoc, strict and type hints 2015-06-02 14:07:55 +02:00
Robin Appelman
6f47a547d8 only use mount provider if we have a valid user 2015-06-02 14:07:54 +02:00
Robin Appelman
24131586d7 call mount providers that are registered after the filesystem is setup 2015-06-02 14:07:54 +02:00
Robin Appelman
c91b52d38c move emitter implementation to a trait 2015-06-02 14:07:54 +02:00
Robin Appelman
4b48dd424f emit hooks from a view as long as the path is inside the default root 2015-06-02 14:07:20 +02:00
Thomas Müller
3ebc8f0564 Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master 
Fix get local file encryption master
 2015-06-02 13:47:37 +02:00
Joas Schilling
be1f319511 Correctly ignore remote shares aswell 2015-06-02 12:33:51 +02:00
Joas Schilling
50a31fa8f9 Add unit tests for wrapStorage 2015-06-02 12:33:17 +02:00
Joas Schilling
9a4040c7ca Move the storage wrapping into a testable method 2015-06-02 12:29:06 +02:00
Vincent Petry
30d7f92763 Get etag from remote OC server 2015-06-02 11:42:03 +02:00
Morris Jobke
cf2c599218 Merge pull request #16200 from owncloud/kill-globalfilecache 
Drop file caching
 2015-06-02 09:11:33 +02:00
Lukas Reschke
73875da4b0 Clean application identifier before processing 2015-06-01 17:03:51 +02:00
Thomas Müller
2104c2ffdd Fixing undefined index 'foo' 2015-06-01 14:10:00 +02:00
Robin Appelman
8902e2be73 fix nooplockingprovider 2015-06-01 13:25:27 +02:00
Robin Appelman
ce04cf6610 shared lock around hooks 2015-06-01 13:24:02 +02:00
Robin Appelman
661c9e2444 add changeLock to the storage api 2015-06-01 13:24:02 +02:00
Robin Appelman
a1372b2fb5 add method to atomically change between shared and exclusive lock 2015-06-01 13:24:02 +02:00
Vincent Petry
270a10b754 Return 423 instead of 503 for locked files 2015-06-01 13:24:02 +02:00
Vincent Petry
0451a6652d Move locking exceptions 2015-06-01 13:24:02 +02:00
Vincent Petry
ba174ac626 Convert LockedException to FileLocked in Sabre connector 
For Sabre to be able to return the proper error code instead of 500, the
LockedException is now rethrown as FileLocked exception in the Sabre
connector
 2015-06-01 13:22:57 +02:00
Robin Appelman
8665a98744 add locking for non-chunking webdav upload 2015-06-01 13:22:57 +02:00
Robin Appelman
72776b165f use arraycache for locking in unit tests 2015-06-01 13:22:56 +02:00
Robin Appelman
6b965d71d1 add seperate config option for locking memcache backend 2015-06-01 13:22:56 +02:00
Robin Appelman
72847dbc77 always use locking in unit tests 2015-06-01 13:22:56 +02:00
Robin Appelman
437c0b55a6 unlock source file when we cant lock the target in a rename 2015-06-01 13:22:56 +02:00
Robin Appelman
668fafd4d2 close file handle after sending sabre response 2015-06-01 13:22:56 +02:00
Vincent Petry
2f4f468399 Added config switch for file locking 2015-06-01 13:22:56 +02:00
Vincent Petry
6df502a5aa Fix Null memcache fallback to match interface 2015-06-01 13:22:56 +02:00
Robin Appelman
006eaa84aa dont release shared lock if we dont have any 2015-06-01 13:22:56 +02:00
Robin Appelman
f0b8672729 fix locking root of a view 2015-06-01 13:22:56 +02:00
Robin Appelman
e08423f956 release all locks on shutdown 2015-06-01 13:22:56 +02:00
Robin Appelman
2d63fd77de dont apply callback wrapper when fopen failed 2015-06-01 13:22:56 +02:00
Robin Appelman
1270c6800d dont lock on meta data operations 2015-06-01 13:22:56 +02:00
Robin Appelman
35c377f7a9 phpdoc and minor issues 2015-06-01 13:22:56 +02:00
Vincent Petry
8d53dc803f Use md5 + prefix for file locking keys in memcache 
Also trim slashes from paths to make sure the locks are based on the
same paths.
 2015-06-01 13:22:56 +02:00
Vincent Petry
0775e9c1ca Use md5 for lock key 2015-06-01 13:22:56 +02:00
Vincent Petry
5edf294ce5 Add CAS methods to Null memcache 
This prevents breaking ownCloud completely when memcache is not enabled
and the locking code is triggered
 2015-06-01 13:22:56 +02:00
Robin Appelman
a1a25a9b5b fix unlocking when moving mount points 2015-06-01 13:22:56 +02:00
Robin Appelman
7e418c7d69 high level locking wip 2015-06-01 13:22:56 +02:00
Robin Appelman
e64360e72d always use arraycache for unit tests 2015-06-01 13:22:56 +02:00
Robin Appelman
bf7002bc65 add locking to the view apo 2015-06-01 13:22:56 +02:00
Robin Appelman
536e187e51 add locking to the storage api 2015-06-01 13:22:56 +02:00
Robin Appelman
cdf7f91259 expose locking provider in the server container 2015-06-01 13:22:55 +02:00
Vincent Petry
06f8c80af6 Validate target file name for some webdav ops 2015-05-29 19:14:38 +02:00
Thomas Müller
67cef93fdd Merge pull request #16578 from owncloud/fix_16556 
show txt preview when file contains text
 2015-05-28 20:48:16 +02:00
Morris Jobke
7f83829db3 Merge pull request #16592 from owncloud/fix-16574 
Add type hint for OC_Channel
 2015-05-28 20:36:44 +02:00
Vincent Petry
e114d00242 Only use quota stream wrapper on "files" 
Prevent using the quota stream wrapper on trashbin folders and other
metadata folders
 2015-05-28 18:31:20 +02:00
Vincent Petry
ded62ff693 Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages 
[encryption] fix move versions between storages
 2015-05-28 15:28:25 +02:00
Vincent Petry
474c99e19a Merge pull request #16577 from owncloud/enc_improve_migration 
only request encryption module for files which are not excluded
 2015-05-28 11:31:33 +02:00
Björn Schießle
e1483f65c3 Merge pull request #16591 from owncloud/enc_improved_error_message 
improved error message for various states
 2015-05-28 10:55:53 +02:00
Bjoern Schiessle
5549641f1f improve error messages displayed to the user 2015-05-27 21:00:02 +02:00
Victor Dubiniuk
4239054383 Add type hint for OC_Channel 2015-05-27 18:03:11 +03:00
Bjoern Schiessle
0de59acb49 only request encryption module for files which are not excluded 2015-05-27 15:47:40 +02:00
Lukas Reschke
ffd73ef2e4 Fix indentation 2015-05-27 14:57:19 +02:00
Georg Ehrke
bb676f2799 show txt preview when file contains text 2015-05-27 14:11:33 +02:00
Morris Jobke
3de945d13d Merge pull request #16527 from owncloud/end-processing-when-404 
End processing when file is not found
 2015-05-27 09:36:05 +02:00
Thomas Müller
4513cf5967 Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de""" 2015-05-26 14:40:07 +02:00
Oliver Kohl D.Sc
f8938f004d Revert "Revert "FIX for webdav.mediencenter.t-online.de"" 2015-05-26 13:36:45 +02:00
Björn Schießle
f70c309c2d Merge pull request #16561 from owncloud/add-default-timeout-back 
Add connection timeout to default POST options
 2015-05-26 12:23:57 +02:00
Vincent Petry
f1fc7b155c Merge pull request #16515 from owncloud/deprecate-useless-helper-class 
Deprecate useless helper class
 2015-05-26 12:22:05 +02:00
Vincent Petry
39c6a36488 Merge pull request #16532 from owncloud/cors-no-cookie-auth 
Disallow cookie auth for cors requests
 2015-05-26 12:12:04 +02:00
Björn Schießle
ab0747113c Merge pull request #16452 from owncloud/enc_ftp_upload 
always write file, if fseek doesn't work we write the whole file
 2015-05-26 12:02:41 +02:00
Thomas Müller
3babcd0344 Merge pull request #16339 from owncloud/master-override-channel 
Allow change update channel via public API
 2015-05-26 11:42:41 +02:00
Lukas Reschke
dff361dc5c Add connection timeout to default POST options 
Fixes https://github.com/owncloud/core/issues/16560
 2015-05-26 11:22:50 +02:00
jknockaert
a577e723b0 flush() comments + perf opt 2015-05-26 10:22:52 +02:00
Vincent Petry
ce34edacfa Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload 
remove part file extension before we read a filekey
 2015-05-22 16:42:52 +02:00
Bjoern Schiessle
c63f2286c0 copy keys before we move a file between storages to make sure that the new target file reuses the old file key, otherwise versions will break 2015-05-22 15:41:28 +02:00
Bernhard Posselt
c8e3599cad disallow cookie auth for cors requests 
testing ...

fixes

fix test

add php doc

fix small mistake

add another phpdoc

remove not working cors annotations from files app
 2015-05-22 14:06:26 +02:00
Bjoern Schiessle
fef75e5417 remove part file extension before we read a filekey to reuse a existing key if possible, otherwise stuff like versioning will break 2015-05-22 12:12:31 +02:00
Lukas Reschke
8ce3d6ea57 End processing when file is not found 
We have to end the processing when a file is not found or otherwise the method is proceeding and even sending invalid file paths to the sendfile methods.

Due to nginx preventing directory traversals this is luckily not immediately exploitable. We should for hardening purposes however quit the script execution just as we do for 403 cases and others as well.
 2015-05-22 11:53:02 +02:00
Vincent Petry
b82d902e18 Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype 
Get correct mimetype when moving and changing extension
 2015-05-22 11:37:11 +02:00
Joas Schilling
d7b2bc9e2f Merge pull request #16516 from owncloud/fix-phpdoc-trait 
Fix PHPDoc
 2015-05-22 09:47:59 +02:00
Lukas Reschke
3d8ea96e55 Fix PHPDoc 
Use correct parameters
 2015-05-22 00:17:38 +02:00
Lukas Reschke
c1f8829590 Deprecate useless helper class 
The helper class has no real reason anymore with 8.1.0 as we now have better public APIs. No need for an `IHelper` class like that from my opinion.
 2015-05-21 23:35:37 +02:00
jknockaert
bf6151e799 fix calculation of $count, $count is always 8129 so we need to check this 
against the unencrypted file size
 2015-05-21 14:15:26 +02:00
Bjoern Schiessle
5a20edac82 test to simulate a non-seekable stream wrapper 2015-05-21 14:15:26 +02:00
jknockaert
fb51880a4a encrypted filesize calculation in flush() 2015-05-21 14:15:26 +02:00
Bjoern Schiessle
38bceb0d74 distinguish between source and target mount point to allow copy/rename between system wide mount points and user specific mountpoints 2015-05-21 14:06:45 +02:00
Lukas Reschke
94077caea9 Merge pull request #16499 from owncloud/fix-phpdoc-annotations 
Fix PHPDoc 🙈
 2015-05-21 13:54:01 +02:00
Lukas Reschke
694d639f94 Fix PHPDoc 🙈 
*sigh*
 2015-05-21 13:07:54 +02:00
Vincent Petry
22968e806c Get correct mimetype when moving and changing extension 
Fixes issue when restoring folders from trash cross-storage, as such
folders have an extension ".d12345678".

Fixes issue when moving folders between storages and at the same time
changing their extension.
 2015-05-21 10:57:58 +02:00
Steffen Lindner
48040c46cb Skip disable3rdParty Apps 2015-05-20 17:06:00 +02:00
Morris Jobke
39d1e99228 Merge pull request #16322 from owncloud/trash-view 
dont go trough the view when moving to trash
 2015-05-20 14:44:01 +02:00
Vincent Petry
7386257676 Merge pull request #16075 from owncloud/skeleton-copy-delay 
wait with copying the skeleton untill login and setupfs are done
 2015-05-20 13:52:08 +02:00
Morris Jobke
1e59be2d2d Merge pull request #16453 from cmeh/patch-6 
Clean-up of orthography, grammar
 2015-05-20 10:26:42 +02:00
Thomas Müller
f9d04f62a8 Merge pull request #16440 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2015-05-19 22:12:35 +02:00
Christian Hoffmann
35207ae363 Clean-up of orthography, grammar 
* Changed "instead to" to "instead of".
* Changed "setup" to "set up" (past participle).
 2015-05-19 21:15:22 +02:00
Thomas Müller
f59576c3ca Merge pull request #16447 from owncloud/fix-minor-code-problems 
Fix unexisting class and broken doc
 2015-05-19 16:23:36 +02:00
Joas Schilling
d832c4ae23 Fix unexisting class and broken doc 2015-05-19 15:27:50 +02:00
Thomas Müller
10d1fd1306 Merge pull request #16419 from owncloud/user-group-backend-performance 
Reduce the complexity of the search queries in the user/group backends to a minimum
 2015-05-19 14:51:13 +02:00
Robin Appelman
9c751f1d87 use copy when doing a crossStorageCopy on the same storage 2015-05-19 14:21:58 +02:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-05-19 11:23:06 +00:00
Thomas Müller
ad88a7d53d exception class will be logged as well - helps especially in cases where the message contained is empty - e.g. "message":"OCP\\Files\\NotFoundException: at \/home\/deepdiver\/Development\/ownCloud\/core-autotest\/apps\/provisioning_api\/lib\/users.php#354", 2015-05-19 12:35:22 +02:00
Thomas Müller
a52afb040a Merge pull request #15965 from owncloud/conditional-logging 
Conditional logging
 2015-05-19 12:00:19 +02:00
Thomas Müller
d90b83725f Merge pull request #16085 from owncloud/encryption-module-rename 
rename to 'Default encryption module'
 2015-05-19 11:13:33 +02:00
Morris Jobke
064f5204cc Persist the state of the maintenance after an upgrade 
* if maintenance mode was enabled before an upgrade
  it will be enabled afterwards too
* fixes #16429
 2015-05-19 10:56:04 +02:00
Morris Jobke
aae9274210 Merge pull request #16293 from owncloud/xcache 
Mute XCache error when trying to clear the opcode cache
 2015-05-19 09:32:17 +02:00
Björn Schießle
1c411baf17 Merge pull request #16412 from owncloud/jknockaert-patch-1 
fix #16356
 2015-05-18 19:26:40 +02:00
Clark Tomlinson
f9b6ee86cd Merge pull request #16399 from owncloud/enc_rmdir_fix 
[encryption] only try to delete file keys if it is a valid path
 2015-05-18 11:09:36 -04:00
Joas Schilling
8efc8c0a96 Reduce the complexity of the search queries in the backends to a minimum 2015-05-18 16:39:21 +02:00
Thomas Müller
c28cd03770 Merge pull request #16403 from owncloud/fix-command-loading 
Only load commands of enabled apps
 2015-05-18 16:16:04 +02:00
jknockaert
2834971a77 fix #16356 2015-05-18 15:06:55 +02:00
Björn Schießle
a1e60e7882 Merge pull request #15980 from owncloud/jknockaert-patch-1 
fix bug #15973
 2015-05-18 15:01:16 +02:00
Vincent Petry
9d3d7ec659 Small perf tweak in strlen loop 2015-05-18 13:27:22 +02:00
Joas Schilling
d683752b37 Sort user groups by group name and hide the user count 2015-05-18 12:55:19 +02:00
Morris Jobke
ad3a32edf6 Only load commands of enabled apps 2015-05-18 12:33:56 +02:00
Robin Appelman
077d41a9ce wait with copying the skeleton untill login and setupfs are done 2015-05-18 12:11:31 +02:00
Bjoern Schiessle
efa674f10d only try to delete file keys if it is a valid path 2015-05-18 11:54:51 +02:00
Vincent Petry
7e271012b2 Merge pull request #16243 from owncloud/error_if_download_failed 
redirect to error page if download failed
 2015-05-18 11:42:55 +02:00
Morris Jobke
7ee3f99a4a Merge pull request #16364 from owncloud/add-warning-webdav 
Add notice that WebDAV interface is not intended for browsers
 2015-05-18 11:28:47 +02:00
Roeland Jago Douma
9866066d3e Depreatace OC_Util::getUrlContent 
It is just a wrapper and the other functions are deprecated already
 2015-05-18 11:03:48 +02:00
Bjoern Schiessle
887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Vincent Petry
246000f799 Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota 
Validate the quota value to be a correct value
 2015-05-15 18:07:13 +02:00
Joas Schilling
0991c0cc02 Merge pull request #16292 from owncloud/webdav-storage-fireprehooks 
Fire prehooks when uploading directly to storage
 2015-05-15 15:08:27 +02:00
Thomas Müller
937306b416 Merge pull request #16323 from owncloud/enc_webdav_fixes 
some encryption fixes
 2015-05-15 10:38:22 +02:00
Lukas Reschke
13778893d9 Add notice that WebDAV interface is not intended for browsers 
Fixes https://github.com/owncloud/core/issues/16359
 2015-05-15 09:07:39 +02:00
Victor Dubiniuk
af814ba270 Allow change update channel via public API 2015-05-13 20:29:33 +03:00
Bjoern Schiessle
ccbefb6e75 delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories 2015-05-13 19:06:23 +02:00
Vincent Petry
3cae0135ad Fire prehooks when uploading directly to storage 2015-05-13 17:47:04 +02:00
Robin Appelman
4789e87a53 Merge pull request #16276 from owncloud/dav-quota-root 
fix webdav quota check for the root of the dav endpoint
 2015-05-13 14:43:02 +02:00
Arthur Schiwon
e5a91fc185 remove file cache remainings from server container 2015-05-13 12:26:36 +02:00
Lukas Reschke
cbfdbf96d2 Mute XCache error when trying to clear the opcode cache 
From https://github.com/owncloud/core/issues/16287:

> This is caused by XCache at 8e59d4c64b/lib/private/util.php (L1276) where we are trying to reset the opcode cache with `XC_TYPE_PHP`.
> I suspect that while XCache is installed its opcode component is not used. Unfortunately, the XCache API is not really properly documented and thus I don't know what API we would have to call to check whether the `XC_TYPE_PHP` cache is populated. In fact, there is an [open XCache bug](http://xcache.lighttpd.net/ticket/176) since 7 years that discusses this problem and is likely to never get fixed since XCache is abandonware.

Fixes https://github.com/owncloud/core/issues/16287
 2015-05-12 19:22:39 +02:00
Morris Jobke
dc362823e0 Merge pull request #16269 from owncloud/master-fix-16179 
Check if cURL supports the desired features
 2015-05-12 18:27:57 +02:00
Arthur Schiwon
d6becb8d82 add repair steps to get rid of old background jobs 2015-05-12 18:19:44 +02:00
Arthur Schiwon
e016ed55ff also free joblist and base from file cache code 2015-05-12 17:44:31 +02:00
Robin Appelman
11e1acd8ec fix webdav quota check for the root of the dav endpoint 2015-05-12 14:02:27 +02:00
Björn Schießle
fbe4b77c49 Merge pull request #16228 from owncloud/enc_fix_restore 
use hooks to update encryption keys
 2015-05-12 13:10:16 +02:00
Lukas Reschke
4613456a8a Check if cURL supports the desired features 
Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour.

Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.
 2015-05-12 12:00:56 +02:00
Morris Jobke
b11c0c533e Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded 
fix check if a file is excluded from encryption
 2015-05-12 09:12:38 +02:00
Morris Jobke
afcec88c6f Merge pull request #16234 from owncloud/issue-16206-fix-app-config-parallel-insert 
Issue 16206 fix app config parallel insert
 2015-05-11 16:05:30 +02:00
Bjoern Schiessle
9dd517071e fix check if file is excluded from encryption 2015-05-11 12:38:59 +02:00
Joas Schilling
dfed287dc0 Use insertIfNotExists to avoid problems with parallel calls 2015-05-11 12:38:33 +02:00
Bjoern Schiessle
0d5c7a11e2 use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we 
are in the storage wrapper the file cache isn't up-to-date
 2015-05-11 12:06:57 +02:00
Thomas Müller
9c57ae89d9 Some locales need to be converted to be compliant with CLDR 2015-05-08 23:45:07 +02:00
Morris Jobke
e79c255cab Conditional logging 
* Log condition for log level increase based on conditions. Once one of these
   conditions is met, the required log level is set to debug. This allows to
   debug specific requests, users or apps

 * Supported conditions (setting `log_condition` in `config.php`):
    - `shared_secret`: if a request parameter with the name `log_secret` is set to
                this value the condition is met
    - `users`:  if the current request is done by one of the specified users,
                this condition is met
    - `apps`:   if the log message is invoked by one of the specified apps,
                this condition is met
 * fix unit test and add app log condition test
 2015-05-08 15:58:33 +02:00
Morris Jobke
892b5ceeeb Move log level check to logger parent class 
* remove duplicate code from child classes
 2015-05-08 15:14:45 +02:00
Arthur Schiwon
3de7f58321 remove file cache classes and its tests 2015-05-08 14:05:54 +02:00
Lukas Reschke
c9921ec127 Merge pull request #16124 from owncloud/issue-16109-fix-share-email-with-shared-folder 
Fix the share mail notification when the item is in a folder
 2015-05-08 13:03:28 +02:00
Lukas Reschke
16a0de6314 Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exists-on-enable-app 
Avoid the log entry with the ModuleAlreadyExists exception when enabl…
 2015-05-08 11:55:02 +02:00
Thomas Müller
4659927d7a Pure numbers are returned as bytes right away 2015-05-08 10:54:54 +02:00
Thomas Müller
15d134124b Validate the quota value to be a correct value 2015-05-07 17:56:13 +02:00
Robin Appelman
06a65fab13 use cross storage move when renaming the part file during webdav put 2015-05-07 14:28:31 +02:00
Joas Schilling
49f94b17f7 Avoid the log entry with the ModuleAlreadyExists exception when enabling the app 2015-05-07 11:00:55 +02:00
Thomas Müller
55eaa165f8 Merge pull request #16119 from owncloud/fix-16056 
[HHVM] Throw RunTimeException from OC\AppFramework\App::buildAppNamespace()
 2015-05-07 00:20:57 +02:00
Andreas Fischer
e418ced656 Check return value of OC_App::getAppPath() and verify info.xml exists. 2015-05-06 17:15:28 +02:00
Joas Schilling
b4471c2591 Fix the share mail notification when the item is in a folder 2015-05-06 15:44:19 +02:00
Jan-Christoph Borchardt
35292eb66c rename to 'Default encryption module' 2015-05-06 15:31:05 +02:00
Joas Schilling
aea734aaf1 Fix missing types on doc block and deduplicate the method name 2015-05-06 14:31:10 +02:00
Bjoern Schiessle
e4829a2358 update 'encrypted'-flag in file cache according to the storage settings 2015-05-06 14:20:05 +02:00
Bjoern Schiessle
dc39bda870 move/copy from storage 2015-05-06 14:20:02 +02:00
Bjoern Schiessle
83ed4ee5b6 unit tests 2015-05-06 12:28:15 +02:00
Bjoern Schiessle
e7a3911c83 check if encryption is enbaled before we start moving keys 2015-05-06 11:35:45 +02:00
Lukas Reschke
9a159372cb Merge pull request #16067 from owncloud/verbosity-in-app-code-check 
Add verbosity option to app:check-code
 2015-05-06 11:21:23 +02:00
Thomas Müller
35a2fd3f89 Only return cached files if existing 2015-05-06 11:16:44 +02:00
Morris Jobke
874d35b27a Merge pull request #16070 from owncloud/enc_update_file_cache_on_copy 
make sure that we keep the correct encrypted-flag and the (unencrypted)size
 2015-05-06 10:28:10 +02:00
Morris Jobke
f1903f61a1 Merge pull request #16072 from owncloud/phpdoc-cache 
improve phpdoc of cache classes
 2015-05-06 09:38:56 +02:00
Morris Jobke
c3fb021acf Merge pull request #16017 from owncloud/proper-update-notification 
Use OC.Notification for update notifications
 2015-05-06 09:28:42 +02:00
Jörn Friedrich Dreyer
4c0d1b0460 Merge pull request #16050 from owncloud/add-workaround-for-populate-raw-post-data 
Don't display errors and log them
 2015-05-06 08:55:46 +02:00
Thomas Müller
a96c2b8354 Only use cached files in case encryption is enabled - in any other case let the underlying storage handle this accordingly - refs #16061 #16062 and others 2015-05-05 16:19:24 +02:00
Bjoern Schiessle
7089af96f2 make sure that we keep the correct encrypted-flag and the (unencrypted)size if a file gets copied 2015-05-05 16:17:14 +02:00
Robin Appelman
e0d151505f improve phpdoc of cache classes 2015-05-05 16:06:28 +02:00
Morris Jobke
56b1c93a79 Add verbosity option to app:check-code 
* by default only lists files with errors
* option -v lists all files even if there are no errors
 2015-05-05 13:57:23 +02:00
Thomas Müller
aae098c24a Check usage of != and == - refs #16054 2015-05-05 12:59:33 +02:00
Lukas Reschke
11310355ed Don't depend on always_populate_raw_post_data 2015-05-05 12:36:15 +02:00
Lukas Reschke
7c5558327d Check mbstring.func_overload only if the mb module is installed. 
Fixes https://github.com/owncloud/core/issues/14670
 2015-05-04 17:13:25 +02:00
Lukas Reschke
64393b4c03 Remove PHP 5.4 warning in checkSetup 
This is catched in index.php as older PHP versions will never execute the code path until there due to 5.4 syntax changes.
 2015-05-04 17:11:17 +02:00
Thomas Müller
08b98a8ede Merge pull request #16042 from owncloud/fix-output-buffering 
Remove hard-dependency on disabled output_buffering
 2015-05-04 16:43:32 +02:00
Lukas Reschke
5c7d15b941 Merge pull request #16043 from owncloud/activity-288-log-entry-when-no-favorite 
Fix undefined variable $tagId
 2015-05-04 16:22:21 +02:00
Joas Schilling
50f6386c63 Fix undefined variable $tagId 2015-05-04 16:19:26 +02:00
Joas Schilling
59c657da53 Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions-for-share-owner 
Do not restrict permissions for the original owner
 2015-05-04 15:07:37 +02:00
Lukas Reschke
4b9e034968 Remove hard-dependency on disabled output_buffering 
This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`.

However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems.

Fixes https://github.com/owncloud/core/issues/16013
 2015-05-04 14:15:15 +02:00
Thomas Müller
4de45b5e61 Merge pull request #15958 from owncloud/usage-of-public-log-interface 
Use internally \OCP\ILogger instead of \OC\Log
 2015-05-04 09:13:26 +02:00
Morris Jobke
cd516eedcd Use OC.Notification for update notifications 
* instead of a static rendering inside PHP use the
  JS OC.Notification.showTemporary to hide the
  notification after 7 seconds automatically
* fixes #14811
 2015-05-03 17:26:03 +02:00
Lukas Reschke
6738c17cb5 Add proper versioning for doc URL 
As per 8.1 we have docs for minor versions as well so we need to link to `8.1` here instead to `8.0`.

Fixes https://github.com/owncloud/core/issues/16002
 2015-05-02 21:05:11 +02:00
Thomas Müller
6b691e3840 Merge pull request #15937 from owncloud/file-locking 
Add memcache based shared/exclusive locking
 2015-05-01 17:47:23 +02:00
jknockaert
f5415653fd fix #15973 
Rework of stream_seek handling; there where basically two bugs: 1. seeking to the end of the current file would fail (with SEEK_SET); and 2. if seeking to an undefined position (outside 0,unencryptedSize) then newPosition was not defined. I used the opportunity to simplify the code.
 2015-04-30 17:10:18 +02:00
Robin Appelman
ba7d221cff allow getting the path from the lockedexception 2015-04-30 14:48:42 +02:00
Robin Appelman
a40a237441 use trait for cas polyfill for xcache 2015-04-30 14:48:39 +02:00
Robin Appelman
96f9573a4b add memcache based shared/exclusive locking 2015-04-30 14:48:39 +02:00
Robin Appelman
acf30ede95 add compare and swap to memcache 2015-04-30 14:48:39 +02:00
Robin Appelman
29213b6136 extends memcache with add, inc and dec 2015-04-30 14:48:36 +02:00
Bernhard Posselt
360d0e3e5e fix #15962 2015-04-30 12:44:45 +02:00
Morris Jobke
fbba7a61cb Use internally \OCP\ILogger instead of \OC\Log 
* this is the preparation for some upcoming logger related changes
* also fixes an issue in the public interface where we request
  an internal class as parameter
 2015-04-30 11:52:30 +02:00
Thomas Müller
d308ec4f0e Merge pull request #15949 from owncloud/l10n-string-json 
Implement json serialize for l10n string
 2015-04-30 11:11:16 +02:00
Bernhard Posselt
1e58538f0e add aliases to pascal case constructor paramters to make it possible to auto assemble controllers 2015-04-29 22:29:45 +02:00
Bernhard Posselt
5b857a6eab implement json serialize for l10n string 2015-04-29 21:22:42 +02:00
Joas Schilling
f524ae261a Ignore "parent" shares when the sharee is the owner of the reshare-source 2015-04-29 14:18:46 +02:00
Joas Schilling
3c37cbdfe7 Correctly select file cache values also when checking group shares 2015-04-29 14:12:12 +02:00
Morris Jobke
8c7db2536d Merge pull request #15596 from owncloud/issue/15589 
Correctly generate the feedback URL for remote share
 2015-04-29 10:52:43 +02:00
Morris Jobke
7df7a3b360 Merge pull request #15906 from rullzer/fix_15777 
Password set via OCS API should not be double escaped
 2015-04-29 10:44:25 +02:00
Lukas Reschke
34d0e610cc Filter potential dangerous filenames for avatars 
We don't want to have users misusing this API resulting in a potential file disclosure of "avatar.(jpg|png)" files.
 2015-04-28 16:57:23 +02:00
Joas Schilling
2eecfcbb80 Fix scrutinizer complains and return type doc 2015-04-28 11:28:55 +02:00
Joas Schilling
9fb7d0bca9 Correctly remove the protocol before prepeding it 2015-04-28 11:28:54 +02:00
Joas Schilling
8f7c64253e Correctly generate the feedback URL for remote share 
The trailing slash was added in c78e3c4a7f
to correctly generate the encryption keys
 2015-04-28 11:28:54 +02:00
Morris Jobke
de8c15e1a4 Merge pull request #14764 from owncloud/shared-etag-propagate 
Propagate etags across shared storages
 2015-04-28 10:58:50 +02:00
Morris Jobke
b4a15db046 Merge pull request #15901 from owncloud/fix-share-docs 
fix several issues with doc blocks on share.php
 2015-04-28 10:41:04 +02:00
Roeland Jago Douma
73bb3a22f6 Password set via OCS API should not be double escaped 2015-04-28 10:33:19 +02:00
Joas Schilling
7c65448377 Fix return type of the getRootFolder() method 2015-04-28 09:36:29 +02:00
Joas Schilling
46083006e1 fix several issues with doc blocks on share.php 2015-04-28 08:40:47 +02:00
Thomas Müller
eb0e9e5646 Merge pull request #15890 from owncloud/fix-helper-docs 
Fix several type(hint) errors in private/helper.php
 2015-04-27 15:28:50 +02:00
Thomas Müller
7d0eba7a41 Merge pull request #15886 from owncloud/fix-15848-master 
Adjust isLocal() on encryption wrapper
 2015-04-27 15:06:26 +02:00
Joas Schilling
db6395ae20 Fix several type(hint) errors in private/helper.php 2015-04-27 14:45:05 +02:00
Thomas Müller
678b7d7e4d Merge pull request #15860 from owncloud/enc_fallback_old_encryption 
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
 2015-04-27 14:32:19 +02:00
Thomas Müller
936d564058 fixes #15848 2015-04-27 14:26:05 +02:00
Morris Jobke
93c25a1f4a Merge pull request #15882 from owncloud/fix-type-annotation 
Fix type annotation
 2015-04-27 14:17:59 +02:00
Robin Appelman
2e897f05b1 triger propagation for webdav uploads 
use post hooks for share etag propagator
 2015-04-27 14:07:16 +02:00
Robin Appelman
45784f213f fix propagation when renaming a directly reshared folder 2015-04-27 14:07:16 +02:00
Robin Appelman
30ad56813a propagate etags for all user of a share 2015-04-27 14:07:15 +02:00
Robin Appelman
518d5aadf5 Allow getting *all* share entries owned by a user 2015-04-27 14:07:15 +02:00
Robin Appelman
849e5521de Make the change propagator an emitter 2015-04-27 14:07:15 +02:00
Thomas Müller
cc331609bf Merge pull request #15411 from mmattel/fix_for_15375_better_message_text 
Improve error messge text for app upgrade try (#15375)
 2015-04-27 13:38:16 +02:00
Lukas Reschke
d0363fe396 Fix type annotation 
Obviously should be an int
 2015-04-27 13:31:18 +02:00
Bjoern Schiessle
27683f9442 fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header 2015-04-27 13:01:18 +02:00
Joas Schilling
d600955a51 Make getDefaultModuleId public and get module protected 2015-04-27 11:03:51 +02:00
Joas Schilling
a09df6d453 Verify that the encryption module exists before setting it 2015-04-27 11:03:50 +02:00
Lukas Reschke
4dfdaf741c Merge pull request #15834 from owncloud/make-temporary-file-really-unique 
Fix collision on temporary files + adjust permissions
 2015-04-25 23:18:26 +02:00
Lukas Reschke
b9df932e3c Merge pull request #15683 from owncloud/block-legacy-clients 
Block old legacy clients
 2015-04-24 18:21:10 +02:00
Bjoern Schiessle
9a5783b284 fix unit tests 2015-04-24 16:47:27 +02:00
jknockaert
49df8ef525 Update encryption.php 2015-04-24 16:44:00 +02:00
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
Lukas Reschke
ab9ea97d3a Catch not existing User-Agent header 
In case of an not sent UA header consider the client as valid
 2015-04-23 16:33:51 +02:00
Lukas Reschke
155ae44bc6 Fix collision on temporary files + adjust permissions 
This changeset hardens the temporary file and directory creation to address multiple problems that may lead to exposure of files to other users, data loss or other unexpected behaviour that is impossible to debug.

**[CWE-668: Exposure of Resource to Wrong Sphere](https://cwe.mitre.org/data/definitions/668.html)**
The temporary file and folder handling as implemented in ownCloud is performed using a MD5 hash over `time()` concatenated with `rand()`. This is insufficiently and leads to the following security problems:
The generated filename could already be used by another user. It is not verified whether the file is already used and thus temporary files might be used for another user as well resulting in all possible stuff such as "user has file of other user".

Effectively this leaves us with:

1. A timestamp based on seconds (no entropy at all)
2. `rand()` which returns usually a number between 0 and 2,147,483,647

Considering the birthday paradox and that we use this method quite often (especially when handling external storage) this is quite error prone and needs to get addressed.

This behaviour has been fixed by using `tempnam` instead for single temporary files. For creating temporary directories an additional postfix will be appended, the solution is for directories still not absolutely bulletproof but the best I can think about at the moment. Improvement suggestions are welcome.

**[CWE-378: Creation of Temporary File With Insecure Permissions](https://cwe.mitre.org/data/definitions/378.html)**

Files were created using `touch()` which defaults to a permission of 0644. Thus other users on the machine may read potentially sensitive information as `/tmp/` is world-readable. However, ownCloud always encourages users to use a dedicated machine to run the ownCloud instance and thus this is no a high severe issue. Permissions have been adjusted to 0600.

**[CWE-379: Creation of Temporary File in Directory with Incorrect Permissions](https://cwe.mitre.org/data/definitions/379.html)**

Files were created using `mkdir()` which defaults to a permission of 0777. Thus other users on the machine may read potentially sensitive information as `/tmp/` is world-readable. However, ownCloud always encourages users to use a dedicated machine to run the ownCloud instance and thus this is no a high severe issue. Permissions have been adjusted to 0700.Please enter the commit message for your changes.
 2015-04-23 15:07:54 +02:00
Martin
676e86b314 Improve error messge text for app upgrade try (#15375) 2015-04-22 13:24:11 +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
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
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