mn_middleware_gem 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2718893addaf4f09f729d99b0f544564e20fb923d800a9f06ada194a274a48be
-  data.tar.gz: 1b0f8ce227169a119de95a16c2052f06e4dd1deb2a935deccffadcf6429b9c32
+  metadata.gz: 063321b466f6a0888755389b5ae7b48c6ff6ac8c869e6f8bae56a3d1e7c3d696
+  data.tar.gz: ad0cabcd0f4adbdd27da6e995d346c0f0c1e74aa802f0dbbe6a0dbb1d64b7297
 SHA512:
-  metadata.gz: 9c1b7605f48fabf4ba3f9c54b9c24a6a38ddc14a0fe339f6921a7cddb83a445ec94d9b118fb6a93e6e6666101b717cdcc6789c93c3b33e7ec5cb1b02738574cd
-  data.tar.gz: a56bb4f343e5070444d2152fc931dbadea2b8887379969aeb1537c4e12ba3f5f7bab8495630cedc33f03d61f204ab0900088ad66bede49eacdfa1a7ccc3c7e36
+  metadata.gz: 16d9818d742c9303fd1907f16060ce810ccafbee275cbe98ce3e521b5e78563bf6fa2072fbd0c0dc357afbfd4d5427e0bc08dd712f2a4f2565a33d8b6ff05063
+  data.tar.gz: 2e609cbcb57f17cafdd6583666dda787b27e529663f45b58d5a63846d6a558002e2d38ead00ef27b54adcad786e820c56b70a15db75044780bb44924283e01d8

data/lib/mn_middleware_gem/middleware/correlation_id.rb

@@ -0,0 +1,55 @@
+require 'securerandom'
+require 'net/http'
+
+class CorrelationId
+  def initialize app
+    @app = app
+  end
+
+  def call(env)
+    request_id = nil
+
+    # see if you can get an existing request id
+    # from these sources, in order of priority
+    if env['HTTP_X_REQUEST_ID']
+      request_id = env['HTTP_X_REQUEST_ID']
+      Rails.logger.debug "Found HTTP_X_REQUEST_ID #{request_id}"
+    elsif env['HTTP_X_AMZN_TRACE_ID']
+      request_id = env['HTTP_X_REQUEST_ID'] = env['HTTP_X_AMZN_TRACE_ID'].match(/^.*Root=([^;]*).*$/).captures[0]
+      Rails.logger.debug "Found HTTP_X_AMZN_TRACE_ID #{request_id}"
+    end
+
+    # if no request id is available, generate one
+    if request_id.nil?
+      request_id = env['HTTP_X_REQUEST_ID'] = SecureRandom.uuid
+      Rails.logger.debug "Set request_id #{request_id}"
+    end
+
+    # set the request id in the request store
+    # so we can use it later in the Net::HTTPHeader monkey patch
+    RequestStore.store[:request_id] = request_id
+
+    # call the superclass and get the app return values
+    status, headers, response = @app.call(env)
+
+    # set the request id in the response header
+    headers['X-Request-Id'] = request_id
+
+    # return all the values back up
+    [status, headers, response]
+  end
+end
+
+# monkey patch net http to inject our extra header
+module Net::HTTPHeader
+  alias original_initialize_http_header initialize_http_header
+
+  def initialize_http_header(initheader)
+    if RequestStore.store[:request_id]
+      Rails.logger.debug "Adding X-Request-Id to outgoing header #{RequestStore.store[:request_id]}"
+      initheader ||= {}
+      initheader['X-Request-Id'] = RequestStore.store[:request_id]
+    end
+    original_initialize_http_header(initheader)
+  end
+end

data/lib/mn_middleware_gem/middleware/remote_ip_logger.rb

@@ -0,0 +1,15 @@
+class RemoteIpLogger
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    if env["HTTP_X_FORWARDED_FOR"]
+      remote_ip = env["HTTP_X_FORWARDED_FOR"].split(",")[0]
+      env['REMOTE_ADDR'] = env["action_dispatch.remote_ip"] = env["HTTP_X_FORWARDED_FOR"] = remote_ip
+      @app.call(env)
+    else
+      @app.call(env)
+    end
+  end
+end

data/lib/mn_middleware_gem/version.rb

@@ -1,3 +1,3 @@
 module MnMiddlewareGem
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mn_middleware_gem
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Shamim Mirzai
@@ -73,6 +73,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mn_middleware_gem.rb
+- lib/mn_middleware_gem/middleware/correlation_id.rb
+- lib/mn_middleware_gem/middleware/remote_ip_logger.rb
 - lib/mn_middleware_gem/version.rb
 homepage: https://github.com/mumsnet/mn_middleware_gem
 licenses: []