postfix_status_line 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a439a7c52803281aed989326452482635a1a51
-  data.tar.gz: 879309fe801021f6ca9405d3f999b3787f1a0626
+  metadata.gz: ba1d3cc388e6481f1a89bae81c03f0964e2edac3
+  data.tar.gz: 2aeacc192ab96a747017c8befeef4609e8be0896
 SHA512:
-  metadata.gz: 92907958f1605d908366b9d032f8a8b98ded4175f5b6dfdc35dd5f08f0829b2df2586d76d2e5fa50c4e8e2d8fcf0d9815294e6f0733dda30ab5f28ada1ee7cfd
-  data.tar.gz: c58b95c85fe2b700e4c69027cb5c99205db1e8dda75a02a992dfabb1b049ce5428f271f4dd52e82e6e5819f5cc4401610496516960a96846cbbb16e1544be5be
+  metadata.gz: ea847a0a7d39284df8f02f94e41575d5561495367b48fd9c767e434504067d5b540d248ad935da826dc088eccb04e3e4561f6217d7e3263c1af5bfa47fc5813e
+  data.tar.gz: 2797537e8eb181261ea00bfc6ecf535633a89f1bf4f5e6af440b2885b413c4a3c99f33830657f641d749126db82cacfdd07bde614c0141e5e1226819f40bc989

data/README.md

@@ -63,9 +63,7 @@ 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
+### Parse [header_checks](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>"
@@ -79,7 +77,8 @@ PostfixStatusLine.parse_header_checks_warning(warning)
 #      "to"=>"********@yahoo.co.jp",
 #      "domain"=>"yahoo.co.jp",
 #      "from"=>"********@P788.local",
-#      "Subject"=>"test from local;"
+#      "header_from"=>"local",
+#      "Subject"=>"test"
 #    }
 ```
 

data/ext/postfix_status_line_core.c

@@ -273,18 +273,45 @@ 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) {
+static void put_header(char *str, size_t len, VALUE hash, bool mask) {
+  if (str[len - 1] != ';') {
     return;
   }
 
-  str += 16;
-  char *value = strchr(str, ':');
+  char *without_cmd = strchr(str, ':');
+
+  if (without_cmd == NULL) {
+    return;
+  }
+
+  if (strncmp(without_cmd, ": header ", 9) != 0) {
+    return;
+  }
+
+  char *value = strchr(without_cmd + 9, ':');
 
   if (value == NULL || *(value + 1) == '\0') {
     return;
   }
 
+  *without_cmd = '\0';
+  without_cmd += 9;
+
+  int i;
+
+  for (i = (int) len - 2; i >= 0; i--) {
+    if (str[i] == ' ') {
+      char *chunk = str + i + 1;
+
+      if (strncmp(chunk, "from ", 5) == 0) {
+        str[len - 1] = '\0';
+        rb_hash_aset(hash, rb_str_new2("header_from"), rb_str_new2(chunk + 5));
+        str[i] = '\0';
+        break;
+      }
+    }
+  }
+
   if (mask) {
     mask_email(value);
   }
@@ -292,9 +319,8 @@ static void put_header(char *str, VALUE hash, bool mask) {
   *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);
+  rb_hash_aset(hash, rb_str_new2("priority"), rb_str_new2(str));
+  rb_hash_aset(hash, rb_str_new2(without_cmd), rb_str_new2(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) {
@@ -312,7 +338,7 @@ static void split_line3(char *str, bool mask, VALUE hash, bool include_hash, cha
       } 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);
+        put_header(ptr, i, hash, mask);
         break;
       }
     }
@@ -483,7 +509,7 @@ static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask,
   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) {
+static VALUE rb_postfix_status_line_parse_header_checks(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;
@@ -517,5 +543,5 @@ 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);
+  rb_define_module_function(rb_mPostfixStatusLineCore, "parse_header_checks", rb_postfix_status_line_parse_header_checks, 6);
 }

data/lib/postfix_status_line.rb

@@ -14,13 +14,13 @@ module PostfixStatusLine
   end
   module_function :parse
 
-  def parse_header_checks_warning(str, options = {})
+  def parse_header_checks(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)
+    PostfixStatusLine::Core.parse_header_checks(str, mask, hash, salt, parse_time, sha_algo)
   end
-  module_function :parse_header_checks_warning
+  module_function :parse_header_checks
 end

data/lib/postfix_status_line/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postfix_status_line
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler