logjam_agent 0.9.2 → 0.9.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDYzMWNjYjFmNzcxZTcxZTE4NGM2MzFlZDMyMDFjMzBmNjk1MGI4NQ==
+    OGE1MWZkYjNjYzNjYzQ5MzkyZjQzMGEzMjZmMTBhOTE0YWM5YzdiZQ==
   data.tar.gz: !binary |-
-    ZmU5ZTUwYTFjODkxYzgxZDZhMDkyNzY3YTNlYjZjNGEyZDlhNmRiMA==
+    YjJhZWU1YjdiNjYwYzM4ZDRjNDQ5NzNhY2I3YzE5Njc0NjFhYTBhMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWY1OGE4NGU2MzMyZjM2YWM4NmFmOWZjZjA3OTQwMjZiOGMzY2FmNzM3MjVl
-    MzJiYWRkMmFjMTJlNjZiMWZkYmJmYTc3MzBhYzNjNzNmNDBiNGQ5NjU2YWQw
-    NTRiNDU5OTk4ZjY1ZjhmY2ZkZmYxMDVjYTMxMTc3MjE0NTgzOGI=
+    Y2M2NmJhZDRjZTJlOWM2M2ZjNDg1ZDIxODVkYTIwZmExYTE0MDhjOWIyOGEz
+    MWM5NmQ1YWQ0YjNjNjE1ZDEyNTM2NjU2ODI0NzY2YTY3NWFiYjA3OTY1ZTVi
+    MjA2NGNlOTA4MzZhZmNhODQwZjA4MGFiM2NhZjVmMWFjOWUyNzA=
   data.tar.gz: !binary |-
-    ZDM2NWQwYjIxMTRkNTJkM2E0MGFiNjNmOTFkMmJhMmQ3ZTI0NWQ4NmY4M2Ex
-    Zjk0OGM5YzBjZWEyM2YzYTE4YTZkY2IyMWMxYjAyZTQ2YmRjNjhjZWQzNThh
-    NmYxN2ZjMWI0MTY3ODRmOTc3MWJmZTU5NjU5OGQwZDkwYWZhNzk=
+    NWRjZGIyZjFlMzg1YmJjYWI5ZWIxYzYwMDU5ZWZjNWQwODdhYzE0YTcxNTZl
+    MmJlNmJmMWE3Mjg5YmJhZTFhZDE3YjllNjY0NWFkZDJkMjhmMGRkNTAzZDVl
+    NzZkOWNjNGYzZjVkNzY4ZDUxNGQxYjQzNTM4YmU3M2ZlZTliMWI=

data/README.md

@@ -38,7 +38,7 @@ module LogjamAgent
   # Configure request data forwarder for ZeroMQ.
   add_forwarder(:zmq, :host => "logjam.instance.at.your.org", :port => 9605)
 
-  # Configure request data forwarder for ZeroMQ.
+  # Configure request data forwarder for AMQP.
   # add_forwarder(:amqp, :host => "message.broker.at.your.org"))
 
   # Configure ip obfuscation. Defaults to no obfuscation.
@@ -49,6 +49,19 @@ module LogjamAgent
 end
 ```
 
+### Generating unique request ids
+
+The agent generates unique request ids for all request handled. It
+will use [uuid4r](https://github.com/skaes/uuid4r) if this is
+avalaibale in the application. Otherwise it will fall back to use the
+standard `SecureRandom` class shipped with Ruby.
+
+### Generating JSON
+
+The agent will try to use the [Oj](https://github.com/ohler55/oj) to
+generate JSON. If this is not available in your application, it will
+fall back to the `to_json` method.
+
 ## Troubleshooting
 
 If the agent experiences problems when sending data, it will log information to a file named

data/lib/logjam_agent.rb

@@ -91,7 +91,7 @@ module LogjamAgent
   self.obfuscate_ips = false
 
   # TODO: ipv6 obfuscation
-  def self.ip_fuscator(ip)
+  def self.ip_obfuscator(ip)
     obfuscate_ips ? ip.to_s.sub(/\d+\z/, 'XXX') : ip
   end
 

data/lib/logjam_agent/rack/logger.rb

@@ -53,7 +53,7 @@ module LogjamAgent
         path = request.filtered_path
 
         logjam_fields = LogjamAgent.request.fields
-        ip = LogjamAgent.ip_fuscator(request.remote_ip)
+        ip = LogjamAgent.ip_obfuscator(request.ip)
         logjam_fields.merge!(:started_at => start_time.iso8601, :ip => ip, :host => @hostname)
         logjam_fields.merge!(extract_request_info(request))
 

data/lib/logjam_agent/railtie.rb

@@ -69,6 +69,38 @@ module LogjamAgent
           end
         end
       end
+
+      # patch rack so that the ip method returns the same result as rails remote_ip (modulo exceptions)
+      app.config.after_initialize do
+        if app.config.action_dispatch.trusted_proxies
+          trusted_proxies = /^127\.0\.0\.1$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.|^::1$|^fd[0-9a-f]{2}:.+|^localhost$/i
+          trusted_proxies = Regexp.union(trusted_proxies, app.config.action_dispatch.trusted_proxies)
+          ::Rack::Request.class_eval <<-"EVA"
+            def trusted_proxy?(ip)
+              ip =~ #{trusted_proxies.inspect}
+            end
+          EVA
+        end
+
+        ::Rack::Request.class_eval <<-EVA
+          def ip
+            remote_addrs = @env['REMOTE_ADDR'] ? @env['REMOTE_ADDR'].split(/[,\s]+/) : []
+            remote_addrs.reject! { |addr| trusted_proxy?(addr) }
+
+            return remote_addrs.first if remote_addrs.any?
+
+            forwarded_ips = @env['HTTP_X_FORWARDED_FOR'] ? @env['HTTP_X_FORWARDED_FOR'].strip.split(/[,\s]+/) : []
+
+            if client_ip = @env['HTTP_TRUE_CLIENT_IP'] || @env['HTTP_CLIENT_IP']
+              # If forwarded_ips doesn't include the client_ip, it might be an
+              # ip spoofing attempt, so we ignore HTTP_CLIENT_IP
+              return client_ip if forwarded_ips.include?(client_ip)
+            end
+
+            return forwarded_ips.reject { |ip| trusted_proxy?(ip) }.last || @env["REMOTE_ADDR"]
+          end
+        EVA
+      end
     end
 
     # avoid garbled tempfile information in the logs

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement