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

6794 commits

Author SHA1 Message Date
Vincent Petry
67d0a3c15e Fixed mime type repair step 2014-06-26 16:40:12 +02:00
Vincent Petry
b7d79a90b0 Merge pull request #9210 from owncloud/better_validation_in_getAppPath 
better validation for OC_App::getAppPath()
 2014-06-26 15:52:12 +02:00
Thomas Müller
4c80c9595f Redeclared as public to allow invocation from within the closure in php 5.3 2014-06-26 14:27:41 +02:00
Jörn Friedrich Dreyer
f96a535f80 fix objectstore test execution 2014-06-26 11:30:00 +02:00
Björn Schießle
1822bba5e9 Merge pull request #9193 from owncloud/sharing_etag_propagation 
make sure that the etags get propagated correctly
 2014-06-26 10:26:24 +02:00
Vincent Petry
b1e778d5fd Moved office mimetype update to a repair step 2014-06-25 19:49:18 +02:00
VicDeo
7c362ab55e Merge pull request #9194 from owncloud/revertloadapps 
Bring back loadApps() in base.php
 2014-06-25 18:52:56 +03:00
Georg Ehrke
09356bc5b3 better validation for OC_App::getAppPath() 2014-06-25 16:24:55 +02:00
Robin Appelman
9a2ed86672 Prevent running the files:scan command as the wrong user 2014-06-25 15:22:49 +02:00
icewind1991
16396e2e33 Merge pull request #9123 from owncloud/webdav-move-permissions 
Fix permissions check when moving a file to a different directory over webdav
 2014-06-25 15:09:58 +02:00
Jörn Friedrich Dreyer
8e6cb6dc54 delete object without downloading it first 2014-06-25 14:53:38 +02:00
Arthur Schiwon
f3ecf819ec extend Dummy user and group implementation to pass tests 2014-06-25 13:13:53 +02:00
Robin Appelman
113749bd96 really always take root of the substorage 2014-06-25 13:00:11 +02:00
Bjoern Schiessle
a0b85fc5e4 make sure that during share and unshare the etags get propagated correctly 2014-06-25 12:11:56 +02:00
Arthur Schiwon
121d52860e return int, not string 2014-06-24 21:54:57 +02:00
Bjoern Schiessle
92a82f02b3 always take root of the substorage 2014-06-24 18:53:51 +02:00
Vincent Petry
a120d6e9a3 Bring back loadApps() in base.php 
loadApps() had been deleted by mistake in
799205488c
 2014-06-24 17:37:58 +02:00
Robin Appelman
92f2a430a8 Don't bother checking for external updates for objectstore storages 2014-06-24 14:48:59 +02:00
Robin Appelman
eb97eee964 Only initialize the swift container when manipulating an object 2014-06-24 14:42:52 +02:00
Robin Appelman
159b603d13 Add support for rackspace swift backends 2014-06-24 14:36:29 +02:00
Bjoern Schiessle
70ca292fd9 only the mount point has delete and update permissions to enable rename operation 2014-06-24 13:55:04 +02:00
Bjoern Schiessle
84d36df70b make sure that we always return the correct permissions 2014-06-24 13:39:37 +02:00
Jenkins for ownCloud
6a4a474aa9 [tx-robot] updated from transifex 2014-06-24 01:54:39 -04:00
Thomas Müller
f913b1629b Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-master 
fix recursion on rmdirr
 2014-06-23 23:18:10 +02:00
Thomas Müller
fba694edae update PHPDoc $fileInfo is a SplFileInfo 2014-06-23 23:15:30 +02:00
Joas Schilling
167ba14af7 Merge pull request #9159 from owncloud/enabledapp-cache-loggedin 
Only cache enabled apps when logged in
 2014-06-23 18:02:57 +02:00
Jörn Friedrich Dreyer
28c1a95575 use common storage test 2014-06-23 16:29:01 +02:00
Vincent Petry
8c82098281 Merge pull request #8974 from owncloud/router-preventloadappsonupgrade 
Prevent loadApps on upgrade
 2014-06-23 15:15:50 +02:00
Robin Appelman
2547945779 Add comment 2014-06-23 15:14:35 +02:00
Thomas Müller
ed31f30afd dir itself has to be removed as well 2014-06-23 14:40:55 +02:00
Robin Appelman
8b41689fe6 Only cache enabled apps when logged in 2014-06-23 13:55:21 +02:00
Thomas Müller
f83821c388 fix recursion on rmdirr 2014-06-23 13:54:27 +02:00
Arthur Schiwon
01a012980a search term for users and groups may occur anywhere in the name or displayname, not just in the beginning 2014-06-23 12:03:09 +02:00
Jörn Friedrich Dreyer
7ec53571c4 use 'object' as the fakedir stream name 2014-06-23 11:07:01 +02:00
Arthur Schiwon
81ecbbb061 trusted domains shall not be ignored on autosetup 2014-06-23 10:33:15 +02:00
Vincent Petry
53ad15e0e3 Merge pull request #9138 from owncloud/fix-documentation 
Add explanation about the current implementation of updateApp
 2014-06-23 10:32:41 +02:00
Jenkins for ownCloud
b8b7c97a41 [tx-robot] updated from transifex 2014-06-23 01:54:38 -04:00
Bart Visscher
089139f8ea Add explanation about the current implementation of updateApp 2014-06-22 12:45:59 +02:00
Jenkins for ownCloud
da0e4b0af0 [tx-robot] updated from transifex 2014-06-21 01:54:37 -04:00
Robin Appelman
80e6d357a2 Fix permissions check when moving a file to a different directory over webdav 2014-06-20 14:29:13 +02:00
Jörn Friedrich Dreyer
c112a1d323 move to stream based IObjectStore interface, rearrange & reformat code 2014-06-20 12:27:47 +02:00
Jenkins for ownCloud
ca96b9d3d5 [tx-robot] updated from transifex 2014-06-20 01:54:32 -04:00
Jenkins for ownCloud
e1fd10f226 [tx-robot] updated from transifex 2014-06-19 01:55:38 -04:00
Jörn Friedrich Dreyer
f2fe00e972 fix rebase, use 'object::user:<username>' or 'object::store:<storageid> as storage id, by default use container/bucket name for storageid, make storageid configurable, store user only for HomeObjectStoreStorage, change updateObject() to writeObject() 2014-06-18 15:20:26 +02:00
Jörn Friedrich Dreyer
5cae863408 change architecture from inheritance to composition 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
9335a5f07f remove duplicate method 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
5722e31d1a add autocreate config option for containers, implement autocreate and delete of containers, use generated container names for tests 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
4e65889f54 only use one config option 'objectstore' for root and home storage configuration 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
7493ff0624 fix unit test by always initializing the root of the storage in the constructor 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
10de4a7b90 move creation of / and users 'files' from storage constructor to setupFS / mount initialization 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
87aaf39259 fix checking unset array values, deduplicate code, remove file from cache if it could not be stored in the objectstore 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
eca536d8b4 minor code cleanup 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
c020e8e658 use exceptions to notify abstract parent class of problems 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
60a8419a1f when root storage cannot be mounted throw an exception visible to the end user 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
1374ba9adf fix fallback config for default home storage 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
ccb698a6a8 move swift and abstract code to core 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
85ccfad37c change 'object_storage' config param to 'root_storage' 
copy skeleton only for local filesystems
 2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer
2bf7e5c02f make objectstore setup more robust, don't pass user to object store mounted as root 2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer
3c66a8c8ed allow configuring objectstore as home and root storage 2014-06-18 12:53:19 +02:00
Vincent Petry
799205488c Prevent loadApps on upgrade 
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
 2014-06-18 11:10:07 +02:00
Jenkins for ownCloud
baf46c74cd [tx-robot] updated from transifex 2014-06-18 01:55:13 -04:00
Lukas Reschke
d4bdcb7a9b Merge pull request #9047 from owncloud/fix_preload_fundamental_apps 
Load fundamental apps, before any possible customizing app may follow
 2014-06-18 07:29:04 +02:00
icewind1991
8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing 
Add server<->server sharing
 2014-06-17 17:40:05 +02:00
Vincent Petry
cce58368ad Merge pull request #9065 from owncloud/migrator-keepprimaryindexname 
Do not rename primary key index when renaming table
 2014-06-17 16:43:33 +02:00
Vincent Petry
7aa11b4361 Do not rename primary key index when renaming table 
When the migrator renames a table, for example for upgrade simulation,
it should not rename the primary key to avoid messing up with the diff
because the MySQL Doctrine code expects that index to always be called
"primary".
 2014-06-17 15:23:18 +02:00
Andreas Fischer
9db0a82a26 We obviously have to pass the hostname as is when there is no ':' in the hostname. 
This reverts commit 73062040e6.
 2014-06-17 14:48:32 +02:00
Robin Appelman
07fdeba50b Fix moving movablemount over webdav 2014-06-17 14:10:11 +02:00
Jenkins for ownCloud
ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Lukas Reschke
f2fc214ce0 Add deprecation notice to load* functions 
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.

Port of https://github.com/owncloud/core/pull/9033
 2014-06-16 20:33:04 +02:00
Jörn Friedrich Dreyer
cd77f92f4c add new keynote mimetype 2014-06-16 16:25:12 +02:00
Robin Appelman
b188550c22 Also support removeable mounts with rmdir 2014-06-16 16:24:42 +02:00
Robin Appelman
0532f5c39a Fix permission for movable storage root 2014-06-16 16:20:40 +02:00
Georg Ehrke
15c215cd03 Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore 
Make shipped apps updatable via appstore
 2014-06-16 15:54:50 +02:00
Georg Ehrke
86f546ff64 disable code check for shipped apps 2014-06-16 13:49:02 +02:00
Arthur Schiwon
7b704eeb5e Load fundamental apps, before any possible customizing app may follow 2014-06-16 13:12:21 +02:00
Vincent Petry
a48bcceb23 Merge pull request #8917 from owncloud/repair-routine-base 
Add support for repair step classes
 2014-06-16 11:13:10 +02:00
Jenkins for ownCloud
ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
macjohnny
e5224782fa Merge pull request #9022 from owncloud/speedup-nested-ldap-groups 
drastic speedup for nested ldap groups
 2014-06-16 07:50:53 +02:00
Jenkins for ownCloud
4d6fc6f309 [tx-robot] updated from transifex 2014-06-15 01:55:06 -04:00
Robin Appelman
87e311b996 Fix storage being passed to cache/watcher and scanner when using storage wrappers 2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b Fix check for shared files inside shares 2014-06-14 10:14:08 +02:00
Robin Appelman
c6a83b2f17 Fix exposing single files over webdav 2014-06-14 10:13:24 +02:00
Robin Appelman
65f3b2fad2 Add server<->server sharing backend 2014-06-14 10:10:37 +02:00
Morris Jobke
35f7565e9b Merge pull request #8978 from owncloud/movie_preview_improvements 
movie previews: use file directly when it's stored locally and encryption is not enabled
 2014-06-14 01:01:59 +02:00
Georg Ehrke
65028c459b don't skip code check for skipped apps 
those apps will have to use the public api
 2014-06-13 21:51:16 +02:00
Georg Ehrke
c378e76412 skip certain tests for shipped apps 2014-06-13 21:45:31 +02:00
Frank Karlitschek
87101e6638 Merge pull request #9018 from owncloud/dbms-socket-support 
Refactor OC_DB::connect() to properly support sockets.
 2014-06-13 18:09:51 +02:00
Jenkins for ownCloud
083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
macjohnny
767aa4e35f drastic speedup for nested ldap groups 
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.

Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
  - getGroupObject() (executed for every group!)
     - groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
 2014-06-13 00:04:06 +02:00
Andreas Fischer
73062040e6 Don't specify host when using a socket. 2014-06-12 20:22:45 +02:00
Andreas Fischer
0932760304 Rename variable to indicate that it can be port and socket. 2014-06-12 20:18:38 +02:00
Andreas Fischer
3d8eabedbd No need to check the port number as this will fail anyway. 2014-06-12 20:17:30 +02:00
Andreas Fischer
4ca1e3cc02 Move getValue() to where required. This actually is not required "global data". 2014-06-12 19:59:40 +02:00
Andreas Fischer
17c2e63449 Move check for : to where it belongs, getting rid of $socket = false; 2014-06-12 19:56:51 +02:00
Andreas Fischer
4b87586487 Extract common variables of $connectionParams. 2014-06-12 19:53:33 +02:00
Andreas Fischer
6da2beeaff Inline $port expression, getting rid of $port variable. 2014-06-12 19:48:37 +02:00
Vincent Petry
b595c982d0 Merge pull request #8968 from owncloud/scanner-parent-repair 
Repair broken parent link in the scanner
 2014-06-12 17:40:44 +02:00
Vincent Petry
05e351416e Fixed instanceof to use interface instead of class 2014-06-12 17:38:26 +02:00
Vincent Petry
ca690c4d02 Added RepairStep interface and default repair step lists 
The updater is using "before update" repair steps and "regular" repair
steps.
The "regular" repair steps are also used by the CLI tool.

Currently no steps exist but can be added later in the static methods in
the \OC\Repair class.

Added unit test to test messaging, error and exception cases.
 2014-06-12 17:38:26 +02:00
Vincent Petry
6fcd1af4db Add support for repair step classes 
This also makes it possible to unit test each repair step class
individually
 2014-06-12 17:38:26 +02:00