ruby-oci8 2.2.3 → 2.2.4

data/ext/oci8/plthook.h

@@ -43,14 +43,24 @@
 #define PLTHOOK_INVALID_ARGUMENT     4
 #define PLTHOOK_OUT_OF_MEMORY        5
 #define PLTHOOK_INTERNAL_ERROR       6
+#define PLTHOOK_NOT_IMPLEMENTED      7
 
 typedef struct plthook plthook_t;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int plthook_open(plthook_t **plthook_out, const char *filename);
+int plthook_open_by_handle(plthook_t **plthook_out, void *handle);
 int plthook_open_by_address(plthook_t **plthook_out, void *address);
 int plthook_enum(plthook_t *plthook, unsigned int *pos, const char **name_out, void ***addr_out);
 int plthook_replace(plthook_t *plthook, const char *funcname, void *funcaddr, void **oldfunc);
 void plthook_close(plthook_t *plthook);
 const char *plthook_error(void);
 
+#ifdef __cplusplus
+}; /* extern "C" */
+#endif
+
 #endif

data/ext/oci8/plthook_elf.c

@@ -6,7 +6,7 @@
  *
  * ------------------------------------------------------
  *
- * Copyright 2013-2014 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright 2013-2016 Kubo Takehiro <kubo@jiubao.org>
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -33,6 +33,9 @@
  * or implied, of the authors.
  *
  */
+#if defined(__sun) && defined(_XOPEN_SOURCE) && !defined(__EXTENSIONS__)
+#define __EXTENSIONS__
+#endif
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdarg.h>
@@ -42,6 +45,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/mman.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <dlfcn.h>
@@ -59,6 +63,7 @@
 
 #if defined __linux__
 #define ELF_OSABI     ELFOSABI_SYSV
+#define ELF_OSABI_ALT ELFOSABI_LINUX
 #elif defined __sun
 #define ELF_OSABI     ELFOSABI_SOLARIS
 #elif defined __FreeBSD__
@@ -146,10 +151,18 @@ struct plthook {
     size_t dynstr_size;
     const Elf_Plt_Rel *plt;
     size_t plt_cnt;
+#ifdef PT_GNU_RELRO
+    const char *relro_start;
+    const char *relro_end;
+#endif
 };
 
 static char errmsg[512];
 
+#ifdef PT_GNU_RELRO
+static size_t page_size;
+#endif
+
 static int plthook_open_executable(plthook_t **plthook_out);
 static int plthook_open_shared_library(plthook_t **plthook_out, const char *filename);
 static int plthook_open_real(plthook_t **plthook_out, const char *base, const char *filename);
@@ -167,6 +180,24 @@ int plthook_open(plthook_t **plthook_out, const char *filename)
     }
 }
 
+int plthook_open_by_handle(plthook_t **plthook_out, void *hndl)
+{
+    struct link_map *lmap = NULL;
+
+    if (hndl == NULL) {
+        set_errmsg("NULL handle");
+        return PLTHOOK_FILE_NOT_FOUND;
+    }
+    if (dlinfo(hndl, RTLD_DI_LINKMAP, &lmap) != 0) {
+        set_errmsg("dlinfo error");
+        return PLTHOOK_FILE_NOT_FOUND;
+    }
+    if (lmap->l_addr == 0 && *lmap->l_name == 0) {
+        return plthook_open_executable(plthook_out);
+    }
+    return plthook_open_real(plthook_out, (const char*)lmap->l_addr, lmap->l_name);
+}
+
 int plthook_open_by_address(plthook_t **plthook_out, void *address)
 {
     Dl_info info;
@@ -229,7 +260,8 @@ static int plthook_open_executable(plthook_t **plthook_out)
 #elif defined __FreeBSD__
     return plthook_open_shared_library(plthook_out, NULL);
 #else
-#error unsupported OS
+    set_errmsg("Opening the main program is not supported on this platform.");
+    return PLTHOOK_NOT_IMPLEMENTED;
 #endif
 }
 
@@ -260,6 +292,9 @@ static int plthook_open_real(plthook_t **plthook_out, const char *base, const ch
     off_t offset;
     plthook_t *plthook;
     int rv;
+#ifdef PT_GNU_RELRO
+    size_t idx;
+#endif
 
     if (base == NULL) {
         set_errmsg("The base address is zero.");
@@ -330,6 +365,29 @@ static int plthook_open_real(plthook_t **plthook_out, const char *base, const ch
         rv = PLTHOOK_INVALID_FILE_FORMAT;
         goto error_exit;
     }
+#ifdef PT_GNU_RELRO
+    if (page_size == 0) {
+        page_size = sysconf(_SC_PAGESIZE);
+    }
+    offset = ehdr->e_phoff;
+    if ((rv = lseek(fd, offset, SEEK_SET)) != offset) {
+        set_errmsg("failed to seek to the program header table.");
+        rv = PLTHOOK_INVALID_FILE_FORMAT;
+        goto error_exit;
+    }
+    for (idx = 0; idx < ehdr->e_phnum; idx++) {
+        Elf_Phdr phdr;
+        if (read(fd, &phdr, sizeof(phdr)) != sizeof(phdr)) {
+            set_errmsg("failed to read the program header table.");
+            rv = PLTHOOK_INVALID_FILE_FORMAT;
+            goto error_exit;
+        }
+        if (phdr.p_type == PT_GNU_RELRO) {
+            plthook->relro_start = plthook->base + phdr.p_vaddr;
+            plthook->relro_end = plthook->relro_start + phdr.p_memsz;
+        }
+    }
+#endif
     close(fd);
     fd = -1;
 
@@ -428,10 +486,26 @@ int plthook_replace(plthook_t *plthook, const char *funcname, void *funcaddr, vo
     while ((rv = plthook_enum(plthook, &pos, &name, &addr)) == 0) {
         if (strncmp(name, funcname, funcnamelen) == 0) {
             if (name[funcnamelen] == '\0' || name[funcnamelen] == '@') {
+#ifdef PT_GNU_RELRO
+                void *maddr = NULL;
+                if (plthook->relro_start <= (char*)addr && (char*)addr < plthook->relro_end) {
+                    maddr = (void*)((size_t)addr & ~(page_size - 1));
+                    if (mprotect(maddr, page_size, PROT_READ | PROT_WRITE) != 0) {
+                        set_errmsg("Could not change the process memory protection at %p: %s",
+                                   maddr, strerror(errno));
+                        return PLTHOOK_INTERNAL_ERROR;
+                    }
+                }
+#endif
                 if (oldfunc) {
                     *oldfunc = *addr;
                 }
                 *addr = funcaddr;
+#ifdef PT_GNU_RELRO
+                if (maddr != NULL) {
+                    mprotect(maddr, page_size, PROT_READ);
+                }
+#endif
                 return 0;
             }
         }
@@ -477,8 +551,15 @@ static int check_elf_header(const Elf_Ehdr *ehdr)
         return PLTHOOK_INVALID_FILE_FORMAT;
     }
     if (ehdr->e_ident[EI_OSABI] != ELF_OSABI) {
+#ifdef ELF_OSABI_ALT
+        if (ehdr->e_ident[EI_OSABI] != ELF_OSABI_ALT) {
+            set_errmsg("invalid OS ABI: 0x%02x", ehdr->e_ident[EI_OSABI]);
+            return PLTHOOK_INVALID_FILE_FORMAT;
+        }
+#else
         set_errmsg("invalid OS ABI: 0x%02x", ehdr->e_ident[EI_OSABI]);
         return PLTHOOK_INVALID_FILE_FORMAT;
+#endif
     }
     if (ehdr->e_type != ET_EXEC && ehdr->e_type != ET_DYN) {
         set_errmsg("invalid file type: 0x%04x", ehdr->e_type);

data/ext/oci8/plthook_osx.c

@@ -142,6 +142,37 @@ int plthook_open(plthook_t **plthook_out, const char *filename)
     return plthook_open_real(plthook_out, _dyld_get_image_header(idx));
 }
 
+int plthook_open_by_handle(plthook_t **plthook_out, void *hndl)
+{
+    int flags[] = {
+        RTLD_LAZY | RTLD_NOLOAD,
+        RTLD_LAZY | RTLD_NOLOAD | RTLD_FIRST,
+    };
+    int flag_idx;
+#define NUM_FLAGS (sizeof(flags) / sizeof(flags[0]))
+
+    if (hndl == NULL) {
+        set_errmsg("NULL handle");
+        return PLTHOOK_FILE_NOT_FOUND;
+    }
+    for (flag_idx = 0; flag_idx < NUM_FLAGS; flag_idx++) {
+        const char *image_name = NULL;
+        uint32_t idx = 0;
+
+        do {
+            void *handle = dlopen(image_name, flags[flag_idx]);
+            if (handle != NULL) {
+                dlclose(handle);
+                if (handle == hndl) {
+                    return plthook_open_real(plthook_out, _dyld_get_image_header(idx));
+                }
+            }
+        } while ((image_name = _dyld_get_image_name(++idx)) != NULL);
+    }
+    set_errmsg("Cannot find the image correspond to handle %p", hndl);
+    return PLTHOOK_FILE_NOT_FOUND;
+}
+
 int plthook_open_by_address(plthook_t **plthook_out, void *address)
 {
     Dl_info dlinfo;

data/ext/oci8/plthook_win32.c

@@ -93,6 +93,15 @@ int plthook_open(plthook_t **plthook_out, const char *filename)
     return plthook_open_real(plthook_out, hMod);
 }
 
+int plthook_open_by_handle(plthook_t **plthook_out, void *hndl)
+{
+    if (hndl == NULL) {
+        set_errmsg("NULL handle");
+        return PLTHOOK_FILE_NOT_FOUND;
+    }
+    return plthook_open_real(plthook_out, (HMODULE)hndl);
+}
+
 int plthook_open_by_address(plthook_t **plthook_out, void *address)
 {
     HMODULE hMod;

data/ext/oci8/stmt.c

@@ -288,7 +288,7 @@ static VALUE oci8_stmt_fetch(VALUE self, VALUE svc)
  *
  *  Returns the definition of column specified by <i>pos</i>
  *
- *  @param [Fixnum] pos Column position which starts from one
+ *  @param [Integer] pos Column position which starts from one
  *  @return [OCI8::Metadata::Base]
  *
  *  @private

data/lib/oci8.rb

@@ -1,4 +1,3 @@
-
 #   --*- ruby -*--
 # This is based on yoshidam's oracle.rb.
 #
@@ -68,12 +67,50 @@ else
   raise 'unsupported ruby engine: ' + RUBY_ENGINE
 end
 
+dll_dir = nil
+begin
+  require 'ruby_installer/runtime' # RubyInstaller2 for Windows
+
+  dll_arch = proc do |file|
+    begin
+      File.open(file, 'rb') do |f|
+        if f.read(2) == 'MZ' # IMAGE_DOS_HEADER.e_magic
+          f.seek(60, IO::SEEK_SET)
+          pe_offset = f.read(4).unpack('V')[0] # IMAGE_DOS_HEADER.e_lfanew
+          f.seek(pe_offset)
+          if f.read(4) == "PE\000\000" # IMAGE_NT_HEADERS.Signature
+            case f.read(2).unpack('v')[0] # IMAGE_FILE_HEADER.Machine
+            when 0x014c # IMAGE_FILE_MACHINE_I386
+              :x86
+            when 0x8664 # IMAGE_FILE_MACHINE_AMD64
+              :x64
+            end
+          end
+        end
+      end
+    rescue
+      nil
+    end
+  end
+
+  ruby_arch = [nil].pack('P').size == 8 ? :x64 : :x86
+  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+    if dll_arch.call(File.join(path, 'OCI.DLL')) == ruby_arch
+      dll_dir = RubyInstaller::Runtime.add_dll_directory(path)
+      break
+    end
+  end
+rescue LoadError
+end
+
 begin
   require so_basename
 rescue LoadError, OCIError
   require 'oci8/check_load_error'
   OCI8::Util::check_load_error($!)
   raise
+ensure
+  dll_dir.remove if dll_dir
 end
 
 require 'oci8/version.rb'

data/lib/oci8/cursor.rb

@@ -58,15 +58,16 @@ class OCI8
     #   # ...or...
     #   cursor.bind_param(':ename', 'SMITH') # bind by name
     #
-    # To bind as number, Fixnum and Float are available, but Bignum is
-    # not supported. If its initial value is NULL, please set nil to 
-    # +type+ and Fixnum or Float to +val+.
+    # To bind as number, set the number intself to +val+. If its initial value
+    # is NULL, please set nil to +type+ and Integer, Float or OraNumber to +val+.
     #
     # example:
-    #   cursor.bind_param(1, 1234) # bind as Fixnum, Initial value is 1234.
+    #   cursor.bind_param(1, 1234) # bind as Integer, Initial value is 1234.
     #   cursor.bind_param(1, 1234.0) # bind as Float, Initial value is 1234.0.
-    #   cursor.bind_param(1, nil, Fixnum) # bind as Fixnum, Initial value is NULL.
+    #   cursor.bind_param(1, nil, Integer) # bind as Integer, Initial value is NULL.
     #   cursor.bind_param(1, nil, Float) # bind as Float, Initial value is NULL.
+    #   cursor.bind_param(1, OraNumber(1234)) # bind as OraNumber, Initial value is 1234.
+    #   cursor.bind_param(1, nil, OraNumber) # bind as OraNumber, Initial value is NULL.
     #
     # In case of binding a string, set the string itself to
     # +val+. When the bind variable is used as output, set the
@@ -379,7 +380,7 @@ class OCI8
     #
     # FYI: Rails oracle adaptor uses 100 by default.
     #
-    # @param [Fixnum] rows The number of rows to be prefetched
+    # @param [Integer] rows The number of rows to be prefetched
     def prefetch_rows=(rows)
       attr_set_ub4(11, rows) # OCI_ATTR_PREFETCH_ROWS(11)
     end
@@ -430,12 +431,12 @@ class OCI8
     # * OCI8::STMT_ALTER
     # * OCI8::STMT_BEGIN (PL/SQL block which starts with a BEGIN keyword)
     # * OCI8::STMT_DECLARE (PL/SQL block which starts with a DECLARE keyword)
-    # * Other Fixnum value undocumented in Oracle manuals.
+    # * Other Integer value undocumented in Oracle manuals.
     #
     # <em>Changes between ruby-oci8 1.0 and 2.0.</em>
     #
     # [ruby-oci8 2.0] OCI8::STMT_* are Symbols. (:select_stmt, :update_stmt, etc.)
-    # [ruby-oci8 1.0] OCI8::STMT_* are Fixnums. (1, 2, 3, etc.)
+    # [ruby-oci8 1.0] OCI8::STMT_* are Integers. (1, 2, 3, etc.)
     #
     def type
       # http://docs.oracle.com/cd/E11882_01/appdev.112/e10646/ociaahan.htm#sthref5506

data/lib/oci8/oci8.rb

@@ -117,8 +117,9 @@ class OCI8
     else
       tcp_connect_timeout = OCI8::properties[:tcp_connect_timeout]
       connect_timeout = OCI8::properties[:connect_timeout]
-      if tcp_connect_timeout || connect_timeout
-        dbname = to_connect_descriptor(dbname, tcp_connect_timeout, connect_timeout)
+      tcp_keepalive = OCI8::properties[:tcp_keepalive]
+      if tcp_connect_timeout || connect_timeout || tcp_keepalive
+        dbname = to_connect_descriptor(dbname, tcp_connect_timeout, connect_timeout, tcp_keepalive)
       end
     end
     if stmt_cache_size
@@ -558,7 +559,7 @@ class OCI8
   # and add TRANSPORT_CONNECT_TIMEOUT or CONNECT_TIMEOUT.
   #
   # @private
-  def to_connect_descriptor(database, tcp_connect_timeout, connect_timeout)
+  def to_connect_descriptor(database, tcp_connect_timeout, connect_timeout, tcp_keepalive)
     if @@easy_connect_naming_regex =~ database && ($1 || $2 || $4 || $5 || $6 || $7)
       connect_data = []
       connect_data << "(SERVICE_NAME=#$5)"
@@ -573,6 +574,9 @@ class OCI8
       if connect_timeout
         desc << "(CONNECT_TIMEOUT=#{connect_timeout})"
       end
+      if tcp_keepalive
+        desc << "(ENABLE=BROKEN)"
+      end
       "(DESCRIPTION=#{desc.join})"
     else
       database

data/lib/oci8/properties.rb

@@ -17,6 +17,8 @@ class OCI8
     :connect_timeout => nil,
     :send_timeout => nil,
     :recv_timeout => nil,
+    :tcp_keepalive => false,
+    :tcp_keepalive_time => nil,
   }
 
   # @private
@@ -62,6 +64,14 @@ class OCI8
         val = val.to_i
         raise ArgumentError, "The property value for :#{name} must be nil or a positive integer." if val <= 0
       end
+    when :tcp_keepalive
+      val = val ? true : false
+    when :tcp_keepalive_time
+      if !val.nil?
+        val = val.to_i
+        raise ArgumentError, "The property value for :#{name} must be nil or a positive integer." if val <= 0
+      end
+      OCI8.__set_prop(4, val)
     end
     super(name, val)
   end
@@ -165,6 +175,18 @@ class OCI8
   #
   #     *Since:* 2.2.2
   #
+  # [:tcp_keepalive]
+  #
+  #     See {file:docs/hanging-after-inactivity.md.md}
+  #
+  #     *Since:* 2.2.4
+  #
+  # [:tcp_keepalive_time]
+  #
+  #     See {file:docs/hanging-after-inactivity.md.md}
+  #
+  #     *Since:* 2.2.4
+  #
   # @return [a customized Hash]
   # @since 2.0.5
   #

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/ruby-oci8.gemspec

@@ -64,11 +64,7 @@ EOS
       raise "No compiled binary are found. Run make in advance."
     when 1
       puts "Binary gem for ruby #{so_vers.first}"
-      if so_vers[0] < '2.0.0'
-        s.required_ruby_version = "~> #{so_vermin}"
-      else
-        s.required_ruby_version = "~> #{so_vermin}.0"
-      end
+      s.required_ruby_version = "~> #{so_vermin}"
     else
       puts "Binary gem for ruby #{so_vers.join(', ')}"
       s.required_ruby_version = ">= #{so_vermin}"