logstash-patterns-core 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5102b0e018cdfa2809b8e626e4e2de508f83c3e8
-  data.tar.gz: 6cca534e70e8ebc02767f332ca053a8ec34ca3cd
+  metadata.gz: 6121e0138e8de43548944cc443bdf0ee2a6b3847
+  data.tar.gz: c1c8ae3d54e66de0b2a103cbdca29e6a186f8456
 SHA512:
-  metadata.gz: 1dcf6d243f752f3712eb083c110a34aae136c349fb4ffe9e38cdfd84a320826e746c546dc3a1f1f0544dd829e72ea72a134c132cc32d14ad8a9a1cc1c25c6077
-  data.tar.gz: d171be7d6448be5b4eb3f491454f34823dcffa3f250d0b89be940fd76366c660b1e23fd1e4118a61d21e6fa185940726c5ba7bfe8ba097445ab09a984df740cf
+  metadata.gz: 14e64a42d2b8e7c31fe076b83ebaef5ddac0b77a6c69e7c28511aafce48d2d4c3d058d9354f60df96033474c4bf70755fb67c6ed96c6ea46e4113e48915e6971
+  data.tar.gz: 3805625550fcf3bd35304bdbfcb8bb666f07debfdd9c4cb3b74332992313df4cc612baef06959ba9c10d045fcb1d2014ca8fc6b0b3c342731ba680be9f444a72

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.0.2
+  - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
+
 ## 4.0.1
   - Republish all the gems under jruby.
 ## 4.0.0

data/CONTRIBUTORS

@@ -26,6 +26,7 @@ Contributors:
 * Jelle Smet (smetj)
 * Jeremiah Shirk (jeremiahshirk)
 * Jordan Sissel (jordansissel)
+* Jose Armesto (fiunchinho)
 * Joseph Price (PriceChild)
 * Kevin Nuckolls (knuckolls)
 * Kurt Hurtado (kurtado)

data/logstash-patterns-core.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-patterns-core'
-  s.version         = '4.0.1'
+  s.version         = '4.0.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Patterns to be used in logstash"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
   s.add_development_dependency "logstash-devutils"
   s.add_development_dependency "logstash-filter-grok"

data/patterns/grok-patterns

@@ -18,6 +18,8 @@ DATA .*?
 GREEDYDATA .*
 QUOTEDSTRING (?>(?<!\\)(?>"(?>\\.|[^\\"]+)+"|""|(?>'(?>\\.|[^\\']+)+')|''|(?>`(?>\\.|[^\\`]+)+`)|``))
 UUID [A-Fa-f0-9]{8}-(?:[A-Fa-f0-9]{4}-){3}[A-Fa-f0-9]{12}
+# URN, allowing use of RFC 2141 section 2.3 reserved characters
+URN urn:[0-9A-Za-z][0-9A-Za-z-]{0,31}:(?:%[0-9a-fA-F]{2}|[0-9A-Za-z()+,.:=@;$_!*'/?#-])+
 
 # Networking
 MAC (?:%{CISCOMAC}|%{WINDOWSMAC}|%{COMMONMAC})
@@ -33,7 +35,7 @@ HOSTPORT %{IPORHOST}:%{POSINT}
 
 # paths
 PATH (?:%{UNIXPATH}|%{WINPATH})
-UNIXPATH (/([\w_%!$@:.,~-]+|\\.)*)+
+UNIXPATH (/([\w_%!$@:.,+~-]+|\\.)*)+
 TTY (?:/dev/(pts|tty([pq])?)(\w+)?/?(?:[0-9]+))
 WINPATH (?>[A-Za-z]+:|\\)(?:\\[^\\?*]*)+
 URIPROTO [A-Za-z]+(\+[A-Za-z+]+)?
@@ -47,7 +49,7 @@ URIPATHPARAM %{URIPATH}(?:%{URIPARAM})?
 URI %{URIPROTO}://(?:%{USER}(?::[^@]*)?@)?(?:%{URIHOST})?(?:%{URIPATHPARAM})?
 
 # Months: January, Feb, 3, 03, 12, December
-MONTH \b(?:Jan(?:uary|uar)?|Feb(?:ruary|ruar)?|M(?:a|ä)?r(?:ch|z)?|Apr(?:il)?|Ma(?:y|i)?|Jun(?:e|i)?|Jul(?:y)?|Aug(?:ust)?|Sep(?:tember)?|O(?:c|k)?t(?:ober)?|Nov(?:ember)?|De(?:c|z)(?:ember)?)\b
+MONTH \b(?:[Jj]an(?:uary|uar)?|[Ff]eb(?:ruary|ruar)?|[Mm](?:a|ä)?r(?:ch|z)?|[Aa]pr(?:il)?|[Mm]a(?:y|i)?|[Jj]un(?:e|i)?|[Jj]ul(?:y)?|[Aa]ug(?:ust)?|[Ss]ep(?:tember)?|[Oo](?:c|k)?t(?:ober)?|[Nn]ov(?:ember)?|[Dd]e(?:c|z)(?:ember)?)\b
 MONTHNUM (?:0?[1-9]|1[0-2])
 MONTHNUM2 (?:0[1-9]|1[0-2])
 MONTHDAY (?:(?:0[1-9])|(?:[12][0-9])|(?:3[01])|[1-9])
@@ -70,7 +72,7 @@ ISO8601_SECOND (?:%{SECOND}|60)
 TIMESTAMP_ISO8601 %{YEAR}-%{MONTHNUM}-%{MONTHDAY}[T ]%{HOUR}:?%{MINUTE}(?::?%{SECOND})?%{ISO8601_TIMEZONE}?
 DATE %{DATE_US}|%{DATE_EU}
 DATESTAMP %{DATE}[- ]%{TIME}
-TZ (?:[PMCE][SD]T|UTC)
+TZ (?:[APMCE][SD]T|UTC)
 DATESTAMP_RFC822 %{DAY} %{MONTH} %{MONTHDAY} %{YEAR} %{TIME} %{TZ}
 DATESTAMP_RFC2822 %{DAY}, %{MONTHDAY} %{MONTH} %{YEAR} %{TIME} %{ISO8601_TIMEZONE}
 DATESTAMP_OTHER %{DAY} %{MONTH} %{MONTHDAY} %{TIME} %{TZ} %{YEAR}

data/patterns/java

@@ -1,8 +1,8 @@
 JAVACLASS (?:[a-zA-Z$_][a-zA-Z$_0-9]*\.)*[a-zA-Z$_][a-zA-Z$_0-9]*
 #Space is an allowed character to match special cases like 'Native Method' or 'Unknown Source'
 JAVAFILE (?:[A-Za-z0-9_. -]+)
-#Allow special <init> method
-JAVAMETHOD (?:(<init>)|[a-zA-Z$_][a-zA-Z$_0-9]*)
+#Allow special <init>, <clinit> methods
+JAVAMETHOD (?:(<(?:cl)?init>)|[a-zA-Z$_][a-zA-Z$_0-9]*)
 #Line number is optional in special cases 'Native method' or 'Unknown source'
 JAVASTACKTRACEPART %{SPACE}at %{JAVACLASS:class}\.%{JAVAMETHOD:method}\(%{JAVAFILE:file}(?::%{NUMBER:line})?\)
 # Java Logs

data/spec/patterns/core_spec.rb

@@ -193,5 +193,92 @@ describe "IPV4" do
       expect(grok_match(pattern,value)).not_to pass
     end
   end
+end
+
+describe "URN" do
+
+  let(:pattern)       { "URN" }
+
+  # Valid URNs
+  # http://tools.ietf.org/html/rfc2141#section-2
+  let(:simple)        { "urn:example:foo" }
+  let(:unreserved)    { "urn:example:" +
+    [*'A'..'Z', *'a'..'z', *'0'..'9', "()+,-.::=@;$_!*'"].join() }
+  let(:reserved)      { "urn:example:/#?" }
+  let(:escaped_upper) { "urn:example:%25foo%2Fbar%3F%23" }
+  let(:escaped_lower) { "urn:example:%25foo%2fbar%3f%23" }
+  let(:only_escaped)  { "urn:example:%00" }
+  let(:long_nid)      { "urn:example-example-example-example-:foo" }
+
+  # Invalid URNs
+  let(:bad_prefix)     { "URN:example:foo" }
+  let(:empty_nid)      { "urn::foo" }
+  let(:leading_hyphen) { "urn:-example:foo" }
+  let(:bad_nid)        { "urn:example.com:foo" }
+  let(:percent_nid)    { "urn:example%41com:foo" }
+  let(:too_long_nid)   { "urn:example-example-example-example-x:foo" }
+  let(:empty_nss)      { "urn:example:" }
+  let(:naked_percent)  { "urn:example:%" }
+  let(:short_percent)  { "urn:example:%a" }
+  let(:nonhex_percent) { "urn:example:%ax" }
+
+  context "when testing a valid URN" do
+    it "should match a simple URN" do
+      expect(grok_match(pattern, simple)).to pass
+    end
+
+    it "should match a complex URN" do
+      expect(grok_match(pattern, unreserved)).to pass
+    end
+
+    it "should allow reserved characters" do
+      expect(grok_match(pattern, reserved)).to pass
+    end
+
+    it "should allow percent-escapes" do
+      expect(grok_match(pattern, escaped_upper)).to pass
+      expect(grok_match(pattern, escaped_lower)).to pass
+      expect(grok_match(pattern, only_escaped)).to pass
+    end
+
+    it "should match a URN with a 32-character NID" do
+      expect(grok_match(pattern, long_nid)).to pass
+    end
+  end
+
+  context "when testing an invalid URN" do
+    it "should reject capitalized 'URN'" do
+      expect(grok_match(pattern, bad_prefix)).not_to pass
+    end
 
+    it "should reject an empty NID" do
+      expect(grok_match(pattern, empty_nid)).not_to pass
+    end
+
+    it "should reject an NID with a leading hyphen" do
+      expect(grok_match(pattern, leading_hyphen)).not_to pass
+    end
+
+    it "should reject an NID with a special character" do
+      expect(grok_match(pattern, bad_nid)).not_to pass
+    end
+
+    it "should reject an NID with a percent sign" do
+      expect(grok_match(pattern, percent_nid)).not_to pass
+    end
+
+    it "should reject an NID longer than 32 characters" do
+      expect(grok_match(pattern, too_long_nid)).not_to pass
+    end
+
+    it "should reject a URN with an empty NSS" do
+      expect(grok_match(pattern, empty_nss)).not_to pass
+    end
+
+    it "should reject non-escape percent signs" do
+      expect(grok_match(pattern, naked_percent)).not_to pass
+      expect(grok_match(pattern, short_percent)).not_to pass
+      expect(grok_match(pattern, nonhex_percent)).not_to pass
+    end
+  end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-patterns-core
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -117,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key:
 specification_version: 4
 summary: Patterns to be used in logstash