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

9957 commits

Author SHA1 Message Date
Morris Jobke
a1e13d95ad Merge pull request #18777 from owncloud/locking-default 
enable transational locking by default
 2015-09-03 11:33:10 +02:00
Joas Schilling
21ba3b8737 Only query the appconfig once 2015-09-03 11:30:57 +02:00
Individual IT Services
cd0a5372ee reuse existing $systemConfig variable 2015-09-03 12:44:35 +05:45
Lukas Reschke
f9e90e92d4 Encode HTML tags in JSON 
While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time.
 2015-09-03 00:44:46 +02:00
Joas Schilling
8f2110e5da Revert "Soft fail when deleting and no entry found" 2015-09-02 19:52:45 +02:00
Robin Appelman
4880d7729b enable transational locking by default 2015-09-02 16:56:47 +02:00
Robin McCorkell
c9c246a3f5 Soft fail when deleting and no entry found 2015-09-02 14:50:07 +01:00
Robin Appelman
0f6df2e0b6 Allow creating previewss that cover the specified dimensions 2015-09-02 10:32:39 +02:00
Morris Jobke
73b43db4f9 Merge pull request #18744 from owncloud/fix-ocs-router 
Delay adding OCS prefix to route collection until all is loaded
 2015-09-02 08:05:15 +02:00
Jenkins for ownCloud
310084cc25 [tx-robot] updated from transifex 2015-09-01 14:03:19 -04:00
Robin Appelman
1c10fb5c9f also use httpclient for uploadFile 2015-09-01 18:01:27 +02:00
Robin Appelman
9858a6f705 Merge pull request #18743 from owncloud/autoloader-check-log-path 
Show the path as part of the exception for not allowed autoloading paths
 2015-09-01 17:20:21 +02:00
Robin McCorkell
5b2529b448 Delay adding OCS prefix to route collection until all is loaded 
->addPrefix() iterates over all registered routes, so must be run after
all apps have had a chance to load their OCS routes.
 2015-09-01 15:42:41 +01:00
Robin Appelman
01dcf7f32c Show the path as part of the exception for not allowed autoloading paths 2015-09-01 16:06:52 +02:00
Vincent Petry
87b3e28f06 Merge pull request #18730 from owncloud/appframework_proper_304 
Properly return 304 in AppFramework
 2015-09-01 15:39:59 +02:00
Robin McCorkell
9e9ffb1356 Allow access to full alias and mapping arrays 2015-09-01 14:07:14 +01:00
Robin Appelman
e9b91b1798 verify the path in the autoloader 2015-09-01 15:03:28 +02:00
Roeland Jago Douma
f12caf930e Properly return 304 
The ETag set in the IF_NONE_MODIFIED header is wraped in quotes (").
However the ETag that is set in response is not (yet). Also we need to
cast the ETag to a string.

* Added unit test
 2015-09-01 11:04:41 +02:00
Vincent Petry
6ccbf4bce6 Improved update version detection logic 2015-08-31 18:35:35 +02:00
Vincent Petry
85b62c7d82 Merge pull request #18635 from owncloud/stickify-files-and-sharing-notification-types 
Sticky the notification types of files and sharing
 2015-08-31 17:56:48 +02:00
Robin McCorkell
3142a20f25 Expose files_external services from Server 
Not exposed to OCP yet
 2015-08-31 15:18:26 +01:00
Vincent Petry
f8d8de5da6 Merge pull request #17899 from owncloud/enc_make_key_storage_root_configurable 
Make root of key storage configurable
 2015-08-31 15:58:30 +02:00
Morris Jobke
c34fbea197 Merge pull request #18691 from owncloud/request-no-read 
Decode request content only on getContent
 2015-08-31 14:58:48 +02:00
Vincent Petry
3b37c20319 Simplify comparison algo 2015-08-31 14:31:17 +02:00
Robin McCorkell
e60c4bada1 Decode request content only on getContent 2015-08-31 01:05:25 +01:00
Morris Jobke
b50ac6ff2f Merge pull request #10149 from owncloud/storage-wrapper-check 
Check result of storage wrappers
 2015-08-30 19:48:37 +02:00
Bjoern Schiessle
37513f9411 don't read certificates if ownCloud is not installed 2015-08-30 19:00:03 +02:00
Bjoern Schiessle
289e9130f3 make system root of key storage configurable 2015-08-30 19:00:03 +02:00
Vincent Petry
d5b0b55eef Throw exception on downgrade attempt 2015-08-30 18:07:22 +02:00
Vincent Petry
2b08659f7d Restrict upgrades to explicit allowed version 
version.php now contains the previous ownCloud version from which
upgrades are allowed. Any other upgrades will show a message that the
upgrade/downgrade is not supported.
 2015-08-30 18:04:18 +02:00
Vincent Petry
045f8cc971 Merge pull request #18651 from owncloud/ocs_share_create_with_expire 
Allow to directly set the expireDate on a new (link)share
 2015-08-30 10:50:12 +02:00
Roeland Jago Douma
2aff11c80b Actually validate the expire date on share 
* Added more intergration tests
 2015-08-30 10:31:43 +02:00
Robin Appelman
4cb8ca1860 Check result of storage wrappers 2015-08-30 10:02:42 +02:00
Vincent Petry
723f8c8f1b Merge pull request #18620 from owncloud/add-public-interface-for-factory 
Add a public interface for the language factory so apps can use it
 2015-08-29 16:44:08 +02:00
Robin Appelman
df8cb2cc63 stream webdav downloads using http client 2015-08-29 14:56:15 +02:00
Robin Appelman
b67d395089 allow streamed responses in http client 2015-08-29 14:56:08 +02:00
Joas Schilling
0ddcc7da44 Merge pull request #18511 from owncloud/downgrad-sharing-error-logs-to-debug 
Change log level of debugging logs to debug
 2015-08-28 21:05:02 +02:00
Björn Schießle
6e210d960c Merge pull request #18423 from owncloud/occ_encrypt_all 
occ command line tool to encrypt all files
 2015-08-28 20:44:55 +02:00
Joas Schilling
42f0651b83 Sticky the notification types of files and sharing 2015-08-28 18:40:50 +02:00
Joas Schilling
37b00b7443 Add since tag 2015-08-28 15:46:55 +02:00
Joas Schilling
a12d354762 Deprecate OC_L10N::get() 2015-08-28 12:04:52 +02:00
Jenkins for ownCloud
933ac14b76 [tx-robot] updated from transifex 2015-08-28 01:55:25 -04:00
Joas Schilling
c3c7689b67 Add a public interface for the language factory so apps can use it 2015-08-27 13:14:50 +02:00
Jenkins for ownCloud
46978b616c [tx-robot] updated from transifex 2015-08-27 01:55:20 -04:00
Bjoern Schiessle
e51fe617d8 copy always file by file to encrypt/decrypt it if needed 2015-08-26 14:58:22 +02:00
Bjoern Schiessle
8c08dd0ac2 occ tool to encrypt all files 2015-08-26 14:58:22 +02:00
Lukas Reschke
3d2ee95f1e Remove last occurence of forcessl 
This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time.
 2015-08-26 14:29:36 +02:00
Thomas Müller
40203d7d1e Remove languages which are no longer maintained on transifex 2015-08-26 12:19:24 +02:00
Jenkins for ownCloud
90e11ee005 [tx-robot] updated from transifex 2015-08-26 04:10:42 -04:00
Thomas Müller
749e3d5219 Merge pull request #18553 from owncloud/write-l10n-on-login 
Save detected l10n of browser on login
 2015-08-26 08:44:25 +02:00
Thomas Müller
534b2e407a Merge pull request #17662 from owncloud/locking-db 
Database backend for locking
 2015-08-26 03:56:37 +02:00
Morris Jobke
e9241fcd8c Merge pull request #18562 from owncloud/explicit-use-statuscode-200 
Explicitly specify status code 200 as response code
 2015-08-25 22:02:27 +02:00
Jenkins for ownCloud
2171cc02c3 [tx-robot] updated from transifex 2015-08-25 12:39:10 -04:00
Lukas Reschke
f3561e2349 Explicitly specify status code 200 as response code 
Potentially fixes https://github.com/owncloud/core/issues/17586
 2015-08-25 18:07:40 +02:00
Morris Jobke
4f13f96981 Save detected l10n of browser on login 
* fixes owncloud/activity#373
 2015-08-25 15:47:31 +02:00
Thomas Müller
6f6a5f6c29 Adding path to log message 2015-08-25 14:31:21 +02:00
Thomas Müller
2f86be9ced Merge pull request #18523 from owncloud/crazy-scanner 
Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php)
 2015-08-25 09:23:42 +02:00
Vincent Petry
fe575feca8 Prevent scanner going crazy with unavailable storages 2015-08-24 16:42:53 +02:00
Morris Jobke
e88b380973 Remove DEBUG constant and use config value 
* introduces config.php option 'debug' that defaults to false
* migrate DEBUG constant to config value
 2015-08-24 15:14:05 +02:00
Lukas Reschke
bd13126a80 Fix master again 
Caused due to merge of two PRs
 2015-08-24 12:19:03 +02:00
Joas Schilling
4e0e2eb222 Change log level of debugging logs to debug 2015-08-24 12:12:08 +02:00
Morris Jobke
b3495a1dc9 Merge pull request #18482 from owncloud/encrypt-session-data 
Add a session wrapper to encrypt the data before storing it on disk
 2015-08-24 12:10:15 +02:00
Vincent Petry
fe568ab64d Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxy 
Use client service to work behind proxy for checks for remote ownCloud instances
 2015-08-24 11:05:14 +02:00
Vincent Petry
31d62c10bf Merge pull request #17501 from tbartenstein/patch-1 
Update fileinfo.php
 2015-08-24 09:57:27 +02:00
Morris Jobke
40b1054530 Merge pull request #18254 from owncloud/mitigate-breach 
Add mitigation against BREACH
 2015-08-24 09:14:27 +02:00
Lukas Reschke
0a1d551090 Use IClientService to check for remote ownCloud instances 
1. Allows to set a timeout (though still not perfect but way better than before)
2. Allows to have unit tests
3. I also added unit tests for the existing controller code
4. Corrected PHPDoc on IClient
 2015-08-22 14:39:43 +02:00
Lukas Reschke
6a3fb0d3b3 Handle failures gracefully, remove switch 2015-08-21 19:16:28 +02:00
Joas Schilling
36eef2ddab Add a session wrapper to encrypt the data before storing it on disk 2015-08-21 17:59:23 +02:00
Morris Jobke
ac086a11c1 Merge pull request #18426 from owncloud/joblist-next-non-existing 
handle non existing job classes in $jobList->getNext
 2015-08-21 10:34:33 +02:00
Joas Schilling
9573d7d60d Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-activities 
Issue 18358 object type and id for activities
 2015-08-20 15:53:36 +02:00
Joas Schilling
c58316b1ae Expand the doc blocks on the new methods 2015-08-20 15:35:24 +02:00
Morris Jobke
d725de505e Merge pull request #18439 from owncloud/fix-appmanagement-install 
[app management] fix dependency check on install
 2015-08-20 13:26:55 +02:00
Joas Schilling
6697844c01 Remove unnecessary code 2015-08-20 13:10:11 +02:00
Morris Jobke
06d8edd963 Merge pull request #17434 from owncloud/update-showappnameonappupdate 
Display app names in update page for app updates
 2015-08-20 11:50:01 +02:00
Vincent Petry
a2674b2b30 Additions to update page 
Apps to update and to disable will always be shown.
Main title changes only when apps need updated, not core.
Added bullet style.
Exclude incompatible apps from updated apps list.
 2015-08-20 11:14:30 +02:00
Joas Schilling
389a32e92a Add test coverage for Activity Event and Manager 2015-08-20 10:25:49 +02:00
Morris Jobke
29decf698c [app management] fix dependency check on install 2015-08-19 21:32:56 +02:00
Morris Jobke
b3356b1288 Merge pull request #18432 from owncloud/ext-backends.simple 
Migrate simple external storage backends to new registration API [part 1]
 2015-08-19 20:04:20 +02:00
Thomas Müller
313cb092f9 Merge pull request #18427 from owncloud/fix-format-ocs 
Fix format of log/private/ocs.php
 2015-08-19 19:09:32 +02:00
Vincent Petry
b919ae96f0 Display app names in update page for app updates 
Whenever the update page is displayed for apps, show app names instead
of the core update text.
 2015-08-19 18:03:35 +02:00
Joas Schilling
4314c8fc6f Use an IEvent object instead of a huge parameter list 2015-08-19 17:44:57 +02:00
Joas Schilling
bc2aa14849 Extend the interfaces IManager and IConsumer to allow passing in the object 2015-08-19 17:44:57 +02:00
Robin McCorkell
3b27603762 Revert "Fix mounting wrapped storages resulting in many-layered wrapping" 
This reverts commit 75a5e6e12b.
 2015-08-19 14:41:43 +01:00
Robin McCorkell
3bb793b6a7 Implement password authentication mechanisms 
Introduces the basic password authentication mechanism, along with a
mechanism based on ownCloud credentials stored in the user session.

Change to lib/private is an extension of PermissionsMask, as
isSharable() override was missing.

Session credentials auth mechanism now disables sharing on applied
storages, as credentials will not be available.
 2015-08-19 14:20:09 +01:00
Lukas Reschke
40b87b1394 Add warning for not existing CA bundle when updating 
For newer releases we shall use an integrity check. But that's a good alternative for now.
 2015-08-19 15:03:33 +02:00
Morris Jobke
8fbb0c7b49 Fix format of log/private/ocs.php 
Fixes https://github.com/owncloud/core/pull/14314#discussion_r37305256
 2015-08-19 14:21:10 +02:00
Robin Appelman
beaef820cf handle non existing job classes in $jobList->getNext 2015-08-19 14:16:05 +02:00
Morris Jobke
127b6e2f3f Merge pull request #18374 from owncloud/router-apps 
Only load app routes if the app has already been loaded [re-merge]
 2015-08-19 09:52:09 +02:00
Bernhard Posselt
66d8476e9e Merge pull request #14314 from owncloud/clean-up-ocs-code 
Cleanup OCS code
 2015-08-18 16:47:53 +02:00
Robin McCorkell
1c26755686 Only load app routes if the app has already been loaded 2015-08-18 09:18:36 +01:00
Robin McCorkell
675d852c7d Merge pull request #17182 from owncloud/user_ini_upload_size 
Update .user.ini when setting upload size limit
 2015-08-17 13:27:47 +01:00
Morris Jobke
24e20a51eb Degrade log message about missing app in appstore to debug 
* fixes #18154
 2015-08-17 11:27:41 +02:00
Thomas Müller
0b64268910 Adding EventDispatcher to IServerContainer 2015-08-14 15:40:15 +02:00
Lukas Reschke
a7e4785be9 Cleanup OCS code 
This removes unused code from `OC_OCS` which nobody understood what it really was for anyways.
 2015-08-14 13:42:56 +02:00
Lukas Reschke
8313a3fcb3 Add mitigation against BREACH 
While BREACH requires the following three factors to be effectively exploitable we should add another mitigation:

1. Application must support HTTP compression
2. Response most reflect user-controlled input
3. Response should contain sensitive data

Especially part 2 is with ownCloud not really given since user-input is usually only echoed if a CSRF token has been passed.

To reduce the risk even further it is however sensible to encrypt the CSRF token with a shared secret. Since this will change on every request an attack such as BREACH is not feasible anymore against the CSRF token at least.
 2015-08-14 01:31:32 +02:00
Thomas Müller
1d219cf799 With V2 we should ensure that the status codes are kept in sync 2015-08-13 10:45:25 +02:00
Thomas Müller
abd3d5c6a5 Merge pull request #17982 from owncloud/appframework-sanitize-name 
Sanitize class names before registerService/query
 2015-08-12 12:19:24 +02:00
Thomas Müller
eb13cb8d75 Merge pull request #18127 from owncloud/dav-request-tests 
add test framework for doing full request webdav tests
 2015-08-12 10:07:20 +02:00
Robin McCorkell
cd5342d0ff Merge pull request #18202 from owncloud/revert-route-breaking-changes 
Revert route breaking changes
 2015-08-11 15:28:06 +01:00
Robin Appelman
b7cbff23d9 handle single file dav endpoints 2015-08-11 14:46:46 +02:00