From 00d3856b92aa533777907b990d76e98bb4d3c9dc Mon Sep 17 00:00:00 2001
From: Côme Chilliet <come.chilliet@nextcloud.com>
Date: Mon, 6 Nov 2023 17:48:42 +0100
Subject: Revert "Migrate code integrity to SetupCheck API"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aa2d315d95d37b48752d0e92d0ce79913be1d4f1.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 core/js/setupchecks.js                 | 10 ++++++++++
 core/js/tests/specs/setupchecksSpec.js | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+)

(limited to 'core/js')

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 0f95eb8c4a5..f5ac8575365 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -246,6 +246,16 @@
 							type: OC.SetupChecks.MESSAGE_TYPE_WARNING
 						});
 					}
+					if(!data.hasPassedCodeIntegrityCheck) {
+						messages.push({
+							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})')
+								.replace('{linkstart1}', '<a target="_blank" rel="noreferrer noopener" class="external" href="' + data.codeIntegrityCheckerDocumentation + '">')
+								.replace('{linkstart2}', '<a href="' + OC.generateUrl('/settings/integrity/failed') + '">')
+								.replace('{linkstart3}', '<a href="' + OC.generateUrl('/settings/integrity/rescan?requesttoken={requesttoken}', {'requesttoken': OC.requestToken}) + '">')
+								.replace(/{linkend}/g, '</a>'),
+							type: OC.SetupChecks.MESSAGE_TYPE_ERROR
+						});
+					}
 					if(data.OpcacheSetupRecommendations.length > 0) {
 						var listOfOPcacheRecommendations = "";
 						data.OpcacheSetupRecommendations.forEach(function(element){
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 733042c3f99..246574653a9 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -227,6 +227,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -281,6 +282,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -335,6 +337,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -389,6 +392,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: false,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -441,6 +445,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -496,6 +501,7 @@ describe('OC.SetupChecks tests', function() {
 					forwardedForHeadersWorking: false,
 					reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -551,6 +557,7 @@ describe('OC.SetupChecks tests', function() {
 					forwardedForHeadersWorking: true,
 					reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -604,6 +611,7 @@ describe('OC.SetupChecks tests', function() {
 					forwardedForHeadersWorking: true,
 					reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: false,
 					missingIndexes: [],
@@ -657,6 +665,7 @@ describe('OC.SetupChecks tests', function() {
 					forwardedForHeadersWorking: true,
 					reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -729,6 +738,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -788,6 +798,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: ['recommendation1', 'recommendation2'],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -840,6 +851,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -896,6 +908,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -949,6 +962,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -999,6 +1013,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -1052,6 +1067,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -1105,6 +1121,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -1157,6 +1174,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
@@ -1216,6 +1234,7 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					forwardedForHeadersWorking: true,
 					isCorrectMemcachedPHPModuleInstalled: true,
+					hasPassedCodeIntegrityCheck: true,
 					OpcacheSetupRecommendations: [],
 					isSettimelimitAvailable: true,
 					missingIndexes: [],
-- 
cgit v1.2.3