wovnrb 0.2.09 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f04bf4839f7b61aec6530ffff379a9f2385173d
-  data.tar.gz: e80efaaa47e0f2ee84cb3cdd92561f3c3cd29047
+  metadata.gz: fc2f6b32bbb1a1ae62581625150e7192a97e7536
+  data.tar.gz: 700ff16d073253ea5e761a1fbba50fa31db4d293
 SHA512:
-  metadata.gz: 7df1df8c8b96eee6398c002797ec48a7dc44166bb0f9c95b558ac033e38285eaa76ce0f3efccffdabbcdf42860b21e239c6acef8d2dea01d9f70ad062dc83e57
-  data.tar.gz: 362d53618e983cab6a3702881d563c58345e4183ffe4e48757796041befd83e191e616cba24c36d8aaed59f6102f039881c84134c3a94c9743c8f62a3d7719a7
+  metadata.gz: c8081098e724536d3eaed17c9ba986f1d09a5fcfad40b59cc34393cac266f3dff2cddb42c9c383d334a8a8c60d884fa98304bdd76f18a81628e7e761269f27b2
+  data.tar.gz: 09747ebd43f2298e0e2daea26b77603bae9fd2bb43cf2334c20ef80d8fde8cb8d4f8ee8db801d74c8989a9828b1072461962ad8605af774c3e60c46670b45284

data/lib/wovnrb.rb

@@ -44,21 +44,23 @@ module Wovnrb
       # pass to application
       status, res_headers, body = @app.call(headers.request_out)
 
-      if res_headers["Content-Type"] =~ /html/ # && !body[0].nil?
-        # ApiData creates request for external server, but cannot use async.
-        # Because some server not allow multi thread. (env['async.callback'] is not supported at all Server).
-        api_data = ApiData.new(headers.redis_url, @store)
-        values = api_data.get_data
-        url = {
+      if res_headers["Content-Type"] =~ /html/
+        unless @store.settings['ignore_globs'].any?{|g| g.match?(headers.pathname)}
+          # ApiData creates request for external server, but cannot use async.
+          # Because some server not allow multi thread. (env['async.callback'] is not supported at all Server).
+          api_data = ApiData.new(headers.redis_url, @store)
+          values = api_data.get_data
+          url = {
             :protocol => headers.protocol,
             :host => headers.host,
             :pathname => headers.pathname
-        }
-        body = switch_lang(body, values, url, lang, headers) unless status.to_s =~ /^1|302/
+          }
+          body = switch_lang(body, values, url, lang, headers) unless status.to_s =~ /^1|302/
 
-        content_length = 0
-        body.each { |b| content_length += b.respond_to?(:bytesize) ? b.bytesize : 0 }
-        res_headers["Content-Length"] = content_length.to_s
+          content_length = 0
+          body.each { |b| content_length += b.respond_to?(:bytesize) ? b.bytesize : 0 }
+          res_headers["Content-Length"] = content_length.to_s
+        end
       end
 
       headers.out(res_headers)

data/lib/wovnrb/services/glob.rb

@@ -0,0 +1,25 @@
+module Wovnrb
+  # inspired by https://github.com/isaacs/node-glob
+  #
+  # "*" Matches 0 or more characters in a single path portion
+  # "**" If a "globstar" is alone in a path portion,
+  #   then it matches zero or more directories and subdirectories searching for matches.
+  #
+  # @note "?" or other pattern is not implemented
+  class Glob
+    def initialize(pattern)
+      sub_directories = pattern.split('/**', -1)
+      regexp = sub_directories.map do |sub_dir|
+        sub_dir.split('*', -1)
+          .map {|p| Regexp.escape(p)}
+          .join('[^/]*')
+      end.join('(/[^/]*)*')
+
+      @regexp = Regexp.new("^#{regexp}$")
+    end
+
+    def match?(url)
+      !@regexp.match(url).nil?
+    end
+  end
+end

data/lib/wovnrb/store.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'cgi'
 require 'singleton'
 require 'wovnrb/services/wovn_logger'
+require 'wovnrb/services/glob'
 
 module Wovnrb
   class Store
@@ -23,6 +24,8 @@ module Wovnrb
           'user_token' => '',
           'secret_key' => '',
           'log_path' => 'log/wovn_error.log',
+          'ignore_paths' => [],
+          'ignore_globs' => [],
           'url_pattern' => 'path',
           'url_pattern_reg' => "/(?<lang>[^/.?]+)",
           'query' => [],
@@ -48,19 +51,23 @@ module Wovnrb
       errors = [];
       if !settings.has_key?('user_token') || settings['user_token'].length < 5 || settings['user_token'].length > 6
         valid = false
-        errors.push("User token #{settings['user_token']} is not valid.");
+        errors.push("User token #{settings['user_token']} is not valid.")
       end
       if !settings.has_key?('secret_key') || settings['secret_key'].length == 0 #|| settings['secret_key'].length < 5 || settings['secret_key'].length > 6
         valid = false
-        errors.push("Secret key #{settings['secret_key']} is not valid.");
+        errors.push("Secret key #{settings['secret_key']} is not valid.")
+      end
+      if settings.has_key?('ignore_paths') && !settings['ignore_paths'].kind_of?(Array)
+        valid = false
+        errors.push("Ignore Paths #{settings['ignore_paths']} should be Array.")
       end
       if !settings.has_key?('url_pattern') || settings['url_pattern'].length == 0
         valid = false
-        errors.push("Url pattern #{settings['url_pattern']} is not valid.");
+        errors.push("Url pattern #{settings['url_pattern']} is not valid.")
       end
       if !settings.has_key?('query') || !settings['query'].kind_of?(Array)
         valid = false
-        errors.push("query config #{settings['query']} is not valid.");
+        errors.push("query config #{settings['query']} is not valid.")
       end
       if !settings.has_key?('api_url') || settings['api_url'].length == 0
         valid = false
@@ -68,11 +75,11 @@ module Wovnrb
       end
       if !settings.has_key?('default_lang') || settings['default_lang'].length == 0
         valid = false
-        errors.push("Default lang #{settings['default_lang']} is not valid.");
+        errors.push("Default lang #{settings['default_lang']} is not valid.")
       end
       if !settings.has_key?('supported_langs') || !settings['supported_langs'].kind_of?(Array) || settings['supported_langs'].size < 1
         valid = false
-        errors.push("Supported langs configuration is not valid.");
+        errors.push("Supported langs configuration is not valid.")
       end
       # log errors
       if errors.length > 0
@@ -92,41 +99,57 @@ module Wovnrb
         @config_loaded = false
       end
 
-      if !@config_loaded
-        # get Rails config.wovnrb
-        if Object.const_defined?('Rails') && Rails.configuration.respond_to?(:wovnrb)
-          config_settings = Rails.configuration.wovnrb.stringify_keys
-          if config_settings.has_key?('url_pattern')
-            if config_settings['url_pattern'] == 'query' || config_settings['url_pattern'] == 'subdomain' || config_settings['url_pattern'] == 'path'
-              config_settings['url_pattern'] = config_settings['url_pattern']
-              config_settings.delete('url_pattern')
-            end
+      if @config_loaded
+        return @settings
+      end
+
+      # get Rails config.wovnrb
+      if Object.const_defined?('Rails') && Rails.configuration.respond_to?(:wovnrb)
+        config_settings = Rails.configuration.wovnrb.stringify_keys
+        if config_settings.has_key?('url_pattern')
+          if config_settings['url_pattern'] == 'query' || config_settings['url_pattern'] == 'subdomain' || config_settings['url_pattern'] == 'path'
+            config_settings['url_pattern'] = config_settings['url_pattern']
+            config_settings.delete('url_pattern')
           end
-          @settings.merge!(Rails.configuration.wovnrb.stringify_keys)
         end
+        @settings.merge!(Rails.configuration.wovnrb.stringify_keys)
+      end
+      cleanSettings
 
-        # fix settings object
-        @settings['default_lang'] = Lang.get_code(@settings['default_lang'])
-        if !@settings.has_key?('supported_langs')
-          @settings['supported_langs'] = [@settings['default_lang']]
-        end
-        if @settings['url_pattern'] == 'path'
-          @settings['url_pattern_reg'] = "/(?<lang>[^/.?]+)"
-        elsif @settings['url_pattern'] == 'query'
-          @settings['url_pattern_reg'] = "((\\?.*&)|\\?)wovn=(?<lang>[^&]+)(&|$)"
-        elsif @settings['url_pattern'] == 'subdomain'
-          @settings['url_pattern_reg'] = "^(?<lang>[^.]+)\."
-        end
-        if @settings['test_mode'] != true || @settings['test_mode'] != 'on'
-          @settings['test_mode'] = false
-        else
-          @settings['test_mode'] = true
-        end
+      # fix settings object
+      @settings['default_lang'] = Lang.get_code(@settings['default_lang'])
+      if !@settings.has_key?('supported_langs')
+        @settings['supported_langs'] = [@settings['default_lang']]
+      end
 
-        @config_loaded = true
+      if @settings['url_pattern'] == 'path'
+        @settings['url_pattern_reg'] = "/(?<lang>[^/.?]+)"
+      elsif @settings['url_pattern'] == 'query'
+        @settings['url_pattern_reg'] = "((\\?.*&)|\\?)wovn=(?<lang>[^&]+)(&|$)"
+      elsif @settings['url_pattern'] == 'subdomain'
+        @settings['url_pattern_reg'] = "^(?<lang>[^.]+)\."
       end
+
+      if @settings['test_mode'] != true || @settings['test_mode'] != 'on'
+        @settings['test_mode'] = false
+      else
+        @settings['test_mode'] = true
+      end
+
+      if @settings['ignore_paths'].kind_of?(Array)
+        @settings['ignore_globs'] = @settings['ignore_paths'].map do |pattern|
+          Glob.new(pattern)
+        end
+      end
+
+      @config_loaded = true
       @settings
     end
+
+    private
+    def cleanSettings
+      @settings['ignore_globs'] = []
+    end
   end
 
 end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.09"
+  VERSION = "0.2.10"
 end

data/test/lib/services/glob_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+require 'wovnrb/services/glob'
+
+module Wovnrb
+  class GlobTest < WovnMiniTest
+    def test_match
+      assert_equal(false, Glob.new('api/*').match?('api'))
+      assert_equal(true, Glob.new('api/*').match?('api/'))
+      assert_equal(true, Glob.new('api/*').match?('api/a'))
+      assert_equal(false, Glob.new('api/*').match?('api/a/b'))
+      assert_equal(true, Glob.new('api/*.html').match?('api/a.html'))
+      assert_equal(false, Glob.new('api/*.html').match?('api/a/b.html'))
+    end
+
+    def test_match_2_star
+      assert_equal(false, Glob.new('api/**/*').match?('api'))
+      assert_equal(true, Glob.new('api/**/*').match?('api/'))
+      assert_equal(true, Glob.new('api/**/*').match?('api/a'))
+      assert_equal(true, Glob.new('api/**/*').match?('api/a/b'))
+      assert_equal(true, Glob.new('api/**/*.html').match?('api/a.html'))
+      assert_equal(true, Glob.new('api/**/*.html').match?('api/a/b.html'))
+      assert_equal(false, Glob.new('api/**/*.html').match?('api/a/b'))
+      assert_equal(true, Glob.new('api/**').match?('api/a'))
+      assert_equal(true, Glob.new('api/**').match?('api/a/b.html'))
+    end
+
+    def test_match_regex_injection
+      assert_equal(false, Glob.new('api/a?*').match?('api/a'))
+      assert_equal(true, Glob.new('api/a?*').match?('api/a?'))
+      assert_equal(true, Glob.new('api/a?*').match?('api/a?b'))
+      assert_equal(false, Glob.new('api/**?').match?('api/a'))
+      assert_equal(true, Glob.new('api/**?').match?('api/?'))
+    end
+  end
+end

data/test/lib/store_test.rb

@@ -43,5 +43,45 @@ module Wovnrb
       assert_equal(false, valid)
       assert_equal(['User token  is not valid.', 'Secret key  is not valid.'], mock.errors)
     end
+
+    def test_settings_ignore_paths
+      s = Wovnrb::Store.instance
+      s.settings({'ignore_paths' => ['/api/**']})
+      assert_equal(1, s.settings['ignore_globs'].size)
+      assert_equal(true, s.settings['ignore_globs'].first.match?('/api/a/b'))
+      assert_equal(false, s.settings['ignore_globs'].first.match?('/a/b'))
+    end
+
+    def test_settings_ignore_paths_multiple
+      s = Wovnrb::Store.instance
+      s.settings({'ignore_paths' => ['/api/a/**', '/api/b/**']})
+      assert_equal(2, s.settings['ignore_globs'].size)
+      assert_equal(true, s.settings['ignore_globs'].any?{|g| g.match?('/api/a')})
+      assert_equal(true, s.settings['ignore_globs'].any?{|g| g.match?('/api/b')})
+      assert_equal(false, s.settings['ignore_globs'].any?{|g| g.match?('/api/c')})
+    end
+
+    def test_settings_ignore_paths_empty
+      s = Wovnrb::Store.instance
+      s.settings({'ignore_paths' => []})
+      assert_equal([], s.settings['ignore_globs'])
+    end
+
+    def test_settings_invalid_ignore_paths
+      mock = LogMock.mock_log
+      store = Wovnrb::Store.instance
+      store.settings({'ignore_paths' => 'aaaa'})
+
+      assert_equal(false, store.valid_settings?)
+      assert_equal(['User token  is not valid.', 'Secret key  is not valid.', 'Ignore Paths aaaa should be Array.'], mock.errors)
+    end
+
+    def test_settings_ignore_glob_injection
+      s = Wovnrb::Store.instance
+      s.settings({'ignore_paths' => nil})
+      s.settings({'ignore_globs' => [1, 2]})
+
+      assert_equal([], s.settings['ignore_globs'])
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.09
+  version: 0.2.10
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -317,6 +317,7 @@ files:
 - lib/wovnrb/html_replacers/text_replacer.rb
 - lib/wovnrb/lang.rb
 - lib/wovnrb/railtie.rb
+- lib/wovnrb/services/glob.rb
 - lib/wovnrb/services/url.rb
 - lib/wovnrb/services/wovn_logger.rb
 - lib/wovnrb/store.rb
@@ -334,6 +335,7 @@ files:
 - test/lib/html_replacers/script_replacer_test.rb
 - test/lib/html_replacers/text_replacer_test.rb
 - test/lib/lang_test.rb
+- test/lib/services/glob_test.rb
 - test/lib/services/url_test.rb
 - test/lib/services/wovn_logger_test.rb
 - test/lib/store_test.rb
@@ -380,6 +382,7 @@ test_files:
 - test/lib/html_replacers/script_replacer_test.rb
 - test/lib/html_replacers/text_replacer_test.rb
 - test/lib/lang_test.rb
+- test/lib/services/glob_test.rb
 - test/lib/services/url_test.rb
 - test/lib/services/wovn_logger_test.rb
 - test/lib/store_test.rb