Skip to content

Commit 57ce25e

Browse files
come-nccome-nc
committed
Revert "Migrate code integrity to SetupCheck API"
This reverts commit aa2d315. Signed-off-by: Côme Chilliet <[email protected]>
1 parent b73fb99 commit 57ce25e

8 files changed

Lines changed: 34 additions & 68 deletions

File tree

‎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
@@ -437,6 +437,8 @@ public function testCheck() {
437437
'forwardedForHeadersWorking' => false,
438438
'reverseProxyDocs' => 'reverse-proxy-doc-link',
439439
'isCorrectMemcachedPHPModuleInstalled' => true,
440+
'hasPassedCodeIntegrityCheck' => true,
441+
'codeIntegrityCheckerDocumentation' => 'http://docs.example.org/server/go.php?to=admin-code-integrity',
440442
'OpcacheSetupRecommendations' => ['recommendation1', 'recommendation2'],
441443
'isSettimelimitAvailable' => true,
442444
'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: [],
@@ -285,6 +286,7 @@ describe('OC.SetupChecks tests', function() {
285286
isFairUseOfFreePushService: true,
286287
forwardedForHeadersWorking: true,
287288
isCorrectMemcachedPHPModuleInstalled: true,
289+
hasPassedCodeIntegrityCheck: true,
288290
OpcacheSetupRecommendations: [],
289291
isSettimelimitAvailable: true,
290292
missingIndexes: [],
@@ -343,6 +345,7 @@ describe('OC.SetupChecks tests', function() {
343345
isFairUseOfFreePushService: true,
344346
forwardedForHeadersWorking: true,
345347
isCorrectMemcachedPHPModuleInstalled: true,
348+
hasPassedCodeIntegrityCheck: true,
346349
OpcacheSetupRecommendations: [],
347350
isSettimelimitAvailable: true,
348351
missingIndexes: [],
@@ -397,6 +400,7 @@ describe('OC.SetupChecks tests', function() {
397400
isFairUseOfFreePushService: true,
398401
forwardedForHeadersWorking: true,
399402
isCorrectMemcachedPHPModuleInstalled: false,
403+
hasPassedCodeIntegrityCheck: true,
400404
OpcacheSetupRecommendations: [],
401405
isSettimelimitAvailable: true,
402406
missingIndexes: [],
@@ -449,6 +453,7 @@ describe('OC.SetupChecks tests', function() {
449453
isFairUseOfFreePushService: true,
450454
forwardedForHeadersWorking: true,
451455
isCorrectMemcachedPHPModuleInstalled: true,
456+
hasPassedCodeIntegrityCheck: true,
452457
OpcacheSetupRecommendations: [],
453458
isSettimelimitAvailable: true,
454459
missingIndexes: [],
@@ -504,6 +509,7 @@ describe('OC.SetupChecks tests', function() {
504509
forwardedForHeadersWorking: false,
505510
reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
506511
isCorrectMemcachedPHPModuleInstalled: true,
512+
hasPassedCodeIntegrityCheck: true,
507513
OpcacheSetupRecommendations: [],
508514
isSettimelimitAvailable: true,
509515
missingIndexes: [],
@@ -559,6 +565,7 @@ describe('OC.SetupChecks tests', function() {
559565
forwardedForHeadersWorking: true,
560566
reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
561567
isCorrectMemcachedPHPModuleInstalled: true,
568+
hasPassedCodeIntegrityCheck: true,
562569
OpcacheSetupRecommendations: [],
563570
isSettimelimitAvailable: true,
564571
missingIndexes: [],
@@ -612,6 +619,7 @@ describe('OC.SetupChecks tests', function() {
612619
forwardedForHeadersWorking: true,
613620
reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
614621
isCorrectMemcachedPHPModuleInstalled: true,
622+
hasPassedCodeIntegrityCheck: true,
615623
OpcacheSetupRecommendations: [],
616624
isSettimelimitAvailable: false,
617625
missingIndexes: [],
@@ -665,6 +673,7 @@ describe('OC.SetupChecks tests', function() {
665673
forwardedForHeadersWorking: true,
666674
reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
667675
isCorrectMemcachedPHPModuleInstalled: true,
676+
hasPassedCodeIntegrityCheck: true,
668677
OpcacheSetupRecommendations: [],
669678
isSettimelimitAvailable: true,
670679
missingIndexes: [],
@@ -737,6 +746,7 @@ describe('OC.SetupChecks tests', function() {
737746
isFairUseOfFreePushService: true,
738747
forwardedForHeadersWorking: true,
739748
isCorrectMemcachedPHPModuleInstalled: true,
749+
hasPassedCodeIntegrityCheck: true,
740750
OpcacheSetupRecommendations: [],
741751
isSettimelimitAvailable: true,
742752
missingIndexes: [],
@@ -796,6 +806,7 @@ describe('OC.SetupChecks tests', function() {
796806
isFairUseOfFreePushService: true,
797807
forwardedForHeadersWorking: true,
798808
isCorrectMemcachedPHPModuleInstalled: true,
809+
hasPassedCodeIntegrityCheck: true,
799810
OpcacheSetupRecommendations: ['recommendation1', 'recommendation2'],
800811
isSettimelimitAvailable: true,
801812
missingIndexes: [],
@@ -848,6 +859,7 @@ describe('OC.SetupChecks tests', function() {
848859
isFairUseOfFreePushService: true,
849860
forwardedForHeadersWorking: true,
850861
isCorrectMemcachedPHPModuleInstalled: true,
862+
hasPassedCodeIntegrityCheck: true,
851863
OpcacheSetupRecommendations: [],
852864
isSettimelimitAvailable: true,
853865
missingIndexes: [],
@@ -904,6 +916,7 @@ describe('OC.SetupChecks tests', function() {
904916
isFairUseOfFreePushService: true,
905917
forwardedForHeadersWorking: true,
906918
isCorrectMemcachedPHPModuleInstalled: true,
919+
hasPassedCodeIntegrityCheck: true,
907920
OpcacheSetupRecommendations: [],
908921
isSettimelimitAvailable: true,
909922
missingIndexes: [],
@@ -957,6 +970,7 @@ describe('OC.SetupChecks tests', function() {
957970
isFairUseOfFreePushService: true,
958971
forwardedForHeadersWorking: true,
959972
isCorrectMemcachedPHPModuleInstalled: true,
973+
hasPassedCodeIntegrityCheck: true,
960974
OpcacheSetupRecommendations: [],
961975
isSettimelimitAvailable: true,
962976
missingIndexes: [],
@@ -1007,6 +1021,7 @@ describe('OC.SetupChecks tests', function() {
10071021
isFairUseOfFreePushService: true,
10081022
forwardedForHeadersWorking: true,
10091023
isCorrectMemcachedPHPModuleInstalled: true,
1024+
hasPassedCodeIntegrityCheck: true,
10101025
OpcacheSetupRecommendations: [],
10111026
isSettimelimitAvailable: true,
10121027
missingIndexes: [],
@@ -1060,6 +1075,7 @@ describe('OC.SetupChecks tests', function() {
10601075
isFairUseOfFreePushService: true,
10611076
forwardedForHeadersWorking: true,
10621077
isCorrectMemcachedPHPModuleInstalled: true,
1078+
hasPassedCodeIntegrityCheck: true,
10631079
OpcacheSetupRecommendations: [],
10641080
isSettimelimitAvailable: true,
10651081
missingIndexes: [],
@@ -1113,6 +1129,7 @@ describe('OC.SetupChecks tests', function() {
11131129
isFairUseOfFreePushService: true,
11141130
forwardedForHeadersWorking: true,
11151131
isCorrectMemcachedPHPModuleInstalled: true,
1132+
hasPassedCodeIntegrityCheck: true,
11161133
OpcacheSetupRecommendations: [],
11171134
isSettimelimitAvailable: true,
11181135
missingIndexes: [],
@@ -1165,6 +1182,7 @@ describe('OC.SetupChecks tests', function() {
11651182
isFairUseOfFreePushService: true,
11661183
forwardedForHeadersWorking: true,
11671184
isCorrectMemcachedPHPModuleInstalled: true,
1185+
hasPassedCodeIntegrityCheck: true,
11681186
OpcacheSetupRecommendations: [],
11691187
isSettimelimitAvailable: true,
11701188
missingIndexes: [],
@@ -1224,6 +1242,7 @@ describe('OC.SetupChecks tests', function() {
12241242
isFairUseOfFreePushService: true,
12251243
forwardedForHeadersWorking: true,
12261244
isCorrectMemcachedPHPModuleInstalled: true,
1245+
hasPassedCodeIntegrityCheck: true,
12271246
OpcacheSetupRecommendations: [],
12281247
isSettimelimitAvailable: true,
12291248
missingIndexes: [],

0 commit comments

Comments
 (0)