postfix_status_line 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b920514b0a6ff068bf055a64be86526944d199a
-  data.tar.gz: ddb676372a005b34e200bab00fa0d2c74398fd7b
+  metadata.gz: 16f4978cc397f853ac95847d796142dc55e7e37f
+  data.tar.gz: 8e1134c395cb76a686a1cd759f6f3f4263428337
 SHA512:
-  metadata.gz: 31cce84295ccb08bddf943cc42f33816fda52761ca0a9c42d6dc414dd15853269fff792b86b1d2add5caeda6da83126154d34a31f7a6c67b6922393e28080e81
-  data.tar.gz: 949dd602e7f663e7e4ab5a8fa4d21bf8873c95a809537be896951d9d229d156dfbde4658c9bf4aaae993e4450260eccc512ac18a11a349b24d655224b3d3712e
+  metadata.gz: 93bfa44661495628f3a7b9b89180fe2b40a4feedaac6e3e46a647ea2f80fcf528a005f51c4c999f37115f99dd82b3142e5a3bf2f9e691f0f60525b9943550464
+  data.tar.gz: d3b1fcfa308b897c340fdfd091d1805458b4d7bf793ccd13699fb25a253e08e30b631621c17831e94d9b81dda21bc3504bd7e3513a0608d77db67f79b40a1edc

data/.travis.yml

@@ -3,6 +3,14 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.0
+before_install:
+  - gem update bundler
+before_script:
+  - '[ "$DISABLE_OPENSSL" = "1" ] && sudo apt-get remove -y libssl-dev || true'
 script:
   - bundle install
   - bundle exec rake
+env:
+  - DISABLE_OPENSSL=0
+  - DISABLE_OPENSSL=1

data/README.md

@@ -51,6 +51,12 @@ PostfixStatusLine.parse(status_line)
 PostfixStatusLine.parse(status_line, hash: true)
 ```
 
+### Specify SHA algorithm
+
+```ruby
+PostfixStatusLine.parse(status_line, hash: true, sha_algorithm: 256)
+```
+
 ### Parse time
 
 ```ruby

data/ext/digest_sha.h

@@ -0,0 +1,40 @@
+#ifndef __DIGEST_SHA_H__
+#define __DIGEST_SHA_H__
+
+#ifndef SHA224_CTX
+#define SHA224_CTX SHA256_CTX
+#endif
+
+#ifndef SHA384_CTX
+#define SHA384_CTX SHA512_CTX
+#endif
+
+#define DEFINE_SHA_FUNCTIONS(SHA_ALGO) \
+  static void sha##SHA_ALGO##_to_str(unsigned char *hash, char buf[]) { \
+    int i; \
+    for (i = 0; i < SHA##SHA_ALGO##_DIGEST_LENGTH; i++) { \
+      snprintf(buf + (i * 2), 3, "%02x", hash[i]); \
+    } \
+  } \
+  static bool digest_sha##SHA_ALGO(char *str, char *salt, size_t salt_len, char buf[]) { \
+    SHA##SHA_ALGO##_CTX ctx; \
+    unsigned char hash[SHA##SHA_ALGO##_DIGEST_LENGTH]; \
+    if (SHA##SHA_ALGO##_Init(&ctx) != 1) { \
+      return false; \
+    } \
+    if (SHA##SHA_ALGO##_Update(&ctx, str, strlen(str)) != 1) { \
+      return false; \
+    } \
+    if (salt != NULL) { \
+      if (SHA##SHA_ALGO##_Update(&ctx, salt, salt_len) != 1) { \
+        return false; \
+      } \
+    } \
+    if (SHA##SHA_ALGO##_Final(hash, &ctx) != 1) { \
+      return false; \
+    } \
+    sha##SHA_ALGO##_to_str(hash, buf); \
+    return true; \
+  }
+
+#endif // __DIGEST_SHA_H__

data/ext/postfix_status_line_core.c

@@ -1,40 +1,13 @@
 #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;
-  }
+DEFINE_SHA_FUNCTIONS(); // SHA1
+DEFINE_SHA_FUNCTIONS(224);
+DEFINE_SHA_FUNCTIONS(256);
+DEFINE_SHA_FUNCTIONS(384);
+DEFINE_SHA_FUNCTIONS(512);
 
-  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 bool rb_value_to_bool(VALUE v_value) {
@@ -208,10 +181,11 @@ static void put_status(char *value, VALUE hash, bool mask) {
 }
 
 #ifdef HAVE_OPENSSL_SHA_H
-static void put_hash(char *email, VALUE hash_obj, char *salt, size_t salt_len) {
+static void put_hash(char *email, VALUE hash_obj, char *salt, size_t salt_len, DIGEST_SHA digest_sha_func) {
+  // XXX: allocate a buffer of sufficient size
   char buf[SHA512_DIGEST_LENGTH * 2 + 1];
 
-  if (!digest_sha512(email, salt, salt_len, buf)) {
+  if (!digest_sha_func(email, salt, salt_len, buf)) {
     return;
   }
 
@@ -219,12 +193,12 @@ static void put_hash(char *email, VALUE hash_obj, char *salt, size_t salt_len) {
 }
 #endif // HAVE_OPENSSL_SHA_H
 
-static void put_to(char *value, VALUE hash, bool mask, bool include_hash, char *salt, size_t salt_len) {
+static void put_to(char *value, VALUE hash, bool mask, bool include_hash, char *salt, size_t salt_len, DIGEST_SHA digest_sha_func) {
   char *email = remove_bracket(value);
 
 #ifdef HAVE_OPENSSL_SHA_H
   if (include_hash) {
-    put_hash(email, hash, salt, salt_len);
+    put_hash(email, hash, salt, salt_len, digest_sha_func);
   }
 #endif
 
@@ -246,7 +220,7 @@ static void put_from(char *value, VALUE hash, bool mask) {
   rb_hash_aset(hash, rb_str_new2("from"), rb_str_new2(email));
 }
 
-static void put_attr(char *str, VALUE hash, bool mask, bool include_hash, char *salt, size_t salt_len) {
+static void put_attr(char *str, VALUE hash, bool mask, bool include_hash, char *salt, size_t salt_len, DIGEST_SHA digest_sha_func) {
   char *value = strchr(str, '=');
 
   if (value == NULL) {
@@ -263,7 +237,7 @@ static void put_attr(char *str, VALUE hash, bool mask, bool include_hash, char *
   } 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);
+    put_to(value, hash, mask, include_hash, salt, salt_len, digest_sha_func);
   } else if (strcmp(str, "from") == 0) {
     put_from(value, hash, mask);
   } else if (strcmp(str, "status") == 0) {
@@ -277,7 +251,7 @@ static void put_attr(char *str, VALUE hash, bool mask, bool include_hash, char *
   }
 }
 
-static void split_line2(char *str, bool mask, VALUE hash, bool include_hash, char *salt, size_t salt_len) {
+static void split_line2(char *str, bool mask, VALUE hash, bool include_hash, char *salt, size_t salt_len, DIGEST_SHA digest_sha_func) {
   char *ptr;
 
   for (;;) {
@@ -287,7 +261,7 @@ static void split_line2(char *str, bool mask, VALUE hash, bool include_hash, cha
       break;
     }
 
-    put_attr(ptr, hash, mask, include_hash, salt, salt_len);
+    put_attr(ptr, hash, mask, include_hash, salt, salt_len, digest_sha_func);
 
     if (strncmp(str, "status=", 7) == 0) {
       break;
@@ -295,7 +269,7 @@ static void split_line2(char *str, bool mask, VALUE hash, bool include_hash, cha
   }
 
   if (str) {
-    put_attr(str, hash, mask, include_hash, salt, salt_len);
+    put_attr(str, hash, mask, include_hash, salt, salt_len, digest_sha_func);
   }
 }
 
@@ -341,7 +315,7 @@ 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) {
+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) {
   Check_Type(v_str, T_STRING);
 
   char *str = RSTRING_PTR(v_str);
@@ -358,7 +332,7 @@ static VALUE rb_postfix_status_line_parse(VALUE self, VALUE v_str, VALUE v_mask,
   char *salt = NULL;
   size_t salt_len = -1;
 
-if (rb_value_to_bool(v_hash)) {
+  if (rb_value_to_bool(v_hash)) {
 #ifdef HAVE_OPENSSL_SHA_H
     include_hash = true;
 
@@ -372,6 +346,40 @@ if (rb_value_to_bool(v_hash)) {
 #endif // HAVE_OPENSSL_SHA_H
   }
 
+  int sha_algo = 512;
+
+  if (!NIL_P(v_sha_algo)) {
+#ifdef HAVE_OPENSSL_SHA_H
+    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;
+
+#ifdef HAVE_OPENSSL_SHA_H
+  switch (sha_algo) {
+    case 1:
+      digest_sha_func = digest_sha;
+      break;
+    case 224:
+      digest_sha_func = digest_sha224;
+      break;
+    case 256:
+      digest_sha_func = digest_sha256;
+      break;
+    case 384:
+      digest_sha_func = digest_sha384;
+      break;
+    case 512:
+      digest_sha_func = digest_sha512;
+      break;
+    default:
+      rb_raise(rb_eArgError, "Invalid SHA algorithm");
+  }
+#endif // HAVE_OPENSSL_SHA_H
+
   char buf[len + 1];
   strncpy(buf, str, len);
   buf[len] = '\0';
@@ -392,7 +400,7 @@ if (rb_value_to_bool(v_hash)) {
     put_epoch(tm, hash);
   }
 
-  split_line2(attrs, mask, hash, include_hash, salt, salt_len);
+  split_line2(attrs, mask, hash, include_hash, salt, salt_len, digest_sha_func);
 
   return hash;
 }
@@ -400,5 +408,5 @@ if (rb_value_to_bool(v_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, 5);
+  rb_define_module_function(rb_mPostfixStatusLineCore, "parse", rb_postfix_status_line_parse, 6);
 }

data/ext/postfix_status_line_core.h

@@ -8,8 +8,11 @@
 #include <stdbool.h>
 #include <time.h>
 
+typedef bool (*DIGEST_SHA)(char *, char *, size_t, char[]);
+
 #ifdef HAVE_OPENSSL_SHA_H
 #include <openssl/sha.h>
+#include "digest_sha.h"
 #endif
 
 #include <ruby.h>

data/lib/postfix_status_line/version.rb

@@ -1,3 +1,3 @@
 module PostfixStatusLine
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/lib/postfix_status_line.rb

@@ -2,12 +2,15 @@ require 'postfix_status_line/version'
 require 'postfix_status_line_core'
 
 module PostfixStatusLine
+  SHA_ALGORITHM = %w(1 224 256 384 512)
+
   def parse(str, options = {})
     mask = options.has_key?(:mask) ? options[:mask] : true
     hash = options[:hash]
     salt = options[:salt]
     parse_time = options[:parse_time]
-    PostfixStatusLine::Core.parse(str, mask, hash, salt, parse_time)
+    sha_algo = options[:sha_algorithm]
+    PostfixStatusLine::Core.parse(str, mask, hash, salt, parse_time, sha_algo)
   end
   module_function :parse
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: postfix_status_line
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Postfix Status Line Log Parser implemented by C.
@@ -74,21 +74,23 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- ext/digest_sha.h
 - ext/extconf.rb
 - ext/postfix_status_line_core.c
 - ext/postfix_status_line_core.h
 - 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
@@ -100,17 +102,17 @@ require_paths:
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Postfix Status Line Log Parser implemented by C.