postfix_status_line 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9520446497f6f210808c56e1a5f861e4b412036d
-  data.tar.gz: 7ee583ea8a511f2ef8735502e0f452aa39eb4479
+  metadata.gz: 20862ceb4887cd85c5d41c00280b4614639efd5b
+  data.tar.gz: e66aa89b96e0e716ea03681efd8d2f170652b644
 SHA512:
-  metadata.gz: 112285e1abcbac3ee737a3c6ed08056e501b1de248880e8798731319be4b7af0056a62ddf3a7812f10b5878d13a764cc3c3c65a8690e852e941cb351394d7a83
-  data.tar.gz: af9412d375e7a8a1ea2f15929c0dc4f13acf8ff1f066b2c4afbb886f2db20a0cc1b228c0854e00a684e82ad228a2d0de6b8435e36d70c84d02c93fd38fe74ed5
+  metadata.gz: baa5e6493ad10a43a24a3cf657fd80f528bfb0f01ad163780ace3048b813deae7992e7e1cbd7fc15655143189b5b3516fe041d307a989a5ba8a3fab12814ba59
+  data.tar.gz: 5ed4a6252af723a09348f8ee7ce892c8a7301d426a9959ff97eea0077bd8002ca86d1cc899b792fd326a9091561732301c6e1ffe2edd355f1016479335001675

data/README.md

@@ -25,10 +25,11 @@ Or install it yourself as:
 ```ruby
 require "postfix_status_line"
 
-status_line = "Feb 27 09:02:37 MyHOSTNAME postfix/smtp[26490]: D53A72713E5: to=<myemail@bellsouth.net>, relay=gateway-f1.isp.att.net[204.127.217.16]:25, delay=0.57, delays=0.11/0.03/0.23/0.19, dsn=2.0.0, status=sent (250 ok ; id=20120227140036M0700qer4ne)"
+status_line = "Feb 27 09:02:37 MyHOSTNAME postfix/smtp[26490]: D53A72713E5: to=<myemail@bellsouth.net>, relay=gateway-f1.isp.att.net[204.127.217.16]:25, conn_use=2, delay=0.57, delays=0.11/0.03/0.23/0.19, dsn=2.0.0, status=sent (250 ok ; id=20120227140036M0700qer4ne)"
 
 PostfixStatusLine.parse(status_line)
 # => {
+#      "conn_use" => 2,
 #      "delay" => 0.57,
 #      "delays" => "0.11/0.03/0.23/0.19",
 #      "dsn" => "2.0.0",
@@ -39,7 +40,13 @@ PostfixStatusLine.parse(status_line)
 #      "status" => "sent",
 #      "status_detail" => "(250 ok ; id=20120227140036M0700qer4ne)",
 #      "time" => "Feb  8 09:02:37",
-#      "to" => "<*******@bellsouth.net>",
+#      "to" => "*******@bellsouth.net",
 #      "domain" => "bellsouth.net"
 #    }
 ```
+
+### Include "to" mail address SH512 hash
+
+```ruby
+PostfixStatusLine.parse(status_line, hash: true)
+```

data/Rakefile

@@ -10,3 +10,4 @@ end
 
 task :default => [:spec]
 task :spec => [:compile]
+task :compile => [:clean]

data/ext/extconf.rb

@@ -1,2 +1,9 @@
 require 'mkmf'
-create_makefile('ext/postfix_status_line_core')
+
+if have_header('openssl/sha.h')
+  if have_library('ssl') and have_library('crypto')
+    create_makefile('ext/postfix_status_line_core')
+  end
+else
+  create_makefile('ext/postfix_status_line_core')
+end

data/ext/postfix_status_line_core.c

@@ -1,5 +1,42 @@
 #include "postfix_status_line_core.h"
 
+#ifdef HAVE_OPENSSL_SHA_H
+static void sha512_to_str(unsigned char *hash, char buf[]) {
+  int i;
+
+  for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
+    snprintf(buf + (i * 2), 3, "%02x", hash[i]);
+  }
+}
+
+static bool digest_sha512(char *str, char *salt, size_t salt_len, char buf[]) {
+  SHA512_CTX ctx;
+  unsigned char hash[SHA512_DIGEST_LENGTH];
+
+  if (SHA512_Init(&ctx) != 1) {
+    return false;
+  }
+
+  if (SHA512_Update(&ctx, str, strlen(str)) != 1) {
+    return false;
+  }
+
+  if (salt != NULL) {
+    if (SHA512_Update(&ctx, salt, salt_len) != 1) {
+      return false;
+    }
+  }
+
+  if (SHA512_Final(hash, &ctx) != 1) {
+    return false;
+  }
+
+  sha512_to_str(hash, buf);
+
+  return true;
+}
+#endif // HAVE_OPENSSL_SHA_H
+
 static char *split(char **orig_str, const char *delim, size_t delim_len) {
   char *str = *orig_str;
   char *ptr = strstr((const char *) str, delim);
@@ -20,31 +57,31 @@ static char *split(char **orig_str, const char *delim, size_t delim_len) {
   return str;
 }
 
-static int split3(char buf[], char **p1, char **p2, char **p3) {
+static bool split3(char buf[], char **p1, char **p2, char **p3) {
   char *buf_ptr = buf;
 
   *p1 = split(&buf_ptr, ": ", 2);
 
   if (*p1 == NULL) {
-    return -1;
+    return false;
   }
 
   *p2 = split(&buf_ptr, ": ", 2);
 
   if (*p2 == NULL) {
-    return -1;
+    return false;
   }
 
   *p3 = buf_ptr;
 
-  return 0;
+  return true;
 }
 
-static int split_p1(char *str, char **time, char **hostname, char **process) {
+static bool split_p1(char *str, char **time, char **hostname, char **process) {
   *process = strrchr(str, ' ');
 
   if (*process == NULL) {
-    return -1;
+    return false;
   }
 
   **process = '\0';
@@ -53,11 +90,11 @@ static int split_p1(char *str, char **time, char **hostname, char **process) {
   *hostname = strrchr(str, ' ');
 
   if (*hostname == NULL) {
-    return -1;
+    return false;
   }
 
   if (*hostname - str < 1) {
-    return -1;
+    return false;
   }
 
   **hostname = '\0';
@@ -65,24 +102,24 @@ static int split_p1(char *str, char **time, char **hostname, char **process) {
 
   *time = str;
 
-  return 0;
+  return true;
 }
 
-static int split_line1(char buf[], char **tm, char **hostname, char **process, char **queue_id, char **attrs) {
+static bool split_line1(char buf[], char **tm, char **hostname, char **process, char **queue_id, char **attrs) {
   char *p1, *p2, *p3;
 
-  if (split3(buf, &p1, &p2, &p3) != 0) {
-    return -1;
+  if (!split3(buf, &p1, &p2, &p3)) {
+    return false;
   }
 
-  if (split_p1(p1, tm, hostname, process) != 0) {
-    return -1;
+  if (!split_p1(p1, tm, hostname, process)) {
+    return false;
   }
 
   *queue_id = p2;
   *attrs = p3;
 
-  return 0;
+  return true;
 }
 
 static void mask_email(char *str) {
@@ -96,7 +133,7 @@ static void mask_email(char *str) {
       }
 
       ptr = NULL;
-    } else if (*str == '<') {
+    } else if (*str == '<' || *str == '(' || *str == ' ' || *str == ',') {
       ptr = str + 1;
     }
 
@@ -104,6 +141,24 @@ static void mask_email(char *str) {
   }
 }
 
+static char *remove_bracket(char *value) {
+  char *email = strchr(value, '<');
+
+  if (email == NULL) {
+    return value;
+  }
+
+  email++;
+
+  char *close_bracket = strchr(email, '>');
+
+  if (close_bracket != NULL) {
+    *close_bracket = '\0';
+  }
+
+  return email;
+}
+
 static void put_domain(char *value, VALUE hash) {
   char *domain = strchr(value, '@');
 
@@ -113,20 +168,14 @@ static void put_domain(char *value, VALUE hash) {
 
   domain++;
 
-  char *bracket = strchr(domain, '>');
-  VALUE v_value;
+  rb_hash_aset(hash, rb_str_new2("domain"), rb_str_new2(domain));
+}
 
-  if (bracket == NULL) {
-    v_value = rb_str_new2(domain);
-  } else {
-    size_t len = bracket - domain;
-    v_value = rb_str_new(domain, len);
+static void put_status(char *value, VALUE hash, bool mask) {
+  if (mask) {
+    mask_email(value);
   }
 
-  rb_hash_aset(hash, rb_str_new2("domain"), v_value);
-}
-
-static void put_status(char *value, VALUE hash) {
   char *detail = strchr(value, ' ');
 
   if (detail != NULL) {
@@ -138,7 +187,36 @@ static void put_status(char *value, VALUE hash) {
   rb_hash_aset(hash, rb_str_new2("status"), rb_str_new2(value));
 }
 
-static void put_attr(char *str, VALUE hash) {
+#ifdef HAVE_OPENSSL_SHA_H
+static void put_hash(char *email, VALUE hash_obj, char *salt, size_t salt_len) {
+  char buf[SHA512_DIGEST_LENGTH * 2 + 1];
+
+  if (!digest_sha512(email, salt, salt_len, buf)) {
+    return;
+  }
+
+  rb_hash_aset(hash_obj, rb_str_new2("hash"), rb_str_new2(buf));
+}
+#endif // HAVE_OPENSSL_SHA_H
+
+static void put_to(char *value, VALUE hash, bool mask, bool include_hash, char *salt, size_t salt_len) {
+  char *email = remove_bracket(value);
+
+#ifdef HAVE_OPENSSL_SHA_H
+  if (include_hash) {
+    put_hash(email, hash, salt, salt_len);
+  }
+#endif
+
+  if (mask) {
+    mask_email(value); // not "email"!
+  }
+
+  rb_hash_aset(hash, rb_str_new2("to"), rb_str_new2(email));
+  put_domain(value, hash);
+}
+
+static void put_attr(char *str, VALUE hash, bool mask, bool include_hash, char *salt, size_t salt_len) {
   char *value = strchr(str, '=');
 
   if (value == NULL) {
@@ -151,25 +229,23 @@ static void put_attr(char *str, VALUE hash) {
   VALUE v_key = rb_str_new2(str);
 
   if (strcmp(str, "delay") == 0) {
-    VALUE v_value = rb_float_new(atof(value));
-    rb_hash_aset(hash, v_key, v_value);
+    rb_hash_aset(hash, v_key, rb_float_new(atof(value)));
+  } else if (strcmp(str, "conn_use") == 0) {
+    rb_hash_aset(hash, v_key, INT2NUM(atoi(value)));
+  } else if (strcmp(str, "to") == 0) {
+    put_to(value, hash, mask, include_hash, salt, salt_len);
   } else if (strcmp(str, "status") == 0) {
-    put_status(value, hash);
+    put_status(value, hash, mask);
   } else {
-    VALUE v_value = rb_str_new2(value);
-    rb_hash_aset(hash, v_key, v_value);
-  }
+    if (mask) {
+      mask_email(value);
+    }
 
-  if (strcmp(str, "to") == 0) {
-    put_domain(value, hash);
+    rb_hash_aset(hash, v_key, rb_str_new2(value));
   }
 }
 
-static void split_line2(char *str, int mask, VALUE hash) {
-  if (mask) {
-    mask_email(str);
-  }
-
+static void split_line2(char *str, bool mask, VALUE hash, bool include_hash, char *salt, size_t salt_len) {
   char *ptr;
 
   for (;;) {
@@ -187,25 +263,47 @@ static void split_line2(char *str, int mask, VALUE hash) {
       break;
     }
 
-    put_attr(ptr, hash);
+    put_attr(ptr, hash, mask, include_hash, salt, salt_len);
   }
 
   if (str) {
-    put_attr(str, hash);
+    put_attr(str, hash, mask, include_hash, salt, salt_len);
   }
 }
 
-static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask) {
+static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask, VALUE v_hash, VALUE v_salt) {
   Check_Type(v_str, T_STRING);
 
   char *str = RSTRING_PTR(v_str);
   size_t len = RSTRING_LEN(v_str);
-  int mask = 1;
+  bool mask = true;
+
+  bool include_hash = false;
+  char *salt = NULL;
+  size_t salt_len = -1;
+
+  switch (TYPE(v_hash)) {
+  case T_FALSE:
+  case T_NIL:
+    break;
+  default:
+#ifdef HAVE_OPENSSL_SHA_H
+    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);
+    }
+#else
+    rb_raise(rb_eArgumentError, "OpenSSL is not linked");
+#endif // HAVE_OPENSSL_SHA_H
+  }
 
   switch (TYPE(v_mask)) {
   case T_FALSE:
   case T_NIL:
-    mask = 0;
+    mask = false;
   }
 
   if (len < 1) {
@@ -218,7 +316,7 @@ static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask)
 
   char *tm, *hostname, *process, *queue_id, *attrs;
 
-  if (split_line1(buf, &tm, &hostname, &process, &queue_id, &attrs) != 0) {
+  if (!split_line1(buf, &tm, &hostname, &process, &queue_id, &attrs)) {
     return Qnil;
   }
 
@@ -228,7 +326,7 @@ static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask)
   rb_hash_aset(hash, rb_str_new2("process"), rb_str_new2(process));
   rb_hash_aset(hash, rb_str_new2("queue_id"), rb_str_new2(queue_id));
 
-  split_line2(attrs, mask, hash);
+  split_line2(attrs, mask, hash, include_hash, salt, salt_len);
 
   return hash;
 }
@@ -236,5 +334,5 @@ static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask)
 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, 2);
+  rb_define_module_function(rb_mPostfixStatusLineCore, "parse", rb_postfix_status_line_parse, 4);
 }

data/ext/postfix_status_line_core.h

@@ -1,6 +1,12 @@
 #ifndef __POSTFIX_STATUS_LINE_CORE_H__
 #define __POSTFIX_STATUS_LINE_CORE_H__
 
+#include <stdbool.h>
+
+#ifdef HAVE_OPENSSL_SHA_H
+#include <openssl/sha.h>
+#endif
+
 #include <ruby.h>
 
 #endif //__POSTFIX_STATUS_LINE_CORE_H__

data/lib/postfix_status_line/version.rb

@@ -1,3 +1,3 @@
 module PostfixStatusLine
-  VERSION = '0.1.7'
+  VERSION = '0.2.0'
 end

data/lib/postfix_status_line.rb

@@ -2,8 +2,11 @@ require 'postfix_status_line/version'
 require 'postfix_status_line_core'
 
 module PostfixStatusLine
-  def parse(str, mask = true)
-    Core.parse(str, mask)
+  def parse(str, options)
+    mask = options.has_key?(:mask) ? options[:mask] : true
+    hash = options[:hash]
+    salt = options[:salt]
+    PostfixStatusLine::Core.parse(str, mask, hash, salt)
   end
   module_function :parse
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postfix_status_line
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler