Migrate Webcache out of webroot (#2083)

* migrate webcache folder out of webroot, migrate htaccess files

* rpm specfile - add missing reference to cache folder

* fix submodule mixup

CMakeLists.txt

@@ -141,6 +141,8 @@ set(ZM_WEBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder/www"
     "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
 set(ZM_CGIDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
     "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
+set(ZM_CACHEDIR "/var/cache/zoneminder" CACHE PATH 
+    "Location of the web server cache busting files, default: /var/cache/zoneminder")
 set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH 
     "Location of dynamic content (events and images), default: /var/lib/zoneminder")
 set(ZM_DB_HOST "localhost" CACHE STRING 

distros/redhat/CMakeLists.txt

@@ -52,6 +52,7 @@ file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events images temp)
 install(DIRECTORY sock swap DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder DESTINATION /var/log DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder DESTINATION /var/run DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(DIRECTORY zoneminder DESTINATION /var/cache DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder-upload DESTINATION /var/spool DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 

distros/redhat/apache/zoneminder.conf.in

@@ -9,6 +9,23 @@ RewriteEngine On
 RewriteCond %{HTTPS} !=on
 RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]
 
+# Order matters. This alias must come first.
+Alias /zm/cache "@ZM_CACHEDIR@"
+<Directory "@ZM_CACHEDIR@">
+    SSLRequireSSL
+    Options -Indexes +MultiViews +FollowSymLinks
+    AllowOverride None
+    <IfModule mod_authz_core.c>
+       # Apache 2.4
+       Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
+</Directory>
+
 Alias /zm "@ZM_WEBDIR@"
 <Directory "@ZM_WEBDIR@">
     # explicitly set index.php as the only directoryindex

distros/redhat/systemd/zoneminder.tmpfiles.in

@@ -1,2 +1,5 @@
 D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@
 D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_CACHEDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_DIR_EVENTS@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_DIR_IMAGES@ 0755 @WEB_USER@ @WEB_GROUP@

distros/redhat/zoneminder.spec

@@ -377,6 +377,7 @@ rm -rf %{_docdir}/%{name}-%{version}
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/sock
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/swap
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/cache/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder

distros/ubuntu1204/conf/apache2/zoneminder.conf

@@ -6,6 +6,12 @@ ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
     Require all granted
 </Directory>
 
+# Order matters. This Alias must come first
+Alias /zm/cache /var/cache/zoneminder/cache
+<Directory /var/cache/zoneminder/cache>
+  Options -Indexes +FollowSymLinks
+</Directory>
+
 Alias /zm /usr/share/zoneminder/www
 <Directory /usr/share/zoneminder/www>
   php_flag register_globals off
@@ -15,6 +21,28 @@ Alias /zm /usr/share/zoneminder/www
   </IfModule>
 </Directory>
 
-<Directory /usr/share/zoneminder/www/api>
+# For better visibility, the following directives have been migrated from the
-    AllowOverride All
+# default .htaccess files included with the CakePHP project.
+# Parameters not set here are inherited from the parent directive above.
+<Directory "/usr/share/zoneminder/www/api">
+   RewriteEngine on
+   RewriteRule ^$ app/webroot/ [L]
+   RewriteRule (.*) app/webroot/$1 [L]
+   RewriteBase /zm/api
 </Directory>
+
+<Directory "/usr/share/zoneminder/www/api/app">
+   RewriteEngine on
+   RewriteRule ^$ webroot/ [L]
+   RewriteRule (.*) webroot/$1 [L]
+   RewriteBase /zm/api
+</Directory>
+
+<Directory "/usr/share/zoneminder/www/api/app/webroot">
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.php [L]
+    RewriteBase /zm/api
+</Directory>
+

distros/ubuntu1204/rules

@@ -25,6 +25,7 @@ override_dh_auto_configure:
             -DZM_SOCKDIR="/var/run/zm"                        \
             -DZM_TMPDIR="/tmp/zm"                             \
             -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"         \
+            -DZM_CACHEDIR="/var/cache/zoneminder/cache"       \
             -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
             -DZM_DIR_IMAGES="/var/cache/zoneminder/images"    \
             -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"               \

distros/ubuntu1204/zoneminder.dirs

@@ -3,6 +3,7 @@ var/lib/zm
 var/cache/zoneminder/events
 var/cache/zoneminder/images
 var/cache/zoneminder/temp
+var/cache/zoneminder/cache
 usr/share/zoneminder/db
 etc/zm
 etc/zm/conf.d

distros/ubuntu1604/conf/apache2/zoneminder.conf

@@ -6,6 +6,12 @@ ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
     Require all granted
 </Directory>
 
+# Order matters. This alias must come first.
+Alias /zm/cache /var/cache/zoneminder/cache
+<Directory /var/cache/zoneminder/cache>
+  Options -Indexes +FollowSymLinks
+</Directory>
+
 Alias /zm /usr/share/zoneminder/www
 <Directory /usr/share/zoneminder/www>
   Options -Indexes +FollowSymLinks
@@ -14,6 +20,27 @@ Alias /zm /usr/share/zoneminder/www
   </IfModule>
 </Directory>
 
-<Directory /usr/share/zoneminder/www/api>
+# For better visibility, the following directives have been migrated from the
-    AllowOverride All
+# default .htaccess files included with the CakePHP project.
+# Parameters not set here are inherited from the parent directive above.
+<Directory "/usr/share/zoneminder/www/api">
+   RewriteEngine on
+   RewriteRule ^$ app/webroot/ [L]
+   RewriteRule (.*) app/webroot/$1 [L]
+   RewriteBase /zm/api
+</Directory>
+
+<Directory "/usr/share/zoneminder/www/api/app">
+   RewriteEngine on
+   RewriteRule ^$ webroot/ [L]
+   RewriteRule (.*) webroot/$1 [L]
+   RewriteBase /zm/api
+</Directory>
+
+<Directory "/usr/share/zoneminder/www/api/app/webroot">
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.php [L]
+    RewriteBase /zm/api
 </Directory>

distros/ubuntu1604/rules

@@ -25,6 +25,7 @@ override_dh_auto_configure:
             -DZM_SOCKDIR="/var/run/zm"                 \
             -DZM_TMPDIR="/tmp/zm"                      \
             -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
+            -DZM_CACHEDIR="/var/cache/zoneminder/cache"  \
             -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
             -DZM_DIR_IMAGES="/var/cache/zoneminder/images"    \
             -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"

distros/ubuntu1604/zoneminder.dirs

@@ -3,7 +3,7 @@ var/lib/zm
 var/cache/zoneminder/events
 var/cache/zoneminder/images
 var/cache/zoneminder/temp
+var/cache/zoneminder/cache
 usr/share/zoneminder/db
-usr/share/zoneminder/www/cache
 etc/zm/
 etc/zm/conf.d

distros/ubuntu1604/zoneminder.postinst

@@ -13,7 +13,7 @@ if [ "$1" = "configure" ]; then
   chown www-data:root /var/log/zm
   chown www-data:www-data /var/lib/zm
   if [ -z "$2" ]; then
-    chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/* /usr/share/zoneminder/www/cache
+    chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
   fi
   if [ ! -e "/etc/apache2/mods-enabled/cgi.load" ] && [ "$(command -v a2enmod)" != "" ]; then
     echo "The cgi module is not enabled in apache2.  I am enabling it using a2enmod cgi."

distros/ubuntu1604/zoneminder.tmpfile

@@ -1,4 +1,4 @@
 d /var/run/zm                   0755 www-data www-data
 d /tmp/zm                       0755 www-data www-data
 d /var/tmp/zm                   0755 www-data www-data
-d /usr/share/zoneminder/www/cache 0755  www-data www-data
+d /var/cache/zoneminder/cache   0755 www-data www-data

misc/apache.conf.in

@@ -8,6 +8,23 @@
     ServerAdmin webmaster@localhost
 
     DocumentRoot "@WEB_PREFIX@"
+
+    # Order matters. This alias must come first.
+    Alias /zm/cache "@ZM_CACHEDIR@"
+    <Directory "@ZM_CACHEDIR@">
+        Options -Indexes +FollowSymLinks
+        AllowOverride None
+        <IfModule mod_authz_core.c>
+           # Apache 2.4
+           Require all granted
+        </IfModule>
+        <IfModule !mod_authz_core.c>
+            # Apache 2.2
+            Order deny,allow
+            Allow from all
+        </IfModule>
+    </Directory>
+
     Alias /zm "@WEB_PREFIX@"
     <Directory "@WEB_PREFIX@">
         Options -Indexes +FollowSymLinks
@@ -38,6 +55,31 @@
         </IfModule>
     </Directory>
 
+    # For better visibility, the following directives have been migrated from the
+    # default .htaccess files included with the CakePHP project.
+    # Parameters not set here are inherited from the parent directive above.
+    <Directory "@ZM_WEBDIR@/api">
+       RewriteEngine on
+       RewriteRule ^$ app/webroot/ [L]
+       RewriteRule (.*) app/webroot/$1 [L]
+       RewriteBase /zm/api
+    </Directory>
+
+    <Directory "@ZM_WEBDIR@/api/app">
+       RewriteEngine on
+       RewriteRule ^$ webroot/ [L]
+       RewriteRule (.*) webroot/$1 [L]
+       RewriteBase /zm/api
+    </Directory>
+
+    <Directory "@ZM_WEBDIR@/api/app/webroot">
+        RewriteEngine On
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteRule ^ index.php [L]
+        RewriteBase /zm/api
+    </Directory>
+
     # Use the first option to have Apache logs written to the general log
     # directory, or the second to have them written to the regular Apache
     # directory (you may have to change the path to that used on your system)

web/.htaccess

@@ -1,5 +0,0 @@
-<IfModule mod_rewrite.c>
-   RewriteEngine on
-   RewriteRule    ^$ app/webroot/    [L]
-   RewriteRule    (.*) app/webroot/$1 [L]
-</IfModule>

web/api/.htaccess

@@ -1,6 +0,0 @@
-<IfModule mod_rewrite.c>
-   RewriteEngine on
-   RewriteRule ^$ app/webroot/ [L]
-   RewriteRule (.*) app/webroot/$1 [L]
-   RewriteBase /zm/api
-</IfModule>

web/api/app/.htaccess

@@ -1,6 +0,0 @@
-<IfModule mod_rewrite.c>
-    RewriteEngine on
-    RewriteRule    ^$    webroot/    [L]
-    RewriteRule    (.*) webroot/$1    [L]
-    RewriteBase /zm/api
-</IfModule>

web/api/app/Plugin/Crud

@@ -1 +1 @@
-Subproject commit 1351dde6b4c75b215099ae8bcf5a21d6c6e10298
+Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef

web/api/app/webroot/.htaccess

@@ -1,7 +0,0 @@
-<IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^ index.php [L]
-    RewriteBase /zm/api
-</IfModule>

web/api/lib/Cake/Console/Templates/skel/.htaccess

@@ -1,5 +0,0 @@
-<IfModule mod_rewrite.c>
-	RewriteEngine on
-	RewriteRule ^$ webroot/ [L]
-	RewriteRule (.*) webroot/$1 [L]
-</IfModule>

web/api/lib/Cake/Console/Templates/skel/webroot/.htaccess

@@ -1,6 +0,0 @@
-<IfModule mod_rewrite.c>
-	RewriteEngine On
-	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule ^ index.php [L]
-</IfModule>

web/includes/config.php.in

@@ -26,6 +26,7 @@ define( 'ZM_CONFIG_SUBDIR', '@ZM_CONFIG_SUBDIR@' ); // Path to config subfolder
 // Define, and override any given in config file
 define( 'ZM_VERSION', '@VERSION@' );               // Version
 define( 'ZM_DIR_TEMP', '@ZM_TMPDIR@' );
+define( 'ZM_DIR_CACHE', '@ZM_CACHEDIR@' );
 global $configvals;
 
 $configFile = ZM_CONFIG;

web/includes/functions.php

@@ -2031,9 +2031,9 @@ function cache_bust( $file ) {
   $parts = pathinfo($file);
   global $css;
   $dirname = preg_replace( '/\//', '_', $parts['dirname'] );
-  $cacheFile = 'cache/'.$dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension'];
+  $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension'];
-  if ( file_exists( ZM_PATH_WEB.'/'.$cacheFile ) or symlink( ZM_PATH_WEB.'/'.$file, ZM_PATH_WEB.'/'.$cacheFile ) ) {
+  if ( file_exists( ZM_DIR_CACHE.'/'.$cacheFile ) or symlink( ZM_PATH_WEB.'/'.$file, ZM_DIR_CACHE.'/'.$cacheFile ) ) {
-    return $cacheFile;
+    return 'cache/'.$cacheFile;
   } else {
     Warning("Failed linking $file to $cacheFile");
   }