disable opcache+#

Dockerfile.Nextcloud

@@ -5,4 +5,12 @@ FROM nextcloud:${NEXTCLOUD_VERSION}
 RUN apt update && apt install -y less vim telnet iputils-ping
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 RUN install-php-extensions gd xdebug
+RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
+RUN sed -i 's/max_execution_time = 30/max_execution_time = -1/g' "$PHP_INI_DIR/php.ini"
+RUN sed -i 's/max_input_time = 60/max_input_time = -1/g' "$PHP_INI_DIR/php.ini"
+RUN sed -i 's/memory_limit = 128M/memory_limit = -1/g' "$PHP_INI_DIR/php.ini"
+RUN echo "error_log = /var/www/html/data/php.log" >> "$PHP_INI_DIR/php.ini"
+
+COPY opcache-disabled.ini /usr/local/etc/php/conf.d/opcache-recommended.ini
+COPY opcache-blacklist.txt /usr/local/etc/php/conf.d/opcache-blacklist.txt
 COPY xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini

Makefile

@@ -121,6 +121,8 @@ appstore: build
 	tar czf $(appstore_package_name).tar.gz \
 	--transform s/$(app_directory_name)/$(app_real_name)/ \
 	--exclude-vcs \
+	--exclude="../$(app_directory_name)/opcache-disabled.ini" \
+	--exclude="../$(app_directory_name)/opcache-blacklist.txt" \
 	--exclude="../$(app_directory_name)/artifacts" \
 	--exclude="../$(app_directory_name)/tmp*" \
 	--exclude="../$(app_directory_name)/Dockerfile*" \

compose-install.yaml

@@ -6,7 +6,7 @@ services:
       args:
         - NEXTCLOUD_VERSION=${NEXTCLOUD_VERSION:-29.0.3}
     environment:
-      - XDEBUG_MODE=${XDEBUG_MODE:-develop}
+      XDEBUG_MODE: ${XDEBUG_MODE:-develop}
     ports:
       - "80:80"
     container_name: nextcloud-container

lib/Service/VerdictService.php

@@ -126,7 +126,6 @@ public static function isFileTooLargeToScan(string $path): bool {
 		return ($size === false) || $size > self::MAX_FILE_SIZE;
 	}
 
-
 	/**
 	 * Scans a file for malicious content with G DATA Verdict-as-a-Service and returns the verdict.
 	 * @param string $filePath The local path to the file to scan.
@@ -229,12 +228,12 @@ public function removeWhitespacesAroundComma(string $s): string {
 		return trim(preg_replace('/\s*,\s*/', ',', $s));
 	}
 
-    /**
-     * @param string $authMethod
-     * @return ClientCredentialsGrantAuthenticator|ResourceOwnerPasswordGrantAuthenticator
-     * @throws VaasAuthenticationException
-     */
-    public function getAuthenticator(string $authMethod): ClientCredentialsGrantAuthenticator|ResourceOwnerPasswordGrantAuthenticator {
+	/**
+	 * @param string $authMethod
+	 * @return ClientCredentialsGrantAuthenticator|ResourceOwnerPasswordGrantAuthenticator
+	 * @throws VaasAuthenticationException
+	 */
+	public function getAuthenticator(string $authMethod): ClientCredentialsGrantAuthenticator|ResourceOwnerPasswordGrantAuthenticator {
 		if ($authMethod === 'ResourceOwnerPassword') {
 			return new ResourceOwnerPasswordGrantAuthenticator(
 				"nextcloud-customer",
@@ -249,8 +248,8 @@ public function getAuthenticator(string $authMethod): ClientCredentialsGrantAuth
 				$this->tokenEndpoint
 			);
 		} else {
-            throw new VaasAuthenticationException("Invalid auth method: " . $authMethod);
-        }
+			throw new VaasAuthenticationException("Invalid auth method: " . $authMethod);
+		}
 	}
 
 	/**

opcache-disabled.ini

@@ -0,0 +1,9 @@
+opcache.enable=1
+opcache.interned_strings_buffer=32
+opcache.max_accelerated_files=10000
+opcache.memory_consumption=128
+opcache.save_comments=1
+opcache.revalidate_freq=60
+opcache.jit=1255
+opcache.jit_buffer_size=128M
+opcache.blacklist_filename=/usr/local/etc/php/conf.d/opcache-blacklist.txt

package.json

@@ -10,7 +10,7 @@
   "license": "AGPL-3.0-or-later",
   "private": true,
   "scripts": {
-    "build": "webpack --node-env production --progress",
+    "build": "webpack --node-env production",
     "dev": "webpack --node-env development --progress",
     "watch": "webpack --node-env development --progress --watch",
     "serve": "webpack --node-env development serve --progress",

tests/bats/functionality-parallel.bats

@@ -15,14 +15,45 @@ setup_file() {
 }
 
 @test "test admin eicar Upload" {
-    RESULT=$(echo $EICAR_STRING | curl --silent -w "%{http_code}" -u admin:admin -T - http://127.0.0.1/remote.php/dav/files/admin/functionality-parallel.eicar.com.txt)
+    EICAR_LENGTH=$(echo $EICAR_STRING | wc -c)
+    RESULT=$(echo $EICAR_STRING | curl -v -X PUT -d"$EICAR_STRING" -w "%{http_code}" -u admin:admin -T - http://127.0.0.1/remote.php/dav/files/admin/functionality-parallel.eicar.com.txt || echo "curl failed")
+
+    if [[ "$RESULT" =~ "curl failed" ]]; then
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container ls -lha data
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container ls -lha data/admin
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container ls -lha data/admin/files
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container cat .htaccess
+        df -h
+        free
+        mpstat
+        docker stats --no-stream --no-trunc
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container cat data/nextcloud.log
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container cat /var/www/html/data/php.log
+        docker logs nextcloud-container
+    fi
+
     echo "Actual: $RESULT"
     curl --silent -q -u admin:admin -X DELETE http://127.0.0.1/remote.php/dav/files/admin/functionality-parallel.eicar.com.txt || echo "file not found"
     [[ "$RESULT" =~ "Upload cannot be completed." ]]
 }
 
 @test "test admin clean upload" {
-    RESULT=$(echo $CLEAN_STRING | curl -w "%{http_code}" -u admin:admin -T - http://127.0.0.1/remote.php/dav/files/admin/functionality-parallel.clean.txt)
+    RESULT=$(echo $CLEAN_STRING | curl -w "%{http_code}" -u admin:admin -T - http://127.0.0.1/remote.php/dav/files/admin/functionality-parallel.clean.txt || echo "curl failed")
+
+    if [[ "$RESULT" =~ "curl failed" ]]; then
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container ls -lha data
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container ls -lha data/admin
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container ls -lha data/admin/files
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container cat .htaccess
+        df -h
+        free
+        mpstat
+        docker stats --no-stream --no-trunc
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container cat data/nextcloud.log
+        $DOCKER_EXEC_WITH_USER -i nextcloud-container cat /var/www/html/data/php.log
+        docker logs nextcloud-container
+    fi
+
     echo "Actual: $RESULT"
     curl --silent -q -u admin:admin -X DELETE http://127.0.0.1/remote.php/dav/files/admin/functionality-parallel.clean.txt || echo "file not found"
     [[ $RESULT -ge 200 && $RESULT -lt 300 ]]