recog 2.1.33 → 2.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2173eb6ef24d3ea0ff49f561dcbe099ec5b27f27
-  data.tar.gz: 1d52782399bd682f42524a5d40ca48e02f7750a3
+  metadata.gz: 64bba6437d0efb9175428c3de00cdbe4de94121a
+  data.tar.gz: fa17f78fff7d4665f62f7fcf53b7ea15c2e630a1
 SHA512:
-  metadata.gz: ab52b5de2a6d6ab01b56fa64458caab19b52805ab27bad318461ead4ae1062f46603ad5be46ff0792b4ee6911e0f715a646b53bb94268ed3b80758918e11ac60
-  data.tar.gz: 18c29a270f42599cc33e28419b6ffee694e9684838bf7c459d953a8a4cf59ee33a2887cedac9e7c1c5ebaa858a260e1e5732ba125d5077c36a3a0ba06530895a
+  metadata.gz: efe0f34686a927bcc767464c7cc657f7a0460b3c14aa0cc2be1d7dcf481bce45c8fcda1ed9e5033687d8ad750f99bb404e3f65705720173b0580e23fac11c536
+  data.tar.gz: 594df47f41ba98784e7025516bd3a42b9fb9e3e86e98c1435f32ae670610ec450f84d55b03b2c7f5fe8d8d29a7bd36b47c29e9e2f0e7015502007da18a3ea3d5

data/cpe-remap.yaml

@@ -103,6 +103,8 @@ mappings:
       jboss_eap: jboss_enterprise_application_platform
       jbossweb: jboss_web_framework_kit
       red_hat_directory_server: directory_server
+  squid_cache:
+    vendor: squid-cache
   sun:
     vendor: sun
     products:

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.1.33'
+  VERSION = '2.1.34'
 end

data/xml/http_servers.xml

@@ -1031,15 +1031,26 @@
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mortbay:jetty:{service.version}"/>
   </fingerprint>
-  <fingerprint pattern="^[Ss]quid/(\d+\.[\w.]+)$">
-    <description>Squid Web </description>
+  <fingerprint pattern="^(?i)squid/(\d+\.[\w.]+)$">
+    <description>Squid Web Proxy with a version</description>
     <example>Squid/2.3.STABLE1</example>
     <example>squid/2.5.12.cc1.29</example>
     <example>squid/2.6.STABLE13</example>
+    <param pos="0" name="service.vendor" value="Squid Cache"/>
     <param pos="0" name="service.product" value="Squid"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:squid-cache:squid:{service.version}"/>
     <param pos="0" name="service.family" value="Squid"/>
     <param pos="1" name="service.version"/>
   </fingerprint>
+  <fingerprint pattern="^(?i)squid$">
+    <description>Squid Web Proxy without a version</description>
+    <example>Squid</example>
+    <example>squid</example>
+    <param pos="0" name="service.vendor" value="Squid Cache"/>
+    <param pos="0" name="service.product" value="Squid"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:squid-cache:squid:-"/>
+    <param pos="0" name="service.family" value="Squid"/>
+  </fingerprint>
   <fingerprint pattern="^thttpd/(\d\.[\w.]+)-MX\s*.*$">
     <description>thttpd with SSL support</description>
     <example>thttpd/2.19-MX Jan 24 2006</example>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 2.1.33
+  version: 2.1.34
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec