recog 2.3.18 → 2.3.22

data/lib/recog/verify_reporter.rb

@@ -3,14 +3,18 @@ class VerifyReporter
   attr_reader :formatter
   attr_reader :success_count, :warning_count, :failure_count
 
-  def initialize(options, formatter)
+  def initialize(options, formatter, path=nil)
     @options = options
     @formatter = formatter
+    @path = path
     reset_counts
   end
 
   def report(fingerprint_count)
     reset_counts
+    if detail? and !@path.to_s.empty?
+      formatter.status_message("\n#{@path}:\n")
+    end
     yield self
     summarize(fingerprint_count) unless @options.quiet
   end
@@ -23,12 +27,12 @@ class VerifyReporter
   def warning(text)
     return unless @options.warnings
     @warning_count += 1
-    formatter.warning_message("#{padding}#{text}")
+    formatter.warning_message("#{path_label}#{padding}#{text}")
   end
 
   def failure(text)
     @failure_count += 1
-    formatter.failure_message("#{padding}#{text}")
+    formatter.failure_message("#{path_label}#{padding}#{text}")
   end
 
   def print_name(fingerprint)
@@ -61,12 +65,18 @@ class VerifyReporter
     @options.detail
   end
 
+  def path_label
+    unless detail?
+      @path.to_s.empty? ? "" : "#{@path}: "
+    end
+  end
+
   def padding
     '   ' if @options.detail
   end
 
   def summary_line
-    summary = "SUMMARY: Test completed with "
+    summary = "#{path_label}SUMMARY: Test completed with "
     summary << "#{@success_count} successful"
     summary << ", #{@warning_count} warnings"
     summary << ", and #{@failure_count} failures"

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.3.18'
+  VERSION = '2.3.22'
 end

data/requirements.txt

@@ -1,2 +1,2 @@
-lxml==4.6.2
+lxml==4.6.3
 pyyaml

data/spec/lib/fingerprint_self_test_spec.rb

@@ -151,6 +151,7 @@ describe Recog::DB do
               # test any extractions specified in the example
               example.attributes.each_pair do |k,v|
                 next if k == '_encoding'
+                next if k == '_filename'
                 expect(match[k]).to eq(v), "Regex didn't extract expected value for fingerprint attribute #{k} -- got #{match[k]} instead of #{v}"
               end
             end

data/spec/lib/recog/verify_reporter_spec.rb

@@ -7,6 +7,7 @@ describe Recog::VerifyReporter do
   let(:summary_line) do
     "SUMMARY: Test completed with 1 successful, 1 warnings, and 1 failures"
   end
+  let(:path) { "fingerprint.xml" }
 
   subject { Recog::VerifyReporter.new(double(detail: false, quiet: false, warnings: true), formatter) }
 
@@ -77,6 +78,74 @@ describe Recog::VerifyReporter do
         end
       end
     end
+
+    context "with fingerprint path" do
+
+      subject { Recog::VerifyReporter.new(double(detail: false, quiet: false, warnings: true), formatter, path) }
+
+      it "prints warnings" do
+        expect(formatter).to receive(:warning_message).with("#{path}: a warning")
+        run_report
+      end
+
+      it "prints failures" do
+        expect(formatter).to receive(:failure_message).with("#{path}: a failure")
+        run_report
+      end
+
+      it "prints summary" do
+        expect(formatter).to receive(:failure_message).with("#{path}: #{summary_line}")
+        run_report
+      end
+    end
+
+    context "with fingerprint path and detail" do
+      subject { Recog::VerifyReporter.new(double(detail: true, quiet: false, warnings: true), formatter, path) }
+
+      it "prints the fingerprint path" do
+        expect(formatter).to receive(:status_message).with("\n#{path}:\n")
+        run_report
+      end
+
+      it "prints the fingerprint name" do
+        expect(formatter).to receive(:status_message).with("\na name")
+        run_report
+      end
+
+      it "prints successes" do
+        expect(formatter).to receive(:success_message).with('   passed')
+        run_report
+      end
+
+      it "prints warnings" do
+        expect(formatter).to receive(:warning_message).with('   a warning')
+        run_report
+      end
+
+      it "prints failures" do
+        expect(formatter).to receive(:failure_message).with('   a failure')
+        run_report
+      end
+
+      it "prints the fingerprint count" do
+        expect(formatter).to receive(:status_message).with("\nVerified 1 fingerprints:")
+        run_report
+      end
+
+      it "prints summary" do
+        expect(formatter).to receive(:failure_message).with(summary_line)
+        run_report
+      end
+
+      context "with no fingerprint tests" do
+        let(:tests) { [] }
+
+        it "does not print the name" do
+          expect(formatter).not_to receive(:status_message).with("\na name")
+          run_report
+        end
+      end
+    end
   end
 
   describe "#print_summary" do

data/tools/dev/hooks/pre-commit

@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Hook script to verify changes about to be committed.
+# The hook should exit with non-zero status after issuing an appropriate
+# message if it wants to stop the commit.
+
+# Verify that each fingerprint asserts known identifiers.
+git diff --cached --name-only --diff-filter=ACM -z xml/*.xml | xargs -0 ./bin/recog_standardize --write
+
+# get status
+status=$?
+
+if [ $status -ne 0 ]; then
+    echo "Please review any new additions to the text files under 'identifiers/'."
+    echo "If any of these names are close to an existing name, update the offending"
+    echo "fingerprint to use the existing name instead. Once the fingerprints are fixed,"
+    echo "remove the 'extra' names from the identifiers files, and run the tool again."
+    exit 1
+fi
+
+exit 0

data/update_cpes.py

@@ -16,8 +16,17 @@ def parse_cpe_vp_map(file):
     parser = etree.XMLParser(remove_comments=False)
     doc = etree.parse(file, parser)
     namespaces = {'ns': 'http://cpe.mitre.org/dictionary/2.0', 'meta': 'http://scap.nist.gov/schema/cpe-dictionary-metadata/0.2'}
-    for cpe_name in doc.xpath("//ns:cpe-list/ns:cpe-item/@name", namespaces=namespaces):
+    for entry in doc.xpath("//ns:cpe-list/ns:cpe-item", namespaces=namespaces):
+        cpe_name = entry.get("name")
+        if not cpe_name:
+            continue
+
+        # If the entry is deprecated then don't add it to our list of valid CPEs.
+        if entry.get("deprecated"):
+            continue
+
         cpe_match = re.match('^cpe:/([aho]):([^:]+):([^:]+)', cpe_name)
+
         if cpe_match:
             cpe_type, vendor, product = cpe_match.group(1, 2, 3)
             if cpe_type not in vp_map:
@@ -55,7 +64,7 @@ def lookup_cpe(vendor, product, cpe_type, cpe_table, remap):
     these values to more correct values used by NIST.
 
     For example, the remapping might tell us that a value of 'alpine' for the
-    vendor string should be 'aplinelinux' instead, or for product 'solaris'
+    vendor string should be 'alpinelinux' instead, or for product 'solaris'
     should be 'sunos'.
 
     This function should only emit values seen in the official NIST CPE list
@@ -86,7 +95,11 @@ def lookup_cpe(vendor, product, cpe_type, cpe_table, remap):
 
     # Everything else depends on a remap of some sort.
     # get the remappings for this one vendor string.
-    vendor_remap = remap.get(vendor, None)
+    vendor_remap = None
+
+    remap_type = remap.get(cpe_type, None)
+    if remap_type:
+        vendor_remap = remap_type.get(vendor, None)
 
     if vendor_remap:
         # If we have product remappings, work that angle next
@@ -190,7 +203,7 @@ def update_cpes(xml_file, cpe_vp_map, r7_vp_map):
                     continue
 
                 vendor = vendor.lower().replace(' ', '_').replace(',', '')
-                product = product.lower().replace(' ', '_').replace(',', '')
+                product = product.lower().replace(' ', '_').replace(',', '').replace('!', '%21')
                 if 'unknown' in [vendor, product]:
                     continue
 
@@ -209,8 +222,8 @@ def update_cpes(xml_file, cpe_vp_map, r7_vp_map):
                     continue
 
                 # building the CPE string
-                # Last minute escaping of '/'
-                product = product.replace('/', '\/')
+                # Last minute escaping of '/' and `!`
+                product = product.replace('/', '\/').replace('%21', '\!')
                 cpe_value = 'cpe:/{}:{}:{}'.format(cpe_type, vendor, product)
 
                 if version:

data/xml/apache_modules.xml

@@ -220,6 +220,36 @@
     <param pos="0" name="service.component.product" value="mod_auth_ldap"/>
   </fingerprint>
 
+  <fingerprint pattern="mod_auth_oracle/(\S+)$">
+    <description>mod_auth_oracle with version</description>
+    <example service.component.version="1.2.3">mod_auth_oracle/1.2.3</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_auth_oracle"/>
+    <param pos="1" name="service.component.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_auth_oracle/?$">
+    <description>mod_auth_oracle without version</description>
+    <example>mod_auth_oracle/</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_auth_oracle"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_auth_pgsql/(\S+)$">
+    <description>mod_auth_pgsql with version</description>
+    <example service.component.version="1.2.3">mod_auth_pgsql/1.2.3</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_auth_pgsql"/>
+    <param pos="1" name="service.component.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_auth_pgsql/?$">
+    <description>mod_auth_pgsql without version</description>
+    <example>mod_auth_pgsql/</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_auth_pgsql"/>
+  </fingerprint>
+
   <fingerprint pattern="mod_auth_radius/(\S+)$">
     <description>mod_auth_radius with version</description>
     <example service.component.version="1.2.3">mod_auth_radius/1.2.3</example>
@@ -978,6 +1008,36 @@
     <param pos="0" name="service.component.product" value="mod_filter"/>
   </fingerprint>
 
+  <fingerprint pattern="mod_frontpage/(\S+)$">
+    <description>mod_frontpage with version</description>
+    <example service.component.version="1.2.3">mod_frontpage/1.2.3</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_frontpage"/>
+    <param pos="1" name="service.component.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_frontpage/?$">
+    <description>mod_frontpage without version</description>
+    <example>mod_frontpage/</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_frontpage"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_gzip/(\S+)$">
+    <description>mod_gzip with version</description>
+    <example service.component.version="1.2.3">mod_gzip/1.2.3</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_gzip"/>
+    <param pos="1" name="service.component.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_gzip/?$">
+    <description>mod_gzip without version</description>
+    <example>mod_gzip/</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_gzip"/>
+  </fingerprint>
+
   <fingerprint pattern="mod_headers/(\S+)$">
     <description>mod_headers with version</description>
     <example service.component.version="1.2.3">mod_headers/1.2.3</example>

data/xml/apache_os.xml

@@ -6,7 +6,7 @@
   against the following patterns to extract OS information.
   -->
 
-  <fingerprint pattern=".*\(iSeries\).*">
+  <fingerprint pattern="\(iSeries\)">
     <description>IBM i5/OS iSeries (OS/400)</description>
     <param pos="0" name="os.vendor" value="IBM"/>
     <param pos="0" name="os.family" value="OS/400"/>
@@ -14,7 +14,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:ibm:os_400:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Mandrake Linux/\d+\.\d+\.92mdk\).*">
+  <fingerprint pattern="\(Mandrake Linux/\d+\.\d+\.92mdk\)">
     <description>Mandriva (formerly Mandrake) Linux 9.2</description>
     <param pos="0" name="os.certainty" value="0.9"/>
     <param pos="0" name="os.vendor" value="Mandriva"/>
@@ -24,7 +24,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:mandriva:linux:9.2"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Mandrake Linux/\d+\.\d+\.100mdk\).*">
+  <fingerprint pattern="\(Mandrake Linux/\d+\.\d+\.100mdk\)">
     <description>Mandriva (formerly Mandrake) Linux 10.0</description>
     <param pos="0" name="os.certainty" value="0.9"/>
     <param pos="0" name="os.vendor" value="Mandriva"/>
@@ -34,7 +34,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:mandriva:linux:10.0"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\((?:Mandrake|Mandriva) Linux/.*">
+  <fingerprint pattern="\((?:Mandrake|Mandriva) Linux/">
     <description>Mandriva (formerly Mandrake) Linux unknown version</description>
     <param pos="0" name="os.vendor" value="Mandriva"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -42,7 +42,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:mandriva:linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Mandrakelinux/.*">
+  <fingerprint pattern="\(Mandrakelinux/">
     <description>Mandriva (formerly Mandrake) Linux unknown version - variant 2</description>
     <param pos="0" name="os.vendor" value="Mandriva"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -50,14 +50,14 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:mandriva:linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(PalmOS\).*">
+  <fingerprint pattern="\(PalmOS\)">
     <description>PalmOS</description>
     <param pos="0" name="os.vendor" value="Palm"/>
     <param pos="0" name="os.family" value="PalmOS"/>
     <param pos="0" name="os.product" value="PalmOS"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Win32\).*">
+  <fingerprint pattern="\(Win32\)">
     <description>Microsoft Windows</description>
     <param pos="0" name="os.certainty" value="0.75"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -66,7 +66,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Darwin\).*">
+  <fingerprint pattern="\(Darwin\)">
     <description>Apple Mac OS X</description>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
@@ -74,7 +74,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Ubuntu\).*">
+  <fingerprint pattern="\(Ubuntu\)">
     <description>Ubuntu</description>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -82,21 +82,21 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*(?:Sun )?Cobalt \(Unix\)?.*">
+  <fingerprint pattern=".{0,512}(?:Sun )?Cobalt \(Unix\)?">
     <description>Sun Cobalt RaQ (Red Hat based Linux)</description>
     <param pos="0" name="os.vendor" value="Sun"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Cobalt RaQ"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(BlueQuartz\).*">
+  <fingerprint pattern="\(BlueQuartz\)">
     <description>Blue Quartz is created by a Cobalt RaQ UG</description>
     <param pos="0" name="os.vendor" value="Sun"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Cobalt RaQ"/>
   </fingerprint>
 
-  <fingerprint pattern="^Apache\/2\.2\.11.*\(Fedora\).*">
+  <fingerprint pattern="^Apache\/2\.2\.11.*\(Fedora\)">
     <description>Red Hat Fedora 11</description>
     <param pos="0" name="os.vendor" value="Red Hat"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -105,7 +105,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:fedora_core:11"/>
   </fingerprint>
 
-  <fingerprint pattern="^Apache\/2\.2\.15.*\(Fedora\).*">
+  <fingerprint pattern="^Apache\/2\.2\.15.*\(Fedora\)">
     <description>Red Hat Fedora 13</description>
     <param pos="0" name="os.vendor" value="Red Hat"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -114,7 +114,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:fedora_core:13"/>
   </fingerprint>
 
-  <fingerprint pattern="^Apache\/2\.2\.16.*\(Fedora\).*">
+  <fingerprint pattern="^Apache\/2\.2\.16.*\(Fedora\)">
     <description>Red Hat Fedora 14</description>
     <param pos="0" name="os.vendor" value="Red Hat"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -123,7 +123,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:fedora_core:14"/>
   </fingerprint>
 
-  <fingerprint pattern="^Apache\/2\.2\.23.*\(Fedora\).*">
+  <fingerprint pattern="^Apache\/2\.2\.23.*\(Fedora\)">
     <description>Red Hat Fedora 17</description>
     <param pos="0" name="os.vendor" value="Red Hat"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -132,7 +132,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:fedora_core:17"/>
   </fingerprint>
 
-  <fingerprint pattern="^Apache\/2\.4\.3.*\(Fedora\).*">
+  <fingerprint pattern="^Apache\/2\.4\.3.*\(Fedora\)">
     <description>Red Hat Fedora 18</description>
     <param pos="0" name="os.vendor" value="Red Hat"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -141,7 +141,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:fedora_core:18"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Fedora\).*">
+  <fingerprint pattern="\(Fedora\)">
     <description>Red Hat Fedora</description>
     <param pos="0" name="os.vendor" value="Red Hat"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -149,7 +149,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:fedora_core:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(RHEL\).*">
+  <fingerprint pattern="\(RHEL\)">
     <description>Red Hat Enterprise Linux</description>
     <param pos="0" name="os.vendor" value="Red Hat"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -157,7 +157,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:enterprise_linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Red[ -]Hat(?:[/ ]Linux)?\).*">
+  <fingerprint pattern="\(Red[ -]Hat(?:[/ ]Linux)?\)">
     <description>Red Hat Linux</description>
     <param pos="0" name="os.vendor" value="Red Hat"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -165,7 +165,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Red Hat Enterprise (?:Linux)?\).*">
+  <fingerprint pattern="\(Red Hat Enterprise (?:Linux)?\)">
     <description>Apache OS: Red Hat Enterprise Linux</description>
     <example os.vendor="Red Hat">Apache/2.4.6 (Red Hat Enterprise Linux) OpenSSL/1.0.2k-fips</example>
     <param pos="0" name="os.vendor" value="Red Hat"/>
@@ -174,7 +174,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:enterprise_linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*Debian(?:[/ ]GNU)?(?:/Linux)?.*">
+  <fingerprint pattern="Debian(?:[/ ]GNU)?(?:/Linux)?">
     <description>Debian Linux</description>
     <param pos="0" name="os.vendor" value="Debian"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -182,7 +182,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\((?:Linux/)?S[uU]SE(?:/Linux)?\).*">
+  <fingerprint pattern="\((?:Linux/)?S[uU]SE(?:/Linux)?\)">
     <description>Novell SuSE Linux</description>
     <param pos="0" name="os.vendor" value="SuSE"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -190,7 +190,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:suse:linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(NETWARE\).*">
+  <fingerprint pattern="\(NETWARE\)">
     <description>Novell NetWare</description>
     <param pos="0" name="os.vendor" value="Novell"/>
     <param pos="0" name="os.family" value="NetWare"/>
@@ -198,7 +198,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*HP-UX_Apache-based_Web_Server.*">
+  <fingerprint pattern="HP-UX_Apache-based_Web_Server">
     <description>HP HP-UX</description>
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.family" value="HP-UX"/>
@@ -206,7 +206,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(CentOS\).*">
+  <fingerprint pattern="\(CentOS\)">
     <description>CentOS Linux</description>
     <param pos="0" name="os.vendor" value="CentOS"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -214,14 +214,14 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:centos:centos:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Turbolinux\).*">
+  <fingerprint pattern="\(Turbolinux\)">
     <description>Turbolinux</description>
     <param pos="0" name="os.vendor" value="Turbolinux"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(FreeBSD\).*">
+  <fingerprint pattern="\(FreeBSD\)">
     <description>FreeBSD</description>
     <param pos="0" name="os.vendor" value="FreeBSD"/>
     <param pos="0" name="os.family" value="FreeBSD"/>
@@ -229,14 +229,14 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:freebsd:freebsd:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Asianux\).*">
+  <fingerprint pattern="\(Asianux\)">
     <description>Asianux Linux</description>
     <param pos="0" name="os.vendor" value="Asianux"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Gentoo(?:/Linux)?\).*">
+  <fingerprint pattern="\(Gentoo(?:/Linux)?\)">
     <description>Gentoo Linux</description>
     <param pos="0" name="os.vendor" value="Gentoo"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -244,7 +244,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:gentoo:linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Conectiva(?:/Linux)?\).*">
+  <fingerprint pattern="\(Conectiva(?:/Linux)?\)">
     <description>Conectiva Linux</description>
     <param pos="0" name="os.vendor" value="Conectiva"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -252,7 +252,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:conectiva:linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Trustix Secure Linux(?:/Linux)?\).*">
+  <fingerprint pattern="\(Trustix Secure Linux(?:/Linux)?\)">
     <description>Trustix Linux</description>
     <param pos="0" name="os.vendor" value="Trustix"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -260,49 +260,49 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:trustix:secure_linux:-"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(White Box\).*">
+  <fingerprint pattern="\(White Box\)">
     <description>White Box Enterprise Linux</description>
     <param pos="0" name="os.vendor" value="White Box"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Enterprise Linux"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(UnitedLinux\).*">
+  <fingerprint pattern="\(UnitedLinux\)">
     <description>UnitedLinux</description>
     <param pos="0" name="os.vendor" value="UnitedLinux"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(PLD/Linux\).*">
+  <fingerprint pattern="\(PLD/Linux\)">
     <description>PLD Linux</description>
     <param pos="0" name="os.vendor" value="PLD"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(Vine/Linux\).*">
+  <fingerprint pattern="\(Vine/Linux\)">
     <description>Vine Linux</description>
     <param pos="0" name="os.vendor" value="Vine"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(rPath\).*">
+  <fingerprint pattern="\(rPath\)">
     <description>rPath Linux</description>
     <param pos="0" name="os.vendor" value="rPath"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern=".*\(StartCom Linux\).*">
+  <fingerprint pattern="\(StartCom Linux\)">
     <description>StartCom Linux</description>
     <param pos="0" name="os.vendor" value="StartCom"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern=".*Linux.*">
+  <fingerprint pattern="Linux">
     <description>Generic Linux fallback</description>
     <param pos="0" name="os.certainty" value="0.75"/>
     <param pos="0" name="os.family" value="Linux"/>