postfix_status_line 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 789a0f356de63f37d382c9df9bc2e52cc3410ccf
-  data.tar.gz: 515db09f1244be59e58c9f3cccd947ff6e07dc47
+  metadata.gz: 94a439a7c52803281aed989326452482635a1a51
+  data.tar.gz: 879309fe801021f6ca9405d3f999b3787f1a0626
 SHA512:
-  metadata.gz: ff4a32767875dade98f09c49589b7de5c28a4673139cef350d66b769b59e2643209fcf71b4f1fb588c1ecdf47042ee72542a032ea624e04dfba710f5ec48ab4e
-  data.tar.gz: f9a4cacfb6a05e7a38740e70cd60126fe147ece783bbbbe7f1db93b5f154292d24074e0ae4cedef4037608e201217853e7599929d8431ce7b39206c6f461b3d6
+  metadata.gz: 92907958f1605d908366b9d032f8a8b98ded4175f5b6dfdc35dd5f08f0829b2df2586d76d2e5fa50c4e8e2d8fcf0d9815294e6f0733dda30ab5f28ada1ee7cfd
+  data.tar.gz: c58b95c85fe2b700e4c69027cb5c99205db1e8dda75a02a992dfabb1b049ce5428f271f4dd52e82e6e5819f5cc4401610496516960a96846cbbb16e1544be5be

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 before_install:
   - gem update bundler
 before_script:

data/README.md

@@ -63,6 +63,26 @@ PostfixStatusLine.parse(status_line, hash: true, sha_algorithm: 256)
 PostfixStatusLine.parse(status_line, parse_time: true)
 ```
 
+### Parse Header Checks Warning
+
+see http://www.postfix.org/header_checks.5.html
+
+```ruby
+warning = "Mar  4 14:44:19 P788 postfix/cleanup[7426]: E80A9DF6F7E: warning: header Subject: test from local; from=<sugawara@P788.local> to=<sgwr_dts@yahoo.co.jp>"
+
+PostfixStatusLine.parse_header_checks_warning(warning)
+# => {
+#      "time"=>"Mar  4 14:44:19",
+#      "hostname"=>"P788",
+#      "process"=>"postfix/cleanup[7426]",
+#      "queue_id"=>"E80A9DF6F7E",
+#      "to"=>"********@yahoo.co.jp",
+#      "domain"=>"yahoo.co.jp",
+#      "from"=>"********@P788.local",
+#      "Subject"=>"test from local;"
+#    }
+```
+
 ## Benchmark (on EC2/t2.micro)
 
 ### Script

data/ext/postfix_status_line_core.c

@@ -273,6 +273,52 @@ static void split_line2(char *str, bool mask, VALUE hash, bool include_hash, cha
   }
 }
 
+static void put_header(char *str, VALUE hash, bool mask) {
+  if (strncmp(str, "warning: header ", 16) != 0) {
+    return;
+  }
+
+  str += 16;
+  char *value = strchr(str, ':');
+
+  if (value == NULL || *(value + 1) == '\0') {
+    return;
+  }
+
+  if (mask) {
+    mask_email(value);
+  }
+
+  *value = '\0';
+  value += 2;
+
+  VALUE v_key = rb_str_new2(str);
+  VALUE v_value = rb_str_new2(value);
+  rb_hash_aset(hash, v_key, v_value);
+}
+
+static void split_line3(char *str, bool mask, VALUE hash, bool include_hash, char *salt, size_t salt_len, DIGEST_SHA digest_sha_func) {
+  char *ptr = str;
+  size_t len = strlen(str);
+  int i;
+
+  for (i = (int) len - 1; i >= 0; i--) {
+    if (ptr[i] == ' ') {
+      char *chunk = ptr + i + 1;
+
+      if (strncmp(chunk, "to=", 3) == 0) {
+        put_attr(chunk, hash, mask, include_hash, salt, salt_len, digest_sha_func);
+        ptr[i] = '\0';
+      } else if (strncmp(chunk, "from=", 5) == 0) {
+        put_attr(chunk, hash, mask, include_hash, salt, salt_len, digest_sha_func);
+        ptr[i] = '\0';
+        put_header(ptr, hash, mask);
+        break;
+      }
+    }
+  }
+}
+
 static int get_year() {
   time_t now = time(NULL);
 
@@ -315,78 +361,82 @@ static void put_epoch(char *time_str, VALUE hash) {
   rb_hash_aset(hash, rb_str_new2("epoch"), LONG2NUM(ts));
 }
 
-static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask, VALUE v_hash, VALUE v_salt, VALUE v_parse_time, VALUE v_sha_algo) {
+static bool parse_init(
+  VALUE v_str, VALUE v_mask, VALUE v_parse_time, VALUE v_hash, VALUE v_salt, VALUE v_sha_algo,
+  char **str, size_t *len, bool *mask, bool *parse_time, bool *include_hash, char **salt, size_t *salt_len, int *sha_algo, DIGEST_SHA *digest_sha_func) {
   Check_Type(v_str, T_STRING);
+  *str = RSTRING_PTR(v_str);
+  *len = RSTRING_LEN(v_str);
 
-  char *str = RSTRING_PTR(v_str);
-  size_t len = RSTRING_LEN(v_str);
-
-  if (len < 1) {
-    return Qnil;
+  if (*len < 1) {
+    return false;
   }
 
-  bool mask = rb_value_to_bool(v_mask);
-  bool parse_time = rb_value_to_bool(v_parse_time);
+  *mask = rb_value_to_bool(v_mask);
+  *parse_time = rb_value_to_bool(v_parse_time);
 
-  bool include_hash = false;
-  char *salt = NULL;
-  size_t salt_len = -1;
+  *include_hash = false;
+  *salt = NULL;
+  *salt_len = -1;
 
   if (rb_value_to_bool(v_hash)) {
 #ifdef HAVE_OPENSSL_SHA_H
-    include_hash = true;
+    *include_hash = true;
 
     if (!NIL_P(v_salt)) {
       Check_Type(v_salt, T_STRING);
-      salt = RSTRING_PTR(v_salt);
-      salt_len = RSTRING_LEN(v_salt);
+      *salt = RSTRING_PTR(v_salt);
+      *salt_len = RSTRING_LEN(v_salt);
     }
 #else
     rb_raise(rb_eArgError, "OpenSSL is not linked");
 #endif // HAVE_OPENSSL_SHA_H
   }
 
-  int sha_algo = 512;
+  *sha_algo = 512;
 
   if (!NIL_P(v_sha_algo)) {
 #ifdef HAVE_OPENSSL_SHA_H
-    sha_algo = NUM2INT(v_sha_algo);
+    *sha_algo = NUM2INT(v_sha_algo);
 #else
     rb_raise(rb_eArgError, "OpenSSL is not linked");
 #endif // HAVE_OPENSSL_SHA_H
   }
 
-  DIGEST_SHA digest_sha_func = NULL;
+  *digest_sha_func = NULL;
 
 #ifdef HAVE_OPENSSL_SHA_H
-  switch (sha_algo) {
+  switch (*sha_algo) {
     case 1:
-      digest_sha_func = digest_sha1;
+      *digest_sha_func = digest_sha1;
       break;
     case 224:
-      digest_sha_func = digest_sha224;
+      *digest_sha_func = digest_sha224;
       break;
     case 256:
-      digest_sha_func = digest_sha256;
+      *digest_sha_func = digest_sha256;
       break;
     case 384:
-      digest_sha_func = digest_sha384;
+      *digest_sha_func = digest_sha384;
       break;
     case 512:
-      digest_sha_func = digest_sha512;
+      *digest_sha_func = digest_sha512;
       break;
     default:
       rb_raise(rb_eArgError, "Invalid SHA algorithm");
   }
 #endif // HAVE_OPENSSL_SHA_H
 
-  char buf[len + 1];
+  return true;
+}
+
+static VALUE pre_parse(char *str, size_t len, char *buf, bool parse_time, char **attrs) {
   strncpy(buf, str, len);
   buf[len] = '\0';
 
-  char *tm, *hostname, *process, *queue_id, *attrs;
+  char *tm, *hostname, *process, *queue_id;
 
-  if (!split_line1(buf, &tm, &hostname, &process, &queue_id, &attrs)) {
+  if (!split_line1(buf, &tm, &hostname, &process, &queue_id, attrs)) {
     return Qnil;
   }
 
@@ -400,13 +450,72 @@ static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask,
     put_epoch(tm, hash);
   }
 
+  return hash;
+}
+
+static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask, VALUE v_hash, VALUE v_salt, VALUE v_parse_time, VALUE v_sha_algo) {
+  char *str;
+  size_t len;
+  bool mask;
+  bool parse_time;
+  bool include_hash;
+  char *salt;
+  size_t salt_len;
+  int sha_algo;
+  DIGEST_SHA digest_sha_func;
+
+  if (!parse_init(v_str, v_mask, v_parse_time, v_hash, v_salt, v_sha_algo,
+                  &str, &len, &mask, &parse_time, &include_hash, &salt, &salt_len, &sha_algo, &digest_sha_func)) {
+    return Qnil;
+  }
+
+  char buf[len + 1];
+  char *attrs;
+
+  VALUE hash = pre_parse(str, len, buf, parse_time, &attrs);
+
+  if (NIL_P(hash)) {
+    return Qnil;
+  }
+
   split_line2(attrs, mask, hash, include_hash, salt, salt_len, digest_sha_func);
 
   return hash;
 }
 
+static VALUE rb_postfix_status_line_parse_header_checks_warning(VALUE self, VALUE v_str, VALUE v_mask, VALUE v_hash, VALUE v_salt, VALUE v_parse_time, VALUE v_sha_algo) {
+  char *str;
+  size_t len;
+  bool mask;
+  bool parse_time;
+  bool include_hash;
+  char *salt;
+  size_t salt_len;
+  int sha_algo;
+  DIGEST_SHA digest_sha_func;
+
+  if (!parse_init(v_str, v_mask, v_parse_time, v_hash, v_salt, v_sha_algo,
+                  &str, &len, &mask, &parse_time, &include_hash, &salt, &salt_len, &sha_algo, &digest_sha_func)) {
+    return Qnil;
+  }
+
+  char buf[len + 1];
+  char *attrs;
+
+  VALUE hash = pre_parse(str, len, buf, parse_time, &attrs);
+
+  if (NIL_P(hash)) {
+    return Qnil;
+  }
+
+  split_line3(attrs, mask, hash, include_hash, salt, salt_len, digest_sha_func);
+
+  return hash;
+}
+
 void Init_postfix_status_line_core() {
   VALUE rb_mPostfixStatusLine = rb_define_module("PostfixStatusLine");
   VALUE rb_mPostfixStatusLineCore = rb_define_module_under(rb_mPostfixStatusLine, "Core");
   rb_define_module_function(rb_mPostfixStatusLineCore, "parse", rb_postfix_status_line_parse, 6);
+  rb_define_module_function(rb_mPostfixStatusLineCore, "parse_header_checks_warning", rb_postfix_status_line_parse_header_checks_warning, 6);
 }

data/lib/postfix_status_line/version.rb

@@ -1,3 +1,3 @@
 module PostfixStatusLine
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

data/lib/postfix_status_line.rb

@@ -13,4 +13,14 @@ module PostfixStatusLine
     PostfixStatusLine::Core.parse(str, mask, hash, salt, parse_time, sha_algo)
   end
   module_function :parse
+
+  def parse_header_checks_warning(str, options = {})
+    mask = options.has_key?(:mask) ? options[:mask] : true
+    hash = options[:hash]
+    salt = options[:salt]
+    parse_time = options[:parse_time]
+    sha_algo = options[:sha_algorithm]
+    PostfixStatusLine::Core.parse_header_checks_warning(str, mask, hash, salt, parse_time, sha_algo)
+  end
+  module_function :parse_header_checks_warning
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postfix_status_line
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,6 @@ files:
 - lib/postfix_status_line.rb
 - lib/postfix_status_line/version.rb
 - postfix_status_line.gemspec
-- test.txt
 homepage: https://github.com/winebarrel/postfix_status_line
 licenses:
 - MIT