openscap_parser 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 159fcf26b6fe71666a9d057d89d772589ac8436d783b7773556121b6b5c11654
-  data.tar.gz: f8181135885961c284b2dabfd4de0408d8888e7cf4271da699f0e42fc0e30bf6
+  metadata.gz: c5c95f01a6f86db68b3d0561858c9d39af294872d3d0e6689f0bc6d37d39e660
+  data.tar.gz: c14ce4fb133683267862decac1f6db27e84f8f504026b135a04e642d849bad52
 SHA512:
-  metadata.gz: be89da681f6a355591027ce73b0dd3a68bcbd73bcc442a2d4e21c2a51485a9e841d493bafef8757aff5f85025e0a5251d3b1519801b2fdb1343fe070b165fe6b
-  data.tar.gz: 8949839744c203ec9074e3069097a3d98739eb65c7a76841c117f456eb02c55c3eee1576cf3b550501012b52f549d8aaaac0f601350d5f92e37a79e2a6602117
+  metadata.gz: 59ed3d7a867fe0b5b230943068be977ce2d4aadc5edc0df79df5b4ce2e7c817420a3251569c70155a7f4c9626d5c0b2f51e35883770f0aeb848b23d3e345adab
+  data.tar.gz: b0d13aabf1dd555a7a376ea74a7092815c91e591f5cb40457ff06ac6f195e379246d31a7a1a0d5bd650c087bf654d26de6ef2cf6002d2a3163ca51626f863221

data/lib/openscap_parser/profile.rb

@@ -1,3 +1,5 @@
+require 'openscap_parser/regex_handler'
+
 module OpenscapParser
   class Profile < XmlNode
     def id
@@ -20,7 +22,27 @@ module OpenscapParser
     end
 
     def selected_rule_ids
-      @selected_rule_ids ||= @parsed_xml.xpath("select[@selected='true']/@idref") &&
+      # Look for selected rule ids where the idref contains '_rule_' that is not preceded by 'group'
+      @selected_rule_ids ||= @parsed_xml.xpath("select[@selected='true']
+                                                      [regex(@idref, '^((?!_group_).)*?(_rule_).*$')]
+                                                      /@idref", RegexHandler) &&
+                             @parsed_xml.xpath("select[@selected='true']
+                                                      [regex(@idref, '^((?!_group_).)*?(_rule_).*$')]
+                                                      /@idref", RegexHandler).map(&:text)
+    end
+
+    def selected_group_ids
+      # Look for selected group ids where the idref contains '_group_' that is not preceded by 'rule'
+      @selected_group_ids ||= @parsed_xml.xpath("select[@selected='true']
+                                                       [regex(@idref, '^((?!_rule_).)*?(_group_).*$')]
+                                                       /@idref", RegexHandler) &&
+                              @parsed_xml.xpath("select[@selected='true']
+                                                       [regex(@idref, '^((?!_rule_).)*?(_group_).*$')]
+                                                       /@idref", RegexHandler).map(&:text)
+    end
+
+    def selected_entity_ids
+      @selected_entity_ids ||= @parsed_xml.xpath("select[@selected='true']/@idref") &&
         @parsed_xml.xpath("select[@selected='true']/@idref").map(&:text)
     end
 

data/lib/openscap_parser/regex_handler.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module OpenscapParser
+  class RegexHandler < XmlNode
+    def self.regex node_set, regex
+      node_set.find_all { |node| node.to_s =~ /#{regex}/ }
+    end
+  end
+end

data/lib/openscap_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenscapParser
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openscap_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -156,6 +156,7 @@ files:
 - lib/openscap_parser/oval_report.rb
 - lib/openscap_parser/profile.rb
 - lib/openscap_parser/profiles.rb
+- lib/openscap_parser/regex_handler.rb
 - lib/openscap_parser/rule.rb
 - lib/openscap_parser/rule_identifier.rb
 - lib/openscap_parser/rule_reference.rb