Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2376893

Timestamp:

09/08/2020 04:56:54 AM (5 years ago)

Author:

devoutpro

Message:

release 1.14
Manual upload of data to the backend system for analysis is done

Location:

nomore404-404-redirection-and-firewall

Files:

: 2397 added
: 1 deleted
: 7 edited

Legend:

: Unmodified
: Added
: Removed

nomore404-404-redirection-and-firewall/trunk/includes/nomore404-activation.php

-                      r2368272
+                      r2376893
     $obj_settings = new NoMore404_Settings();
     NoMore404_Model_Static_Class::good_error_log('settings:', $obj_settings);
+    //NoMore404_Model_Static_Class::good_error_log('settings:', $obj_settings);
     $table_name1 = $prefix . "nomore404_uri";
 …
                                 ADD whitelist TINYINT(1) NOT NULL DEFAULT '0'";
             $result = $wpdb->query($update_query1);
             NoMore404_Model_Static_Class::good_error_log('Table 1 update 1 result:', $result);
+            //NoMore404_Model_Static_Class::good_error_log('Table 1 update 1 result:', $result);
+        }
 …
                                 ADD comment VARCHAR(50) NULL";
             $result = $wpdb->query($update_query1);
             NoMore404_Model_Static_Class::good_error_log('Table 1 update 2 result:', $result);
+            //NoMore404_Model_Static_Class::good_error_log('Table 1 update 2 result:', $result);
+        }
         if($obj_settings->options['dbversion'] < '1.13'){ // alter table here if before v 1.13
 …
                                 ADD uploaded TINYINT(1) NOT NULL DEFAULT '0'";
             $result = $wpdb->query($update_query1);
             NoMore404_Model_Static_Class::good_error_log('Table 1 update 3 result:', $result);
+            //NoMore404_Model_Static_Class::good_error_log('Table 1 update 3 result:', $result);
+        }
         $table1updated = True;
         NoMore404_Model_Static_Class::var_error_log('Table 1 updated:', $table1updated);
+        //NoMore404_Model_Static_Class::var_error_log('Table 1 updated:', $table1updated);
+    }
 …
         $obj_settings->SetLatestVersions();
+    }
     NoMore404_Model_Static_Class::good_error_log('settings:', $obj_settings);
+    //NoMore404_Model_Static_Class::good_error_log('settings:', $obj_settings);
+}

nomore404-404-redirection-and-firewall/trunk/includes/nomore404-list-table-class.php

r2368272	r2376893
866	866	$data = NoMore404_Model_Static_Class::getCallers($orderby, $order, $search, $uriid, $current_page, $per_page);
867	867
	868	//NoMore404_Model_Static_Class::good_error_log('Callers in list class:', $data);
	869
868	870	$total_items = NoMore404_Model_Static_Class::countCallers($search, $uriid);
869	871

nomore404-404-redirection-and-firewall/trunk/includes/nomore404-model.php

-                      r2368272
+                      r2376893
         $query = 'SELECT * FROM ' . self::$uri_caller_table_name;
+        $query .= ' WHERE uploaded <> 1 AND ';
+        $query .=       '(';
+        $query .=           'caller_id IN ';
+        $query .=               '(SELECT uc.caller_id FROM ' . self::$caller_table_name . ' uc ';
+        $query .=                   'WHERE uc.uploaded <> 1 AND (uc.whitelist = 1 OR uc.malicious = 1 OR uc.suspicious = 1)';
+        $query .=               ') OR ';
+        $query .=           'uri_id IN ';
+        $query .=               '(SELECT uu.uri_id FROM ' . self::$uri_table_name . ' uu ';
+        $query .=                   'WHERE uu.uploaded <> 1 AND (uu.whitelist = 1 OR uu.malicious = 1 OR uu.suspicious = 1) ';
+        $query .=               ') ';
+        $query .=        ') ';
+        $query .= ' WHERE uploaded <> 1';
         $query .= ' ORDER BY uri_id';
 …
         if($markuploaded){
+            $query = 'UPDATE ' . self::$uri_caller_table_name . ' SET uploaded = 1';
+            $query .= ' WHERE uploaded <> 1 AND ';
+            $query .=       '(';
+            $query .=           'caller_id IN ';
+            $query .=               '(SELECT uc.caller_id FROM ' . self::$caller_table_name . ' uc ';
+            $query .=                   'WHERE uc.uploaded <> 1 AND (uc.whitelist = 1 OR uc.malicious = 1 OR uc.suspicious = 1)';
+            $query .=               ') OR ';
+            $query .=           'uri_id IN ';
+            $query .=               '(SELECT uu.uri_id FROM ' . self::$uri_table_name . ' uu ';
+            $query .=                   'WHERE uu.uploaded <> 1 AND (uu.whitelist = 1 OR uu.malicious = 1 OR uu.suspicious = 1) ';
+            $query .=               ') ';
+            $query .=        ') ';
+            $query = 'UPDATE ' . self::$uri_caller_table_name . ' SET uploaded = 1, date_uploaded = UTC_TIMESTAMP()';
+            $query .= ' WHERE uploaded <> 1';
             $query .= ' ORDER BY uri_id';
             $wpdb->query($query);
 …
         if($markuploaded){
             $query = 'UPDATE ' . self::$uri_table_name . ' SET uploaded = 1';
+            $query = 'UPDATE ' . self::$uri_table_name . ' SET uploaded = 1, date_uploaded = UTC_TIMESTAMP()';
             $query .= ' WHERE uploaded <> 1 AND (whitelist = 1 OR malicious = 1 OR suspicious = 1)';
             $wpdb->query($query);
 …
         if($markuploaded){
             $query = 'UPDATE ' . self::$caller_table_name . ' SET uploaded = 1';
+            $query = 'UPDATE ' . self::$caller_table_name . ' SET uploaded = 1, date_uploaded = UTC_TIMESTAMP()';
             $query .= ' WHERE uploaded <> 1 AND (whitelist = 1 OR malicious = 1 OR suspicious = 1)';
             $wpdb->query($query);
 …
              $output = $wpdb->insert_id;
          } catch (Exception $ex) {
             self::good_error_log('Caught URICaller insert error:',$ex->getMessage());
+            //self::good_error_log('Caught URICaller insert error:',$ex->getMessage());
             return False; // if insert did not work - return false
+         }
 …
                             array('uri_id' => $uri_id, 'caller_id' => $caller_id));
          } catch (Exception $ex) {
             self::good_error_log('Caught URICaller update error:',$ex->getMessage());
+            //self::good_error_log('Caught URICaller update error:',$ex->getMessage());
             return False; // if insert did not work - return false
+         }
 …
              $output = $wpdb->insert_id;
          } catch (Exception $ex) {
             self::good_error_log('Caught Caller insert error:',$ex->getMessage());
+            //self::good_error_log('Caught Caller insert error:',$ex->getMessage());
             return False; // if insert did not work - return false
+         }
 …
             $output = $wpdb->update(self::$caller_table_name, $caller_data, array('caller_id' => $caller_id));
          } catch (Exception $ex) {
             self::good_error_log('Caught Caller update error:',$ex->getMessage());
+            //self::good_error_log('Caught Caller update error:',$ex->getMessage());
             return False; // if update did not work - return false
+         }
 …
             );
          } catch (Exception $ex) {
             self::good_error_log('Caught Caller delete error:',$ex->getMessage());
+            //self::good_error_log('Caught Caller delete error:',$ex->getMessage());
             return False; // if update did not work - return false
+         }
 …
         global $wpdb;
         self::good_error_log('Counting callers by URIid:', $filteruriid);
+        //self::good_error_log('Counting callers by URIid:', $filteruriid);
         if('' == $filteruriid ){ // if not filtered  then normal sort and search applies
 …
+        }
         self::good_error_log('Running query:', $cleanedsql);
+        //self::good_error_log('Running query:', $cleanedsql);
         $num = (int) $wpdb->get_var($cleanedsql);
         self::good_error_log('Number of records:', $num);
+        //self::good_error_log('Number of records:', $num);
         return $num;
+    }
 …
+            }
         }else{
+            $query = 'SELECT * FROM ' . self::$caller_table_name . ' c ';
+            // prepare list of fields
+            $listOfFieldsToGet = 'c.caller_id, c.caller_ip, c.comment, c.hostname, c.date_created, c.date_last_used,
+                                    c.counter, c.suspicious, c.malicious, c.whitelist, c.uploaded';
+            // form query
+            $query = 'SELECT ' . $listOfFieldsToGet . ' FROM ' . self::$caller_table_name . ' c ';
             $query .= 'INNER JOIN ' . self::$uri_caller_table_name . ' uc ';
             $query .= 'ON c.caller_id = uc.caller_id and uc.uri_id = %d';
 …
+        }
         $output = $wpdb->get_results($cleanedsql, ARRAY_A);
+        //NoMore404_Model_Static_Class::good_error_log('SQL  in model class:', $cleanedsql);
+        //NoMore404_Model_Static_Class::good_error_log('Callers in model class:', $output);
         return $output;
+    }
 …
             );
          } catch (Exception $ex) {
             self::good_error_log('Caught URI delete error:',$ex->getMessage());
+            //self::good_error_log('Caught URI delete error:',$ex->getMessage());
             return False; // if update did not work - return false
+         }
 …
         return $uri_data;
+    }
     public static  function InsertURI($uri_data) {
          global $wpdb;
 …
              $output = $wpdb->insert_id;
          } catch (Exception $ex) {
             self::good_error_log('Caught insert error:',$ex->getMessage());
+            //self::good_error_log('Caught insert error:',$ex->getMessage());
             return False; // if insert did not work - return false
+         }
 …
             $output = $wpdb->update(self::$uri_table_name, $uri_data, array('uri_id' => $uri_id));
          } catch (Exception $ex) {
             self::good_error_log('Caught update error:',$ex->getMessage());
+            //self::good_error_log('Caught update error:',$ex->getMessage());
             return $output; // if insert did not work - return false
+         }

nomore404-404-redirection-and-firewall/trunk/includes/nomore404-upload-download.php

-                      r2368272
+                      r2376893
     // if not uploaded then all changes to uploaded flag will be rolled back
     public static function UploadAllNewData($dofullupload = false) {
+        global $wpdb;
         // Start Transaction
         $wpdb->query( "START TRANSACTION" );
 …
         $strJSON = Self::CreateJSON4Upload(FALSE); // what was not uploaded yet
+        //NoMore404_Model_Static_Class::good_error_log('Uploading info:', $strJSON);
         if(FALSE !== $strJSON){ // there is something to upload
             $uploaded = self::UploadStringAsFile2S3($strJSON);
             if($uploaded) $wpdb->query( "ROLLBACK" );
+            if($uploaded) $wpdb->query( "COMMIT" );
             else $wpdb->query( "ROLLBACK" );
         }else{
 …
                 'ACL' => 'bucket-owner-full-control',
             ]);
+            NoMore404_Model_Static_Class::good_error_log('S3UploadResult:', $result);
+            //NoMore404_Model_Static_Class::good_error_log('S3UploadResult:', $result);
+            //NoMore404_Model_Static_Class::good_error_log('File uploaded:', $file2upload);
             // returns true if uploaded
 …
         $strJSONText .= '"wp_version": "' . get_bloginfo('version') . '",' . PHP_EOL; // wordpress verson
         $strJSONText .= '"version": "' . NOMORE404VERSION . '",' . PHP_EOL; // plug in versions
         $strJSONText .= '"dbversion": "' . NOMORE404DBVERSION . '",' . PHP_EOL; //
         $strJSONText .= '"Callers": '; // start of caller records
+        $strJSONText .= '"dbversion": "' . NOMORE404DBVERSION . '"'; //
         // lets get callers data
         // first get data what was not uploaded yet
+        // first get data what was not uploaded yet and mark them uploaded as well in transaction
         $callers2upload = NoMore404_Model_Static_Class::getCallersForUpload(TRUE);
         //NoMore404_Model_Static_Class::good_error_log('Callers:', $callers2upload);
+        if(NULL !== $callers2upload){ // there is something to take in
+        //NoMore404_Model_Static_Class::var_error_log('Callers to upload:',$callers2upload);
+        if((NULL !== $callers2upload) && (is_array($callers2upload) && sizeof($callers2upload) > 0)){
+        // there is something to take in, it is array with at least one element
             //NoMore404_Model_Static_Class::good_error_log('Callers:', $callers2upload);
             //NoMore404_Model_Static_Class::good_error_log('CallersJSON:', json_encode($callers2upload, JSON_FORCE_OBJECT));
+            $strJSONText .= json_encode($callers2upload, JSON_PRETTY_PRINT) . ',' . PHP_EOL;
+            $strJSONText .= ',' . PHP_EOL . '",Callers": '; // start of caller records
+            $strJSONText .= json_encode($callers2upload, JSON_PRETTY_PRINT);
             $thereIsSomethingToUpload = TRUE;
             //NoMore404_Model_Static_Class::good_error_log('JSON error:',json_last_error_msg());
 …
+        $strJSONText .= '"URIs": '; // start of URIs records
         $URIs2upload = NoMore404_Model_Static_Class::getURIsForUpload(TRUE); // get data what was not uploaded yet
+        if(NULL !== $URIs2upload){ // there is something to take in
+            $strJSONText .= json_encode($URIs2upload, JSON_PRETTY_PRINT) . ',' . PHP_EOL;
+        if(NULL !== $URIs2upload && (is_array($URIs2upload) && sizeof($URIs2upload) > 0)){
+            $strJSONText .=  ',' . PHP_EOL . '"URIs": '; // start of URIs records
+            // there is something to take in, it is array with at least one element
+            $strJSONText .= json_encode($URIs2upload, JSON_PRETTY_PRINT);
             $thereIsSomethingToUpload = TRUE;
+        }
         $strJSONText .= '"URICaller": '; // start of URIs records
         $URICaller2upload = NoMore404_Model_Static_Class::getURICallerForUpload(TRUE); // get data what was not uploaded yet
         //NoMore404_Model_Static_Class::good_error_log('$URICaller2upload:', $URICaller2upload);
+        if(NULL !== $URICaller2upload){ // there is something to take in
+        if(NULL !== $URICaller2upload && (is_array($URICaller2upload) && sizeof($URICaller2upload) > 0)){
+            $strJSONText .= ',' . PHP_EOL . '"URICaller": '; // start of URIs records
+            // there is something to take in, it is array with at least one element
             $strJSONText .= json_encode($URICaller2upload, JSON_PRETTY_PRINT) . PHP_EOL;
             $thereIsSomethingToUpload = TRUE;

nomore404-404-redirection-and-firewall/trunk/includes/nomore404-view.php

-                      r2368272
+                      r2376893
         $output .= '</tr>' . PHP_EOL;
+        $output .= '<td>Date Uploaded</td>' . PHP_EOL;
+        $output .= '<td>' . esc_attr($uri_data['date_uploaded']) . '</td>' . PHP_EOL;
+        $output .= '</tr>' . PHP_EOL;
+        $output .= '<tr>' . PHP_EOL;
+        $output .= '<td>Date Downloaded</td>' . PHP_EOL;
+        $output .= '<td>' . esc_attr($uri_data['date_downloaded']) . '</td>' . PHP_EOL;
+        $output .= '</tr>' . PHP_EOL;
+        $output .= '<tr>' . PHP_EOL;
+        $output .= '<tr>' . PHP_EOL;
+        $output .= '<td>Uploaded</td>' . PHP_EOL;
+        $output .= '<td><input type="checkbox" name="uploaded" value="Enabled" '
+                . checked($uri_data['uploaded'], true, false) . '>' . PHP_EOL;
+        $output .= '</td>' . PHP_EOL;
+        $output .= '</tr>' . PHP_EOL;
         $output .= '</table>' . PHP_EOL;
         echo $output;
 …
         $output .= '</tr>' . PHP_EOL;
         $output .= '<tr>' . PHP_EOL;
         $output .= '<td>Date Last Used</td>' . PHP_EOL;
         $output .= '<td>' . esc_attr($caller_data['date_last_used']) . '</td>' . PHP_EOL;
         $output .= '</tr>' . PHP_EOL;
         $output .= '<tr>' . PHP_EOL;
         $output .= '<td>Counter</td>' . PHP_EOL;
         $output .= '<td>' . esc_attr($caller_data['counter']) . '</td>' . PHP_EOL;
         $output .= '</tr>' . PHP_EOL;
         $output .= '<tr>' . PHP_EOL;
         $output .= '<td>Suspicious</td>' . PHP_EOL;
         $output .= '<td><input type="checkbox" name="suspicious" value="Enabled" '
 …
         $output .= '</td>' . PHP_EOL;
         $output .= '</tr>' . PHP_EOL;
+        $output .= '<td>Date Uploaded</td>' . PHP_EOL;
+        $output .= '<td>' . esc_attr($caller_data['date_uploaded']) . '</td>' . PHP_EOL;
+        $output .= '</tr>' . PHP_EOL;
+        $output .= '<tr>' . PHP_EOL;
+        $output .= '<td>Date Downloaded</td>' . PHP_EOL;
+        $output .= '<td>' . esc_attr($caller_data['date_downloaded']) . '</td>' . PHP_EOL;
+        $output .= '</tr>' . PHP_EOL;
+        $output .= '<tr>' . PHP_EOL;
+        $output .= '<tr>' . PHP_EOL;
+        $output .= '<td>Uploaded</td>' . PHP_EOL;
+        $output .= '<td><input type="checkbox" name="uploaded" value="Enabled" '
+                . checked($caller_data['uploaded'], true, false) . '>' . PHP_EOL;
+        $output .= '</td>' . PHP_EOL;
+        $output .= '</tr>' . PHP_EOL;
         $output .= '</table>' . PHP_EOL;

nomore404-404-redirection-and-firewall/trunk/nomore404.php

-                      r2368272
+                      r2376893
  * Plugin URI:          https://devoutpro.com/nomore404
  * Description:         NoMore404 is a free WordPress plugin for redirection of 404 pages (301 type of redirection) and simple firewall to block malicious hosts and URLs.
  * Version:             1.13
+ * Version:             1.14
  * Requires at least:   4.0
  * Requires PHP:        5.3
 …
 defined('ABSPATH') or exit;
 define("NOMORE404VERSION", "1.13");
 define("NOMORE404DBVERSION", "1.13");
+define("NOMORE404VERSION", "1.14");
+define("NOMORE404DBVERSION", "1.14");
 // plugin activation and uninstallation
 …
                         if (isset($_SESSION['uri_data']))
                             $uri_data = array_merge($uri_data,$_SESSION['uri_data']);
-                        //NoMore404_Model_Static_Class::var_error_log('URI data after merge: ', $uri_data);
                     }elseif ('edit' === $_GET['mode']) { // edit existing uri
                         $uri_id = (int) $_GET['id'];
 …
     if (isset($_POST['btnUpload'])) { // button upload clicked
-        //NoMore404_Model_Static_Class::good_error_log('Uploading...', $_POST);
         $uploaded = NoMore404_UD_Static_Class::UploadAllNewData();
         if($uploaded)
 …
     $caller_data['malicious'] = ( isset($_POST['malicious']) ? True : False );
     $caller_data['whitelist'] = ( isset($_POST['whitelist']) ? True : False );
+    $caller_data['uploaded'] = ( isset($_POST['uploaded']) ? True : False );
     if($caller_data['malicious']) $caller_data['suspicious'] = True; // malicious is stronger
 …
     $uri_data['malicious'] = ( isset($_POST['malicious']) ? True : False );
     $uri_data['whitelist'] = ( isset($_POST['whitelist']) ? True : False );
+    $uri_data['uploaded'] = ( isset($_POST['uploaded']) ? True : False );
     $_SESSION['uri_data'] = $uri_data; // save uri data in session
 …
         ?>
         <div class="notice notice-error is-dismissible">
             <p><?php _e('Upload did not work, contact support.'); ?></p>
+            <p><?php _e('Upload did not work, possibly nothing to upload.'); ?></p>
         </div>
         <?php

nomore404-404-redirection-and-firewall/trunk/readme.txt

-                      r2368272
+                      r2376893
 Tested up to: 5.5
 Requires PHP: 5.3
 Stable tag: 1.13
+Stable tag: 1.14
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+.14 Manual upload of data to the backend system for analysis is done
 .13 Fixed activation and db upgrade errors.
      Uploading whitelists, suspects and  blacklists to the backend

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory