[4] Ensure opcache file invalidate on file copy & delete (#32915)

Author: Phil E. Taylor

administrator/components/com_admin/script.php

@@ -8160,8 +8160,8 @@ protected function fixFilenameCasing()
 if ($newBasename !== $expectedBasename)
 {
 // Rename the file.
-rename(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
-rename(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
+File::move(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
+File::move(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
 
 continue;
 }
@@ -8176,14 +8176,14 @@ protected function fixFilenameCasing()
 if (!in_array($expectedBasename, scandir(dirname($newRealpath))))
 {
 // Rename the file.
-rename(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
-rename(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
+File::move(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
+File::move(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
 }
 }
 else
 {
 // On Unix with both files: Delete the incorrectly cased file.
-unlink(JPATH_ROOT . $old);
+File::delete(JPATH_ROOT . $old);
 }
 }
 }

administrator/components/com_config/src/Model/ApplicationModel.php

@@ -956,12 +956,6 @@ private function writeConfigFile(Registry $config)
 throw new \RuntimeException(Text::_('COM_CONFIG_ERROR_WRITE_FAILED'));
 }
 
-// Invalidates the cached configuration file
-if (function_exists('opcache_invalidate'))
-{
-\opcache_invalidate($file);
-}
-
 // Attempt to make the file unwriteable.
 if (Path::isOwner($file) && !Path::setPermissions($file, '0444'))
 {

administrator/components/com_joomlaupdate/restore.php

@@ -1494,6 +1494,7 @@ public function createDirRecursive($dirName, $perms)
 // Is this a file instead of a directory?
 if (is_file($root . $path))
 {
+$this->clearFileInOPCache($root . $path);
 @unlink($root . $path);
 $ret = @mkdir($root . $path);
 }
@@ -1523,6 +1524,8 @@ public function chmod($file, $perms)
 
 public function unlink($file)
 {
+$this->clearFileInOPCache($file);
+
 return @unlink($file);
 }
 
@@ -1533,7 +1536,20 @@ public function rmdir($directory)
 
 public function rename($from, $to)
 {
-return @rename($from, $to);
+$this->clearFileInOPCache($from);
+$ret = @rename($from, $to);
+$this->clearFileInOPCache($to);
+
+return $ret;
+}
+
+public function clearFileInOPCache($file){
+if (ini_get('opcache.enable')
+&& function_exists('opcache_invalidate')
+&& (!ini_get('opcache.restrict_api') || stripos(realpath($_SERVER['SCRIPT_FILENAME']), ini_get('opcache.restrict_api')) === 0))
+{
+\opcache_invalidate($file, true);
+}
 }
 
 }
@@ -5105,10 +5121,13 @@ public function __toString()
 $filename = dirname(__FILE__) . '/restore_finalisation.php';
 if (file_exists($filename))
 {
-// opcode cache busting before including the filename
-if (function_exists('opcache_invalidate'))
+// We cannot use the Filesystem API here.
+if (ini_get('opcache.enable')
+&& function_exists('opcache_invalidate')
+&& (!ini_get('opcache.restrict_api') || stripos(realpath($_SERVER['SCRIPT_FILENAME']), ini_get('opcache.restrict_api')) === 0)
+)
 {
-\opcache_invalidate($filename);
+\opcache_invalidate($filename, true);
 }
 if (function_exists('apc_compile_file'))
 {

administrator/components/com_joomlaupdate/restore_finalisation.php

@@ -74,12 +74,6 @@ function finalizeRestore($siteRoot, $restorePath)
 {
 (new JoomlaInstallerScript)->deleteUnexistingFiles();
 }
-
-// Clear OPcache
-if (function_exists('opcache_reset'))
-{
-\opcache_reset();
-}
 }
 }
 }
@@ -97,7 +91,7 @@ function finalizeRestore($siteRoot, $restorePath)
 abstract class File
 {
 /**
- * Proxies checking a folder exists to the native php version
+ * Proxies checking a file exists to the native php version
  *
  * @param string $fileName The path to the file to be checked
  *
@@ -121,9 +115,26 @@ public static function exists($fileName)
  */
 public static function delete($fileName)
 {
+/** @var \AKPostprocDirect $postproc */
 $postproc = \AKFactory::getPostProc();
 $postproc->unlink($fileName);
 }
+/**
+ * Proxies moving a file to the restore.php version
+ *
+ * @param string $src The path to the source file
+ * @param string $dest The path to the destination file
+ *
+ * @return boolean True on success
+ *
+ * @since __DEPLOY_VERSION__
+ */
+public static function move($src, $dest)
+{
+/** @var \AKPostprocDirect $postproc */
+$postproc = \AKFactory::getPostProc();
+$postproc->rename($src, $dest);
+}
 }
 }
 

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -863,28 +863,13 @@ public function cleanUp()
 $tempdir = $app->get('tmp_path');
 
 $file = $app->getUserState('com_joomlaupdate.file', null);
-$target = $tempdir . '/' . $file;
-
-if (!@unlink($target))
-{
-File::delete($target);
-}
+File::delete($tempdir . '/' . $file);
 
 // Remove the restoration.php file.
-$target = JPATH_COMPONENT_ADMINISTRATOR . '/restoration.php';
-
-if (!@unlink($target))
-{
-File::delete($target);
-}
+File::delete(JPATH_COMPONENT_ADMINISTRATOR . '/restoration.php');
 
 // Remove joomla.xml from the site's root.
-$target = JPATH_ROOT . '/joomla.xml';
-
-if (!@unlink($target))
-{
-File::delete($target);
-}
+File::delete(JPATH_ROOT . '/joomla.xml');
 
 // Unset the update filename from the session.
 $app = Factory::getApplication();
@@ -1044,10 +1029,7 @@ public function removePackageFiles()
 {
 if (File::exists($file))
 {
-if (!@unlink($file))
-{
-File::delete($file);
-}
+File::delete($file);
 }
 }
 }

installation/src/Model/CleanupModel.php

@@ -30,21 +30,6 @@ class CleanupModel extends BaseInstallationModel
  */
 public function deleteInstallationFolder()
 {
-// TODO: Move this to the generic library method once #32915 is merged
-if (ini_get('opcache.enable')
-&& function_exists('opcache_invalidate')
-&& (!ini_get('opcache.restrict_api') || stripos(realpath($_SERVER['SCRIPT_FILENAME']), ini_get('opcache.restrict_api')) === 0))
-{
-try
-{
-\opcache_invalidate(JPATH_INSTALLATION . '/index.php', true);
-}
-catch (\Exception $e)
-{
-// Silently accept invalidation error
-}
-}
-
 $return = Folder::delete(JPATH_INSTALLATION) && (!file_exists(JPATH_ROOT . '/joomla.xml') || File::delete(JPATH_ROOT . '/joomla.xml'));
 
 // Rename the robots.txt.dist file if robots.txt doesn't exist

installation/src/Model/ConfigurationModel.php

@@ -665,7 +665,7 @@ private function deleteConfiguration()
 
 if (file_exists($path))
 {
-unlink($path);
+File::delete($path);
 }
 }
 }

libraries/src/Cache/Storage/FileStorage.php

@@ -11,6 +11,7 @@
 \defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Cache\CacheStorage;
+use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 
@@ -68,6 +69,7 @@ public function __construct($options = array())
 // Delete only the existing file if it is empty.
 if (@filesize($path) === 0)
 {
+File::invalidateFileCache($path);
 @unlink($path);
 }
 
@@ -240,6 +242,7 @@ public function remove($id, $group)
 {
 $path = $this->_getFilePath($id, $group);
 
+File::invalidateFileCache($path);
 if (!@unlink($path))
 {
 return false;
@@ -319,6 +322,7 @@ public function gc()
 
 if (($time + $this->_lifetime) < $this->_now || empty($time))
 {
+File::invalidateFileCache($file);
 $result |= @unlink($file);
 }
 }
@@ -437,6 +441,7 @@ protected function _checkExpire($id, $group)
 
 if (($time + $this->_lifetime) < $this->_now || empty($time))
 {
+File::invalidateFileCache($path);
 @unlink($path);
 
 return false;
@@ -523,6 +528,7 @@ protected function _deleteFolder($path)
 
 if (!empty($files) && !\is_array($files))
 {
+File::invalidateFileCache($files);
 if (@unlink($files) !== true)
 {
 return false;
@@ -534,7 +540,9 @@ protected function _deleteFolder($path)
 {
 $file = $this->_cleanPath($file);
 
-// In case of restricted permissions we zap it one way or the other as long as the owner is either the webserver or the ftp
+// In case of restricted permissions we delete it one way or the other as long as the owner is either the webserver or the ftp
+File::invalidateFileCache($file);
+
 if (@unlink($file) !== true)
 {
 Log::add(__METHOD__ . ' ' . Text::sprintf('JLIB_FILESYSTEM_DELETE_FAILED', basename($file)), Log::WARNING, 'jerror');