summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* make JobList::next() lock freeJörn Friedrich Dreyer2017-04-071-5/+10
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Don't force the use of Accept-Language anymoreJoas Schilling2017-04-071-18/+0
| | | | | | | | | | | | | | | | | This is not intended anymore, since it falls back to force english when the header is not set. Also 0228bc6e66cbcb2848eacb41f1de6e7f63ebcb65 makes clear that the order should be: 1. User setting 2. Accept language 3. Admin default This is the case since the commit from above, unless via OCS and DAV. Both forced to accept-language falling back to english. By removing the force, it now also matches the w3 priority list: https://www.w3.org/International/questions/qa-lang-priorities Signed-off-by: Joas Schilling <coding@schilljs.com>
* Save the scope of an auth token in the sessionRobin Appelman2017-04-053-24/+68
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #4138 from nextcloud/resources_match_fullidMorris Jobke2017-04-041-1/+7
|\ | | | | Match slashes in ../{id} resource routes
| * Match slashes in ../{id} resource routesRoeland Jago Douma2017-04-041-1/+7
| | | | | | | | | | | | | | | | | | | | Fixes #2954 Before we could match on <prefix>/{id} however if the id contains a / this would not match properly. But since we define the resource routes internally we now make sure that we match all chars (up until the ?). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4192 from ↵Morris Jobke2017-04-041-2/+2
|\ \ | | | | | | | | | | | | nextcloud/fix/custom-default-app-redirect-2fa-selection Redirect to 2FA selection screen
| * | Redirect to 2FA selection screenChristoph Wurst2017-04-031-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | Apps like 'rainloop' use \OCP\Util::isLoggedIn() to check whether the current request is authenticated. Since we redirected to the index page before, it resulted in an infinite redirection loop. This change sets the redirection URL to the 2FA selection page, which is the only allowed page in that authentication state. Fixes https://github.com/nextcloud/server/issues/3702 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #3310 from duritong/patch-1Morris Jobke2017-04-041-1/+3
|\ \ | | | | | | only chmod logfile if necessary
| * | only chmod logfile if necessaryduritong2017-01-291-1/+3
| | | | | | | | | otherwise e.g. on SELinux this will log an error, so we better avoid it if not necessary.
* | | Merge pull request #2095 from nextcloud/bruteforcesetttingsLukas Reschke2017-04-042-0/+66
|\ \ \ | | | | | | | | Introduce bruteforce settings
| * | | Fixed layout of bruteforcesettingsMorris Jobke2017-04-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Respect bruteforce settings in the ThrottlerRoeland Jago Douma2017-04-021-0/+65
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Adds security section to the admin pageRoeland Jago Douma2017-04-021-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4093 from nextcloud/endorse-password-protectionRoeland Jago Douma2017-04-042-0/+5
|\ \ \ \ | | | | | | | | | | Endorse password protection
| * | | | feature endorse password for share linksBjoern Schiessle2017-04-032-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | works like "enforce password protection", but let the user optionally remove the password protection after the password is set. by Timo Benk Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | / Don't try to parse empty body if there is no bodyRoeland Jago Douma2017-04-041-0/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3890 If we do a put request without a body the current code still tries to read the body. This patch makes sure that we do not try to read the body if the content length is 0. See RFC 2616 Section 4.3 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4131 from nextcloud/fix-jscombinerChristoph Wurst2017-04-031-1/+1
|\ \ \ | |/ / |/| | Fix check for cache value in JSCombiner
| * | Fix check for cache value in JSCombinerMorris Jobke2017-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes following log output, because there was empty string stored in the cache Invalid argument supplied for foreach() at lib/private/Template/JSCombiner.php#108 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4140 from nextcloud/no_encryption_no_wrapperBjörn Schießle2017-03-311-2/+5
|\ \ \ | | | | | | | | Don't add the Encryption Storage Wrapper if there are no encryption modules
| * | | Don't add the Encryption Storage Wrapper if there are no encryption modulesRoeland Jago Douma2017-03-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #4125 If there is no encryption module enabled it makes no sense to setup the encryption wrapper (because we can't do anything anyway). This saves reading the header of files. Especialy on external storage/objectstore this should improve performance Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #3832 from nextcloud/fix_1303Roeland Jago Douma2017-03-301-0/+4
|\ \ \ \ | | | | | | | | | | Do not clear CSRF token on logout (fix for #1303)
| * | | | Do not clear CSRF token on logout (fix for #1303)Roeland Jago Douma2017-03-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a hacky way to allow the use case of #1303. What happens is 1. User tries to login 2. PreLoginHook kicks in and figures out that the user need to change their LDAP password or whatever => redirects user 3. While loading the redirect some logic of ours kicks in and logouts the user (thus clearing the session). 4. We render the new page but now the session and the page disagree about the CSRF token This is kind of hacky but I don't think it introduces new attack vectors. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #4150 from nextcloud/capped-memcache-pushJoas Schilling2017-03-302-2/+7
|\ \ \ \ \ | | | | | | | | | | | | support pushing to CappedMemoryCache
| * | | | | user ids are stringsRobin Appelman2017-03-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | support pushing to CappedMemoryCacheRobin Appelman2017-03-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | rename fun to funcRobin Appelman2017-03-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Add tests for query builder (i)likeRobin Appelman2017-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | dont double escapeRobin Appelman2017-03-302-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | fix licence headersRobin Appelman2017-03-305-40/+45
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Move all children of a folder in a single queryRobin Appelman2017-03-301-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Add function builder to the query builderRobin Appelman2017-03-305-0/+172
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | add support for escaping like parameters when using the query builderRobin Appelman2017-03-303-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Add MD5() to sqliteRobin Appelman2017-03-301-0/+3
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #4132 from nextcloud/fix-safari-gzipLukas Reschke2017-03-302-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix gzip files for Safari
| * | | | | Fix gzip files for SafariMorris Jobke2017-03-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Safari support gzip only if the filename does not end on .gz - so this renames them to .gzip Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | also rename defaultMailHeaderColor to defaultColorPrimaryJan-Christoph Borchardt2017-03-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Add fallback to getMailHeaderColor so we don't break existing themesJulius Härtl2017-03-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-291-3/+3
| |_|/ / / |/| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #4116 from nextcloud/swift-cache-tokenRoeland Jago Douma2017-03-291-10/+62
|\ \ \ \ \ | | | | | | | | | | | | Cache swift authentication token in memcache
| * | | | | serialize the token to json instead of using php's serializeRobin Appelman2017-03-281-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | cache swift tokens in memcacheRobin Appelman2017-03-281-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4129 from nextcloud/remove-verbose-error-messageJoas Schilling2017-03-291-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove verbose error message
| * | | | | Remove verbose error messageLukas Reschke2017-03-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to have this included in the error message. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4120 from nextcloud/newest-item-first-in-activityMorris Jobke2017-03-281-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change the order on merging activities so the newest item is first
| * | | | | | Change the order on merging activities so the newest item is firstJoas Schilling2017-03-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #4127 from nextcloud/update-legacy-csp-policyMorris Jobke2017-03-281-1/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Update legacy CSP policy
| * | | | | | Update legacy CSP policyLukas Reschke2017-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligns it with the one enforced by the AppFramework Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | Merge pull request #4070 from nextcloud/gzip_scss_jsMorris Jobke2017-03-282-1/+17
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | GZip generated CSS/JS files
| * | | | | | Fix testsRoeland Jago Douma2017-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Allow to gzip CSS/JS filesRoeland Jago Douma2017-03-282-1/+17
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since in production the SCSS files are compiled once and the javascript files are combined once we can just as well gzip them aggresively. This means that once they are requested and the browser supports gzip we can just serve the gzipped file saving precious bandwidth. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 07:29:01 +0000