Changeset 1844703

Timestamp:

03/22/2018 06:05:42 AM (8 years ago)

Author:

osexcel

Message:

Centrora Joomla 7.3.2

Location:

ose-firewall/trunk

Files:

• classes/App/Model/Bsconfigv7Model.php (modified) (3 diffs)
• classes/App/Model/ScanreportModel.php (modified) (1 diff)
• classes/Library/fwscannerv7/fwstatsv7.php (modified) (2 diffs)
• classes/Library/oseFirewallBase.php (modified) (1 diff)
• classes/Library/oseFirewallJoomla.php (modified) (2 diffs)
• classes/Library/vsscanner/fpscanner.php (modified) (1 diff)
• classes/Library/vsscanner/mfscanner.php (modified) (2 diffs)
• ose_firewall_badge.php (modified) (1 diff)
• ose_wordpress_firewall.php (modified) (3 diffs)

ose-firewall/trunk/classes/App/Model/Bsconfigv7Model.php

@@ -35 +35 @@
     }
     protected function loadLibrary () {
+        $subscription = oseFirewall::checkSubscriptionStatus (false);
+        if(!$subscription){
+            return;
+        }
         $this->loadFirewallStat () ;
         oseFirewallBase::callLibClass('fwscannerv7','fwscannerv7');
@@ -124 +128 @@
     public function getFirewallScannerVersion()
     {
-        $result = $this->fwscannerv7->getFirewallScannerVersion();
+        //$result = $this->fwscannerv7->getFirewallScannerVersion();
+        $oseFirewall = new oseFirewall();
+        $result = $oseFirewall->getFirewallScannerVersion();
         return $result;
     }
@@ -130 +136 @@
     public function getFolderPermissions()
     {
-        $result = $this->fwscannerv7->checkPermissions();
+        //$result = $this->fwscannerv7->checkPermissions();
+        $oseFirewall = new oseFirewall();
+        $result = $oseFirewall->checkPermissions();
         return $result;
     }

ose-firewall/trunk/classes/App/Model/ScanreportModel.php

@@ -38 +38 @@
     protected function loadLibrary()
     {
+        $subscription = oseFirewall::checkSubscriptionStatus (false);
+        if(!$subscription){
+            return;
+        }
         oseFirewall::callLibClass('vsscanstat', 'vsscanstat');
     }

ose-firewall/trunk/classes/Library/fwscannerv7/fwstatsv7.php

@@ -10 +10 @@
     die('Direct Access Not Allowed');
 }
-define('WEBLOG_ALLOWED_DAYS',30);
+define('WEBLOG_ALLOWED_DAYS',90);
 define('WEBLOGBACkUP_ALLOWED_MONTHS',3);
 oseFirewall::loadJSON ();
@@ -1098 +1098 @@
         $datetime2 = new DateTime($formattedDate);
         $interval = $datetime1->diff($datetime2);
-        if($interval->y>=1 || $interval->m>=1 ||$interval->d>=WEBLOGBACkUP_ALLOWED_MONTHS) //change if days >30 days
+        if($interval->y>=1 || $interval->m>=WEBLOGBACkUP_ALLOWED_MONTHS ||$interval->d>=WEBLOG_ALLOWED_DAYS) //change if days >30 days
         {
             return true;

ose-firewall/trunk/classes/Library/oseFirewallBase.php

@@ -2006 +2006 @@
     }
 
-
-
-
+    public function getFirewallScannerVersion()
+    {
+        $fs7 = $this->getFirewallSettingsfromDb();
+        $fs6 = oseFirewall::getConfiguration('scan');
+        $result =array();
+        if($fs7['status'] == 1)
+        {
+            $result['status'] = 1;
+            $result['v7'] =$fs7['info'][1];
+        }
+        if($fs6['success']==1)
+        {
+            $result['status'] = 1;
+            $result['v6'] = $fs6['data']['devMode'];
+        }
+        return $result;
+
+    }
+    public function getFirewallSettingsfromDb()
+    {
+        $this->db = oseFirewall::getDBO();
+        $settings  = array();
+        $query = "SELECT `id`,`value` FROM `#__osefirewall_fwscannerv7Config` WHERE 1";
+        $this->db->setQuery($query);
+        $temp = $this->db->loadResultList();
+        if(!empty($temp))
+        {
+            foreach($temp as $record)
+            {
+
+                $settings[$record['id']] = $record['value'];
+                if($record['id'] == 17) // send values till 17 only
+                {
+                    break;
+                }
+            }
+            $settings[25] = $temp[24]['value']; ////brute force attempts
+            $settings[26] = $temp[25]['value']; //brute force time lime
+            $settings[27] = $temp[26]['value']; //google authentication for the login page
+            if(isset($temp[32]['value']))
+            {
+                $settings[33] = $temp[32]['value'];//attempt threshold
+            }
+        }
+        if(!empty($settings))
+        {
+            $result['status'] = 1;
+            $result['info'] = $settings;
+            return $result;
+        }else {
+            $result['status'] = 0;
+            $result['info'] = "The firewall scanner has not been set yet";
+            return $result;
+        }
+    }
+    public function checkPermissions()
+    {
+        if(oseFirewallBase::isSuite()) {
+            $permissions = substr(sprintf('%o', fileperms(OSE_CONTENTFOLDER)), -3);
+            $user = substr($permissions, 0, 1);
+            $group = substr($permissions, 1, 1);
+            $other = substr($permissions, 2, 1);
+            $msg = "mkdir " . OSE_WEBLOGFOLDER . "; mkdir " . OSE_WEBLOG_BACKUPFOLDER . "; chmod -R 0777 " . OSE_WEBLOGFOLDER . "<br/>; chmod -R 0777 " . OSE_WEBLOG_BACKUPFOLDER;
+            if (($user == 7) && ($group >= 5) && ($other >= 5)) {
+                $this->permission = true;
+                $this->makeDirectories();
+                if (file_exists(OSE_WEBLOG_BACKUPFOLDER) && file_exists(OSE_WEBLOGFOLDER) && $this->checkWebLogBackupFolderPermission() && $this->checkWebLogFolderPermission()) {
+                    return $this->prepareSuccessMessage('The folder has appropriate folder permissions');
+                } else {
+                    return oseFirewallBase::prepareErrorMessage("The folders do not appropriate permissions, please run the following commands : <br/>" . $msg);
+                }
+            } else {
+                $change_perm = chmod(OSE_CONTENTFOLDER, 0755);
+                if ($change_perm == true) {
+                    $this->permission = true;
+                    $this->makeDirectories();
+                    if (file_exists(OSE_WEBLOG_BACKUPFOLDER) && file_exists(OSE_WEBLOGFOLDER) && $this->checkWebLogBackupFolderPermission() && $this->checkWebLogFolderPermission()) {
+                        return $this->prepareSuccessMessage('The folder has appropriate folder permissions');
+                    } else {
+                        return oseFirewallBase::prepareErrorMessage("The folders do not appropriate permissions, please run the following commands : <br/>" . $msg);
+                    }
+                } else {
+                    $this->permission = false;
+                    $msg = "mkdir " . OSE_CONTENTFOLDER . "; chmod 0755 " . OSE_CONTENTFOLDER . "<br/> ; mkdir " . OSE_WEBLOGFOLDER . "; mkdir " . OSE_WEBLOG_BACKUPFOLDER . "; chmod -R 0777 " . OSE_WEBLOGFOLDER . "<br/>; chmod -R 0777 " . OSE_WEBLOG_BACKUPFOLDER;
+                    return oseFirewallBase::prepareErrorMessage("The folders do not appropriate permissions, please run the following commands : <br/>" . $msg);
+                }
+            }
+        }else{
+            return $this->prepareSuccessMessage('The folder has appropriate folder permissions');
+        }
+    }
 
 

ose-firewall/trunk/classes/Library/oseFirewallJoomla.php

@@ -241 +241 @@
 
         //OLD FIREWALL VIEW FOR VERSION 7
+        /*
         $menu .= '<li id="nav-fsv6"';
         $menu .= ($view == 'ose_fw_bsconfigv7') ? 'class=""' : '';
@@ -273 +274 @@
         $menu .= '><a href="index.php?option=' . $extension . '&view=audit">' . oLang::_get('AUDIT_WEBSITE') . '</a></li>';
         $menu .= '</div>';
-
+        */
 
         //First UL Ends

ose-firewall/trunk/classes/Library/vsscanner/fpscanner.php

@@ -27 +27 @@
     die('Direct Access Not Allowed');
 }
-oseFirewall::callLibClass('vsscanner', 'vsscanner');
-
-class fpScanner extends virusScanner
+//oseFirewall::callLibClass('vsscanner', 'vsscanner');
+
+class fpScanner
 {
     private $scanhisttablebl = '#__osefirewall_scanhist';

ose-firewall/trunk/classes/Library/vsscanner/mfscanner.php

@@ -27 +27 @@
     die('Direct Access Not Allowed');
 }
-oseFirewall::callLibClass('vsscanner', 'vsscanner');
-
-class mfScanner extends virusScanner
+//oseFirewall::callLibClass('vsscanner', 'vsscanner');
+
+class mfScanner
 {
     const CHUNK_SIZE = 2048;
@@ -464 +464 @@
         return $content;
     }
+
+    public function  human_filesize($bytes, $decimals = 2)
+    {
+        $size = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+        $factor = floor((strlen($bytes) - 1) / 3);
+        return sprintf("%.{$decimals}f", $bytes / pow(1024, $factor)) . @$size[$factor];
+    }
 }
 

ose-firewall/trunk/ose_firewall_badge.php

@@ -4 +4 @@
    Description: Plugin For Showing Centrora Security Badge 
    Author: Centrora Security
-   Version: 7.3.1
+   Version: 7.3.2
 */
 include(dirname(__FILE__).'/includes/oseBadgeWidget.php');

ose-firewall/trunk/ose_wordpress_firewall.php

@@ -5 +5 @@
 Description: Centrora Security (previously OSE Firewall) - A WordPress Security Firewall plugin created by Centrora. Protect your WordPress site by identify any malicious codes, spam, virus, SQL injection, and security vulnerabilities.
 Author: Centrora (Previously ProWeb)
-Version: 7.3.1
+Version: 7.3.2
 Author URI: http://www.centrora.com/
 */
@@ -204 +204 @@
              }else {
                 ////FIREWALL SCANNER V7
+                if(!oseFirewall::checkSubscriptionStatus (false) || !file_exists(OSE_FWFRAMEWORK . ODS . 'fwscannerv7' . ODS . 'fwscannerv7.php')){
+                    return;
+                }
                 $oseFirewall::callLibClass('fwscannerv7', 'fwscannerv7');
                 $fwscannerv7 = new oseFirewallScannerV7();
@@ -239 +242 @@
     }
 }
-
+if(!oseFirewall::checkSubscriptionStatus (false) || !file_exists(OSE_FWFRAMEWORK . ODS . 'fwscannerv7' . ODS . 'fwscannerv7.php')){
+    return;
+}
 $oseFirewall::callLibClass('fwscannerv7','fwscannerv7');
 $fwscannerv7 = new oseFirewallScannerV7();