Skip to content

Commit 00d3856

Browse files
come-nccome-nc
committed
Revert "Migrate code integrity to SetupCheck API"
This reverts commit aa2d315. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
1 parent 0fd5ed9 commit 00d3856

File tree

8 files changed

+34
-68
lines changed

8 files changed

+34
-68
lines changed

‎apps/settings/composer/composer/autoload_classmap.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
'OCA\\Settings\\Settings\\Personal\\Security\\WebAuthn' => $baseDir . '/../lib/Settings/Personal/Security/WebAuthn.php',
7575
'OCA\\Settings\\Settings\\Personal\\ServerDevNotice' => $baseDir . '/../lib/Settings/Personal/ServerDevNotice.php',
7676
'OCA\\Settings\\SetupChecks\\CheckUserCertificates' => $baseDir . '/../lib/SetupChecks/CheckUserCertificates.php',
77-
'OCA\\Settings\\SetupChecks\\CodeIntegrity' => $baseDir . '/../lib/SetupChecks/CodeIntegrity.php',
7877
'OCA\\Settings\\SetupChecks\\DefaultPhoneRegionSet' => $baseDir . '/../lib/SetupChecks/DefaultPhoneRegionSet.php',
7978
'OCA\\Settings\\SetupChecks\\EmailTestSuccessful' => $baseDir . '/../lib/SetupChecks/EmailTestSuccessful.php',
8079
'OCA\\Settings\\SetupChecks\\FileLocking' => $baseDir . '/../lib/SetupChecks/FileLocking.php',

‎apps/settings/composer/composer/autoload_static.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ class ComposerStaticInitSettings
8989
'OCA\\Settings\\Settings\\Personal\\Security\\WebAuthn' => __DIR__ . '/..' . '/../lib/Settings/Personal/Security/WebAuthn.php',
9090
'OCA\\Settings\\Settings\\Personal\\ServerDevNotice' => __DIR__ . '/..' . '/../lib/Settings/Personal/ServerDevNotice.php',
9191
'OCA\\Settings\\SetupChecks\\CheckUserCertificates' => __DIR__ . '/..' . '/../lib/SetupChecks/CheckUserCertificates.php',
92-
'OCA\\Settings\\SetupChecks\\CodeIntegrity' => __DIR__ . '/..' . '/../lib/SetupChecks/CodeIntegrity.php',
9392
'OCA\\Settings\\SetupChecks\\DefaultPhoneRegionSet' => __DIR__ . '/..' . '/../lib/SetupChecks/DefaultPhoneRegionSet.php',
9493
'OCA\\Settings\\SetupChecks\\EmailTestSuccessful' => __DIR__ . '/..' . '/../lib/SetupChecks/EmailTestSuccessful.php',
9594
'OCA\\Settings\\SetupChecks\\FileLocking' => __DIR__ . '/..' . '/../lib/SetupChecks/FileLocking.php',

‎apps/settings/lib/AppInfo/Application.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,16 @@
4949
use OCA\Settings\Search\SectionSearch;
5050
use OCA\Settings\Search\UserSearch;
5151
use OCA\Settings\SetupChecks\CheckUserCertificates;
52-
use OCA\Settings\SetupChecks\CodeIntegrity;
5352
use OCA\Settings\SetupChecks\DefaultPhoneRegionSet;
5453
use OCA\Settings\SetupChecks\EmailTestSuccessful;
5554
use OCA\Settings\SetupChecks\FileLocking;
5655
use OCA\Settings\SetupChecks\InternetConnectivity;
5756
use OCA\Settings\SetupChecks\LegacySSEKeyFormat;
5857
use OCA\Settings\SetupChecks\MemcacheConfigured;
5958
use OCA\Settings\SetupChecks\PhpDefaultCharset;
60-
use OCA\Settings\SetupChecks\PhpModules;
6159
use OCA\Settings\SetupChecks\PhpFreetypeSupport;
6260
use OCA\Settings\SetupChecks\PhpGetEnv;
61+
use OCA\Settings\SetupChecks\PhpModules;
6362
use OCA\Settings\SetupChecks\PhpOutdated;
6463
use OCA\Settings\SetupChecks\PhpOutputBuffering;
6564
use OCA\Settings\SetupChecks\RandomnessSecure;
@@ -157,7 +156,6 @@ public function register(IRegistrationContext $context): void {
157156
);
158157
});
159158
$context->registerSetupCheck(CheckUserCertificates::class);
160-
$context->registerSetupCheck(CodeIntegrity::class);
161159
$context->registerSetupCheck(DefaultPhoneRegionSet::class);
162160
$context->registerSetupCheck(EmailTestSuccessful::class);
163161
$context->registerSetupCheck(FileLocking::class);

‎apps/settings/lib/Controller/CheckSetupController.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,8 @@ public function check() {
736736
'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
737737
'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
738738
'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
739+
'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
740+
'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
739741
'OpcacheSetupRecommendations' => $this->getOpcacheSetupRecommendations(),
740742
'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
741743
'missingPrimaryKeys' => $this->hasMissingPrimaryKeys(),

‎apps/settings/lib/SetupChecks/CodeIntegrity.php‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎apps/settings/tests/Controller/CheckSetupControllerTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,8 @@ public function testCheck() {
432432
'forwardedForHeadersWorking' => false,
433433
'reverseProxyDocs' => 'reverse-proxy-doc-link',
434434
'isCorrectMemcachedPHPModuleInstalled' => true,
435+
'hasPassedCodeIntegrityCheck' => true,
436+
'codeIntegrityCheckerDocumentation' => 'http://docs.example.org/server/go.php?to=admin-code-integrity',
435437
'OpcacheSetupRecommendations' => ['recommendation1', 'recommendation2'],
436438
'isSettimelimitAvailable' => true,
437439
'isSqliteUsed' => false,

‎core/js/setupchecks.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,16 @@
246246
type: OC.SetupChecks.MESSAGE_TYPE_WARNING
247247
});
248248
}
249+
if(!data.hasPassedCodeIntegrityCheck) {
250+
messages.push({
251+
msg: t('core', 'Some files have not passed the integrity check. Further information on how to resolve this issue can be found in the {linkstart1}documentation ↗{linkend}. ({linkstart2}List of invalid files…{linkend} / {linkstart3}Rescan…{linkend})')
252+
.replace('{linkstart1}', '<a target="_blank" rel="noreferrer noopener" class="external" href="' + data.codeIntegrityCheckerDocumentation + '">')
253+
.replace('{linkstart2}', '<a href="' + OC.generateUrl('/settings/integrity/failed') + '">')
254+
.replace('{linkstart3}', '<a href="' + OC.generateUrl('/settings/integrity/rescan?requesttoken={requesttoken}', {'requesttoken': OC.requestToken}) + '">')
255+
.replace(/{linkend}/g, '</a>'),
256+
type: OC.SetupChecks.MESSAGE_TYPE_ERROR
257+
});
258+
}
249259
if(data.OpcacheSetupRecommendations.length > 0) {
250260
var listOfOPcacheRecommendations = "";
251261
data.OpcacheSetupRecommendations.forEach(function(element){

‎core/js/tests/specs/setupchecksSpec.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ describe('OC.SetupChecks tests', function() {
227227
isFairUseOfFreePushService: true,
228228
forwardedForHeadersWorking: true,
229229
isCorrectMemcachedPHPModuleInstalled: true,
230+
hasPassedCodeIntegrityCheck: true,
230231
OpcacheSetupRecommendations: [],
231232
isSettimelimitAvailable: true,
232233
missingIndexes: [],
@@ -281,6 +282,7 @@ describe('OC.SetupChecks tests', function() {
281282
isFairUseOfFreePushService: true,
282283
forwardedForHeadersWorking: true,
283284
isCorrectMemcachedPHPModuleInstalled: true,
285+
hasPassedCodeIntegrityCheck: true,
284286
OpcacheSetupRecommendations: [],
285287
isSettimelimitAvailable: true,
286288
missingIndexes: [],
@@ -335,6 +337,7 @@ describe('OC.SetupChecks tests', function() {
335337
isFairUseOfFreePushService: true,
336338
forwardedForHeadersWorking: true,
337339
isCorrectMemcachedPHPModuleInstalled: true,
340+
hasPassedCodeIntegrityCheck: true,
338341
OpcacheSetupRecommendations: [],
339342
isSettimelimitAvailable: true,
340343
missingIndexes: [],
@@ -389,6 +392,7 @@ describe('OC.SetupChecks tests', function() {
389392
isFairUseOfFreePushService: true,
390393
forwardedForHeadersWorking: true,
391394
isCorrectMemcachedPHPModuleInstalled: false,
395+
hasPassedCodeIntegrityCheck: true,
392396
OpcacheSetupRecommendations: [],
393397
isSettimelimitAvailable: true,
394398
missingIndexes: [],
@@ -441,6 +445,7 @@ describe('OC.SetupChecks tests', function() {
441445
isFairUseOfFreePushService: true,
442446
forwardedForHeadersWorking: true,
443447
isCorrectMemcachedPHPModuleInstalled: true,
448+
hasPassedCodeIntegrityCheck: true,
444449
OpcacheSetupRecommendations: [],
445450
isSettimelimitAvailable: true,
446451
missingIndexes: [],
@@ -496,6 +501,7 @@ describe('OC.SetupChecks tests', function() {
496501
forwardedForHeadersWorking: false,
497502
reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
498503
isCorrectMemcachedPHPModuleInstalled: true,
504+
hasPassedCodeIntegrityCheck: true,
499505
OpcacheSetupRecommendations: [],
500506
isSettimelimitAvailable: true,
501507
missingIndexes: [],
@@ -551,6 +557,7 @@ describe('OC.SetupChecks tests', function() {
551557
forwardedForHeadersWorking: true,
552558
reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
553559
isCorrectMemcachedPHPModuleInstalled: true,
560+
hasPassedCodeIntegrityCheck: true,
554561
OpcacheSetupRecommendations: [],
555562
isSettimelimitAvailable: true,
556563
missingIndexes: [],
@@ -604,6 +611,7 @@ describe('OC.SetupChecks tests', function() {
604611
forwardedForHeadersWorking: true,
605612
reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
606613
isCorrectMemcachedPHPModuleInstalled: true,
614+
hasPassedCodeIntegrityCheck: true,
607615
OpcacheSetupRecommendations: [],
608616
isSettimelimitAvailable: false,
609617
missingIndexes: [],
@@ -657,6 +665,7 @@ describe('OC.SetupChecks tests', function() {
657665
forwardedForHeadersWorking: true,
658666
reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
659667
isCorrectMemcachedPHPModuleInstalled: true,
668+
hasPassedCodeIntegrityCheck: true,
660669
OpcacheSetupRecommendations: [],
661670
isSettimelimitAvailable: true,
662671
missingIndexes: [],
@@ -729,6 +738,7 @@ describe('OC.SetupChecks tests', function() {
729738
isFairUseOfFreePushService: true,
730739
forwardedForHeadersWorking: true,
731740
isCorrectMemcachedPHPModuleInstalled: true,
741+
hasPassedCodeIntegrityCheck: true,
732742
OpcacheSetupRecommendations: [],
733743
isSettimelimitAvailable: true,
734744
missingIndexes: [],
@@ -788,6 +798,7 @@ describe('OC.SetupChecks tests', function() {
788798
isFairUseOfFreePushService: true,
789799
forwardedForHeadersWorking: true,
790800
isCorrectMemcachedPHPModuleInstalled: true,
801+
hasPassedCodeIntegrityCheck: true,
791802
OpcacheSetupRecommendations: ['recommendation1', 'recommendation2'],
792803
isSettimelimitAvailable: true,
793804
missingIndexes: [],
@@ -840,6 +851,7 @@ describe('OC.SetupChecks tests', function() {
840851
isFairUseOfFreePushService: true,
841852
forwardedForHeadersWorking: true,
842853
isCorrectMemcachedPHPModuleInstalled: true,
854+
hasPassedCodeIntegrityCheck: true,
843855
OpcacheSetupRecommendations: [],
844856
isSettimelimitAvailable: true,
845857
missingIndexes: [],
@@ -896,6 +908,7 @@ describe('OC.SetupChecks tests', function() {
896908
isFairUseOfFreePushService: true,
897909
forwardedForHeadersWorking: true,
898910
isCorrectMemcachedPHPModuleInstalled: true,
911+
hasPassedCodeIntegrityCheck: true,
899912
OpcacheSetupRecommendations: [],
900913
isSettimelimitAvailable: true,
901914
missingIndexes: [],
@@ -949,6 +962,7 @@ describe('OC.SetupChecks tests', function() {
949962
isFairUseOfFreePushService: true,
950963
forwardedForHeadersWorking: true,
951964
isCorrectMemcachedPHPModuleInstalled: true,
965+
hasPassedCodeIntegrityCheck: true,
952966
OpcacheSetupRecommendations: [],
953967
isSettimelimitAvailable: true,
954968
missingIndexes: [],
@@ -999,6 +1013,7 @@ describe('OC.SetupChecks tests', function() {
9991013
isFairUseOfFreePushService: true,
10001014
forwardedForHeadersWorking: true,
10011015
isCorrectMemcachedPHPModuleInstalled: true,
1016+
hasPassedCodeIntegrityCheck: true,
10021017
OpcacheSetupRecommendations: [],
10031018
isSettimelimitAvailable: true,
10041019
missingIndexes: [],
@@ -1052,6 +1067,7 @@ describe('OC.SetupChecks tests', function() {
10521067
isFairUseOfFreePushService: true,
10531068
forwardedForHeadersWorking: true,
10541069
isCorrectMemcachedPHPModuleInstalled: true,
1070+
hasPassedCodeIntegrityCheck: true,
10551071
OpcacheSetupRecommendations: [],
10561072
isSettimelimitAvailable: true,
10571073
missingIndexes: [],
@@ -1105,6 +1121,7 @@ describe('OC.SetupChecks tests', function() {
11051121
isFairUseOfFreePushService: true,
11061122
forwardedForHeadersWorking: true,
11071123
isCorrectMemcachedPHPModuleInstalled: true,
1124+
hasPassedCodeIntegrityCheck: true,
11081125
OpcacheSetupRecommendations: [],
11091126
isSettimelimitAvailable: true,
11101127
missingIndexes: [],
@@ -1157,6 +1174,7 @@ describe('OC.SetupChecks tests', function() {
11571174
isFairUseOfFreePushService: true,
11581175
forwardedForHeadersWorking: true,
11591176
isCorrectMemcachedPHPModuleInstalled: true,
1177+
hasPassedCodeIntegrityCheck: true,
11601178
OpcacheSetupRecommendations: [],
11611179
isSettimelimitAvailable: true,
11621180
missingIndexes: [],
@@ -1216,6 +1234,7 @@ describe('OC.SetupChecks tests', function() {
12161234
isFairUseOfFreePushService: true,
12171235
forwardedForHeadersWorking: true,
12181236
isCorrectMemcachedPHPModuleInstalled: true,
1237+
hasPassedCodeIntegrityCheck: true,
12191238
OpcacheSetupRecommendations: [],
12201239
isSettimelimitAvailable: true,
12211240
missingIndexes: [],

0 commit comments

Comments
 (0)