perimeter_x 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e3418c30763e225706ca5ee7a3a88958c4a210
-  data.tar.gz: 4671a1eb52edc4cfdb9ba4e85932c2dcb7e33dbb
+  metadata.gz: 1f3a1b696f592b2f1478cc376a96475a5d5f0778
+  data.tar.gz: e859865af132477c953d6aed1a7c70bb927b432e
 SHA512:
-  metadata.gz: 13ca73c6ac3c22ff0d9d93d42cab42049a06e458f9596538cd2225a07dd1ea9e20db8bf4c6921519ed29c349e717eb929643051ef1510337b1414bf6ea8f6c01
-  data.tar.gz: 2bc1a8fe0845f3899537bb34151c545ea7c6a5343b271c7bceb4d221a9551d74dec174042e30b02e7e29d533d7e0453235163ee0635d2275576c75ed4758efd5
+  metadata.gz: 1f67c50466d0a347d7d5e3dc6c30f66332a3dabb27a34152e49c36a6614fa06ce81bc02d8f50ba2e061f9fb4cef8b21e9fb684d2d2b8b138ffab87298d0e1f81
+  data.tar.gz: 35d39968545b296e04f02bed0bb2c67b40ca1ff6773e352533fbe06e2795ad630a838d159fe517a12702e79d5054d81ef828fa966e9278dec7fd6eaa37dd2e06

data/.gitignore

@@ -1,4 +1,5 @@
 *.rbc
+*.iml
 capybara-*.html
 .rspec
 /log

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.3

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    perimeter_x (1.0.5)
+    perimeter_x (1.3.0)
       activesupport (>= 4.2.0)
-      httpclient (= 2.8.2.4)
+      concurrent-ruby (~> 1.0, >= 1.0.5)
       mustache (~> 1.0, >= 1.0.3)
+      typhoeus (~> 1.1, >= 1.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -16,13 +17,15 @@ GEM
       tzinfo (~> 1.1)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    httpclient (2.8.2.4)
-    i18n (0.8.1)
+    ethon (0.10.1)
+      ffi (>= 1.3.0)
+    ffi (1.9.18)
+    i18n (0.8.6)
     metaclass (0.0.4)
     minitest (5.10.1)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
-    mustache (1.0.4)
+    mustache (1.0.5)
     rake (10.4.2)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -38,6 +41,8 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     thread_safe (0.3.6)
+    typhoeus (1.1.2)
+      ethon (>= 0.9.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
 

data/Rakefile

@@ -3,6 +3,7 @@ begin
 
   RSpec::Core::RakeTask.new(:spec)
 
+  task :default => :spec
   task :test => :spec
 rescue LoadError
   # no rspec available

data/changelog.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.3.0] - 2017-06-04
+### Added
+ - Sending client_uuid on page_requested activities
+ - Supporting mobile sdk
+### Fixed
+ - Using `request.env` instead of `env`
+
 ## [1.2.0] - 2017-06-04
 ### Fixed 
     - Default timeouts for post api requests
@@ -27,3 +34,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  - Constants on px_constants
  - Cookie Validation flow when cookie score was over the configured threshold
  - Using symbols instead of strings for requests body
+

data/examples/app/controllers/home_controller.rb

@@ -1,7 +1,7 @@
 class HomeController < ApplicationController
   include PxModule
 
-  before_filter :px_verify_request
+  before_action :px_verify_request
 
   def index
   end

data/lib/perimeter_x.rb

@@ -1,3 +1,6 @@
+require 'concurrent'
+require 'json'
+require 'base64'
 require 'perimeterx/configuration'
 require 'perimeterx/utils/px_logger'
 require 'perimeterx/utils/px_constants'
@@ -10,29 +13,46 @@ require 'perimeterx/internal/validators/perimeter_x_cookie_validator'
 require 'perimeterx/internal/validators/perimeter_x_captcha_validator'
 
 module PxModule
-
   # Module expose API
   def px_verify_request
-    verified, px_ctx = PerimeterX.instance.verify(env)
+    verified, px_ctx = PerimeterX.instance.verify(request.env)
 
     # Invalidate _pxCaptcha, can be done only on the controller level
-    cookies[:_pxCaptcha] = { value: "", expires: -1.minutes.from_now }
+    cookies[:_pxCaptcha] = {value: "", expires: -1.minutes.from_now}
 
-    if (!verified)
+    unless verified
       # In case custon block handler exists
       if (PerimeterX.instance.px_config.key?(:custom_block_handler))
-        PerimeterX.instance.px_config[:logger].debug("PxModule[px_verify_request]: custom_block_handler triggered")
+        PerimeterX.instance.px_config[:logger].debug('PxModule[px_verify_request]: custom_block_handler triggered')
         return instance_exec(px_ctx, &PerimeterX.instance.px_config[:custom_block_handler])
       else
         # Generate template
-        PerimeterX.instance.px_config[:logger].debug("PxModule[px_verify_request]: sending default block page")
+        PerimeterX.instance.px_config[:logger].debug('PxModule[px_verify_request]: sending default block page')
         html = PxTemplateFactory.get_template(px_ctx, PerimeterX.instance.px_config)
-        response.headers["Content-Type"] = "text/html"
+        response.headers['Content-Type'] = 'text/html'
         response.status = 403
-        render :html => html
+        # Web handler
+        if px_ctx.context[:cookie_origin] == 'cookie'
+          PerimeterX.instance.px_config[:logger].debug('PxModule[px_verify_request]: web block')
+          response.headers['Content-Type'] = 'text/html'
+          render :html => html
+        else # Mobile SDK
+          PerimeterX.instance.px_config[:logger].debug('PxModule[px_verify_request]: mobile sdk block')
+          response.headers['Content-Type'] = 'application/json'
+          hash_json = {
+              :action => px_ctx.context[:block_action],
+              :uuid => px_ctx.context[:uuid],
+              :vid => px_ctx.context[:vid],
+              :appId => PerimeterX.instance.px_config[:app_id],
+              :page => Base64.strict_encode64(html),
+              :collectorUrl => "https://collector-#{PerimeterX.instance.px_config[:app_id]}.perimeterx.net"
+          }
+          render :json => hash_json
+        end
       end
     end
 
+    # Request was verified
     return verified
   end
 
@@ -41,7 +61,7 @@ module PxModule
   end
 
 
-  # PerimtereX Module
+  # PerimeterX Module
   class PerimeterX
     @@__instance = nil
     @@mutex = Mutex.new
@@ -62,19 +82,19 @@ module PxModule
 
     def self.instance
       return @@__instance if !@@__instance.nil?
-      raise Exception.new("Please initialize perimeter x first")
+      raise Exception.new('Please initialize perimeter x first')
     end
 
 
     #Instance Methods
     def verify(env)
       begin
-        @logger.debug("PerimeterX[pxVerify]")
-        req = ActionDispatch::Request.new(env)
+        @logger.debug('PerimeterX[pxVerify]')
         if (!@px_config[:module_enabled])
-          @logger.warn("Module is disabled")
+          @logger.warn('Module is disabled')
           return true
         end
+        req = ActionDispatch::Request.new(env)
         px_ctx = PerimeterXContext.new(@px_config, req)
 
         # Captcha phase
@@ -96,7 +116,7 @@ module PxModule
         end
       rescue Exception => e
         @logger.error("#{e.backtrace.first}: #{e.message} (#{e.class})")
-        e.backtrace.drop(1).map { |s| @logger.error("\t#{s}") }
+        e.backtrace.drop(1).map {|s| @logger.error("\t#{s}")}
         return true
       end
     end
@@ -111,11 +131,11 @@ module PxModule
       @px_cookie_validator = PerimeterxCookieValidator.new(@px_config)
       @px_s2s_validator = PerimeterxS2SValidator.new(@px_config, @px_http_client)
       @px_captcha_validator = PerimeterxCaptchaValidator.new(@px_config, @px_http_client)
-      @logger.debug("PerimeterX[initialize]")
+      @logger.debug('PerimeterX[initialize]Z')
     end
 
     private def handle_verification(px_ctx)
-      @logger.debug("PerimeterX[handle_verification]")
+      @logger.debug('PerimeterX[handle_verification]')
       @logger.debug("PerimeterX[handle_verification]: processing ended - score:#{px_ctx.context[:score]}, uuid:#{px_ctx.context[:uuid]}")
 
       score = px_ctx.context[:score]
@@ -130,12 +150,12 @@ module PxModule
       @px_activity_client.send_block_activity(px_ctx)
 
       # In case were in monitor mode, end here
-      if(@px_config[:module_mode] == PxModule::MONITOR_MODE)
-        @logger.debug("PerimeterX[handle_verification]: monitor mode is on, passing request")
+      if (@px_config[:module_mode] == PxModule::MONITOR_MODE)
+        @logger.debug('PerimeterX[handle_verification]: monitor mode is on, passing request')
         return true
       end
 
-      @logger.debug("PerimeterX[handle_verification]: verification ended, the request should be blocked")
+      @logger.debug('PerimeterX[handle_verification]: verification ended, the request should be blocked')
 
       return false, px_ctx
     end

data/lib/perimeterx/configuration.rb

@@ -20,7 +20,7 @@ module PxModule
       :api_connect_timeout      => 1,
       :api_timeout              => 1,
       :max_buffer_len           => 10,
-      :send_page_activities     => false,
+      :send_page_activities     => true,
       :send_block_activities    => true,
       :sdk_name                 => PxModule::SDK_NAME,
       :debug                    => false,
@@ -31,7 +31,7 @@ module PxModule
 
     def initialize(params)
       PX_DEFAULT[:perimeterx_server_host] = "https://sapi-#{params[:app_id].downcase}.perimeterx.net"
-      @configuration = PX_DEFAULT.merge(params);
+      @configuration = PX_DEFAULT.merge(params)
       @configuration[:logger] = PxLogger.new(@configuration[:debug])
     end
   end

data/lib/perimeterx/internal/clients/perimeter_x_activity_client.rb

@@ -18,6 +18,8 @@ module PxModule
       end
 
       details[:module_version] = @px_config[:sdk_name]
+      details[:cookie_origin] = px_ctx.context[:cookie_origin]
+
       px_data = {
         :type       => activity_type,
         :headers    => format_headers(px_ctx),
@@ -53,9 +55,9 @@ module PxModule
       end
 
       details = {
-        :block_uuid    => px_ctx.context[:uuid],
-        :block_score   => px_ctx.context[:score],
-        :block_reason  => px_ctx.context[:block_reason]
+        :block_uuid => px_ctx.context[:uuid],
+        :block_score => px_ctx.context[:score],
+        :block_reason => px_ctx.context[:blocking_reason]
       }
 
       send_to_perimeterx(PxModule::BLOCK_ACTIVITY, px_ctx, details)
@@ -70,7 +72,8 @@ module PxModule
 
       details = {
         :http_version  => px_ctx.context[:http_version],
-        :http_method   => px_ctx.context[:http_method]
+        :http_method   => px_ctx.context[:http_method],
+        :client_uuid   => px_ctx.context[:uuid]
       }
 
       if (px_ctx.context.key?(:decoded_cookie))

data/lib/perimeterx/internal/{perimeter_x_cookie_v1.rb → payload/perimeter_x_cookie_v1.rb}

@@ -1,5 +1,5 @@
 module PxModule
-  class PerimeterxCookieV1 < PerimeterxCookie
+  class PerimeterxCookieV1 < PerimeterxPayload
 
     attr_accessor :px_config, :px_ctx
 

data/lib/perimeterx/internal/{perimeter_x_cookie_v3.rb → payload/perimeter_x_cookie_v3.rb}

@@ -1,5 +1,5 @@
 module PxModule
-  class PerimeterxCookieV3 < PerimeterxCookie
+  class PerimeterxCookieV3 < PerimeterxPayload
 
     attr_accessor :px_config, :px_ctx, :cookie_hash
 

data/lib/perimeterx/internal/{perimeter_x_cookie.rb → payload/perimeter_x_payload.rb}

@@ -4,7 +4,7 @@ require 'openssl'
 require 'perimeterx/internal/exceptions/px_cookie_decryption_exception'
 
 module PxModule
-  class PerimeterxCookie
+  class PerimeterxPayload
     attr_accessor :px_cookie, :px_config, :px_ctx, :cookie_secret, :decoded_cookie
 
     def initialize(px_config)
@@ -13,7 +13,12 @@ module PxModule
     end
 
     def self.px_cookie_factory(px_ctx, px_config)
-      if (px_ctx.context[:px_cookie].key?(:v3))
+      if px_ctx.context[:cookie_origin] == 'header'
+        if (px_ctx.context[:px_cookie].key?(:v3))
+          return PerimeterxTokenV3.new(px_config,px_ctx)
+        end
+        return PerimeterxTokenV1.new(px_config,px_ctx)
+      elsif (px_ctx.context[:px_cookie].key?(:v3))
         return PerimeterxCookieV3.new(px_config, px_ctx)
       end
       return PerimeterxCookieV1.new(px_config, px_ctx)
@@ -131,8 +136,8 @@ module PxModule
       hmac = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, @cookie_secret, hmac_str)
       # ref: https://thisdata.com/blog/timing-attacks-against-string-comparison/
       password_correct = ActiveSupport::SecurityUtils.secure_compare(
-      ::Digest::SHA256.hexdigest(cookie_hmac),
-      ::Digest::SHA256.hexdigest(hmac)
+          ::Digest::SHA256.hexdigest(cookie_hmac),
+          ::Digest::SHA256.hexdigest(hmac)
       )
 
     end

data/lib/perimeterx/internal/payload/perimeter_x_token_v1.rb

@@ -0,0 +1,38 @@
+module PxModule
+  class PerimeterxTokenV1 < PerimeterxPayload
+
+    attr_accessor :px_config, :px_ctx
+
+    def initialize(px_config, px_ctx)
+      super(px_config)
+      @px_ctx = px_ctx
+      @px_cookie = px_ctx.get_px_cookie
+      @cookie_secret = px_config[:cookie_key]
+      @logger.debug('PerimeterxTokenV1[initialize]')
+    end
+
+    def cookie_score
+      return @decoded_cookie[:s][:b]
+    end
+
+    def cookie_hmac
+      return @decoded_cookie[:h]
+    end
+
+    def valid_format?(cookie)
+      return cookie.key?(:t) && cookie.key?(:s) && cookie[:s].key?(:b) && cookie.key?(:s) && cookie.key?(:v) && cookie.key?(:h)
+    end
+
+    def cookie_block_action
+      return 'c'
+    end
+
+    def secured?
+      hmac_str = "#{cookie_time}#{@decoded_cookie[:s][:a]}#{cookie_score}#{cookie_uuid}#{cookie_vid}"
+
+      return hmac_valid?(hmac_str, cookie_hmac)
+    end
+
+  end
+
+end

data/lib/perimeterx/internal/payload/perimeter_x_token_v3.rb

@@ -0,0 +1,36 @@
+module PxModule
+  class PerimeterxTokenV3 < PerimeterxPayload
+
+    attr_accessor :px_config, :px_ctx, :cookie_hash
+
+    def initialize(px_config, px_ctx)
+      super(px_config)
+      hash, cookie = px_ctx.get_px_cookie().split(':', 2)
+      @px_cookie = cookie
+      @cookie_hash = hash
+      @px_ctx = px_ctx
+      @cookie_secret = px_config[:cookie_key]
+      @logger.debug('PerimeterxTokenV3[initialize]')
+    end
+
+    def cookie_score
+      return @decoded_cookie[:s]
+    end
+
+    def cookie_hmac
+      return @cookie_hash
+    end
+
+    def valid_format?(cookie)
+      return cookie.key?(:t) && cookie.key?(:s) && cookie.key?(:u) && cookie.key?(:u) && cookie.key?(:a)
+    end
+
+    def cookie_block_action
+      @decoded_cookie[:a]
+    end
+
+    def secured?
+      return hmac_valid?(@px_cookie, cookie_hmac)
+    end
+  end
+end

data/lib/perimeterx/internal/perimeter_x_context.rb

@@ -7,31 +7,42 @@ module PxModule
     attr_accessor :px_config
 
     def initialize(px_config, req)
-      @logger = px_config[:logger];
-      @logger.debug("PerimeterXContext[initialize] ")
+      @logger = px_config[:logger]
+      @logger.debug('PerimeterXContext[initialize]')
       @context = Hash.new
 
       @context[:px_cookie] = Hash.new
       @context[:headers] = Hash.new
+      @context[:cookie_origin] = 'cookie'
       cookies = req.cookies
-      if (!cookies.empty?)
+
+      # Get token from header
+      if req.headers[PxModule::TOKEN_HEADER]
+        @context[:cookie_origin] = 'header'
+        token = req.headers[PxModule::TOKEN_HEADER]
+        if token.include? ':'
+          exploded_token = token.split(':', 2)
+          cookie_sym = "v#{exploded_token[0]}".to_sym
+          @context[:px_cookie][cookie_sym] = exploded_token[1]
+        end
+      elsif !cookies.empty? # Get cookie from jar
         # Prepare hashed cookies
         cookies.each do |k, v|
           case k.to_s
-            when "_px3"
+            when '_px3'
               @context[:px_cookie][:v3] = v
-            when "_px"
+            when '_px'
               @context[:px_cookie][:v1] = v
-            when "_pxCaptcha"
+            when '_pxCaptcha'
               @context[:px_captcha] = v
           end
         end #end case
       end #end empty cookies
 
       req.headers.each do |k, v|
-        if (k.start_with? "HTTP_")
-          header = k.to_s.gsub("HTTP_", "")
-          header = header.gsub("_", "-").downcase
+        if (k.start_with? 'HTTP_')
+          header = k.to_s.gsub('HTTP_', '')
+          header = header.gsub('_', '-').downcase
           @context[:headers][header.to_sym] = v
         end
       end #end headers foreach
@@ -52,9 +63,9 @@ module PxModule
       end
 
       if req.server_protocol
-          httpVer = req.server_protocol.split("/")
+          httpVer = req.server_protocol.split('/')
           if httpVer.size > 0
-              @context[:http_version] = httpVer[1];
+              @context[:http_version] = httpVer[1]
           end
       end
       @context[:http_method] = req.method
@@ -65,19 +76,19 @@ module PxModule
 		sensitive_routes.each do |sensitive_route|
 			return true if uri.start_with? sensitive_route
 		end
-		return false
+    false
 	end
 
     def set_block_action_type(action)
       @context[:block_action] = case action
-        when "c"
-          "captcha"
-        when "b"
-          return "block"
-        when "j"
-          return "challenge"
+        when 'c'
+          'captcha'
+        when 'b'
+          return 'block'
+        when 'j'
+          return 'challenge'
         else
-          return "captcha"
+          return captcha
         end
     end
 

data/lib/perimeterx/internal/validators/perimeter_x_captcha_validator.rb

@@ -48,7 +48,7 @@ module PxModule
 
         if (response.status_code == 200)
           response_body = eval(response.body)
-          if ( response_body[:status] == 0 )
+          if ( response_body[:code] == 0 )
             captcha_validated = true
           end
         end

data/lib/perimeterx/internal/validators/perimeter_x_cookie_validator.rb

@@ -1,7 +1,9 @@
 require 'perimeterx/utils/px_constants'
-require 'perimeterx/internal/perimeter_x_cookie'
-require 'perimeterx/internal/perimeter_x_cookie_v1'
-require 'perimeterx/internal/perimeter_x_cookie_v3'
+require 'perimeterx/internal/payload/perimeter_x_payload'
+require 'perimeterx/internal/payload/perimeter_x_token_v1'
+require 'perimeterx/internal/payload/perimeter_x_token_v3'
+require 'perimeterx/internal/payload/perimeter_x_cookie_v1'
+require 'perimeterx/internal/payload/perimeter_x_cookie_v3'
 
 module PxModule
   class PerimeterxCookieValidator
@@ -24,7 +26,7 @@ module PxModule
         end
 
         # Deserialize cookie start
-        cookie = PerimeterxCookie.px_cookie_factory(px_ctx, @px_config)
+        cookie = PerimeterxPayload.px_cookie_factory(px_ctx, @px_config)
         if (!cookie.deserialize())
           @logger.warn("PerimeterxCookieValidator:[verify]: invalid cookie")
           px_ctx.context[:s2s_call_reason] =  PxModule::COOKIE_DECRYPTION_FAILED
@@ -46,6 +48,7 @@ module PxModule
         if (cookie.high_score?)
           @logger.warn("PerimeterxCookieValidator:[verify]: cookie high score")
           px_ctx.context[:s2s_call_reason] = PxModule::COOKIE_HIGH_SCORE
+          px_ctx.context[:blocking_reason] = 'cookie_high_score'
           return true, px_ctx
         end
 
@@ -54,12 +57,12 @@ module PxModule
           px_ctx.context[:s2s_call_reason] = PxModule::COOKIE_VALIDATION_FAILED
           return false, px_ctx
         end
-		
-	if (px_ctx.context[:sensitive_route])
-	  @logger.info("PerimeterxCookieValidator:[verify]: cookie was verified but route is sensitive")
-	  px_ctx.context[:s2s_call_reason] = PxModule::SENSITIVE_ROUTE
-	  return false, px_ctx
-	end
+
+        if (px_ctx.context[:sensitive_route])
+          @logger.info("PerimeterxCookieValidator:[verify]: cookie was verified but route is sensitive")
+          px_ctx.context[:s2s_call_reason] = PxModule::SENSITIVE_ROUTE
+          return false, px_ctx
+        end
 
         @logger.debug("PerimeterxCookieValidator:[verify]: cookie validation passed succesfully")
 

data/lib/perimeterx/internal/validators/perimeter_x_s2s_validator.rb

@@ -5,11 +5,11 @@ module PxModule
 
     def initialize(px_config, http_client)
       super(px_config, http_client)
-      @logger.debug("PerimeterxS2SValidator[initialize]")
+      @logger.debug('PerimeterxS2SValidator[initialize]')
     end
 
     def send_risk_request(px_ctx)
-      @logger.debug("PerimeterxS2SValidator[send_risk_request]: send_risk_request")
+      @logger.debug('PerimeterxS2SValidator[send_risk_request]: send_risk_request')
 
       risk_mode = PxModule::RISK_MODE_ACTIVE
       if @px_config[:module_mode] == PxModule::MONITOR_MODE
@@ -26,6 +26,7 @@ module PxModule
         :additional => {
           :s2s_call_reason => px_ctx.context[:s2s_call_reason],
           :module_version => @px_config[:sdk_name],
+          :cookie_origin => px_ctx.context[:cookie_origin],
           :http_method => px_ctx.context[:http_method],
           :http_version => px_ctx.context[:http_version],
           :risk_mode => risk_mode
@@ -103,7 +104,7 @@ module PxModule
       if(response.code != 200)
         @logger.warn("PerimeterxS2SValidator[verify]: bad response, return code #{response.code}")
         px_ctx.context[:uuid] = ""
-        px_ctx.context[:s2s_error_msg] = response_body[:message]
+        px_ctx.context[:s2s_error_msg] = !response_body || response_body[:message].nil? ? 'unknown' : response_body[:message]
       end
 
       @logger.debug("PerimeterxS2SValidator[verify]: done")

data/lib/perimeterx/utils/px_constants.rb

@@ -4,33 +4,35 @@ module PxModule
   # Misc
   MONITOR_MODE = 1
   ACTIVE_MODE = 2
-  RISK_MODE_ACTIVE = "active_blocking"
-  RISK_MODE_MONITOR = "monitor"
+  RISK_MODE_ACTIVE = 'active_blocking'
+  RISK_MODE_MONITOR = 'monitor'
   SDK_NAME = "RUBY SDK v#{PxModule::VERSION}"
 
   # Routes
-  API_V1_S2S = "/api/v1/collector/s2s"
-  API_V1_CAPTCHA = "/api/v1/risk/captcha"
-  API_V2_RISK = "/api/v2/risk"
+  API_V1_S2S = '/api/v1/collector/s2s'
+  API_V1_CAPTCHA = '/api/v1/risk/captcha'
+  API_V2_RISK = '/api/v2/risk'
 
   # Activity Types
-  BLOCK_ACTIVITY = "block"
-  PAGE_REQUESTED_ACTIVITY = "page_requested"
+  BLOCK_ACTIVITY = 'block'
+  PAGE_REQUESTED_ACTIVITY = 'page_requested'
 
   # PxContext
-  NO_COOKIE = "no_cookie"
-  INVALID_COOKIE = "invalid_cookie"
-  EXPIRED_COOKIE = "cookie_expired"
-  COOKIE_HIGH_SCORE = "cookie_high_score"
-  COOKIE_VALIDATION_FAILED = "cookie_validation_failed"
-  COOKIE_DECRYPTION_FAILED = "cookie_decryption_failed"
-  SENSITIVE_ROUTE = "sensitive_route"
+  NO_COOKIE = 'no_cookie'
+  INVALID_COOKIE = 'invalid_cookie'
+  EXPIRED_COOKIE = 'cookie_expired'
+  COOKIE_HIGH_SCORE = 'cookie_high_score'
+  COOKIE_VALIDATION_FAILED = 'cookie_validation_failed'
+  COOKIE_DECRYPTION_FAILED = 'cookie_decryption_failed'
+  SENSITIVE_ROUTE = 'sensitive_route'
 
   # Templates
-  BLOCK_TEMPLATE = "block.mustache"
-  CAPTCHA_TEMPLATE = "captcha.mustache"
+  BLOCK_TEMPLATE = 'block'
+  CAPTCHA_TEMPLATE = 'captcha'
+  TEMPLATE_EXT = '.mustache'
 
-  # Tempalte Props
+
+  # Template Props
   PROP_REF_ID = :refId
   PROP_APP_ID = :appId
   PROP_VID = :vid
@@ -39,7 +41,11 @@ module PxModule
   PROP_CUSTOM_LOGO = :customLogo
   PROP_CSS_REF = :cssRef
   PROP_JS_REF = :jsRef
+  HOST_URL = :hostUrl
 
   VISIBLE = 'visible'
   HIDDEN = 'hidden'
+
+  # Mobile SDK
+  TOKEN_HEADER = 'X-PX-AUTHORIZATION'
 end

data/lib/perimeterx/utils/px_http_client.rb

@@ -15,7 +15,7 @@ module PxModule
       @logger.debug("PxHttpClient[initialize]: HTTP client is being initilized with base_uri: #{px_config[:perimeterx_server_host]}")
     end
 
-    # Runs a POST commant to Perimeter X servers
+    # Runs a POST command to Perimeter X servers
     # Params:
     # +path+:: string containing uri
     # +body+:: hash object, containing the request body, must be converted to json format

data/lib/perimeterx/utils/px_template_factory.rb

@@ -5,15 +5,20 @@ module PxModule
 
     def self.get_template(px_ctx, px_config)
       logger = px_config[:logger]
-      if (px_config[:challenge_enabled] && px_ctx.context[:block_action] == "challenge")
-        logger.debug("PxTemplateFactory[get_template]: px challange triggered")
+      if (px_config[:challenge_enabled] && px_ctx.context[:block_action] == 'challenge')
+        logger.debug('PxTemplateFactory[get_template]: px challange triggered')
         return px_ctx.context[:block_action_data].html_safe
       end
 
-      logger.debug("PxTemplateFactory[get_template]: rendering template")
-      template_type = px_config[:captcha_enabled] ? PxModule::CAPTCHA_TEMPLATE : BLOCK_TEMPLATE
+      logger.debug('PxTemplateFactory[get_template]: rendering template')
+      template_type = px_ctx.context[:block_action] == 'captcha' ? PxModule::CAPTCHA_TEMPLATE : BLOCK_TEMPLATE
 
-      Mustache.template_file =  "#{File.dirname(__FILE__) }/templates/#{template_type}"
+      template_postfix = ''
+      if px_ctx.context[:cookie_origin] == 'header'
+        template_postfix = '.mobile'
+      end
+
+      Mustache.template_file =  "#{File.dirname(__FILE__) }/templates/#{template_type}#{template_postfix}#{PxModule::TEMPLATE_EXT}"
       view = Mustache.new
 
       view[PxModule::PROP_APP_ID] = px_config[:app_id]
@@ -23,9 +28,10 @@ module PxModule
       view[PxModule::PROP_CUSTOM_LOGO] = px_config[:custom_logo]
       view[PxModule::PROP_CSS_REF] = px_config[:css_ref]
       view[PxModule::PROP_JS_REF] = px_config[:js_ref]
+      view[PxModule::HOST_URL] = "https://collector-#{px_config[:app_id]}.perimeterx.net"
       view[PxModule::PROP_LOGO_VISIBILITY] = px_config[:custom_logo] ? PxModule::VISIBLE : PxModule::HIDDEN
 
       return view.render.html_safe
     end
   end #end class
-end #end module
+end #end module

data/lib/perimeterx/utils/templates/block.mobile.mustache

@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Access to this page has been denied.</title>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300" rel="stylesheet">
+    <style>
+        html,body{
+            margin: 0;
+            padding: 0;
+            font-family: 'Open Sans', sans-serif;
+            color: #000;
+        }
+
+        a{
+            color: #c5c5c5;
+            text-decoration: none;
+        }
+
+        .container{
+            align-items: center;
+            display: flex;
+            flex: 1;
+            justify-content: space-between;
+            flex-direction: column;
+            height: 100%;
+        }
+
+        .container > div {
+            width: 100%;
+            display: flex;
+            justify-content:center;
+        }
+
+        .container > div > div {
+            display: flex;
+            width: 80%;
+        }
+
+        .customer-logo-wrapper{
+            padding-top: 2rem;
+            flex-grow: 0;
+            background-color: #fff;
+            visibility: {{logoVisibility}};
+        }
+
+        .customer-logo{
+            border-bottom: 1px solid #000;
+        }
+
+        .customer-logo > img{
+            padding-bottom: 1rem;
+            max-height: 50px;
+            max-width: auto;
+        }
+
+        .page-title-wrapper{
+            flex-grow: 2;
+        }
+        .page-title {
+            flex-direction: column-reverse;
+        }
+
+        .content-wrapper{
+            flex-grow: 5;
+        }
+        .content{
+            flex-direction: column;
+        }
+
+        .page-footer-wrapper{
+            align-items: center;
+            flex-grow: 0.2;
+            background-color: #000;
+            color: #c5c5c5;
+            font-size: 70%;
+        }
+        @media (min-width:768px){
+            html,body{
+                height: 100%;
+            }
+        }
+    </style>
+    <!-- Custom CSS -->
+    {{# cssRef }}
+        <link rel="stylesheet" type="text/css" href="{{cssRef}}" />
+    {{/ cssRef }}
+</head>
+<body>
+<section class="container">
+    <div class="customer-logo-wrapper">
+        <div class="customer-logo">
+            <img src="{{customLogo}}" alt="Logo"/>
+        </div>
+    </div>
+    <div class="page-title-wrapper">
+        <div class="page-title">
+            <h1>Access to this page has been denied.</h1>
+        </div>
+    </div>
+    <div class="content-wrapper">
+        <div class="content">
+            <p>
+                You have been blocked because we believe you are using automation tools to browse the website.
+            </p>
+            <p>
+                Please note that Javascript and Cookies must be enabled on your browser to access the website.
+            </p>
+            <p>
+                If you think you have been blocked by mistake, please contact the website administrator with the reference ID below.
+            </p>
+            <p>
+                Reference ID: #{{refId}}
+            </p>
+        </div>
+    </div>
+    <div class="page-footer-wrapper">
+        <div class="page-footer">
+            <p>
+                Powered by
+                <a href="https://www.perimeterx.com">PerimeterX</a>
+                , Inc.
+            </p>
+        </div>
+    </div>
+</section>
+<!-- Custom Script -->
+{{# jsRef }}
+    <script src="{{jsRef}}"></script>
+{{/ jsRef }}
+</body>
+</html>

data/lib/perimeterx/utils/templates/captcha.mobile.mustache

@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Access to this page has been denied.</title>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300" rel="stylesheet">
+    <style>
+        html,body{
+            margin: 0;
+            padding: 0;
+            font-family: 'Open Sans', sans-serif;
+            color: #000;
+        }
+
+        a{
+            color: #c5c5c5;
+            text-decoration: none;
+        }
+
+        .container{
+            align-items: center;
+            display: flex;
+            flex: 1;
+            justify-content: space-between;
+            flex-direction: column;
+            height: 100%;
+        }
+
+        .container > div {
+            width: 100%;
+            display: flex;
+            justify-content:center;
+        }
+
+        .container > div > div {
+            display: flex;
+            width: 80%;
+        }
+
+        .customer-logo-wrapper{
+            padding-top: 2rem;
+            flex-grow: 0;
+            background-color: #fff;
+            visibility: {{logoVisibility}};
+        }
+
+        .customer-logo{
+            border-bottom: 1px solid #000;
+        }
+
+        .customer-logo > img{
+            padding-bottom: 1rem;
+            max-height: 50px;
+            max-width: auto;
+        }
+
+        .page-title-wrapper{
+            flex-grow: 2;
+        }
+        .page-title {
+            flex-direction: column-reverse;
+        }
+
+        .content-wrapper{
+            flex-grow: 5;
+        }
+        .content{
+            flex-direction: column;
+        }
+
+        .page-footer-wrapper{
+            align-items: center;
+            flex-grow: 0.2;
+            background-color: #000;
+            color: #c5c5c5;
+            font-size: 70%;
+        }
+
+        @media (min-width:768px){
+            html,body{
+                height: 100%;
+            }
+        }
+    </style>
+    <!-- Custom CSS -->
+    {{#cssRef}}
+        <link rel="stylesheet" type="text/css" href="{{cssRef}}" />
+    {{/cssRef}}
+    <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+</head>
+
+<body>
+<section class="container">
+    <div class="customer-logo-wrapper">
+        <div class="customer-logo">
+            <img src="{{customLogo}}" alt="Logo"/>
+        </div>
+    </div>
+    <div class="page-title-wrapper">
+        <div class="page-title">
+            <h1>Please verify you are a human</h1>
+        </div>
+    </div>
+    <div class="content-wrapper">
+        <div class="content">
+            <p>
+                Please click "I am not a robot" to continue
+            </p>
+            <div class="g-recaptcha" data-sitekey="6Lcj-R8TAAAAABs3FrRPuQhLMbp5QrHsHufzLf7b" data-callback="handleCaptcha" data-theme="dark">
+            </div>
+            <p>
+                Access to this page has been denied because we believe you are using automation tools to browse the website.
+            </p>
+            <p>
+                This may happen as a result of the following:
+            </p>
+            <ul>
+                <li>
+                    Javascript is disabled or blocked by an extension (ad blockers for example)
+                </li>
+                <li>
+                    Your browser does not support cookies
+                </li>
+            </ul>
+            <p>
+                Please make sure that Javascript and cookies are enabled on your browser and that you are not blocking them from loading.
+            </p>
+            <p>
+                Reference ID: #{{refId}}
+            </p>
+        </div>
+    </div>
+    <div class="page-footer-wrapper">
+        <div class="page-footer">
+            <p>
+                Powered by
+                <a href="https://www.perimeterx.com">PerimeterX</a>
+                , Inc.
+            </p>
+        </div>
+    </div>
+</section>
+<!-- Captcha -->
+<script>
+    function captchaSolved(res) {
+        window.location.href = '/px/captcha_callback?status=' + res.status;
+    }
+
+    function handleCaptcha(response) {
+        var appId = '{{appId}}';
+        var vid = '{{vid}}';
+        var uuid = '{{uuid}}';
+        var collectorUrl = '{{{hostUrl}}}';
+        var req = new XMLHttpRequest();
+        req.open('POST', collectorUrl + '/api/v1/collector/captcha');
+        req.setRequestHeader('Content-Type', 'application/json');
+        req.addEventListener('error', function() {
+            captchaSolved({
+                status: 1
+            });
+        });
+        req.addEventListener('cancel', function() {
+            captchaSolved({
+                status: 2
+            });
+        });
+        req.addEventListener('load', function() {
+            if (req.status == 200) {
+                try {
+                    var responseJSON = JSON.parse(req.responseText);
+                    return captchaSolved(responseJSON);
+                } catch (ex) {}
+            }
+            captchaSolved({
+                status: 3
+            });
+        });
+        req.send(JSON.stringify({
+            appId: appId,
+            uuid: uuid,
+            vid: vid,
+            pxCaptcha: response,
+            hostname: window.location.hostname,
+            request: {
+                url: window.location.href
+            }
+        }));
+    }
+</script>
+<!-- Custom Script -->
+{{#jsRef}}
+    <script src="{{jsRef}}"></script>
+{{/jsRef}}
+</body>
+</html>

data/lib/perimeterx/version.rb

@@ -1,3 +1,3 @@
 module PxModule
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/readme.md

@@ -61,7 +61,7 @@ On the Rails controller include the PerimeterX SDK via the before_action and cal
 class HomeController < ApplicationController
   include PxModule
 
-  before_filter :px_verify_request
+  before_action :px_verify_request
   ...
   ...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perimeter_x
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Nitzan Goldfeder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,6 +156,7 @@ extra_rdoc_files:
 - changelog.md
 files:
 - ".gitignore"
+- ".travis.yml"
 - Dockerfile
 - Gemfile
 - Gemfile.lock
@@ -171,10 +172,12 @@ files:
 - lib/perimeterx/internal/clients/perimeter_x_activity_client.rb
 - lib/perimeterx/internal/clients/perimeter_x_risk_client.rb
 - lib/perimeterx/internal/exceptions/px_cookie_decryption_exception.rb
+- lib/perimeterx/internal/payload/perimeter_x_cookie_v1.rb
+- lib/perimeterx/internal/payload/perimeter_x_cookie_v3.rb
+- lib/perimeterx/internal/payload/perimeter_x_payload.rb
+- lib/perimeterx/internal/payload/perimeter_x_token_v1.rb
+- lib/perimeterx/internal/payload/perimeter_x_token_v3.rb
 - lib/perimeterx/internal/perimeter_x_context.rb
-- lib/perimeterx/internal/perimeter_x_cookie.rb
-- lib/perimeterx/internal/perimeter_x_cookie_v1.rb
-- lib/perimeterx/internal/perimeter_x_cookie_v3.rb
 - lib/perimeterx/internal/validators/perimeter_x_captcha_validator.rb
 - lib/perimeterx/internal/validators/perimeter_x_cookie_validator.rb
 - lib/perimeterx/internal/validators/perimeter_x_s2s_validator.rb
@@ -182,7 +185,9 @@ files:
 - lib/perimeterx/utils/px_http_client.rb
 - lib/perimeterx/utils/px_logger.rb
 - lib/perimeterx/utils/px_template_factory.rb
+- lib/perimeterx/utils/templates/block.mobile.mustache
 - lib/perimeterx/utils/templates/block.mustache
+- lib/perimeterx/utils/templates/captcha.mobile.mustache
 - lib/perimeterx/utils/templates/captcha.mustache
 - lib/perimeterx/version.rb
 - perimeter_x.gemspec