Changeset 1936614

Timestamp:

09/06/2018 05:53:56 AM (8 years ago)

Author:

osexcel

Message:

Centrora Joomla 7.4.7

Location:

ose-firewall/trunk

Files:

• assets/views/dashboard.php (modified) (3 diffs)
• classes/App/Model/ManageipsModel.php (modified) (1 diff)
• classes/Library/firewallstat/firewallstatBase.php (modified) (2 diffs)
• classes/Library/fwscannerv7/ipManagement.php (modified) (1 diff)
• ose_firewall_badge.php (modified) (1 diff)
• ose_wordpress_firewall.php (modified) (1 diff)
• public/js/dashboard.js (modified) (2 diffs)

ose-firewall/trunk/assets/views/dashboard.php

@@ -25 +25 @@
                         <div class="panel panel-success">
                             <div class="panel-body" id="dashmenu" style="min-height: 300px; margin-left:-45px; ">
-                                <a href="javascript:void(0)" id="btn_country"
-                                   class="col-md-12"><?php oLang::_('OVERVIEW_COUNTRY_MAP_BTN'); ?></a>
+                                <a href="javascript:void(0)" id="btn_recenthack"
+                                   class="col-md-12"><?php oLang::_('RECENT_HACKING_INFO_BTN'); ?></a>
                                 <a href="javascript:void(0)" id="btn_traffic"
                                    class="col-md-12"><?php oLang::_('OVERVIEW_TRAFFICS_BTN'); ?></a>
                                 <a href="javascript:void(0)" id="btn_recentscan"
                                    class="col-md-12"><?php oLang::_('RECENT_SCANNING_RESULT_BTN'); ?></a>
-                                <a href="javascript:void(0)" id="btn_recenthack"
-                                   class="col-md-12"><?php oLang::_('RECENT_HACKING_INFO_BTN'); ?></a>
                                 <!--<a href="javascript:void(0)" id="btn_backup"
                                    class="col-md-12"><?php oLang::_('RECENT_BACKUP_BTN'); ?></a>-->
@@ -43 +41 @@
                                 </select>
                                 <button id="guide-btn">Guide</button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-9" id="overview_country" style="display: block;">
-                        <div class="bs-component">
-                            <div class="panel panel-teal">
-                                <div class="panel-heading">
-                                    <h3 class="panel-title_visible"
-                                        id="map-title"><?php oLang::_('OVERVIEW_COUNTRY_MAP'); ?></h3>
-                                </div>
-                                <div class="panel-body">
-                                    <div id="world-map"></div>
-                                </div>
                             </div>
                         </div>
@@ -107 +92 @@
                                             <thead>
                                             <tr>
-                                                <th><?php oLang::_('O_DATE'); ?></th>
-                                                <th><?php oLang::_('O_START_IP'); ?></th>
-                                                <th><?php oLang::_('O_RISK_SCORE'); ?></th>
-                                                <th><?php oLang::_('O_STATUS'); ?></th>
+                                                <th width="30%"><?php oLang::_('O_DATE'); ?></th>
+                                                <th width="40%"><?php oLang::_('O_IP'); ?></th>
+                                                <th width="30%"><?php oLang::_('O_STATUS'); ?></th>
                                             </tr>
                                             </thead>

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

@@ -67 +67 @@
     {
         $return = array();
-        $oseFirewallStat = new oseFirewallStat();
+        //$oseFirewallStat = new oseFirewallStat();
+        oseFirewall::callLibClass('fwscannerv7', 'ipManagement');
+        $ipManagement = new ipManagement();
         if (oseFirewall::isDBReady())
         {
-            $return = $oseFirewallStat->getLatestTraffic();
+            $return = $ipManagement->getLatestTraffic();
         }
         else

ose-firewall/trunk/classes/Library/firewallstat/firewallstatBase.php

@@ -1603 +1603 @@
     public function getTrafficData () {
         $return = array();
+        /*
         $query = "SELECT EXTRACT(HOUR FROM`datetime`) as hour, COUNT(id) + SUM(`visits`) as count FROM `#__osefirewall_acl` " .
             "WHERE (`status` = 1 OR `status` = 4) AND `datetime` > DATE_SUB(CURDATE(), INTERVAL 1 DAY) GROUP BY hour ORDER BY `hour` ASC";
@@ -1615 +1616 @@
         $this->db->setQuery($query);
         $return[2] = $this->db->loadObjectList();
+        */
+        $query = "SELECT EXTRACT(HOUR FROM`dateadded`) as hour, COUNT(id) as count, ip,status FROM `#__osefirewall_ipmanagement` " .
+            "WHERE (`status` = 2 ) AND `dateadded` > DATE_SUB(CURDATE(), INTERVAL 1 DAY) GROUP BY hour ORDER BY `hour` ASC";
+        $this->db->setQuery($query);
+        $return[0] = $this->db->loadObjectList();
+        $return[0] = $this->filterIpsWithRecords($return[0]);
+        $query = "SELECT EXTRACT(HOUR FROM`dateadded`) as hour, COUNT(id)  as count, ip,status FROM `#__osefirewall_ipmanagement` " .
+            "WHERE (`status` = 1) AND `dateadded` > DATE_SUB(CURDATE(), INTERVAL 1 DAY) GROUP BY hour ORDER BY `hour` ASC";
+        $this->db->setQuery($query);
+        $return[1] = $this->db->loadObjectList();
+        $return[1] = $this->filterIpsWithRecords($return[1]);
+        $query = "SELECT EXTRACT(HOUR FROM`dateadded`) as hour, COUNT(id) as count, ip,status FROM `#__osefirewall_ipmanagement` " .
+            "WHERE (`status` = 0) AND `dateadded` > DATE_SUB(CURDATE(), INTERVAL 1 DAY) GROUP BY hour ORDER BY `hour` ASC";
+        $this->db->setQuery($query);
+        $return[2] = $this->db->loadObjectList();
+        $return[2] = $this->filterIpsWithRecords($return[2]);
         return $return;
     }
-
+    public function filterIpsWithRecords($records){
+        $return = array();
+        foreach ($records as $record){
+            $folderPath = OSE_WEBLOGFOLDER.ODS.$record->ip;
+            if(file_exists($folderPath) && file_exists($folderPath."/blocked.php")){
+                $return[] = $record;
+            }else{
+                if($record->status == 1 || $record->status == 2){
+                    $return[] = $record;
+                }
+            }
+        }
+        return $return;
+    }
     private function headerArray()
     {

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

@@ -1182 +1182 @@
     }
 
-
-
+    public function getLatestTraffic()
+    {
+        $return = $this->getIPInfoList('', '','', 0, 5, 'dateadded', 'desc');
+        $return['data'] = $this->convertLatestTraffic($return['data']);
+        return $return;
+    }
+    private function convertLatestTraffic($results){
+        $i = 0;
+        $return = array ();
+        foreach ($results as $result){
+            $return[$i]->datetime = $result['datetime'];
+            $return[$i]->ip = $result['ip'];
+            $return[$i]->status = $result['status'];
+        }
+        return $return;
+    }
 }

ose-firewall/trunk/ose_firewall_badge.php

@@ -4 +4 @@
    Description: Plugin For Showing Centrora Security Badge 
    Author: Centrora Security
-   Version: 7.4.6
+   Version: 7.4.7
 */
 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.4.6
+Version: 7.4.7
 Author URI: http://www.centrora.com/
 */

ose-firewall/trunk/public/js/dashboard.js

@@ -190 +190 @@
         });
     });
+
+    $("#btn_recenthack").click();
 });
 
@@ -322 +324 @@
             columns: [
                 {"data": "datetime"},
-                {"data": "ip32_start"},
-                {"data": "score"},
+                {"data": "ip"},
                 {"data": "status"}
             ]