Changeset 1155457

Timestamp:

05/07/2015 03:09:56 PM (11 years ago)

Author:

yorman

Message:

Added. Integrity checks with unfixable files and better description

Location:

sucuri-scanner/trunk

Files:

• inc/css/sucuriscan-default-css.css (modified) (1 diff)
• inc/tpl/integrity-corefiles.html.tpl (modified) (1 diff)
• inc/tpl/integrity-corefiles.snippet.tpl (modified) (1 diff)
• sucuri.php (modified) (4 diffs)

sucuri-scanner/trunk/inc/css/sucuriscan-default-css.css

@@ -10 +10 @@
 .sucuriscan-visible{}
 .sucuriscan-hidden{display:none !important}
+.sucuriscan-opacity{opacity:0.6}
 .sucuriscan-monospace{font-family:Monospace, Courier}
 .sucuriscan-ellipsis{overflow:hidden;display:inline-block;white-space:nowrap;text-overflow:ellipsis}

sucuri-scanner/trunk/inc/tpl/integrity-corefiles.html.tpl

@@ -56 +56 @@
                 <td colspan="5">
                     <p>
-                        The action to restore the content of a file will only work with files that were
-                        <b>modified</b> or <b>removed</b>, for files that were <b>added</b> you must
-                        either remove or mark as fixed. Files marked as <b>fixed</b> will always be
-                        ignored from the integrity checks, an attacker can use this option to hide a
-                        malicious file, so always check what files are being ignored.
+                        <strong>Note.</strong> This is not a malware scanner but an integrity checker
+                        which is a completely different thing, if you want to check if your site is
+                        generating malicious code then use the <a href="%%SUCURI.URL.Scanner%%">malware
+                        scan</a> tool. If you see the text <em>"must be fixed manually"</em> in any of
+                        these files that means that they do not have write permissions so you can not
+                        fix them using this tool.
                     </p>
 

sucuri-scanner/trunk/inc/tpl/integrity-corefiles.snippet.tpl

@@ -2 +2 @@
 <tr class="%%SUCURI.CoreFiles.CssClass%% sucuriscan-hidden">
     <td class="check-column">
-        <input type="checkbox" name="sucuriscan_integrity_files[]" value="%%SUCURI.CoreFiles.FilePath%%" />
-        <input type="hidden" name="sucuriscan_integrity_types[]" value="%%SUCURI.CoreFiles.StatusType%%" />
+        <input type="checkbox" name="sucuriscan_integrity_files[]"
+        value="%%SUCURI.CoreFiles.FilePath%%" %%SUCURI.CoreFiles.IsFixtableFile%% />
+        <input type="hidden" name="sucuriscan_integrity_types[]"
+        value="%%SUCURI.CoreFiles.StatusType%%" %%SUCURI.CoreFiles.IsFixtableFile%% />
     </td>
     <td><span class="sucuriscan-label sucuriscan-label-%%SUCURI.CoreFiles.StatusType%%">%%SUCURI.CoreFiles.StatusType%%</span></td>
     <td><em title="%%SUCURI.CoreFiles.FileSizeNumber%% bytes">~%%SUCURI.CoreFiles.FileSizeHuman%%</em></td>
     <td>%%SUCURI.CoreFiles.ModifiedAt%%</td>
-    <td><span class="sucuriscan-monospace sucuriscan-wraptext">%%SUCURI.CoreFiles.FilePath%%</span></td>
+    <td>
+        <span class="sucuriscan-monospace sucuriscan-wraptext">%%SUCURI.CoreFiles.FilePath%%</span>
+        <em>%%SUCURI.CoreFiles.IsNotFixable%%</em>
+    </td>
 </tr>

sucuri-scanner/trunk/sucuri.php

@@ -8537 +8537 @@
                     }
 
-                    // Generate the HTML code from the snippet template for this file.
+                    // Add extra information to the file list.
                     $css_class = ( $counter % 2 == 0 ) ? '' : 'alternate';
                     $file_size = @filesize( $full_filepath );
+                    $is_fixable_html = '';
+                    $is_fixable_text = '';
+
+                    // Check whether the file can be fixed automatically or not.
+                    if ( $file_info['is_fixable'] !== true ) {
+                        $css_class .= ' sucuriscan-opacity';
+                        $is_fixable_html = 'disabled="disbled"';
+                        $is_fixable_text = '(must be fixed manually)';
+                    }
+
+                    // Generate the HTML code from the snippet template for this file.
                     $template_variables['CoreFiles.List'] .= SucuriScanTemplate::get_snippet('integrity-corefiles', array(
                         'CoreFiles.CssClass' => $css_class,
@@ -8548 +8559 @@
                         'CoreFiles.FileSizeNumber' => number_format( $file_size ),
                         'CoreFiles.ModifiedAt' => SucuriScan::datetime( $file_info['modified_at'] ),
+                        'CoreFiles.IsFixtableFile' => $is_fixable_html,
+                        'CoreFiles.IsNotFixable' => $is_fixable_text,
                     ));
                     $counter += 1;
@@ -8632 +8645 @@
                 $output['stable'][] = array(
                     'filepath' => $file_path,
+                    'is_fixable' => false,
                     'modified_at' => 0,
                 );
             } else {
                 $modified_at = @filemtime( $full_filepath );
+                $is_fixable = (bool) is_writable( $full_filepath );
                 $output['modified'][] = array(
                     'filepath' => $file_path,
+                    'is_fixable' => $is_fixable,
                     'modified_at' => $modified_at,
                 );
             }
         } else {
+            $is_fixable = is_writable( dirname( $full_filepath ) );
             $output['removed'][] = array(
                 'filepath' => $file_path,
+                'is_fixable' => $is_fixable,
                 'modified_at' => 0,
             );
@@ -8661 +8679 @@
             $full_filepath = ABSPATH . '/' . $file_path;
             $modified_at = @filemtime( $full_filepath );
+            $is_fixable = (bool) is_writable( $full_filepath );
             $output['added'][] = array(
                 'filepath' => $file_path,
+                'is_fixable' => $is_fixable,
                 'modified_at' => $modified_at,
             );