immunio 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f381a24b73b7115c320e46e538564da3d4001f2
-  data.tar.gz: 12b66439e36175bddd908eca2f94ec5269c6ccb4
+  metadata.gz: df076162b48fc75f6e04a46db9118579b1107e53
+  data.tar.gz: 64d31948b83cae4e3c3c847224a24c9520a51b27
 SHA512:
-  metadata.gz: 75b54a277712434f4cfc18dd8f1a7e2bbe0c061dd7f4053f9e98048a9608107c1dc22e2c4b92334191970b68560ac83632661aae561efc332a28eb8c0c0830a1
-  data.tar.gz: d37adcced6010eb26a12990217d59d93f8520122b583d0489d0a7df85c795f2fea3102d02767d12285eaed411149fce6903e0c4bdb999f4d27141aae5bb211c0
+  metadata.gz: 4264cc06b7cce23856abda0680db53a5cfe7a2fcb39e175e0e58884a869ed0e0253f16aff6be6cdf3330c45671c25af03649f2a6fcb2bc189a328347b7b7701f
+  data.tar.gz: 343a25d95f60caa65993f3397d08f06a7e43a67b0994367b9355f9b62a0b7025e46a57c3c33921f3aefafa5a587ff91939bb3eafb0f9d743454e0b950299a101

data/lib/immunio/agent.rb

@@ -4,8 +4,6 @@ require "yaml"
 require_relative "channel"
 require_relative "processor"
 
-
-
 module Immunio
   @agent = nil
 
@@ -156,16 +154,14 @@ module Immunio
       locations << File.join("config", CONFIG_FILENAME)
 
       locations.each do |location|
-        Immunio.logger.debug { "Trying to find config file at #{location}" }
         begin
-          realpath = File.realpath(location) # Raises exception if file doesn't exist
-          Immunio.logger.debug { "Found config file at #{realpath}" }
-          options = YAML.load_file(realpath).symbolize_keys
-          config.update options
+          config.update load_config_at_location(location)
           Immunio.logger.debug { "Configuration after loading from file: #{config}" }
           break
         rescue SystemCallError => e
-          Immunio.logger.debug { "Failed to load config: #{e}" }
+          Immunio.logger.error { "Failed to open config: #{e}" }
+        rescue => e
+          Immunio.logger.error { "Bad immunio configuration file: #{e.inspect}" }
         end
       end
 
@@ -197,7 +193,18 @@ module Immunio
       config.plugins_active.subtract(config.plugins_disabled)
       config.plugins_active.merge(config.plugins_enabled)
       Immunio.logger.info { "Active plugins: #{config.plugins_active.to_a}" }
+    end
 
+    # Loads the configuration file.
+    # Raises:
+    #   - Errno::ENOENT if it doesn't exist;
+    #   - NoMethodError if the config is invalid, `YAML.load_file` will return
+    #     a `String`, and `symbolize_keys` will be called on it.
+    def load_config_at_location(location)
+      Immunio.logger.debug { "Trying to find config file at #{location}" }
+      realpath = File.realpath(location) # Raises exception if file doesn't exist
+      Immunio.logger.debug { "Found config file at #{realpath}" }
+      YAML.load_file(realpath).symbolize_keys
     end
 
     def plugin_enabled?(plugin)

data/lib/immunio/plugins/action_view.rb

@@ -506,6 +506,27 @@ module Immunio
       content
     end
   end
+
+  # Hook for the `ActiveSupport::Hash#to_query`.
+  # Use case: building a url within a decorator that renders a partial with an interpolation.
+  module ActiveSupportHooks
+    extend ActiveSupport::Concern
+
+    included do
+      Immunio::Utils.alias_method_chain self, :to_query, :immunio
+    end
+
+    def to_query_with_immunio(namespace = nil)
+      escaped_string = to_query_without_immunio(namespace)
+      Request.time "plugin", "#{Module.nesting[0]}::#{__method__}" do
+        # Our markers got escaped, so un-unescaped them back.
+        escaped_string.gsub!(
+          Immunio::Template::ENCODED_IMMUNIO_TOKENS_RE,
+          "{immunio-\\1:\\2:\\3}\\4{/immunio-\\1:\\2:\\3}")
+      end
+      escaped_string
+    end
+  end
 end
 
 # Add XSS hooks if enabled
@@ -518,6 +539,8 @@ if Immunio::agent.plugin_enabled?("xss") then
     if defined? Haml::Compiler
       Haml::Compiler.send :include, Immunio::HamlHooks
     end
+
+    Hash.send :include, Immunio::ActiveSupportHooks
   end
 
   # Hook into rendering process of Rails.

data/lib/immunio/version.rb

@@ -1,5 +1,5 @@
 module Immunio
   AGENT_TYPE = "agent-ruby"
-  VERSION = "1.0.14"
+  VERSION = "1.0.15"
   VM_VERSION = "2.2.0"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: immunio
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Immunio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.6
 - !ruby/object:Gem::Dependency
@@ -56,56 +56,56 @@ dependencies:
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: |
@@ -124,6 +124,9 @@ extensions:
 - ext/immunio/Rakefile
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- bin/immunio
 - ext/immunio/Rakefile
 - lib/immunio.rb
 - lib/immunio/agent.rb
@@ -420,10 +423,7 @@ files:
 - lua-hooks/ext/sha1/sha1.c
 - lua-hooks/ext/sha2/luasha256.c
 - lua-hooks/ext/sha2/sha256.c
-- README.md
-- LICENSE
 - lua-hooks/lib/boot.lua
-- bin/immunio
 homepage: http://immun.io/
 licenses:
 - Immunio
@@ -435,17 +435,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Immunio Ruby agent