Disable early returns

Author: jvazquez-r7

lib/rex/parser/openvas_nokogiri.rb

@@ -31,48 +31,49 @@ def start_element(name=nil,attrs=[])
   def end_element(name=nil)
     block = @block
     case name
-    when "name"
-      return if not in_tag("result")
-      @state[:has_text] = true
-      @state[:vuln_name] = @text.strip if @text
-    when "description"
+    when 'name'
+      if in_tag('result')
+        @state[:has_text] = true
+        @state[:vuln_name] = @text.strip if @text
+      end
+    when 'description'
       @state[:has_text] = true
       @state[:vuln_desc] = @text.strip if @text
-    when "bid"
-      return unless in_tag("result")
-      return unless in_tag("nvt")
-      @state[:has_text] = true
-      @state[:bid] = @text.strip if @text
-    when "cve"
-      return unless in_tag("result")
-      return unless in_tag("nvt")
-      @state[:has_text] = true
-      @state[:cves] = @text.strip if @text
-    when "risk_factor"
-      return unless in_tag("result")
-      return unless in_tag("nvt")
-      #we do this to clean out the buffer so to speak
-      #if we don't set text to nil now, the text will show up later
-      @state[:has_text] = true
-    when "cvss_base"
-      return unless in_tag("result")
-      return unless in_tag("nvt")
-      @state[:has_text] = true
-    when "subnet"
+    when 'bid'
+      if in_tag('result') && in_tag('nvt')
+        @state[:has_text] = true
+        @state[:bid] = @text.strip if @text
+      end
+    when 'cve'
+      if in_tag('result') && in_tag('nvt')
+        @state[:has_text] = true
+        @state[:cves] = @text.strip if @text
+      end
+    when 'risk_factor'
+      if in_tag('result') && in_tag('nvt')
+        #we do this to clean out the buffer so to speak
+        #if we don't set text to nil now, the text will show up later
+        @state[:has_text] = true
+      end
+    when 'cvss_base'
+      if in_tag('result')  && in_tag('nvt')
+        @state[:has_text] = true
+      end
+    when 'subnet'
       @state[:has_text] = true
-    when "result"
-      record_vuln if in_tag("results")
-    when "threat"
-      @state[:has_text] = true if in_tag("ports") && in_tag("port")
-    when "host"
+    when 'result'
+      record_vuln if in_tag('results')
+    when 'threat'
+      @state[:has_text] = true if in_tag('ports') && in_tag('port')
+    when 'host'
       if in_tag('result')
         @state[:has_text] = true
         @state[:host] = @text.strip if @text
       elsif in_tag('ports') && in_tag('port')
         @state[:has_text] = true
         @state[:host] = @text.strip if @text
       end
-    when "port"
+    when 'port'
       if in_tag('result')
         @state[:has_text] = true
         if @text && @text.index('(')
@@ -102,8 +103,8 @@ def end_element(name=nil)
           record_service unless @state[:port] == 'general'
         end
       end
-    when "name"
-      return if not in_tag("result")
+    when 'name'
+      return if not in_tag('result')
       @state[:has_text] = true
     end