Merge pull request #17 from PerimeterX/dev

Releasing version 1.3.0

Author: nitzanpx

.gitignore

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

.travis.yml

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

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    perimeter_x (1.2.0)
+    perimeter_x (1.3.0)
       activesupport (>= 4.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       mustache (~> 1.0, >= 1.0.3)
@@ -20,7 +20,7 @@ GEM
     ethon (0.10.1)
       ffi (>= 1.3.0)
     ffi (1.9.18)
-    i18n (0.8.1)
+    i18n (0.8.6)
     metaclass (0.0.4)
     minitest (5.10.1)
     mocha (1.2.1)

Rakefile

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

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
+

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

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_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 @@ def self.configure(params)
   end
 
 
-  # PerimtereX Module
+  # PerimeterX Module
   class PerimeterX
     @@__instance = nil
     @@mutex = Mutex.new
@@ -62,19 +82,19 @@ def self.configure(params)
 
     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 @@ def verify(env)
         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 @@ def verify(env)
       @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 @@ def verify(env)
       @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

lib/perimeterx/configuration.rb

@@ -20,7 +20,7 @@ class Configuration
       :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 @@ class Configuration
 
     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

lib/perimeterx/internal/clients/perimeter_x_activity_client.rb

@@ -18,6 +18,8 @@ def send_to_perimeterx(activity_type, px_ctx, details = [])
       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 @@ def send_block_activity(px_ctx)
       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 @@ def send_page_requested_activity(px_ctx)
 
       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))

…meterx/internal/perimeter_x_cookie_v1.rb …nternal/payload/perimeter_x_cookie_v1.rblib/perimeterx/internal/perimeter_x_cookie_v1.rb renamed to lib/perimeterx/internal/payload/perimeter_x_cookie_v1.rb lib/perimeterx/internal/perimeter_x_cookie_v1.rb renamed to lib/perimeterx/internal/payload/perimeter_x_cookie_v1.rb

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