arachni 1.2.1 → 1.3

data/components/reporters/html/default/issue/info.erb

@@ -3,7 +3,7 @@
 %>
 
 <%= erb 'issue/remarks.erb', issue: issue %>
-<%= erb 'issue/platform.erb', issue: parent_issue %>
+<%= erb 'issue/platform.erb', issue: issue %>
 
 <% if (issue.vector.respond_to?(:seed) && issue.vector.seed) || issue.signature || issue.proof %>
 <table class="table table-condensed table-fixed">

data/components/reporters/html/default/summary/issues/by_name.erb

@@ -38,7 +38,7 @@
                                 </th>
                             <% end %>
 
-                            <% if group.first.variations.first.request %>
+                            <% if group.first.request %>
                                 <th>
                                     HTTP method
                                 </th>
@@ -69,9 +69,9 @@
                                     </td>
                                 <% end %>
 
-                                <% if issue.variations.first.request %>
+                                <% if issue.request %>
                                     <td>
-                                        <code><%= issue.variations.first.request.method.to_s.upcase %></code>
+                                        <code><%= issue.request.method.to_s.upcase %></code>
                                     </td>
                                 <% end %>
 

data/components/reporters/stdout.rb

@@ -10,7 +10,6 @@
 # All UIs must have a default report.
 #
 # @author Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>
-# @version 0.3.1
 class Arachni::Reporters::Stdout < Arachni::Reporter::Base
 
     def run
@@ -42,12 +41,14 @@ class Arachni::Reporters::Stdout < Arachni::Reporter::Base
         print_info "User agent: #{report.options[:http][:user_agent]}"
         print_line
         print_status 'Audited elements: '
-        print_info '* Links'    if report.options[:audit][:links]
-        print_info '* Forms'    if report.options[:audit][:forms]
-        print_info '* Cookies'  if report.options[:audit][:cookies]
-        print_info '* Headers'  if report.options[:audit][:headers]
-        print_info '* XMLs'     if report.options[:audit][:xmls]
-        print_info '* JSONs'    if report.options[:audit][:jsons]
+        print_info '* Links'     if report.options[:audit][:links]
+        print_info '* Forms'     if report.options[:audit][:forms]
+        print_info '* Cookies'   if report.options[:audit][:cookies]
+        print_info '* Headers'   if report.options[:audit][:headers]
+        print_info '* XMLs'      if report.options[:audit][:xmls]
+        print_info '* JSONs'     if report.options[:audit][:jsons]
+        print_info '* UI inputs' if report.options[:audit][:ui_inputs]
+        print_info '* UI forms'  if report.options[:audit][:ui_forms]
         print_line
         print_status "Checks: #{report.options[:checks].join( ', ' )}"
 
@@ -97,33 +98,20 @@ class Arachni::Reporters::Stdout < Arachni::Reporter::Base
         print_line
 
         report.issues.each_with_index do |issue, i|
-            print_ok "[#{i+1}] #{issue.name}"
+            trusted = issue.trusted? ? 'Trusted' : 'Untrusted'
+
+            print_ok "[#{i+1}] #{issue.name} (#{trusted})"
             print_info '~~~~~~~~~~~~~~~~~~~~'
 
             print_info "Digest:     #{issue.digest}"
             print_info "Severity:   #{issue.severity.to_s.capitalize}"
-            print_line
-            print_info "URL:        #{issue.vector.action}"
-            print_info "Element:    #{issue.vector.type}"
-
-            if issue.active?
-                print_info "Method:     #{issue.vector.method.to_s.upcase}"
-                print_info "Input name: #{issue.affected_input_name}"
-            end
-
-            if issue.vector.respond_to? :inputs
-                print_info "All inputs: #{issue.vector.inputs.keys.join(', ')}"
-            end
-
-            print_line
-            print_info "Tags: #{issue.tags.join(', ')}" if issue.tags.is_a?( Array )
-            print_line
             print_info 'Description: '
             print_info issue.description
+            print_info "Tags: #{issue.tags.join(', ')}" if issue.tags.is_a?( Array )
 
             if issue.cwe_url
                 print_line
-                print_info issue.cwe_url
+                print_info "CWE: #{issue.cwe_url}"
             end
 
             if issue.references
@@ -131,7 +119,20 @@ class Arachni::Reporters::Stdout < Arachni::Reporter::Base
                 issue.references.each{ |ref| print_info "  #{ref[0]} - #{ref[1]}" }
             end
 
-            print_info_variations issue
+            print_line
+            print_info "URL:        #{issue.vector.action}"
+            print_info "Element:    #{issue.vector.type}"
+
+            if issue.vector.respond_to? :inputs
+                print_info "All inputs: #{issue.vector.inputs.keys.join(', ')}"
+            end
+
+            if issue.active?
+                print_info "Method:     #{issue.vector.method.to_s.upcase}"
+                print_info "Input name: #{issue.affected_input_name}"
+            end
+
+            print_info_issue_details issue
             print_line
         end
 
@@ -154,61 +155,51 @@ class Arachni::Reporters::Stdout < Arachni::Reporter::Base
         end
     end
 
-    def print_info_variations( issue )
+    def print_info_issue_details( issue )
         print_line
-        print_status 'Variations'
-        print_info '----------'
-
-        issue.variations.each_with_index do |var, i|
-            print_line
-            trusted = var.trusted? ? 'Trusted' : 'Untrusted'
-
-            print_info "Variation #{i+1} (#{trusted}):"
-
-            if var.active?
-                if var.vector.respond_to? :seed
-                    print_info "Seed:      #{var.vector.seed.inspect}"
-                end
-
-                print_info "Injected:  #{var.vector.affected_input_value.inspect}"
+        if issue.active?
+            if issue.vector.respond_to? :seed
+                print_info "Seed:      #{issue.vector.seed.inspect}"
             end
 
-            print_info "Signature: #{var.signature}"     if var.signature
-            print_info "Proof:     #{var.proof.inspect}" if var.proof
+            print_info "Injected:  #{issue.vector.affected_input_value.inspect}"
+        end
 
-            print_line
-            print_info "Referring page: #{var.referring_page.dom.url}"
-            if var.referring_page.dom.transitions.any?
-                print_info 'DOM transitions:'
-                var.referring_page.dom.print_transitions( method(:print_info), '    ' )
-            end
+        print_info "Signature: #{issue.signature}"     if issue.signature
+        print_info "Proof:     #{issue.proof.inspect}" if issue.proof
 
-            print_line
-            print_info "Affected page:  #{var.page.dom.url}"
+        print_line
+        print_info "Referring page: #{issue.referring_page.dom.url}"
+        if issue.referring_page.dom.transitions.any?
+            print_info 'DOM transitions:'
+            issue.referring_page.dom.print_transitions( method(:print_info), '    ' )
+        end
 
-            if !var.request.to_s.empty?
-                print_info "HTTP request\n#{var.request}"
-            end
+        print_line
+        print_info "Affected page:  #{issue.page.dom.url}"
 
-            if var.page.dom.transitions.any?
-                print_info 'DOM transitions:'
-                var.page.dom.print_transitions( method(:print_info), '    ' )
-            end
+        if !issue.request.to_s.empty?
+            print_info "HTTP request\n#{issue.request}"
+        end
 
-            next if var.remarks.empty?
+        if issue.page.dom.transitions.any?
+            print_info 'DOM transitions:'
+            issue.page.dom.print_transitions( method(:print_info), '    ' )
+        end
 
-            print_line
-            print_info 'Remarks'
-            print_info '-------'
-            var.remarks.each do |logger, remarks|
-                print_info "  By #{logger}:"
-                remarks.each do |remark|
-                    print_info "    *  #{word_wrap remark}"
-                end
-            end
+        return if issue.remarks.empty?
 
-            print_line
+        print_line
+        print_info 'Remarks'
+        print_info '-------'
+        issue.remarks.each do |logger, remarks|
+            print_info "  By #{logger}:"
+            remarks.each do |remark|
+                print_info "    *  #{word_wrap remark}"
+            end
         end
+
+        print_line
     end
 
     # Stolen from Rails.
@@ -225,7 +216,7 @@ class Arachni::Reporters::Stdout < Arachni::Reporter::Base
             name:        'Stdout',
             description: %q{Prints the results to standard output.},
             author:      'Tasos "Zapotek" Laskos <tasos.laskos@arachni-scanner.com>',
-            version:     '0.3.1'
+            version:     '0.3.2'
         }
     end
 

data/components/reporters/xml.rb

@@ -73,60 +73,46 @@ class Arachni::Reporters::XML < Arachni::Reporter::Base
                                     xml.source vector.source
                                 end
 
+                                if vector.respond_to? :seed
+                                    xml.seed vector.seed
+                                end
+
                                 if issue.active?
                                     xml.method_ vector.method
                                 end
 
-                                if issue.variations.first.vector.respond_to? :affected_input_name
-                                    xml.affected_input_name issue.variations.first.vector.affected_input_name
+                                if vector.respond_to? :affected_input_name
+                                    xml.affected_input_name vector.affected_input_name
                                 end
 
                                 if vector.respond_to? :inputs
                                     add_inputs( xml, vector.inputs )
                                 end
-                            }
-
-                            xml.variations {
-                                issue.variations.each do |variation|
-                                    xml.variation {
-                                        vector = variation.vector
 
-                                        xml.vector {
-                                            if issue.active?
-                                                xml.method_ vector.method
-                                            end
-
-                                            if vector.respond_to? :seed
-                                                xml.seed vector.seed
-                                            end
-
-                                            if vector.respond_to? :inputs
-                                                add_inputs( xml, vector.inputs )
-                                            end
-                                        }
+                                if vector.respond_to? :default_inputs
+                                    add_inputs( xml, vector.default_inputs, :default_inputs  )
+                                end
+                            }
 
-                                        xml.remarks {
-                                            variation.remarks.each do |commenter, remarks|
-                                                remarks.each do |remark|
-                                                    xml.remark {
-                                                        xml.commenter commenter
-                                                        xml.text_ remark
-                                                    }
-                                                end
-                                            end
+                            xml.remarks {
+                                issue.remarks.each do |commenter, remarks|
+                                    remarks.each do |remark|
+                                        xml.remark {
+                                            xml.commenter commenter
+                                            xml.text_ remark
                                         }
-
-                                        add_page( xml, variation.page )
-                                        add_page( xml, variation.referring_page, :referring_page )
-
-                                        xml.signature variation.signature
-                                        xml.proof variation.proof
-                                        xml.trusted variation.trusted
-                                        xml.platform_type variation.platform_type
-                                        xml.platform_name variation.platform_name
-                                    }
+                                    end
                                 end
                             }
+
+                            add_page( xml, issue.page )
+                            add_page( xml, issue.referring_page, :referring_page )
+
+                            xml.signature issue.signature
+                            xml.proof issue.proof
+                            xml.trusted issue.trusted
+                            xml.platform_type issue.platform_type
+                            xml.platform_name issue.platform_name
                         }
                     end
                 }

data/components/reporters/xml/schema.xsd

@@ -387,10 +387,6 @@
         </xs:sequence>
     </xs:complexType>
 
-    <!--
-        Holds generic information about the logged issue, while providing
-        details as "issuevariations" via the "variations" attribute.
-    -->
     <xs:complexType name="issue">
         <xs:all>
             <xs:element name="name" type="xs:string"/>
@@ -403,8 +399,45 @@
             <xs:element name="cwe" type="xs:integer" minOccurs="0"/>
             <xs:element name="vector" type="vector"/>
             <xs:element name="digest" type="xs:integer"/>
-            <xs:element name="variations" type="issuevariations"/>
             <xs:element name="check" type="check"/>
+
+            <!--
+                Page which displays the logged issue.
+            -->
+            <xs:element name="page" type="page"/>
+            <xs:element name="referring_page" type="page"/>
+
+            <!--
+                Signature used to identify the issue. Its match will be the
+                "proof".
+            -->
+            <xs:element name="signature" type="xs:string" minOccurs="0"/>
+
+            <!--
+                String proving the existence of the issue.
+            -->
+            <xs:element name="proof" type="xs:string"/>
+
+            <!--
+                Some issues may be logged even though the system doesn't
+                have 100% confidence in them, in that case they will be
+                marked as not trusted.
+            -->
+            <xs:element name="trusted" type="xs:boolean"/>
+
+            <xs:element name="remarks" type="remarks"/>
+
+            <!--
+                Type of the platform affected by this issue.
+                "db", "os", etc.
+            -->
+            <xs:element name="platform_type" type="xs:string"/>
+
+            <!--
+                Name of the platform affected by this issue.
+                "mysql", "linux", etc.
+            -->
+            <xs:element name="platform_name" type="xs:string"/>
         </xs:all>
     </xs:complexType>
 
@@ -421,18 +454,6 @@
         </xs:all>
     </xs:complexType>
 
-    <!--
-        Issues have 1 or more variations.
-        Currently, active checks only have 1 variation while passive ones
-        can have multiple.
-    -->
-    <xs:complexType name="issuevariations">
-        <xs:sequence>
-            <xs:element name="variation" type="issuevariation"
-                        minOccurs="1" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
     <!--
         Input vector information, in essence, the element affected
         by the logged issue.
@@ -481,56 +502,11 @@
             <xs:element name="affected_input_name" type="xs:string"
                         minOccurs="0"/>
 
+            <xs:element name="default_inputs" type="inputs" minOccurs="0"/>
             <xs:element name="inputs" type="inputs" minOccurs="0"/>
-        </xs:all>
-    </xs:complexType>
-
-    <!--
-        Details about the logged issue, each variation represents a
-        situation where the same issue has been identified albeit in
-        different ways.
-    -->
-    <xs:complexType name="issuevariation">
-        <xs:all>
-            <xs:element name="vector" type="variationvector"/>
-
-            <!--
-                Page which displays the logged issue.
-            -->
-            <xs:element name="page" type="page"/>
-            <xs:element name="referring_page" type="page"/>
-
-            <!--
-                Signature used to identify the issue. Its match will be the
-                "proof".
-            -->
-            <xs:element name="signature" type="xs:string" minOccurs="0"/>
 
-            <!--
-                String proving the existence of the issue.
-            -->
-            <xs:element name="proof" type="xs:string"/>
-
-            <!--
-                Some issues may be logged even though the system doesn't
-                have 100% confidence in them, in that case they will be
-                marked as not trusted.
-            -->
-            <xs:element name="trusted" type="xs:boolean"/>
-
-            <xs:element name="remarks" type="remarks"/>
-
-            <!--
-                Type of the platform affected by this issue.
-                "db", "os", etc.
-            -->
-            <xs:element name="platform_type" type="xs:string"/>
-
-            <!--
-                Name of the platform affected by this issue.
-                "mysql", "linux", etc.
-            -->
-            <xs:element name="platform_name" type="xs:string"/>
+            <xs:element name="seed" type="xs:string" minOccurs="0"
+                        maxOccurs="1"/>
         </xs:all>
     </xs:complexType>
 
@@ -576,30 +552,6 @@
         </xs:all>
     </xs:complexType>
 
-    <!--
-        This is details on the state of the logged vector when
-        an "issuevariation" was identified.
-
-        Merged with "vector" it forms the full vector mutation.
-    -->
-    <xs:complexType name="variationvector">
-        <xs:sequence>
-            <!--
-                HTTP method used to submit the vector. Can be different
-                from the "vector" one because the fuzzed version could
-                have been submitted with a different method.
-            -->
-            <xs:element name="method" type="xs:string" minOccurs="0"
-                        maxOccurs="1"/>
-
-            <xs:element name="seed" type="xs:string" minOccurs="0"
-                        maxOccurs="1"/>
-
-            <xs:element name="inputs" type="inputs" minOccurs="0"
-                        maxOccurs="1"/>
-        </xs:sequence>
-    </xs:complexType>
-
     <xs:complexType name="page">
         <xs:all>
             <xs:element name="body" type="xs:string"/>
@@ -801,6 +753,8 @@
             <xs:enumeration value="Arachni::Element::GenericDOM" />
             <xs:enumeration value="Arachni::Element::JSON" />
             <xs:enumeration value="Arachni::Element::XML" />
+            <xs:enumeration value="Arachni::Element::UIForm::DOM" />
+            <xs:enumeration value="Arachni::Element::UIInput::DOM" />
         </xs:restriction>
     </xs:simpleType>