aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Add missing newlines to .htaccessMichaIng2019-10-311-2/+2
| | | Signed-off-by: MichaIng <micha@dietpi.com>
* Add "Order" to assure that no parental "Allow" can grant accessMichaIng2019-09-261-0/+2
| | | Signed-off-by: MichaIng <micha@dietpi.com>
* Minor syntaxMichaIng2019-08-191-21/+21
| | | | | | | + Use Apache syntax with cases according to official docs: https://github.com/nextcloud/server/pull/16792/files#r315207691 + Add missing whitespace for concatenating strings to variable: https://github.com/nextcloud/server/pull/16792/files#r315207520 + Apache 2.5 will be released as 2.6: https://github.com/nextcloud/server/pull/16792/files#r315206147 Signed-off-by: Micha Felle <micha@dietpi.com>
* Update lib/private/Setup.php MichaIng2019-08-191-1/+1
| | | | | + Remove unnecessary spaces from code Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
* Harden data protection .htaccessMichaIng2019-08-191-8/+16
| | | | | | | | | | | + Set "Satisfy All" whenever available, as well on Apache 2.4+. This is required to override possible "Satisfy Any" on parent dir, which otherwise would allow direct access to data, regardless of "Require" directive. + Set "Deny from all" as well whenever available, to block access regardless of which access control directive takes priority. + Assume Apache 2.2 only, if mod_authz_core and mod_access_compat are both not available, to avoid doubled directives. In this case set "Deny from all" directive only if the providing mod_authz_host module is available. "Satisfy" is a core directive on Apache 2.2. + Update Apache version strings. Regarding the used directives/modules, Apache 2.4 and 2.5 behave the same. + Add ordering spaces to better reflect the nested directives and to match style of other .htaccess files. Fixes: https://github.com/nextcloud/server/issues/6449 Signed-off-by: Micha Felle <micha@dietpi.com>
* Make the auto-disabled list more broadJoas Schilling2019-08-153-14/+20
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix tracking of auto disabled apps in UpdaterGeorg Ehrke2019-08-151-1/+10
| | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* Merge pull request #15946 from martink-p/bugxfix/9792/encrypted-external-webdavRoeland Jago Douma2019-08-151-2/+27
|\ | | | | Update Encryption.php
| * Update Encryption.phpmartink-p2019-06-171-7/+9
| | | | | | | | Signed-off-by: martink-p <47943787+martink-p@users.noreply.github.com>
| * Update Encryption.phpmartink-p2019-06-171-1/+7
| | | | | | | | Signed-off-by: martink-p <47943787+martink-p@users.noreply.github.com>
| * Apply suggestions from code reviewmartink-p2019-06-171-5/+5
| | | | | | | | | | Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de> Signed-off-by: martink-p <47943787+martink-p@users.noreply.github.com>
| * Update Encryption.phpmartink-p2019-06-171-2/+19
| | | | | | | | Signed-off-by: martink-p <47943787+martink-p@users.noreply.github.com>
* | Merge pull request #16572 from nextcloud/fix/15613/bring-back-psql9-compatRoeland Jago Douma2019-08-142-3/+24
|\ \ | | | | | | instead of upsert query, fallback to default on PSQL <= 9.4
| * | instead of upsert, fallback to default query on PgSQL <= 9.4Arthur Schiwon2019-08-142-3/+24
| | | | | | | | | | | | | | | | | | because there is no upsert yet Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #16725 from nextcloud/bugfix/noid/syslog-diblizzz2019-08-142-2/+3
|\ \ \ | |/ / |/| | Fix loading of the syslog logging class
| * | Make sure SystemConfig class can be injected and syslog_tag is fetched properlyJulius Härtl2019-08-132-2/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Get the proper UIDRoeland Jago Douma2019-08-132-1/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some user backends (like the database backend) allow us to obtain a user case insensitive. However the UID itself is case sensitive. Example: * create a user User1 * login as User1 - This results the data/User1 folder to be created etc * now have some code somewhere that obtains the userFolder (from IRootFolder) but pas in 'uSER1' as uid - The code will check if that is a valid user. And in this case it is since User1 and uSER1 both map to the same user - However the the UID in the user object is used for the folder a new folder fill be create data/uSER1 With this PR this is avoided now. Since we obtain the real UID casing in the backend before creating the user object. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #16721 from nextcloud/fix/16644Roeland Jago Douma2019-08-111-4/+4
|\ \ | | | | | | Correctly handle emtpy string in proxyuserpwd config
| * | Correctly handle emtpy string in proxyuserpwd configScott Shambarger2019-08-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As documented, the default value for config value proxyuserpwd is ''. However, that value results in the error: "cURL error 5: Unsupported proxy syntax in '@'". This patch handles the values of '' and null (the default in the code) the same for config values proxyuserpwd and proxy. Signed-off-by: Scott Shambarger <devel@shambarger.net>
* | | Merge pull request #16179 from J0WI/mv-frameoptionsRoeland Jago Douma2019-08-111-5/+5
|\ \ \ | | | | | | | | Add X-Frame-Options header to .htaccess
| * | | Remove duplicated spacesJ0WI2019-08-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: J0WI <J0WI@users.noreply.github.com>
| * | | Sort headersJ0WI2019-08-111-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: J0WI <J0WI@users.noreply.github.com>
| * | | Add X-Frame-Options header to .htaccessJ0WI2019-08-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: J0WI <J0WI@users.noreply.github.com>
* | | | Add feature policy headerRoeland Jago Douma2019-08-104-0/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the events and the classes to modify the feature policy. It also adds a default restricted feature policy. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Have the OCSBaseResponse call the parent constructorRoeland Jago Douma2019-08-081-1/+2
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #15187 from vitormattos/bugfix-create-database-userRoeland Jago Douma2019-08-081-0/+4
|\ \ \ | | | | | | | | Bugfix: user is not allowed
| * \ \ Merge remote-tracking branch 'nextcloud/master' into bugfix-create-database-userVitor Mattos2019-04-301-1/+3
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'nextcloud/master' into bugfix-create-database-userVitor Mattos2019-04-263-84/+3
| |\ \ \ \
| * | | | | solve code reviewVitor Mattos2019-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vitor Mattos <vitor@php.rio>
| * | | | | Check if database exists and grand permissionVitor Mattos2019-04-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vitor Mattos <vitor@php.rio>
| * | | | | Bugfix: user is not allowedVitor Mattos2019-04-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The created user don't has permission to connect to database. I changed the code to give permission Signed-off-by: Vitor Mattos <vitor@php.rio>
* | | | | | Properly return an int in the getId function of the cacheRoeland Jago Douma2019-08-071-1/+1
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | fixes #16684 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #16592 from nextcloud/bugfix/noid/federated-reshareRoeland Jago Douma2019-08-011-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix permission check on incoming federated shares
| * | | | | Fix permission check on incoming federated sharesJulius Härtl2019-07-311-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since federated shares have their permissions set on the node, we do not need to check for parent share permissions. Otherwise reshares of incoming federated have no permission variable defined and creating them will fail Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Add form-action CSP elementRoeland Jago Douma2019-07-311-0/+9
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | setting unsafe-eval is deprecatedRoeland Jago Douma2019-07-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be removed in a future version of Nextcloud. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #16594 from ↵Joas Schilling2019-07-301-29/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/tech-debt/noid/remove-unused-checkPasswordProtectedShare Remove unused OC\Share\Share::checkPasswordProtectedShare
| * | | | | Remove unused OC\Share\Share::checkPasswordProtectedShareMorris Jobke2019-07-291-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #16579 from nextcloud/enh/PostLoginEventRoeland Jago Douma2019-07-303-2/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add proper PostLoginEvent
| * | | | | | Add proper PostLoginEventRoeland Jago Douma2019-07-293-2/+80
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used by othr mechanisms to listen for this event in a lazy fashion. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #16502 from nextcloud/bugfix/16474Morris Jobke2019-07-291-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Check the if we can actually access the storage cache for recent files
| * | | | | | Add additional check for read permissionsJulius Härtl2019-07-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Check the if we can actually access the storage cache for recent filesJulius Härtl2019-07-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Fix typo in commentMorris Jobke2019-07-291-1/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #16582 from nextcloud/enh/split_up_security_middlewareRoeland Jago Douma2019-07-293-43/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | Split up security middleware
| * | | | | | Split up security middlewareRoeland Jago Douma2019-07-273-43/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With upcoming work for the feature policy header. Splitting this in smaller classes that just do 1 thing makes sense. I rather have a few small classes that are tiny and do 1 thing right (and we all understand what is going on) than have big ones. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #16570 from nextcloud/enh/supress_touch_errorRoeland Jago Douma2019-07-291-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Supress warnings touch can generate
| * | | | | | Supress warnings touch can generateRoeland Jago Douma2019-07-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already catch the result value. Having the warning being logged explicitly doesn't help and polutes the log. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #16558 from nextcloud/enh/less_verbose_locked_loggingRoeland Jago Douma2019-07-271-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Do not log all locked exceptions
| * | | | | | Do not log all locked exceptionsRoeland Jago Douma2019-07-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happen for valid reasons (multiple users writing at the same time) with for example the text app. Apps should properly handle it. No reason to log it by default. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>