version 1.0.78

Author: rauladorean

extension-catalog/listing.txt

@@ -4,24 +4,24 @@
 $obj = new stdClass();
 $obj->url="";
 $obj->created_at="2023-03-14 16:03 UTC";
-$obj->updated_at="2024-01-18 11:43 UTC";
+$obj->updated_at="2025-04-15 12:49 UTC";
 $obj->ai_compatible=false;
 $obj->ai_only=false;
 $obj->revision="f51baaed036a40beed9dba71ca8b2ef5";
-$obj->build="2024-01-18 11:43 UTC";
+$obj->build="2025-04-15 12:49 UTC";
 $obj->uuid="58268850-ddaf-4f29-9794-f289820938f2"; #random from https://www.uuidgenerator.net/version4
 $obj->code="ls-sftp-access";
 $obj->name="SFTP Access";
 $obj->description="SFTP Access extension will allow you to enable SFTP access for additional FTP users";
 $obj->version="1.0";
-$obj->release="77";
+$obj->release="78";
 $obj->author=null;
 $obj->vendor="Layershift";
 $obj->example=false;
 $obj->featured=true;
-$obj->checksum="43cf5b35977456e91c62da8289badc2d";
+$obj->checksum="1addd170938b71c5e7b139cba655e43c";
 $obj->fake=false;
-$obj->download_url="https://plesk-extension-catalog.layershift.com/extensions//ls-sftp-access/ls-sftp-access-1.0-77.zip";
+$obj->download_url="https://plesk-extension-catalog.layershift.com/extensions//ls-sftp-access/ls-sftp-access-1.0-78.zip";
 $obj->buy_url="";
 $obj->icon="https://plesk-extension-catalog.layershift.com/extensions/ls-sftp-access/64x64.png";
 $obj->screenshots=array(

ls-sftp-access/CHANGES.md

@@ -1,3 +1,7 @@
+# 1.0-78
+Bug fixes:
+ * Check if CageFS is installed and add the /jail folder to the mount points
+
 # 1.0-77
 Bug fixes:
  * sshd_config block breaking new variables added at the end of the file

ls-sftp-access/meta.xml

@@ -4,7 +4,7 @@
   <name>SFTP Access</name>
   <description>SFTP Access extension will allow you to enable SFTP access for additional FTP users</description>
   <version>1.0</version>
-  <release>77</release>
+  <release>78</release>
   <vendor>Layershift</vendor>
   <url>https://www.layershift.com</url>
   <plesk_min_version>18.0.50</plesk_min_version>

ls-sftp-access/plib/controllers/IndexController.php

@@ -21,7 +21,7 @@ public function indexAction()
         $this->view->tabs = $this->_getTabs();
 
         $out="<table>";
-        $out.="<tr><td>SFTP for additional FTP users.<br> Version: 1.0.77</td></tr>";
+        $out.="<tr><td>SFTP for additional FTP users.<br> Version: 1.0.78</td></tr>";
         $out.="</table>";
         $this->view->service_status=$out;
 

ls-sftp-access/plib/scripts/post-install.php

@@ -43,7 +43,7 @@
     file_put_contents(pm_Context::getVarDir()."debug.log", 'done'."\n", FILE_APPEND);
 
 
-if ($isUpgrade==0) {
+
     file_put_contents(pm_Context::getVarDir()."debug.log", 'executing provision.sh ...'."\n", FILE_APPEND);
     // call provision script
     try {
@@ -53,7 +53,7 @@
         exit;
     }
     file_put_contents(pm_Context::getVarDir()."debug.log", 'done'."\n", FILE_APPEND);
-}
+
 
 
 exit(0);

ls-sftp-access/sbin/provision.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 printenv
-# create the jail home
+# Create the jail home
 mkdir -p -v -m 751 /jail
 chown root.root /jail
 
@@ -9,7 +9,7 @@ if [ $? -ne 0 ]; then
     groupadd sftpusers
 fi
 
-# configure autofs
+# Configure AutoFS
 if [ -d /etc/auto.master.d ]; then
     if [ -f /etc/auto.master.d/ls-sftp-access.autofs ]; then
         mv -v /etc/auto.master.d/ls-sftp-access.autofs /etc/auto.master.d/ls-sftp-access.autofs_$(date +%s)
@@ -31,10 +31,10 @@ else
 fi
 
 
-# configure sshd
+# Configure SSHD
 grep -q "### ls-sftp-access configuration block begin ###" /etc/ssh/sshd_config
 if [ $? -eq 0 ]; then
-    cp -v /etc/ssh/sshd_config /etc/ssh/sshd_config_$(date +%s)
+    cp -p -v /etc/ssh/sshd_config /etc/ssh/sshd_config_$(date +%s)
 fi
 
 grep -q "### ls-sftp-access configuration block begin ###" /etc/ssh/sshd_config
@@ -62,7 +62,18 @@ EOF
 
 systemctl restart sshd
 
-# prepare persistent configuration files
+# Check if CageFS is installed and add the jail folder to the mount points
+rpm -q cagefs 2>&1 >/dev/null
+if [ $? -eq 0 ]; then
+    cat <<EOF >> /etc/cagefs/cagefs.mp
+### ls-sftp-access configuration block begin ###
+/jail
+### ls-sftp-access configuration block end ###
+EOF
+    cagefsctl --remount-all
+fi
+
+# Prepare persistent configuration files
 
 if [ ! -f /usr/local/psa/admin/conf/ls-sftp-access ]; then
     touch /usr/local/psa/admin/conf/ls-sftp-access;

ls-sftp-access/sbin/uninstall.sh

@@ -3,6 +3,7 @@
 systemctl stop autofs
 systemctl disable autofs
 
+# Remove SSHD configuration block
 grep -q "### ls-sftp-access configuration block begin ###" /etc/ssh/sshd_config
 if [ $? -eq 0 ]; then
     grep -q "### ls-sftp-access configuration block begin ###" /etc/ssh/sshd_config
@@ -12,3 +13,12 @@ if [ $? -eq 0 ]; then
     fi
 fi
 
+# Remove the CageFS mounte point
+rpm -q cagefs 2>&1 >/dev/null
+if [ $? -eq 0 ]; then
+    grep -q "### ls-sftp-access configuration block begin ###" /etc/cagefs/cagefs.mp
+    if [ $? -eq 0 ]; then
+        sed -e '/^### ls-sftp-access configuration block begin ###/,/^### ls-sftp-access configuration block begin ###/d' -i /etc/cagefs/cagefs.mp
+        cagefsctl --remount-all
+    fi
+fi