]> source.dussan.org Git - nextcloud-server.git/commitdiff
Migrate Forwarded For Headers check to new API
authorCôme Chilliet <come.chilliet@nextcloud.com>
Mon, 13 Nov 2023 16:07:25 +0000 (17:07 +0100)
committerCôme Chilliet <91878298+come-nc@users.noreply.github.com>
Mon, 20 Nov 2023 10:36:42 +0000 (11:36 +0100)
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
apps/settings/composer/composer/autoload_classmap.php
apps/settings/composer/composer/autoload_static.php
apps/settings/lib/AppInfo/Application.php
apps/settings/lib/Controller/CheckSetupController.php
apps/settings/lib/SetupChecks/ForwardedForHeaders.php [new file with mode: 0644]
apps/settings/tests/Controller/CheckSetupControllerTest.php
core/js/setupchecks.js
core/js/tests/specs/setupchecksSpec.js

index d578167a597a48da64e267c9dcbf6cbd33bb54c4..e6d1f3ff83f5de042b55213e7c7fed945204d25e 100644 (file)
@@ -78,6 +78,7 @@ return array(
     'OCA\\Settings\\SetupChecks\\DefaultPhoneRegionSet' => $baseDir . '/../lib/SetupChecks/DefaultPhoneRegionSet.php',
     'OCA\\Settings\\SetupChecks\\EmailTestSuccessful' => $baseDir . '/../lib/SetupChecks/EmailTestSuccessful.php',
     'OCA\\Settings\\SetupChecks\\FileLocking' => $baseDir . '/../lib/SetupChecks/FileLocking.php',
+    'OCA\\Settings\\SetupChecks\\ForwardedForHeaders' => $baseDir . '/../lib/SetupChecks/ForwardedForHeaders.php',
     'OCA\\Settings\\SetupChecks\\InternetConnectivity' => $baseDir . '/../lib/SetupChecks/InternetConnectivity.php',
     'OCA\\Settings\\SetupChecks\\LegacySSEKeyFormat' => $baseDir . '/../lib/SetupChecks/LegacySSEKeyFormat.php',
     'OCA\\Settings\\SetupChecks\\MemcacheConfigured' => $baseDir . '/../lib/SetupChecks/MemcacheConfigured.php',
index d6506f2bebc45cc1fdf4f7e433a07c650f46a07d..1a95f65119ac36dbcb9cd037c49f04b1ae5767b8 100644 (file)
@@ -93,6 +93,7 @@ class ComposerStaticInitSettings
         'OCA\\Settings\\SetupChecks\\DefaultPhoneRegionSet' => __DIR__ . '/..' . '/../lib/SetupChecks/DefaultPhoneRegionSet.php',
         'OCA\\Settings\\SetupChecks\\EmailTestSuccessful' => __DIR__ . '/..' . '/../lib/SetupChecks/EmailTestSuccessful.php',
         'OCA\\Settings\\SetupChecks\\FileLocking' => __DIR__ . '/..' . '/../lib/SetupChecks/FileLocking.php',
+        'OCA\\Settings\\SetupChecks\\ForwardedForHeaders' => __DIR__ . '/..' . '/../lib/SetupChecks/ForwardedForHeaders.php',
         'OCA\\Settings\\SetupChecks\\InternetConnectivity' => __DIR__ . '/..' . '/../lib/SetupChecks/InternetConnectivity.php',
         'OCA\\Settings\\SetupChecks\\LegacySSEKeyFormat' => __DIR__ . '/..' . '/../lib/SetupChecks/LegacySSEKeyFormat.php',
         'OCA\\Settings\\SetupChecks\\MemcacheConfigured' => __DIR__ . '/..' . '/../lib/SetupChecks/MemcacheConfigured.php',
index 6f4a94bdda9a8cb94bc0af3e222649b4296da87a..d694e650b4871c04a256d3f879abfd5a8e757a02 100644 (file)
@@ -53,6 +53,7 @@ use OCA\Settings\SetupChecks\CheckUserCertificates;
 use OCA\Settings\SetupChecks\DefaultPhoneRegionSet;
 use OCA\Settings\SetupChecks\EmailTestSuccessful;
 use OCA\Settings\SetupChecks\FileLocking;
+use OCA\Settings\SetupChecks\ForwardedForHeaders;
 use OCA\Settings\SetupChecks\InternetConnectivity;
 use OCA\Settings\SetupChecks\LegacySSEKeyFormat;
 use OCA\Settings\SetupChecks\MemcacheConfigured;
@@ -162,6 +163,7 @@ class Application extends App implements IBootstrap {
                $context->registerSetupCheck(DefaultPhoneRegionSet::class);
                $context->registerSetupCheck(EmailTestSuccessful::class);
                $context->registerSetupCheck(FileLocking::class);
+               $context->registerSetupCheck(ForwardedForHeaders::class);
                $context->registerSetupCheck(InternetConnectivity::class);
                $context->registerSetupCheck(LegacySSEKeyFormat::class);
                $context->registerSetupCheck(MemcacheConfigured::class);
index 6d74a670a07d331ee84bd4f56520525e1811be3f..13e54063d8ac9291e383e75f312c03b17ec00b70 100644 (file)
@@ -246,31 +246,6 @@ class CheckSetupController extends Controller {
                return '';
        }
 
-       /**
-        * Check if the reverse proxy configuration is working as expected
-        *
-        * @return bool
-        */
-       private function forwardedForHeadersWorking(): bool {
-               $trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
-               $remoteAddress = $this->request->getHeader('REMOTE_ADDR');
-
-               if (empty($trustedProxies) && $this->request->getHeader('X-Forwarded-Host') !== '') {
-                       return false;
-               }
-
-               if (\is_array($trustedProxies)) {
-                       if (\in_array($remoteAddress, $trustedProxies, true) && $remoteAddress !== '127.0.0.1') {
-                               return $remoteAddress !== $this->request->getRemoteAddress();
-                       }
-               } else {
-                       return false;
-               }
-
-               // either not enabled or working correctly
-               return true;
-       }
-
        /**
         * Checks if the correct memcache module for PHP is installed. Only
         * fails if memcached is configured and the working module is not installed.
@@ -721,7 +696,6 @@ Raw output
                                'cronErrors' => $this->getCronErrors(),
                                'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(),
                                'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
-                               'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
                                'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
                                'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
                                'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
diff --git a/apps/settings/lib/SetupChecks/ForwardedForHeaders.php b/apps/settings/lib/SetupChecks/ForwardedForHeaders.php
new file mode 100644 (file)
index 0000000..1408888
--- /dev/null
@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2023 Côme Chilliet <come.chilliet@nextcloud.com>
+ *
+ * @author Côme Chilliet <come.chilliet@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Settings\SetupChecks;
+
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\SetupCheck\ISetupCheck;
+use OCP\SetupCheck\SetupResult;
+
+class ForwardedForHeaders implements ISetupCheck {
+       public function __construct(
+               private IL10N $l10n,
+               private IConfig $config,
+               private IURLGenerator $urlGenerator,
+               private IRequest $request,
+       ) {
+       }
+
+       public function getCategory(): string {
+               return 'security';
+       }
+
+       public function getName(): string {
+               return $this->l10n->t('Forwared for headers');
+       }
+
+       public function run(): SetupResult {
+               $trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
+               $remoteAddress = $this->request->getHeader('REMOTE_ADDR');
+
+               if (!\is_array($trustedProxies)) {
+                       return SetupResult::error($this->l10n->t('Your trusted_proxies setting is not correctly set, it should be an array.'));
+               }
+
+               if (($remoteAddress === '') && ($this->request->getRemoteAddress() === '')) {
+                       /* Most likely we were called from CLI */
+                       return SetupResult::info('Your remote address could not be determined.');
+               }
+
+               if (empty($trustedProxies) && $this->request->getHeader('X-Forwarded-Host') !== '') {
+                       return SetupResult::warning(
+                               $this->l10n->t('The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud.'),
+                               $this->urlGenerator->linkToDocs('admin-reverse-proxy')
+                       );
+               }
+
+               if (\in_array($remoteAddress, $trustedProxies, true) && ($remoteAddress !== '127.0.0.1')) {
+                       if ($remoteAddress !== $this->request->getRemoteAddress()) {
+                               /* Remote address was successfuly fixed */
+                               return SetupResult::success('Working');
+                       } else {
+                               return SetupResult::warning(
+                                       $this->l10n->t('The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud.'),
+                                       $this->urlGenerator->linkToDocs('admin-reverse-proxy')
+                               );
+                       }
+               }
+
+               /* Either not enabled or working correctly */
+               return SetupResult::success();
+       }
+}
index 0437d8a38b30ad34bf63b689e52e3569cc26f33f..2df86a7b49c6be95988e3e522c70c82af8311142 100644 (file)
@@ -415,7 +415,6 @@ class CheckSetupControllerTest extends TestCase {
                                ],
                                'cronErrors' => [],
                                'isUsedTlsLibOutdated' => '',
-                               'forwardedForHeadersWorking' => false,
                                'reverseProxyDocs' => 'reverse-proxy-doc-link',
                                'isCorrectMemcachedPHPModuleInstalled' => true,
                                'hasPassedCodeIntegrityCheck' => true,
index 86d84719d4a29a67421a437c1f0faf03246f5a0e..1d64acf01ea86768b217e0a947ed9f4907eb14c9 100644 (file)
                                                        type: OC.SetupChecks.MESSAGE_TYPE_WARNING
                                                });
                                        }
-                                       if(!data.forwardedForHeadersWorking) {
-                                               messages.push({
-                                                       msg: t('core', 'The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud. Further information can be found in the {linkstart}documentation ↗{linkend}.')
-                                                               .replace('{linkstart}', '<a target="_blank" rel="noreferrer noopener" class="external" href="' + data.reverseProxyDocs + '">')
-                                                               .replace('{linkend}', '</a>'),
-                                                       type: OC.SetupChecks.MESSAGE_TYPE_WARNING
-                                               });
-                                       }
                                        if(!data.isCorrectMemcachedPHPModuleInstalled) {
                                                messages.push({
                                                        msg: t('core', 'Memcached is configured as distributed cache, but the wrong PHP module "memcache" is installed. \\OC\\Memcache\\Memcached only supports "memcached" and not "memcache". See the {linkstart}memcached wiki about both modules ↗{linkend}.')
index 7fee0ed0fae454f0a980eb5b1c5371a10e397f9f..d9124cfc84d9d5103e5d396d78939e8b969ea56b 100644 (file)
@@ -225,7 +225,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -279,7 +278,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -333,7 +331,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -387,7 +384,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: false,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -439,7 +435,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -482,59 +477,6 @@ describe('OC.SetupChecks tests', function() {
                        });
                });
 
-               it('should return an error if the forwarded for headers are not working', function(done) {
-                       var async = OC.SetupChecks.checkSetup();
-
-                       suite.server.requests[0].respond(
-                               200,
-                               {
-                                       'Content-Type': 'application/json',
-                               },
-                               JSON.stringify({
-                                       suggestedOverwriteCliURL: '',
-                                       isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: false,
-                                       reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
-                                       isCorrectMemcachedPHPModuleInstalled: true,
-                                       hasPassedCodeIntegrityCheck: true,
-                                       OpcacheSetupRecommendations: [],
-                                       isSettimelimitAvailable: true,
-                                       missingIndexes: [],
-                                       missingPrimaryKeys: [],
-                                       missingColumns: [],
-                                       cronErrors: [],
-                                       cronInfo: {
-                                               diffInSeconds: 0
-                                       },
-                                       appDirsWithDifferentOwner: [],
-                                       isImagickEnabled: true,
-                                       areWebauthnExtensionsEnabled: true,
-                                       pendingBigIntConversionColumns: [],
-                                       isMysqlUsedWithoutUTF8MB4: false,
-                                       isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed: true,
-                                       reverseProxyGeneratedURL: 'https://server',
-                                       temporaryDirectoryWritable: true,
-                                       generic: {
-                                               network: {
-                                                       "Internet connectivity": {
-                                                               severity: "success",
-                                                               description: null,
-                                                               linkToDoc: null
-                                                       }
-                                               },
-                                       },
-                               })
-                       );
-
-                       async.done(function( data, s, x ){
-                               expect(data).toEqual([{
-                                       msg: 'The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud. Further information can be found in the <a target="_blank" rel="noreferrer noopener" class="external" href="https://docs.nextcloud.com/foo/bar.html">documentation ↗</a>.',
-                                       type: OC.SetupChecks.MESSAGE_TYPE_WARNING
-                               }]);
-                               done();
-                       });
-               });
-
                it('should return an error if set_time_limit is unavailable', function(done) {
                        var async = OC.SetupChecks.checkSetup();
 
@@ -546,7 +488,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
@@ -599,7 +540,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
@@ -684,7 +624,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -743,7 +682,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: ['recommendation1', 'recommendation2'],
@@ -795,7 +733,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -851,7 +788,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -904,7 +840,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -954,7 +889,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -1007,7 +941,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -1060,7 +993,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -1112,7 +1044,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],
@@ -1171,7 +1102,6 @@ describe('OC.SetupChecks tests', function() {
                                JSON.stringify({
                                        suggestedOverwriteCliURL: '',
                                        isFairUseOfFreePushService: true,
-                                       forwardedForHeadersWorking: true,
                                        isCorrectMemcachedPHPModuleInstalled: true,
                                        hasPassedCodeIntegrityCheck: true,
                                        OpcacheSetupRecommendations: [],