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

11517 commits

Author SHA1 Message Date
Lukas Reschke
42a70ed482 Require at least libxml 2.7.0 
Fixes https://github.com/owncloud/core/issues/23168
 2016-03-12 22:13:05 +01:00
Jenkins for ownCloud
5862a067d9 [tx-robot] updated from transifex 2016-03-12 01:55:36 -05:00
David Baucum
c519447522 Removed unnecessary check 'installed' system value' call. 
OC_Utils::checkServer makes an unnecessary call to $config->getSystemValue('installed', false), which replicates the call made immediately before it during the call to needUpgrade.
 2016-03-11 15:59:11 -05:00
Thomas Müller
a8922e9d35 Merge pull request #23125 from owncloud/add-port-support-to-trusteddomain 
Explicitly check for port
 2016-03-11 14:55:27 +01:00
Robin Appelman
54e750ba78 dont die when we cant save the resized avatar, log instead 2016-03-11 13:44:35 +01:00
Robin Appelman
a8db587b1f move failedstorage to core 2016-03-11 13:15:45 +01:00
Roeland Jago Douma
b8ce9c5554 Use more generic node instead of File/Folder 
The phpdoc for the sharing functions was very restrictive. As a
consequence passing node object (for example from the OCS Share API
where we don't really care if it is a file or folder), would actually
be invalid.

With this loser restriction the interfaces become more generic.
 2016-03-11 08:51:07 +01:00
Jenkins for ownCloud
1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Lukas Reschke
dc6789fd5b Explicitly check for port 
The setup uses `\OCP\IRequest::getInsecureServerHost` which in some cases can also include a port. This makes the trusted domain check fail thus.

I've decided to add this here that way because adjusting the setup would require parsing the host properly. This is not something that can be done very good in PHP. Check the following example for why `parse_url` is not our friend: https://3v4l.org/k501Z
 2016-03-10 22:32:29 +01:00
Lukas Reschke
3e8decf5e9 Improved rewrite rule 
As per https://github.com/owncloud/core/issues/23098 and https://github.com/owncloud/core/issues/23117
 2016-03-10 22:20:02 +01:00
Roeland Jago Douma
e6712c47a6 Fix some scrutinizer warning in the sharing code 
* Better phpdoc
* Promper use statements
* Unused parameter
 2016-03-10 21:35:22 +01:00
Thomas Müller
51072f742e Merge pull request #21582 from owncloud/core_composer 
Composers PSR-4 autoloader in core
 2016-03-10 12:06:44 +01:00
Joas Schilling
6b4117df34 Correctly escape join statements and use selectAlias 2016-03-10 10:24:08 +01:00
Thomas Müller
308c99f1fd Merge pull request #23029 from owncloud/add-rewrite-rules-after-setup 
Add base rewrite rule only when RewriteBase is defined
 2016-03-10 08:25:18 +01:00
Jenkins for ownCloud
96d70aa270 [tx-robot] updated from transifex 2016-03-10 01:55:35 -05:00
Roeland Jago Douma
d16b371e38 POC for PSR-4 autoloader server.php => Server.php 2016-03-09 16:53:39 +01:00
Roeland Jago Douma
f7729cdc40 Add composers default autoloader to core 
This introduces the defacto standard PSR-4 autoloader from composer into
core. This will allow proper PSR-4 naming of our classes.

Since our original autoloader is still available we can slowly switch
over classes to PSR-4.
 2016-03-09 16:53:27 +01:00
Vincent Petry
12b2192038 Do not set response status in CLI in case of error 2016-03-09 15:40:34 +01:00
Lukas Reschke
bc4a043a76 Add base rewrite rule only when RewriteBase is defined 
In case Apache is configured with an `Alias` such as with the ownCloud packages the rewrite rules will fail when no valid RewriteBase is configured.
 2016-03-09 15:13:07 +01:00
Thomas Müller
0cc53ee06d Merge pull request #22602 from owncloud/fix_slow_chunkcheck 
Do not check all chunks of a chunked upload if we do not need to
 2016-03-09 15:06:44 +01:00
Thomas Müller
d0a70a9776 Merge pull request #23006 from owncloud/require-xml-reader 
Add XMLReader as requirement
 2016-03-09 15:03:50 +01:00
Roeland Jago Douma
e8f22a16f6 Select queries in the default share provider should query for file/folder 
There can be leftover calendar and contacts shares in the oc_share
table. We need to filter those out properly.
 2016-03-09 11:19:57 +01:00
Lukas Reschke
642c38ffb2 Add XMLReader as requirement 
The SabreDAV release in 9.0 requires XMLReader, while this is usually compiled in by default some distributions like Gentoo don't.

Without this ownCloud gives a fatal 500 error instead of telling people to enable XMLReader.

Fixes https://github.com/owncloud/core/issues/23003
 2016-03-09 11:11:00 +01:00
Jenkins for ownCloud
afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Vincent Petry
e5a107cc45 Fix share mounting recursion 2016-03-08 14:46:42 +01:00
Thomas Müller
6acde90e2c Merge pull request #22800 from owncloud/fix-20536 
don't hide server not available exception, fixes #20536
 2016-03-08 09:58:26 +01:00
Thomas Müller
21b6bd321d Merge pull request #22918 from owncloud/remove-double-encoding-in-name 
Remove double URL encoding
 2016-03-08 09:40:27 +01:00
Jenkins for ownCloud
a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
Roeland Jago Douma
e08f98075c Do not check all chunks of a chunked upload if we do not need to 
Fixes #22601

Before we did a full test on all chunks to verify if a chunked upload
was completed. This is unneeded since if we are missing one chunk we can
already fail.

Also we look from back to front since it is much more likely that we
find a missing chunk thus can error out early.
 2016-03-07 19:52:30 +01:00
Lukas Reschke
1fd76b6379 Remove double URL encoding 
ZipStreamer as bundled with 9.0 will properly encode the filename already.

Fixes https://github.com/owncloud/core/issues/22836#issuecomment-193336245
 2016-03-07 19:29:15 +01:00
Thomas Müller
19dc02b8e0 Merge pull request #22900 from owncloud/diskfreespace-filesworkaround 
Fix call to disk_free_space when a file is provided
 2016-03-07 15:07:31 +01:00
Thomas Müller
fa436b5b0c Merge pull request #22812 from owncloud/node-lock 
Add locking to the node api
 2016-03-07 14:43:49 +01:00
Joas Schilling
69d7097a1a Make sure that the return value is an array 2016-03-07 11:57:05 +01:00
Lukas Reschke
14f932f3c7 Add DAV authenticated also to other scopes 
Fixes https://github.com/owncloud/core/issues/22893
 2016-03-07 11:17:33 +01:00
Vincent Petry
89881ed511 Fix call to disk_free_space when a file is provided 
In the case of shared files, we have to call free_space() on the file
name. This has the side-effect that when uploading to a local storage
without quota set, it will call disk_free_space with the file name,
which fails.

This fix uses the parent folder in case the given path is a file.
 2016-03-07 11:01:24 +01:00
Jenkins for ownCloud
c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Thomas Müller
6dcf70f244 Merge pull request #22807 from owncloud/remove-empty-translations 
ne, or_IN, uz and yo have been removed from transifex and will be rem…
 2016-03-06 19:59:57 +01:00
Jenkins for ownCloud
a98f5c03dc [tx-robot] updated from transifex 2016-03-05 01:56:08 -05:00
C. Montero Luque
7a0720f300 Merge branch 'master' into fix-db-locking-cleanup 2016-03-04 13:35:04 -05:00
Morris Jobke
138219d74a Run cleanup of expired DB file locks to background job 
* fixes #22819

The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.

This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
 2016-03-04 15:52:23 +01:00
Thomas Müller
b56dbd0607 Merge pull request #22816 from owncloud/external-unavailable-recheck 
allow availability recheck for external storages
 2016-03-04 15:29:17 +01:00
Joas Schilling
98f5423df7 ucwords does not support delimiter on 5.4 2016-03-04 12:13:16 +01:00
Jenkins for ownCloud
bcc200cf9b [tx-robot] updated from transifex 2016-03-04 01:55:53 -05:00
Thomas Müller
8d2238e055 Merge pull request #22796 from owncloud/fix-encryption-on-version-restore 
Keep "encryptedVersion" when calling `\OC\Files\View::copy`
 2016-03-03 16:31:11 +01:00
Robin Appelman
6990100e6e allow availability recheck for external storages 2016-03-03 14:19:34 +01:00
Lukas Reschke
72c8187cbb Keep "encryptedVersion" when calling \OC\Files\View::copy 
When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted.

To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982):

1. setup a new ownCloud 9.0 beta2
2. enable encryption
2. upload a docx (5.7MB large)
3. upload the same file again and overwrite the existing file
4. I can download the original file and the first version
5. I restore the first version
6. restored version can no longer be downloaded with the error described above

The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in 54cea05271 the stream is directly copied and thus bypassing the FS.
 2016-03-03 14:15:36 +01:00
Robin Appelman
02635c6f2f Add locking to the node api 2016-03-03 13:47:00 +01:00
Lukas Reschke
e55c52c078 Exclude the assets folder from integrity check 
We should not scan the assets folder as this can contain user specific content. Partially addresses https://github.com/owncloud/core/issues/22803
 2016-03-03 13:46:41 +01:00
Thomas Müller
8cacfce83d ne, or_IN, uz and yo have been removed from transifex and will be removed from git here now as well 2016-03-03 11:29:57 +01:00
Jenkins for ownCloud
8b76e8c57b [tx-robot] updated from transifex 2016-03-03 01:56:04 -05:00
Arthur Schiwon
adf5d111f6 don't hide server not available exception, fixes #20536 2016-03-03 01:15:41 +01:00
C. Montero Luque
4d69e562a0 Merge pull request #22757 from owncloud/apply-license 
Update copyright information and author file
 2016-03-01 15:36:37 -05:00
Lukas Reschke
c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke
c430f5ba53 Map Maci 2016-03-01 17:45:05 +01:00
Lukas Reschke
933f60e314 Update author information 
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
 2016-03-01 17:25:15 +01:00
Lukas Reschke
2d68c1b945 Exclude custom data directory from integrity checker 
We should not scan any custom data directory in the integrity checker as well. Otherwise this would lead to a massive increased update time that may likely exceed the timeout.

To test this:

1. Install ownCloud 8.2.2, set as data dir another folder than `data` such as `data-asdf`. Make sure that folder lives in the web root as well.
2. Update that instance to 9.0.0 beta2 => Errors are shown in the code integrity check
3. Apply this patch and trigger the rescan in the admin settings => No errors are shown anymore (can also do a new update with that patch applied)

Fixes https://github.com/owncloud/core/issues/22698
 2016-03-01 17:16:10 +01:00
Thomas Müller
5fe5233f41 Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs 
Add autodiscovery support to server-to-server sharing implementation
 2016-03-01 11:27:28 +01:00
Thomas Müller
256dfd27b6 Merge pull request #17451 from owncloud/apps-disablebrokenappafterenable 
Disable app that bricks the server after enabling
 2016-03-01 11:26:18 +01:00
Thomas Müller
fd4742d430 Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset 
Don't return quota when none set
 2016-03-01 08:30:58 +01:00
Thomas Müller
71e5de3865 Merge pull request #22677 from owncloud/allow-to-overwrite-single-l10n-string-via-theme 
Allow to overwrite a single language string via the theme folder
 2016-03-01 08:26:28 +01:00
Thomas Müller
da18d04b38 Merge pull request #22733 from owncloud/size-propagation-new-file 
fix size propagation for new files
 2016-03-01 08:20:34 +01:00
Thomas Müller
caf6c43187 Merge pull request #22736 from owncloud/propagation-ignore-encryption 
ignore encryption keys for propagation
 2016-03-01 08:19:42 +01:00
Jenkins for ownCloud
a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Thomas Müller
3adb6ae0f5 Merge pull request #22707 from owncloud/use-our-public-api 
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
 2016-03-01 07:24:57 +01:00
Robin Appelman
003a686c1b ignore encryption keys for propagation 2016-02-29 17:47:09 +01:00
Robin Appelman
8c700cc99d fix size propagation for new files 2016-02-29 17:31:01 +01:00
Vincent Petry
11215f4e27 Return -3 for unlimited quota 
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
 2016-02-29 14:36:20 +01:00
Vincent Petry
1dbe240b0e Disable app that bricks the server after enabling 
If an app is getting enabled in the web UI, an ajax call is now made to
make sure the server still works. If it doesn't, it sends an emergency
app disabling call to disable the breaking app.
 2016-02-29 12:07:37 +01:00
Joas Schilling
a1c02a0567 Fix since version 2016-02-29 11:02:10 +01:00
Joas Schilling
2a0cda74d4 Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* 2016-02-29 09:44:40 +01:00
Thomas Müller
6526c122af Merge pull request #22683 from owncloud/fix_22682 
Relax rootfolder check
 2016-02-29 08:53:58 +01:00
Thomas Müller
3e8e0049b4 Merge pull request #22673 from owncloud/fix_enforced_expire_date_setting 
Expiration date can only be enforced if default is enabled
 2016-02-29 07:08:57 +01:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Roeland Jago Douma
b116e80c56 Relax rootfolder check 
* Updated unit tests
* Added intergration test
 2016-02-26 16:05:32 +01:00
Joas Schilling
78570a5f72 Allow to overwrite a single language string via the theme folder 2016-02-26 13:56:02 +01:00
Roeland Jago Douma
bfcdf40a64 Expiration date can only be enforced if default is enabled 
If the default expiration date is not enebaled it can not be enforced.

* Added unit tests
 2016-02-26 11:38:06 +01:00
Thomas Müller
62d7885c3b Merge pull request #22660 from owncloud/fix_22656 
Do not allow sharing of the users root folder
 2016-02-26 10:49:12 +01:00
Thomas Müller
0795cc373d Merge pull request #22646 from owncloud/fix_22642 
Set default expiration date if none given on share creation
 2016-02-26 10:48:21 +01:00
Thomas Müller
cbde4bb92f Merge pull request #22650 from owncloud/fix_hook 
Fix verifyExpirationDate passwordSet argument
 2016-02-26 09:32:41 +01:00
Lukas Reschke
59028cced0 Add autodiscovery support to server-to-server sharing 
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
 2016-02-26 09:26:55 +01:00
Thomas Müller
cb41b1a863 Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508 
Before installing new shipped apps we need to load authentication apps
 2016-02-25 21:43:32 +01:00
Roeland Jago Douma
8213d5df4f Do not allow sharing of the root folder 
Sharing of the users root folder should not be allowed as it is very
weird UX. Also many of our clients have no proper way of displaying
this.

Added unit test

Also added intergration tests to make sure we won't allow it in the
future.
 2016-02-25 20:40:30 +01:00
Thomas Müller
776d91f3bc Merge pull request #21854 from owncloud/fix-share-hook-group-add 
Fix addUserToGroup hook of the share code
 2016-02-25 16:56:19 +01:00
Roeland Jago Douma
9412f69104 Fix verifyExpirationDate passwordSet argument 
Password set should be false if the password is null.

Also updated the unit tests to tests this now.
 2016-02-25 15:39:02 +01:00
Thomas Müller
914ac09aae Merge pull request #22636 from owncloud/fix-ssl-on-external-storages 
Fix HTTPS support on external storages
 2016-02-25 14:36:00 +01:00
Thomas Müller
efc966698f Merge pull request #22579 from owncloud/fix_broken_unencrypted_size 
Heal unencrypted file sizes at download time (second approach)
 2016-02-25 14:34:48 +01:00
Roeland Jago Douma
6d4f80d680 Set default expiration date if none given on share creation 
When we create a share for the first time we should set the default
expiration date. If none is given.

Fixes #22642
 2016-02-25 14:21:46 +01:00
Jenkins for ownCloud
32f4bea0ae [tx-robot] updated from transifex 2016-02-25 01:58:06 -05:00
Lukas Reschke
bf4a038535 Add proxy support to external storage 
Otherwise debugging issues is a PITA
 2016-02-24 19:48:47 +01:00
Thomas Müller
2ec1c738d0 Merge pull request #22573 from owncloud/issue-22568-allow-string-object-ids 
Make sure we can store strings as per the interface
 2016-02-24 12:15:23 +01:00
Thomas Müller
4124d909b6 Merge pull request #22565 from owncloud/avoid-scanning-root-storage 
Avoids scanning the root storage
 2016-02-24 12:14:39 +01:00
Thomas Müller
bfde96a623 Fix PHPDoc of OC_App::loadApps() 2016-02-23 15:57:12 +01:00
Bjoern Schiessle
834b51b83b recalculate unencrypted size if we assume that the size stored in the db is not correct 2016-02-23 15:09:46 +01:00
Thomas Müller
9a0950f10b Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries 
Allow defining a limit and offset for getObjectIdsForTags
 2016-02-23 15:02:08 +01:00
Thomas Müller
fae6643e6d Merge pull request #22582 from owncloud/case-insensitive-contact-search 
Case insensitive contact search
 2016-02-23 10:48:38 +01:00
Thomas Müller
ad6238c808 Install new shipped apps after upgrading all existing apps 2016-02-23 10:31:11 +01:00
Joas Schilling
fb8b34bdd0 Allow defining a limit and offset for getObjectIdsForTags 2016-02-23 09:04:15 +01:00
Joas Schilling
8754ea6c8a Make sure we don't quote column names twice 2016-02-23 08:50:52 +01:00
Thomas Müller
7bf658ab18 Before installing new shipped apps we need to load authentication apps - fixes #22508 2016-02-23 08:41:12 +01:00
Thomas Müller
83d5080e78 Merge pull request #22581 from owncloud/fix_interface 
since 9.0 we have a additional parameter $position used for integrity…
 2016-02-22 20:20:33 +01:00
Thomas Müller
4537eaac41 Add ILIKE support to querybuilder 2016-02-22 19:46:37 +01:00
Bjoern Schiessle
33ec70d57e since 9.0 we have a additional parameter $position used for integrity checks 2016-02-22 18:25:01 +01:00
Morris Jobke
8c77fdef3e Avoids scanning the root storage 
This check will skip the background scan for the root storage
because there is nothing in the root storage that isn't already
in another (mostly user-) storage.

Fixes #22501
 2016-02-22 16:43:47 +01:00
Joas Schilling
24c7f38a00 Make sure we can store strings as per the interface 2016-02-22 15:43:20 +01:00
Thomas Müller
a70421ff2f Merge pull request #22552 from owncloud/fix-avconv-preview-parameters 
Move `-an` after the input arg because it is an output option
 2016-02-22 14:14:35 +01:00
Roeland Jago Douma
fe08b5e9d9 We should check for exceptions when trying to get the avatar 
Fixes #22550

* Updated phpdoc of avatatmanager
* Add unit test
 2016-02-22 10:14:14 +01:00
Joas Schilling
2865ccfdc4 Move -an after the input arg because it is an output option 2016-02-22 09:40:46 +01:00
Thomas Müller
f8677628d4 Merge pull request #22503 from owncloud/issue_22500 
When (re-)sharing an incomming federated share set the corrent owner
 2016-02-19 16:07:43 +01:00
Thomas Müller
fb38625741 Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrename 
Check delete permission before attemping copy+delete
 2016-02-19 16:06:55 +01:00
Thomas Müller
b5281b61ed Merge pull request #22410 from owncloud/fix_22119 
Do not copy skeleton on avatar access
 2016-02-19 16:06:40 +01:00
Thomas Müller
2fd0e9b768 Merge pull request #22521 from owncloud/mssql-is-not-support-since-ages 
Remove old adapter - mssql is not supported
 2016-02-19 13:35:32 +01:00
Thomas Müller
5820666254 Merge pull request #22218 from owncloud/occ-no-extra-messages 
Add global --no-warnings option to occ…
 2016-02-19 13:32:52 +01:00
Joas Schilling
c20c836a46 Remove old adapter - mssql is not supported 2016-02-19 13:16:43 +01:00
Vincent Petry
a9e0cfad8b Check delete permission before attemping copy+delete 
Some move operations when cross-storage will be replaced by copy and
delete. Before attempting this, first check whether the source storage
has delete permissions.

This also prevents renaming system-wide external storages.
 2016-02-19 12:59:10 +01:00
Roeland Jago Douma
2dcf887cce When (re-)sharing an incomming federated share set the corrent owner 
Incomming federated shares are a special kind. We mount them as normal
webdav shares but we do supply owner info with the federated cloud id of
the share owner.

Since we do not yet have the new resharing behaviour on federated shares
we need to set the correct owner. Which will allow sharing and proper
mounting for other users.

fixes #22500
 2016-02-19 12:43:03 +01:00
Roeland Jago Douma
f837c08465 Fix even more 2016-02-19 09:43:20 +01:00
Joas Schilling
8756a22c60 Fix more things 2016-02-19 09:43:11 +01:00
Thomas Müller
8e36678873 Fix PHPDoc 2016-02-19 09:43:11 +01:00
Scrutinizer Auto-Fixer
0d0151a3e1 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-02-19 09:43:11 +01:00
Victor Dubiniuk
972e0c62b3 Add global --no-warning option to occ in order not to pollute output with warnings 2016-02-19 00:33:48 +03:00
Thomas Müller
48f6ae0b2d Merge pull request #22493 from owncloud/issue_22467 
getRootFolder should not setup the FS for any user
 2016-02-18 16:46:00 +01:00
Thomas Müller
2a9b0aaaa1 Merge pull request #22482 from owncloud/getowner-cache 
cache result for getowner
 2016-02-18 16:45:40 +01:00
Thomas Müller
6c4cdddba8 Merge pull request #21610 from owncloud/quota-sharedfile 
Fix quota check for single shared files
 2016-02-18 14:25:32 +01:00
Roeland Jago Douma
b539bb15e1 Make scrutinizer happy 2016-02-18 14:25:18 +01:00
Roeland Jago Douma
7abb8693a1 getRootFolder should not setup the FS for any user 
Fixes #22467

This can go wrong when an app (take the ldap app) DIs something that
needs the rootFolder. This break if we use cookie auth since then we
know the user at that point and thus try to setup the fs for that user.

However if there are then incomming shares from an ldap user they will
fails since the user manager can't find them yet.

Now getRootFolder does not setup the fs for any user.
 2016-02-18 13:55:54 +01:00
v1r0x
534071f4b2 set correct http status code 
Was intended to respond with a 303 (See other) status code instead of 307 (Temporary Redirect).
 2016-02-18 11:56:09 +01:00
Thomas Müller
73d46afc3c Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle 
Add index names so Doctrine does not use a too long random string
 2016-02-18 11:18:32 +01:00
Joas Schilling
6374472e2e No more static 2016-02-18 10:12:23 +01:00
Robin Appelman
f309bc960d cache result for getowner 2016-02-17 19:14:46 +01:00
Thomas Müller
7af7d18cfa Merge pull request #16783 from owncloud/handle-redirects-global 
Adding global error handler for ajax calls which run into redirection…
 2016-02-17 14:49:04 +01:00
Vincent Petry
8f96ef147f Don't apply quota in stream wrapper for part files 
When overwriting shared files as recipient, the part file is written on
the uploader's storage before overwriting the target file.

If the uploader has no quota left, they should still be able to
overwrite that file with Webdav. To make this work, they need to be able
to write the part file to their own storage first.
 2016-02-17 11:52:49 +01:00
Thomas Müller
9e415a956a Merge pull request #22451 from owncloud/use-proper-user-folder 
Handles null as return code and uses proper UserFolder in trashbin
 2016-02-17 10:58:31 +01:00
Jenkins for ownCloud
fe29feae9a [tx-robot] updated from transifex 2016-02-17 01:56:11 -05:00
Morris Jobke
de58364eb8 Handles null as return code and uses proper UserFolder in trashbin 2016-02-16 18:45:25 +01:00
Thomas Müller
c6fef52939 Merge pull request #22416 from owncloud/fix_22402 
Return proper error string if sharing for this user is disabled
 2016-02-16 13:37:22 +01:00
Thomas Müller
d5226c88ac Merge pull request #22338 from owncloud/fix_22247 
Allow more characters in filenames
 2016-02-16 13:37:07 +01:00
Roeland Jago Douma
ed6843e87b Return proper error string if sharing for this user is disabled 
Fixes #22402
 2016-02-16 10:22:49 +01:00
Lukas Reschke
b99c6f1f67 Send 401 header for OC_JSON::checkLoggedIn() 2016-02-16 09:48:40 +01:00
Joas Schilling
b14e8fa427 Make sure our index names fit in oracle 2016-02-16 09:28:29 +01:00
Roeland Jago Douma
47d28155a8 Do not copy skeleton on avatar access 
Fixes #22119

Just try to get the folder of the user. If it is not there a
NotFoundException will be thrown. Which will be handled by the avatar
endpoint.
 2016-02-16 09:18:38 +01:00
Thomas Müller
60d22f834f Merge pull request #22407 from fancycode/untrusted_domain 
Pass checked host as "domain" variable to "untrustedDomain" template.
 2016-02-16 08:29:02 +01:00
Jenkins for ownCloud
3dd1961f92 [tx-robot] updated from transifex 2016-02-16 01:55:39 -05:00
Joachim Bauch
0173063923 Pass checked host as "domain" variable to "untrustedDomain" template. 
Currently the "SERVER_NAME" is passed to the template, which in some cases doesn't match the host returned by "getInsecureServerHost" (or is empty).
 2016-02-15 17:02:14 +01:00
Thomas Müller
3ab328350a Merge pull request #22376 from owncloud/fix-return-code-getAppPath 
Properly handle return code of OC_App::getAppPath
 2016-02-15 16:58:37 +01:00
Lukas Reschke
dfc3536d2b Catch auth coming from JS in OCS 2016-02-15 15:38:37 +01:00
Thomas Müller
7b858d7c4a Merge pull request #22381 from owncloud/remove-not-needed-variable 
Remove not needed variable
 2016-02-15 12:02:03 +01:00
Jenkins for ownCloud
be34cea970 [tx-robot] updated from transifex 2016-02-15 01:55:28 -05:00
Thomas Müller
db79799eb8 Merge pull request #22380 from owncloud/make-scrutinizer-happy 
Fix typo in PHPDoc
 2016-02-15 07:01:41 +01:00
Morris Jobke
6cd3fa2ed7 Remove not needed variable 2016-02-14 21:44:53 +01:00
Morris Jobke
da06447c3b Fix typo in PHPDoc 2016-02-14 21:34:40 +01:00
Morris Jobke
083240482a Remove unreachable code in priavte/api.php 2016-02-14 21:12:29 +01:00
Morris Jobke
ef49f6ef5d Properly handle return code of OC_App::getAppPath 
* fixes #20128
* getAppPath could return false, but it was not handled everywhere
 2016-02-14 20:57:09 +01:00
Morris Jobke
e60e0fe22c Fix BMP support 
* fixes #16461
 2016-02-14 09:30:27 +01:00
Jenkins for ownCloud
7061416016 [tx-robot] updated from transifex 2016-02-14 01:55:37 -05:00
Thomas Müller
198d234068 Merge pull request #22345 from owncloud/make-note-if-appcodechecker-is-not-enabled 
Add note if integrity check is disabled
 2016-02-13 18:24:26 +01:00
Thomas Müller
0b4895bc7c Merge pull request #22343 from owncloud/check-if-admin-user 
Check if admin user
 2016-02-13 18:24:17 +01:00
Jenkins for ownCloud
2344c8e07d [tx-robot] updated from transifex 2016-02-13 01:55:39 -05:00
Morris Jobke
5fe55de6d8 Always set up a config object within the user object 
* the new getEmailAddress and setEmailAddress relies on this anyway
 2016-02-12 16:33:37 +01:00
Lukas Reschke
29ce56ed07 Check if admin user 
We should not add the JS for not admin users.
 2016-02-12 14:37:50 +01:00
Lukas Reschke
4b90429178 Add note if integrity check is disabled 
Our issue template states that users should post the output of `/index.php/settings/integrity/failed`, at the moment it displays that all passes have been passed if the integrity checker has been disabled.

This is however a wrong approach considering that some distributions are gonna package Frankenstein releases and makes it harder for us to detect such issues. Thus if the integrity code checker is disabled (using the config switch)  it displays now: `Appcode checker has been disabled. Integrity cannot be verified.`

This is not displayed anywhere else in the UI except these URL used for us for debugging purposes.
 2016-02-12 11:11:39 +01:00
Thomas Müller
207c09c511 Merge pull request #22309 from owncloud/infinite-recursion-on-expired-link 
Do not getShare in deleteShare, it's already there when deleting
 2016-02-12 11:11:26 +01:00
Thomas Müller
e99c4d83dc Merge pull request #22317 from owncloud/fix_invisible_linkshares 
Do not allow invisible link shares
 2016-02-12 11:10:58 +01:00
Jenkins for ownCloud
f8607ac132 [tx-robot] updated from transifex 2016-02-12 01:56:04 -05:00
Roeland Jago Douma
6bd0d51b2a More characters are allowed on POSIX systems 2016-02-12 07:49:31 +01:00
Thomas Müller
dfe267424f Merge pull request #22315 from owncloud/update-info-checker-requirements 
Update info checker requirements
 2016-02-11 14:31:47 +01:00
Thomas Müller
207c1a661b Merge pull request #22264 from owncloud/read-version-from-info.xml-only 
No longer evaluate appinfo/version
 2016-02-11 14:28:51 +01:00
Thomas Müller
27a4c9f625 Merge pull request #22308 from owncloud/shorter-ttl-find-path 
Shorter TTL on  findBinaryPath caching
 2016-02-11 14:02:24 +01:00
Roeland Jago Douma
4533cb9c59 Add parent for invisible link shares 2016-02-11 13:29:23 +01:00
Joas Schilling
8cfdc62eae Update info checker requirements 2016-02-11 11:54:13 +01:00
Roeland Jago Douma
dd630e33ea Properly check for legacy methods 
The new shares are completely without parents eventually. But for some
current legacy reasons the methods are still around. But we should
properly check for them.

Fixes #22309
 2016-02-11 11:30:52 +01:00
Joas Schilling
ee080a9bc3 Do not getShare in deleteShare, it's already there when deleting 2016-02-11 11:21:06 +01:00
Thomas Müller
2efb97ba09 Fixes #13658 2016-02-11 10:53:18 +01:00
Jenkins for ownCloud
5165998723 [tx-robot] updated from transifex 2016-02-11 01:55:35 -05:00
Thomas Müller
3184115c3c Merge pull request #22285 from owncloud/fix_22275 
Only show link shares for the current user
 2016-02-10 20:01:41 +01:00
Thomas Müller
6ffb83ae19 Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-of-entries-to-cleanup 
Chunk the cleanup queries to make sure they don't time out
 2016-02-10 17:26:11 +01:00
Thomas Müller
39e6a1897b Merge pull request #22271 from owncloud/remember-login-state 
Remember previous state of remember login checkbox
 2016-02-10 17:25:34 +01:00
Thomas Müller
8b165c5ed5 No longer evaluate appinfo/version 2016-02-10 17:24:14 +01:00
Roeland Jago Douma
9651defe3f Also filter the old share info endpoint 
Make sure we do not show an icon if we can't display a share
 2016-02-10 17:05:57 +01:00
Vincent Chan
06b2f11e57 refactoring code 2016-02-10 15:28:14 +01:00
Thomas Müller
5c89cf9565 Merge pull request #22267 from owncloud/fix_encryption2 
calculate and update the version of the encryption signature correctly
 2016-02-10 15:14:52 +01:00
Bjoern Schiessle
9dc759b4dc remember signature version and only set it on update to make sure that other 
apps like files_versions still get the old signature version
 2016-02-10 13:27:32 +01:00
Joas Schilling
0ebb205010 Chunk the queries to make sure they don't time out 2016-02-10 13:04:37 +01:00
Thomas Müller
a8d9eb5320 Merge pull request #22256 from owncloud/hide-updater-secret 
Hide updater.secret from occ output by default
 2016-02-10 08:58:46 +01:00
Jenkins for ownCloud
9ebcc4ce31 [tx-robot] updated from transifex 2016-02-10 01:56:05 -05:00
Vincent Petry
3736f13826 Check if partial cache entry or not in encryption wrapper 2016-02-09 23:43:27 +01:00
Lukas Reschke
5ccb9dfa7e Use database for keeping track of the version 2016-02-09 23:43:27 +01:00
Lukas Reschke
3badf5caf5 Use number of chunk for HMAC as well 
Prevents switching single blocks within the encrypted file.
 2016-02-09 23:43:26 +01:00
Björn Schießle
9bb97c714b fixing unit tests 2016-02-09 23:43:26 +01:00
Björn Schießle
cf3a8f274f make it backward compatible to work with signed and un-signed files 2016-02-09 23:43:25 +01:00
Thomas Müller
29f6f451a9 Merge pull request #22192 from owncloud/fix_19685 
Only set the default expiration date on share creation
 2016-02-09 23:38:00 +01:00
C. Montero Luque
962d0c3290 Merge pull request #22252 from owncloud/consolidate-user-set-quota 
Consolidate getQuota and setQuota methods in User instance
 2016-02-09 22:00:24 +01:00
Lukas Reschke
40d798e668 Hide updater.secret from occ output by default 
We should not have people post that value to us.
 2016-02-09 20:41:55 +01:00
Arthur Schiwon
03d0fb4e3f revolutionar: change updates might even sent the new value (optional) 2016-02-09 18:37:41 +01:00
Lukas Reschke
abc675d87e Move update notification code into app 
Moves the update notification code in a single app. This is required since we want to use SSO for the new updater and for this have some code running in ownCloud as well (and we don't want that in core neccessarily). This app can provide that in the future, right now it's only the update notification itself. Will continue working on the SSO right away but wanted to keep the PR small.

Furthermore also makes some more code unit-testable...
 2016-02-09 18:05:51 +01:00
Arthur Schiwon
096115870c Avatar should also claim its change 2016-02-09 17:44:49 +01:00
Arthur Schiwon
82a37d41d0 Doc improvements 2016-02-09 17:41:04 +01:00
Arthur Schiwon
3a796d1e15 Consolidate getQuota and setQuota methods in User instance 2016-02-09 17:16:43 +01:00
Thomas Müller
2982017682 Merge pull request #22228 from owncloud/comments-limit-message 
Limit comment message to 1k chars
 2016-02-09 16:35:23 +01:00
Arthur Schiwon
bbc86e0756 on DAV throw Bad Request if provided message is too long 2016-02-09 13:59:13 +01:00
Thomas Müller
6474866aff Merge pull request #22225 from owncloud/sharing-moar-hooks 
More sharing hooks for extended auditing
 2016-02-09 13:30:22 +01:00
Thomas Müller
1a2d72b0ac Merge pull request #22212 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2016-02-09 13:30:06 +01:00
Thomas Müller
d11179a0f5 Merge pull request #22227 from owncloud/appmanager-hooks 
Send events when enabling and disabling of apps
 2016-02-09 11:23:19 +01:00
Roeland Jago Douma
49726470ab Catch exception 2016-02-09 11:05:34 +01:00
Roeland Jago Douma
426a12baaa Throw exception 2016-02-09 11:05:29 +01:00
Roeland Jago Douma
ee65cd0bd8 Only set the default expiration date on share creation 
Fixes #19685

The default expiration date should only be set when we create a new
share. So if a share is created and the expiration date is unset. And
after that the password is updated the expiration date should remain
unset.
 2016-02-09 11:05:14 +01:00
Joas Schilling
349f3bf54a More fixes 2016-02-09 10:40:00 +01:00
Roeland Jago Douma
12afd7b005 Move password update hook after update 2016-02-09 10:38:12 +01:00
Roeland Jago Douma
623a0e4637 Example hook check 2016-02-09 10:36:44 +01:00
Vincent Petry
19980be116 Fix part file partial cache logic in encryption code 
The encryption code uses partial cache entries for the part file (which
are not stored in the database) but are useful for other parts of the
code to retrieve the file size again.

This means that in the fixed code $info was empty, so getData() could
not be called.

The fix makes sure to support both cases when the cache entry exists and
doesn't.
 2016-02-09 09:47:34 +01:00
Jenkins for ownCloud
e749a02e6b [tx-robot] updated from transifex 2016-02-09 01:55:36 -05:00
Arthur Schiwon
347ad3e223 Limit comment message to 1k chars 2016-02-09 03:14:30 +01:00
Arthur Schiwon
cd00751de5 Send events when enabling and disabling of apps 2016-02-09 02:51:12 +01:00
Arthur Schiwon
4dfd56ee81 add post hook on link-share password change 2016-02-08 23:27:37 +01:00
Thomas Müller
a03279a3a8 Merge pull request #22207 from owncloud/mountcache-exists-check 
better exists check for insert mount cache
 2016-02-08 17:57:59 +01:00
Scrutinizer Auto-Fixer
08f0dc9067 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-02-08 15:43:39 +00:00
Thomas Müller
ec399e6bbc Merge pull request #22200 from owncloud/node-checksum-resolvefileinfo 
Make sure fileinfo exists when calling getCheckSum in node API
 2016-02-08 16:10:31 +01:00
Thomas Müller
acc7d63a69 Merge pull request #22164 from owncloud/files_external-verify 
Add occ command to verify storage configurations
 2016-02-08 15:21:07 +01:00
Robin Appelman
26a8fb157d better exists check for insert mount cache 2016-02-08 15:18:42 +01:00
Roeland Jago Douma
1e8e00c541 Add proper throw tags to File 2016-02-08 14:44:26 +01:00
Robin Appelman
b95e388526 Add occ command to verify storage configurations 2016-02-08 14:07:58 +01:00
Vincent Petry
41ba9280f7 Make sure fileinfo exists when calling getCheckSum in node API 2016-02-08 12:24:18 +01:00
Roeland Jago Douma
a506f9ca3f Respect not allowing outgoing shares 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
ba0bab294e Add federated share provider to core 2016-02-08 11:30:48 +01:00
Thomas Müller
62b5948ff5 Merge pull request #22156 from owncloud/share2_unshare_ifexpired 
Delete a link share if it is expired on access
 2016-02-08 09:59:00 +01:00
Jenkins for ownCloud
4130639a7e [tx-robot] updated from transifex 2016-02-08 01:54:46 -05:00
Jenkins for ownCloud
feb0522cd0 [tx-robot] updated from transifex 2016-02-07 01:55:33 -05:00
Roeland Jago Douma
46faf6d3ca Fix exception on delete 2016-02-06 13:31:54 +01:00
Roeland Jago Douma
8486d61764 getSharesBy should also expire link shares 2016-02-06 13:31:54 +01:00
Roeland Jago Douma
3028ec5440 Delete expired share when fetched by id 2016-02-06 13:31:54 +01:00
Roeland Jago Douma
5ed56d9edb Delete a link share if it is expired on access 
If we access a link share we should check if it has expired already.
If so we should remove it and throw a ShareNotFound exception
 2016-02-06 13:31:54 +01:00
Thomas Müller
5832178f59 Merge pull request #22139 from owncloud/comments-files-cleanup 
cleanup jobs for comments and comment read marks
 2016-02-06 13:26:00 +01:00
Thomas Müller
a9015d61a7 Merge pull request #22166 from owncloud/remove-local-folder 
remove unused Storage->getLocalFolder
 2016-02-06 13:21:59 +01:00
Jenkins for ownCloud
9fa09b67e6 [tx-robot] updated from transifex 2016-02-06 01:55:36 -05:00
Joas Schilling
065141f6f4 Move casting to IExpressionBuilder 2016-02-05 21:26:30 +01:00
Thomas Müller
6ccd5ecb07 Merge pull request #22169 from owncloud/cache-interface-fixes 
Cache interface cleanup/phpdoc
 2016-02-05 18:09:19 +01:00
Robin Appelman
282c1cb24f remove unused Storage->search 2016-02-05 17:52:37 +01:00
Robin Appelman
559189cf47 additional phpdoc for search 2016-02-05 17:52:19 +01:00
Robin Appelman
615f0f5499 add deprecation notice to search methods 2016-02-05 17:46:43 +01:00
Robin Appelman
fb76d7de69 remove unused Storage->getLocalFolder 2016-02-05 16:48:08 +01:00
Joas Schilling
550f3af285 Remove old background job 2016-02-05 15:51:08 +01:00
Thomas Müller
e15a120f83 Merge pull request #22152 from owncloud/activities-for-comments 
Activities for comments
 2016-02-05 13:50:38 +01:00
Thomas Müller
f7e37984be Merge pull request #22153 from owncloud/event-for-console-commands 
Dispatch an event when a console command is run
 2016-02-05 13:30:35 +01:00
Joas Schilling
4056cca427 Only dispatch the delete event, when the deletion was successful 2016-02-05 12:39:07 +01:00
Joas Schilling
97b907335a Dispatch an event when a console command is run 2016-02-05 12:24:54 +01:00
Thomas Müller
e6bab280a6 Merge pull request #22143 from owncloud/fix_12385 
When a user is removed we should remove the right shares
 2016-02-05 11:53:28 +01:00
Joas Schilling
070ff71a2d Add activities for comments 2016-02-05 11:30:53 +01:00
Joas Schilling
e86dcdacc8 Dispatch events when adding, updating and deleting comments 2016-02-05 11:30:53 +01:00
Scrutinizer Auto-Fixer
466a085253 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-02-05 09:38:43 +00:00
Roeland Jago Douma
5f521067d8 When a user is removed we should remove the right shares 
* This means all the shares directly shared with them
* Or all group shares having a special share with them

This patch fixes the operator precedece (AND before OR).
So before this patch:

(share_with = <deleted user> AND share_type = 0) OR share_type=2

So it deleted all user specific shares

Now:
share_with = <deleted user> AND (share_type = 0 OR (share_type=2)
 2016-02-05 10:05:22 +01:00
Roeland Jago Douma
169874957a Path should be relative 2016-02-04 19:19:10 +01:00