tshield 0.3.0.0 → 0.3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d38191a1b4051da47c94d62f65e23a908c2ff8b3
-  data.tar.gz: 96b0176cb11b3f635b3671406c024d803c480b96
+  metadata.gz: 16569c4650ae0fb6c0f181e599c1449a4b40bbdb
+  data.tar.gz: 0d98311928827e374b8316f22ab015904ec28153
 SHA512:
-  metadata.gz: 6480b0e7408e523f498d71503ac505daed9bf9a0acb55a24ea5154f42d3b1100e47af69a50e43de8e62b484627970520f13f5cf45d2044af921246d8c13c4676
-  data.tar.gz: 9cffbac477c63f2d84b64d1c3ebc65f25a373fc34f6dd38995cae22c7306fb1f570140751d4c8d2333e11237fb08585192686260266be90d796e68eeef36a27f
+  metadata.gz: 927d205cf8404a59cb12f843cb87a7b6179c4f3d65652b6e5062260cf26e2e4c58b79808ea1065a151866cdbd59549c0fb41a425a9632937a066953ee30f3697
+  data.tar.gz: 1346a118634fe1fda37246a736d242945235a8deaa5b4942ed7a184be4f823fd1379752952bd1d10dfb0ebb74185172525e6f0c7f1e0eb240076860c90671daa

data/lib/tshield/configuration.rb

@@ -27,6 +27,10 @@ module TShield
       domains[domain]['headers'] || {}
     end
 
+    def get_excluded_headers(domain)
+      domains[domain]['excluded_headers'] || []
+    end
+
     def session_path
       @session_path ||= '/sessions'
     end

data/lib/tshield/controllers/requests.rb

@@ -7,41 +7,41 @@ require 'byebug'
 require 'tshield/options'
 require 'tshield/configuration'
 require 'tshield/request'
+require 'tshield/sessions'
 
 module TShield
   module Controllers
     module Requests
-      PATHP = /([a-zA-Z\/\.-_]+)/
+      PATHP = /([a-zA-Z\/\._-]+)/
 
       def self.registered(app)
         app.configure :production, :development do
           app.enable :logging
         end
-
         
         app.get (PATHP) do
-          treat(params, request)
+          treat(params, request, response)
         end
 
         app.post (PATHP) do
-          treat(params, request)
+          treat(params, request, response)
         end
 
         app.put (PATHP) do
-          treat(params, request)
+          treat(params, request, response)
         end
 
         app.patch (PATHP) do
-          treat(params, request)
+          treat(params, request, response)
         end
 
         app.head (PATHP) do
-          treat(params, request)
+          treat(params, request, response)
         end
       end
 
       module Helpers
-        def treat(params, request)
+        def treat(params, request, response)
           path = params.fetch('captures', [])[0]
 
           debugger if TShield::Options.instance.break?(path: path, moment: :before)
@@ -73,25 +73,38 @@ module TShield
 
           set_content_type content_type
 
-          response = TShield::Request.new(path, options).response
+          api_response = TShield::Request.new(path, options).response
 
           logger.info(
-            "original=#{response.original} method=#{method} path=#{path} content-type=#{request_content_type}")
+            "original=#{api_response.original} method=#{method} path=#{path} content-type=#{request_content_type} session=#{current_session_name(request)}")
 
-          response.body
+          status api_response.status
+          headers api_response.headers.reject { |k,v| configuration.get_excluded_headers(domain(path)).include?(k) }
+          body api_response.body
         end
 
         def set_content_type(request_content_type)
           content_type :json
         end
 
+        def current_session_name(request)
+          session = TShield::Sessions.current(request.ip)
+          session ? session[:name] : 'no-session'
+        end
+
         def add_headers(headers, path)
-          @configuration ||= TShield::Configuration.singleton
-          domain = @configuration.get_domain_for(path)
-          @configuration.get_headers(domain).each do |source, destiny| 
+          configuration.get_headers(domain(path)).each do |source, destiny| 
             headers[destiny] = request.env[source] unless request.env[source].nil?
           end
         end
+
+        def configuration
+          @configuration ||= TShield::Configuration.singleton
+        end
+
+        def domain(path)
+          @domain ||= configuration.get_domain_for(path)
+        end
       end
     end
   end

data/lib/tshield/request.rb

@@ -2,6 +2,8 @@ require 'httparty'
 require 'json'
 require 'byebug'
 
+require 'digest/sha1'
+
 require 'tshield/configuration'
 require 'tshield/options'
 require 'tshield/response'
@@ -32,8 +34,7 @@ module TShield
         @response.original = false
       else
         raw = HTTParty.send("#{method}", @url, @options)
-        save(raw)
-        @response = TShield::Response.new(raw.body, raw.header)
+        @response = save(raw)
         @response.original = true
       end
       current_session[:counter].add(@path, method) if current_session
@@ -51,9 +52,18 @@ module TShield
     end
 
     def save(raw_response)
-      content << {body: raw_response.body}
+      headers = {}
+      raw_response.headers.each {|k,v| headers[k] = v}
+
+      content << {
+        body: raw_response.body, 
+        status: raw_response.code,
+        headers: headers
+      }
+
       write(content)
-      content
+
+      TShield::Response.new(raw_response.body, headers, raw_response.code)
     end
 
     def current_session
@@ -69,7 +79,7 @@ module TShield
     end
 
     def exists
-      file_exists  && include_current_response?
+      file_exists && include_current_response?
     end
 
     def include_current_response?
@@ -80,7 +90,7 @@ module TShield
 
     def get_current_response
       current = content[@content_idx || 0]
-      TShield::Response.new(current['body'], current['header']) 
+      TShield::Response.new(current['body'], current['headers'] || [], current['status'] || 200) 
     end
 
     def key
@@ -101,7 +111,7 @@ module TShield
       domain_path = File.join(request_path, domain.gsub(/.*:\/\//, ''))
       Dir.mkdir(domain_path) unless File.exists?(domain_path)
 
-      path_path = File.join(domain_path, @path.gsub(/\//, '-').gsub(/^-/, ''))
+      path_path = File.join(domain_path, safe_dir(@path))
       Dir.mkdir(path_path) unless File.exists?(path_path)
 
       method_path = File.join(path_path, method)
@@ -116,6 +126,16 @@ module TShield
       f.close
     end
 
+    def safe_dir(url)
+      if url.size > 225
+        path = url.gsub(/(\?.*)/, '')
+        params = Digest::SHA1.hexdigest $1
+        "#{path.gsub(/\//, '-').gsub(/^-/, '')}?#{params}"
+      else
+        url.gsub(/\//, '-').gsub(/^-/, '')
+      end
+    end
+
   end
 
 end

data/lib/tshield/response.rb

@@ -1,10 +1,11 @@
 module TShield
   class Response
-    attr_accessor :body, :headers, :original
+    attr_accessor :body, :headers, :status, :original
 
-    def initialize(body, headers)
+    def initialize(body, headers, status)
       @body = body
       @headers = headers
+      @status = status
     end
   end
 end

data/lib/tshield/sessions.rb

@@ -4,21 +4,26 @@ require 'tshield/counter'
 module TShield
   module Sessions
     def self.start(ip, name)
-      sessions[ip] = {name: name, counter: TShield::Counter.new}
+      sessions[normalize_ip(ip)] = {name: name, counter: TShield::Counter.new}
     end
 
     def self.stop(ip)
-      sessions[ip] = nil
+      sessions[normalize_ip(ip)] = nil
     end
 
     def self.current(ip)
-      sessions[ip]
+      sessions[normalize_ip(ip)]
     end
 
     protected 
     def self.sessions
       @sessions ||= {}
     end
+
+    def self.normalize_ip(ip)
+      ip == '::1' ? '127.0.0.1' : ip
+    end
+
   end
 end
 

data/lib/tshield/version.rb

@@ -2,7 +2,7 @@ module TShield
   class Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 0
+    PATCH = 3
     PRE = 0
 
     class << self

data/spec/tshield/request_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe TShield::Request do
+
+  describe 'when save response' do
+    it '' do
+    end
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tshield
 version: !ruby/object:Gem::Version
-  version: 0.3.0.0
+  version: 0.3.3.0
 platform: ruby
 authors:
 - Diego Rubin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -175,6 +175,7 @@ files:
 - spec/spec_helper.rb
 - spec/tshield/configuration_spec.rb
 - spec/tshield/fixtures/config/tshield.yml
+- spec/tshield/request_spec.rb
 - tshield.gemspec
 homepage: https://github.com/diegorubin/tshield
 licenses:
@@ -204,3 +205,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/tshield/fixtures/config/tshield.yml
 - spec/tshield/configuration_spec.rb
+- spec/tshield/request_spec.rb