upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge b6cc514376 into d09b8c99de

Browse source
This commit is contained in:
Josh 2026-02-03 19:58:17 -01:00 committed by GitHub
commit c4ea96f011
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/settings/lib/SetupChecks/DataDirectoryProtected.php
View file

@ -33,16 +33,17 @@ class DataDirectoryProtected implements ISetupCheck {
}
public function getCategory(): string {
return 'network';
return 'security';
}
public function getName(): string {
return $this->l10n->t('Data directory protected');
return $this->l10n->t('Data directory status');
}
public function run(): SetupResult {
$dataDir = str_replace(\OC::$SERVERROOT . '/', '', $this->config->getSystemValueString('datadirectory', ''));
$dataUrl = $this->urlGenerator->linkTo('', $dataDir . '/.ncdata');
$dataDirActual = $this->config->getSystemValueString('datadirectory', '');
$dataDirUriPath = str_replace(\OC::$SERVERROOT . '/', '', $dataDirActual);
$dataUrl = $this->urlGenerator->linkTo('', $dataDirUriPath . '/.ncdata');
$noResponse = true;
foreach ($this->runRequest('GET', $dataUrl, [ 'httpErrors' => false ]) as $response) {
@ -55,7 +56,11 @@ class DataDirectoryProtected implements ISetupCheck {
}
if (str_contains($body, '# Nextcloud data directory')) {
return SetupResult::error($this->l10n->t('Your data directory and files are probably accessible from the internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root.'));
return SetupResult::error(
$this->l10n->t(
'Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root.'
)
);
}
} else {
$this->logger->debug('[expected] Could not access data directory from outside.', ['url' => $dataUrl]);
@ -63,9 +68,28 @@ class DataDirectoryProtected implements ISetupCheck {
}
if ($noResponse) {
return SetupResult::warning($this->l10n->t('Could not check that the data directory is protected. Please check manually that your server does not allow access to the data directory.') . "\n" . $this->serverConfigHelp());
return SetupResult::warning(
$this->l10n->t(
'Could not check that the data directory is protected. Please check manually that your server does not allow access to the data directory.'
)
. "\n"
. $this->serverConfigHelp()
);
}
return SetupResult::success();
// check for unused /data folder
$dataDirDefault = \OC::$SERVERROOT . '/data';
if ($dataDirActual !== $dataDirDefault
&& file_exists($dataDirDefault)
) {
return SetupResult::info(
$this->l10n->t(
'Dormant data directory found at "%s". You may want to remove this unused directory (to avoid confusion with the in-use one and to free up storage space).',
$dataDirDefault
)
);
}
return SetupResult::success($this->l10n->t('Protected'));
}
}