moesif_rack 1.4.19 → 2.0.1

data/lib/moesif_rack/regex_config_helper.rb

@@ -1,119 +1,111 @@
 require 'moesif_api'
 
-require_relative './moesif_helpers.rb'
+require_relative './moesif_helpers'
 
 class RegexConfigHelper
-
-    def initialize debug
-        @debug = debug
+  def initialize(debug)
+    @debug = debug
+  end
+
+  def prepare_config_mapping(event)
+    # Function to prepare config mapping
+    # Params:
+    #  - event: Event to be logged
+    # Return:
+    #  - regex_config: Regex config mapping
+    regex_config = {}
+
+    # Config mapping for request.verb
+    if defined? event.request.verb
+      regex_config['request.verb'] = event.request.verb
     end
 
-    def prepare_config_mapping(event)
-        # Function to prepare config mapping
-        # Params:
-        #  - event: Event to be logged
-        # Return:
-        #  - regex_config: Regex config mapping
-        regex_config = {}
-
-        # Config mapping for request.verb
-        if defined? event.request.verb
-            regex_config["request.verb"] = event.request.verb
-        end
-
-        # Config mapping for request.uri
-        if defined? event.request.uri
-            extracted = /http[s]*:\/\/[^\/]+(\/[^?]+)/.match(event.request.uri)
-            if !extracted.nil?
-              route_mapping = extracted.captures[0]
-            else
-              route_mapping = '/'
-            end
-            regex_config["request.route"] = route_mapping
-        end
-
-        # Config mapping for request.ip_address
-        if defined? event.request.ip_address
-            regex_config["request.ip_address"] = event.request.ip_address
-        end
-
-        # Config mapping for response.status
-        if defined? event.response.status
-            regex_config["response.status"] = event.response.status
-        end
+    # Config mapping for request.uri
+    if defined? event.request.uri
+      extracted = %r{https*://[^/]+(/[^?]+)}.match(event.request.uri)
+      route_mapping = if !extracted.nil?
+                        extracted.captures[0]
+                      else
+                        '/'
+                      end
+      regex_config['request.route'] = route_mapping
+    end
 
-        return regex_config
+    # Config mapping for request.ip_address
+    if defined? event.request.ip_address
+      regex_config['request.ip_address'] = event.request.ip_address
+    end
 
+    # Config mapping for response.status
+    if defined? event.response.status
+      regex_config['response.status'] = event.response.status
     end
 
-    def regex_match(event_value, condition_value)
-        # Function to perform the regex matching with event value and condition value
-        # Params:
-        #  - event_value: Value associated with event (request)
-        #  - condition_value: Value associated with the regex config condition
-        # Return:
-        #  - regex_matched: Regex matched value to determine if the regex match was successful
-
-        extracted = Regexp.new(condition_value).match(event_value)
-        if !extracted.nil?
-          return extracted.to_s
+    regex_config
+  end
+
+  def regex_match(event_value, condition_value)
+    # Function to perform the regex matching with event value and condition value
+    # Params:
+    #  - event_value: Value associated with event (request)
+    #  - condition_value: Value associated with the regex config condition
+    # Return:
+    #  - regex_matched: Regex matched value to determine if the regex match was successful
+
+    extracted = Regexp.new(condition_value).match(event_value)
+    return if extracted.nil?
+
+    extracted.to_s
+  end
+
+  def fetch_sample_rate_on_regex_match(regex_configs, config_mapping)
+    # Function to fetch the sample rate and determine if request needs to be block or not
+    # Args:
+    #  - regex_configs: Regex configs
+    #  - config_mapping: Config associated with the request
+    # Return:
+    #  - sample_rate: Sample rate
+
+    # Iterate through the list of regex configs
+    regex_configs.each do |regex_rule|
+      # Fetch the sample rate
+      sample_rate = regex_rule['sample_rate']
+      # Fetch the conditions
+      conditions = regex_rule['conditions']
+      # Bool flag to determine if the regex conditions are matched
+      regex_matched = false
+      # Create a table to hold the conditions mapping (path and value)
+      condition_table = {}
+
+      # Iterate through the regex rule conditions and map the path and value
+      conditions.each do |condition|
+        # Add condition path -> value to the condition table
+        condition_table[condition['path']] = condition['value']
+      end
+
+      # Iterate through conditions table and perform `and` operation between each conditions
+      condition_table.each do |path, values|
+        # Check if the path exists in the request config mapping
+        if !config_mapping[path].nil?
+          # Fetch the value of the path in request config mapping
+          event_data = config_mapping[path]
+
+          # Perform regex matching with event value
+          regex_matched = regex_match(event_data, values)
+        else
+          # Path does not exists in request config mapping, so no need to match regex condition rule
+          regex_matched = false
         end
-    end
 
-    def fetch_sample_rate_on_regex_match(regex_configs, config_mapping)
-        # Function to fetch the sample rate and determine if request needs to be block or not
-        # Args:
-        #  - regex_configs: Regex configs
-        #  - config_mapping: Config associated with the request
-        # Return:
-        #  - sample_rate: Sample rate
-
-        # Iterate through the list of regex configs
-        regex_configs.each { |regex_rule|
-            # Fetch the sample rate
-            sample_rate = regex_rule["sample_rate"]
-            # Fetch the conditions
-            conditions = regex_rule["conditions"]
-            # Bool flag to determine if the regex conditions are matched
-            regex_matched = false
-            # Create a table to hold the conditions mapping (path and value)
-            condition_table = {}
-
-            # Iterate through the regex rule conditions and map the path and value
-            conditions.each { |condition|
-                # Add condition path -> value to the condition table
-                condition_table[condition["path"]] = condition["value"]
-            }
-
-            # Iterate through conditions table and perform `and` operation between each conditions
-            condition_table.each do |path, values|
-
-                # Check if the path exists in the request config mapping
-                if !config_mapping[path].nil?
-                    # Fetch the value of the path in request config mapping
-                    event_data = config_mapping[path]
-
-                    # Perform regex matching with event value
-                    regex_matched = regex_match(event_data, values)
-                else
-                    # Path does not exists in request config mapping, so no need to match regex condition rule
-                    regex_matched = false
-                end
-
-                # If one of the rule does not match, skip the condition & avoid matching other rules for the same condition
-                if !regex_matched
-                    break
-                end
-            end
-
-            # If regex conditions matched, return sample rate
-            if regex_matched
-                return sample_rate
-            end
-        }
-
-        # If regex conditions are not matched, return sample rate as None and will use default sample rate
-        return nil
+        # If one of the rule does not match, skip the condition & avoid matching other rules for the same condition
+        break unless regex_matched
+      end
+
+      # If regex conditions matched, return sample rate
+      return sample_rate if regex_matched
     end
 
+    # If regex conditions are not matched, return sample rate as None and will use default sample rate
+    nil
+  end
 end

data/lib/moesif_rack/update_company.rb

@@ -1,56 +1,52 @@
 class CompanyHelper
-    def update_company(api_controller, debug, company_profile)
-        if company_profile.any?
-            if company_profile.key?("company_id")
-                begin
-                api_controller.update_company(MoesifApi::CompanyModel.from_hash(company_profile))
-                if debug
-                    puts "Update Company Successfully"
-                end
-                rescue MoesifApi::APIException => e
-                if e.response_code.between?(401, 403)
-                    puts "Unathorized accesss updating company to Moesif. Please verify your Application Id."
-                end
-                if debug
-                    puts "Error updating company to Moesif, with status code: "
-                    puts e.response_code
-                end
-                end
-            else 
-                puts "To update a company, a company_id field is required"
-            end
-            else 
-            puts "Expecting the input to be of the type - dictionary while updating user"
+  def update_company(api_controller, debug, company_profile)
+    if company_profile.any?
+      if company_profile.key?('company_id')
+        begin
+          api_controller.update_company(MoesifApi::CompanyModel.from_hash(company_profile))
+          puts 'Update Company Successfully' if debug
+        rescue MoesifApi::APIException => e
+          if e.response_code.between?(401, 403)
+            puts 'Unathorized accesss updating company to Moesif. Please verify your Application Id.'
+          end
+          if debug
+            puts 'Error updating company to Moesif, with status code: '
+            puts e.response_code
+          end
         end
+      else
+        puts 'To update a company, a company_id field is required'
+      end
+    else
+      puts 'Expecting the input to be of the type - dictionary while updating user'
     end
+  end
 
-    def update_companies_batch(api_controller, debug, company_profiles)
-        companyModels = []
-        company_profiles.each { |company| 
-        if company.key?("company_id")
-            companyModels << MoesifApi::CompanyModel.from_hash(company)
-        else 
-            puts "To update a company, a company_id field is required"
-        end
-        }
+  def update_companies_batch(api_controller, debug, company_profiles)
+    companyModels = []
+    company_profiles.each do |company|
+      if company.key?('company_id')
+        companyModels << MoesifApi::CompanyModel.from_hash(company)
+      else
+        puts 'To update a company, a company_id field is required'
+      end
+    end
 
-        if companyModels.any?
-            begin
-                api_controller.update_companies_batch(companyModels)
-                if debug
-                puts "Update Companies Successfully"
-                end
-            rescue MoesifApi::APIException => e
-                if e.response_code.between?(401, 403)
-                puts "Unathorized accesss updating companies to Moesif. Please verify your Application Id."
-                end
-                if debug
-                puts "Error updating companies to Moesif, with status code: "
-                puts e.response_code
-                end
-            end
-        else
-        puts "Expecting the input to be of the type - Array of hashes while updating companies in batch"
+    if companyModels.any?
+      begin
+        api_controller.update_companies_batch(companyModels)
+        puts 'Update Companies Successfully' if debug
+      rescue MoesifApi::APIException => e
+        if e.response_code.between?(401, 403)
+          puts 'Unathorized accesss updating companies to Moesif. Please verify your Application Id.'
+        end
+        if debug
+          puts 'Error updating companies to Moesif, with status code: '
+          puts e.response_code
         end
+      end
+    else
+      puts 'Expecting the input to be of the type - Array of hashes while updating companies in batch'
     end
+  end
 end

data/lib/moesif_rack/update_user.rb

@@ -1,56 +1,52 @@
 class UserHelper
-    def update_user(api_controller, debug, user_profile)
-        if user_profile.any?
-            if user_profile.key?("user_id")
-            begin
-                api_controller.update_user(MoesifApi::UserModel.from_hash(user_profile))
-                if debug
-                puts "Update User Successfully"
-                end
-            rescue MoesifApi::APIException => e
-                if e.response_code.between?(401, 403)
-                puts "Unathorized accesss updating user to Moesif. Please verify your Application Id."
-                end
-                if debug
-                puts "Error updating user to Moesif, with status code: "
-                puts e.response_code
-                end
-            end
-            else 
-            puts "To update an user, an user_id field is required"
-            end
-        else 
-            puts "Expecting the input to be of the type - dictionary while updating user"
+  def update_user(api_controller, debug, user_profile)
+    if user_profile.any?
+      if user_profile.key?('user_id')
+        begin
+          api_controller.update_user(MoesifApi::UserModel.from_hash(user_profile))
+          puts 'Update User Successfully' if debug
+        rescue MoesifApi::APIException => e
+          if e.response_code.between?(401, 403)
+            puts 'Unathorized accesss updating user to Moesif. Please verify your Application Id.'
+          end
+          if debug
+            puts 'Error updating user to Moesif, with status code: '
+            puts e.response_code
+          end
         end
+      else
+        puts 'To update an user, an user_id field is required'
+      end
+    else
+      puts 'Expecting the input to be of the type - dictionary while updating user'
     end
+  end
 
-    def update_users_batch(api_controller, debug, user_profiles)
-        userModels = []
-        user_profiles.each { |user| 
-        if user.key?("user_id")
-            userModels << MoesifApi::UserModel.from_hash(user)
-        else 
-            puts "To update an user, an user_id field is required"
-        end
-        }
+  def update_users_batch(api_controller, debug, user_profiles)
+    userModels = []
+    user_profiles.each do |user|
+      if user.key?('user_id')
+        userModels << MoesifApi::UserModel.from_hash(user)
+      else
+        puts 'To update an user, an user_id field is required'
+      end
+    end
 
-        if userModels.any?
-            begin
-            api_controller.update_users_batch(userModels)
-            if debug
-                puts "Update Users Successfully"
-            end
-            rescue MoesifApi::APIException => e
-            if e.response_code.between?(401, 403)
-                puts "Unathorized accesss updating user to Moesif. Please verify your Application Id."
-            end
-            if debug
-                puts "Error updating user to Moesif, with status code: "
-                puts e.response_code
-            end
-            end
-        else
-            puts "Expecting the input to be of the type - Array of hashes while updating users in batch"
+    if userModels.any?
+      begin
+        api_controller.update_users_batch(userModels)
+        puts 'Update Users Successfully' if debug
+      rescue MoesifApi::APIException => e
+        if e.response_code.between?(401, 403)
+          puts 'Unathorized accesss updating user to Moesif. Please verify your Application Id.'
+        end
+        if debug
+          puts 'Error updating user to Moesif, with status code: '
+          puts e.response_code
         end
+      end
+    else
+      puts 'Expecting the input to be of the type - Array of hashes while updating users in batch'
     end
+  end
 end

data/moesif_capture_outgoing/httplog/adapters/net_http.rb

@@ -1,29 +1,26 @@
 require 'time'
 
 module Net
-    class HTTP
-      alias orig_request request unless method_defined?(:orig_request)
-  
-      def request(request, body = nil, &block)
+  class HTTP
+    alias orig_request request unless method_defined?(:orig_request)
 
-        # Request Start Time
-        request_time = Time.now.utc.iso8601(3)
-        
-        # URL
-        url = "https://#{@address}#{request.path}"
+    def request(request, body = nil, &block)
+      # Request Start Time
+      request_time = Time.now.utc.iso8601(3)
 
-        # Response
-        @response = orig_request(request, body, &block)
+      # URL
+      url = "https://#{@address}#{request.path}"
 
-        # Response Time
-        response_time = Time.now.utc.iso8601(3)
-  
-        # Log Event to Moesif
-        if started?
-            MoesifCaptureOutgoing.call(url, request, request_time, @response, response_time)
-        end
-  
-        @response
-      end
+      # Response
+      @response = orig_request(request, body, &block)
+
+      # Response Time
+      response_time = Time.now.utc.iso8601(3)
+
+      # Log Event to Moesif
+      MoesifCaptureOutgoing.call(url, request, request_time, @response, response_time) if started?
+
+      @response
     end
   end
+end