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

Also check for instanceid and passwordhash

Browse source 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
This commit is contained in:
Carl Schwan 2022-03-09 13:36:06 +01:00
parent 7496bf3461
commit e6161af662
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/s3-external.yml vendored
View file

@ -55,7 +55,7 @@ jobs:
php -S localhost:8080 &
- name: PHPUnit
run: |
echo "<?php return ['run' => true, 'secret' => 'actually-not-secret', 'hostname' => 'localhost','key' => 'minio','secret' => 'minio123', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
echo "<?php return ['run' => true, 'secret' => 'actually-not-secret', 'passwordsalt' => 'actually-not-secret', 'hostname' => 'localhost','key' => 'minio','secret' => 'minio123', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/Amazons3Test.php
phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/VersionedAmazonS3Test.php
- name: S3 logs

12
lib/private/legacy/OC_Util.php
View file

@ -969,11 +969,13 @@ class OC_Util {
];
}
if ($config->getValue('secret', '') === '' && !\OC::$CLI) {
$errors[] = [
'error' => $l->t('The required \'secret\' config variable is not configued in the config.php file.'),
'hint' => $l->t('Please ask your server administrator to check the Nextcloud configuration.')
];
foreach (['secret', 'instanceid', 'passwordsalt'] as $requiredConfig) {
if ($config->getValue($requiredConfig, '') === '' && !\OC::$CLI) {
$errors[] = [
'error' => $l->t('The required \'' . $requiredConfig . '\' config variable is not configued in the config.php file.'),
'hint' => $l->t('Please ask your server administrator to check the Nextcloud configuration.')
];
}
}
$errors = array_merge($errors, self::checkDatabaseVersion());

4
tests/travis/install.sh
View file

@ -44,7 +44,6 @@ echo "Using database $DATABASENAME"
cat > ./tests/autoconfig-sqlite.php <<DELIM
<?php
\$AUTOCONFIG = array (
'secret' => 'actually-not-secret',
'installed' => false,
'dbtype' => 'sqlite',
'dbtableprefix' => 'oc_',
@ -57,7 +56,6 @@ DELIM
cat > ./tests/autoconfig-mysql.php <<DELIM
<?php
\$AUTOCONFIG = array (
'secret' => 'actually-not-secret',
'installed' => false,
'dbtype' => 'mysql',
'dbtableprefix' => 'oc_',
@ -74,7 +72,6 @@ DELIM
cat > ./tests/autoconfig-pgsql.php <<DELIM
<?php
\$AUTOCONFIG = array (
'secret' => 'actually-not-secret',
'installed' => false,
'dbtype' => 'pgsql',
'dbtableprefix' => 'oc_',
@ -91,7 +88,6 @@ DELIM
cat > ./tests/autoconfig-oracle.php <<DELIM
<?php
\$AUTOCONFIG = array (
'secret' => 'actually-not-secret',
'installed' => false,
'dbtype' => 'oci',
'dbtableprefix' => 'oc_',