log_sense 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 793e7473effe036178ca643379f44eea040d15582aa10a26af0874f2cc0cd76b
-  data.tar.gz: '0950e85c8e60b3a7bdb815db354d0e156a52066405ac85c47996530875dd2eba'
+  metadata.gz: e566be6e4288d20605f8dd39aa5fb016534a20af366b4f7ad229af3610397771
+  data.tar.gz: cb338c23a5e829876a2649896cacb00f4274f1be7c9a606a1dcd4c3d9f0431b1
 SHA512:
-  metadata.gz: 0730de44eb8da2fb80a2f707b66e59d367bed09e71e19cb1a19d2044181ad5deb254f8461c375d2a45230408e5eb8c9aa248f5361c051f41e4406b3ebfdc400a
-  data.tar.gz: 45fb244c7d0fdc1edbbb75305c943b37a079e48f5e12ed9096c6c64e0e554051a56551bbe74b47f4edf40bd1738ea90a9357bd11d5e74f3395a4d87e7fd9dda9
+  metadata.gz: 89ca1ce0379ed828b0a6ea7af79e35626f0b67693f4b3f2ae744df9b6714fff6f02f30c82f78d84fd76e0d947378a0f3fb11fd865cb015cb11964c02694e3e02
+  data.tar.gz: ddf3d3a976979e03c9544a613051fab201146db40b6fb0da2e21b521012b6f19413df133d68ae10187baff0a8abef4c43e2a79322a58c851572faa94c792229c

data/lib/log_sense/apache_log_line_parser.rb

@@ -0,0 +1,53 @@
+module LogSense
+  class ApacheLogLineParser
+    # parses a query and makes it into an expression which can be evaluated
+    # LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" combined
+    #
+    # %h: IP
+    # %l: ident or -
+    # %u: userid or -
+    # %t: [10/Oct/2000:13:55:36 -0700]
+    #   day = 2*digit
+    #   month = 3*letter
+    #   year = 4*digit
+    #   hour = 2*digit
+    #   minute = 2*digit
+    #   second = 2*digit
+    #   zone = (`+' | `-') 4*digit
+    # %r: GET /apache_pb.gif HTTP/1.0
+    # %{User-agent}: "
+    #
+    # 116.179.32.16 - - [19/Dec/2021:22:35:11 +0100] "GET / HTTP/1.1" 200 135 "-" "Mozilla/5.0 (compatible; Baiduspider/2.0; +http://www.baidu.com/search/spider.html)"
+
+    DAY = /[0-9]{2}/
+    MONTH = /[A-Za-z]{3}/
+    YEAR = /[0-9]{4}/
+    TIMEC = /[0-9]{2}/
+    TIMEZONE = /(\+|-)[0-9]{4}/
+
+    IP = /(?<ip>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})/
+    IDENT = /(?<ident>[^ ]+|-)/
+    USERID = /(?<userid>[^ ]+|-)/
+
+    TIMESTAMP = /(?<date>#{DAY}\/#{MONTH}\/#{YEAR}):(?<time>#{TIMEC}:#{TIMEC}:#{TIMEC} #{TIMEZONE})/
+
+    VERB=/(?<method>GET|HEAD|POST|PUT|DELETE|CONNECT|OPTIONS|TRACE|PATCH)/
+    PROTOCOL=/(?<protocol>HTTP\/[0-9]\.[0-9])/
+    URL=/(?<url>[^ ]+)/
+    REFERER=/(?<referer>[^ ])+/
+    RETURN_CODE=/(?<status>[1-5][0-9][0-9])/
+    SIZE=/(?<size>[0-9]+|-)/
+
+    USER_AGENT = /(?<user_agent>[^"]+)/
+
+    attr_reader :format
+
+    def initialize 
+      @format = /#{IP} #{IDENT} #{USERID} \[#{TIMESTAMP}\] "#{VERB} #{URL} #{PROTOCOL}" #{RETURN_CODE} #{SIZE} "#{REFERER}" "#{USER_AGENT}"/
+    end
+
+    def parse line
+      hash = @format.match(line) || raise("Apache LogLine Parser Error: Could not parse #{line}")
+    end
+  end
+end

data/lib/log_sense/apache_log_parser.rb

@@ -1,4 +1,3 @@
-require 'apache_log/parser'
 require 'sqlite3'
 require 'browser'
 
@@ -50,21 +49,20 @@ module LogSense
                 platform_version)
               values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
 
-      parser = ApacheLog::Parser.new(options[:format] || 'combined')
+      parser = ApacheLogLineParser.new
       
       content.each do |line|
         begin
           hash = parser.parse line
-
           ua = Browser.new(hash[:user_agent], accept_language: "en-us")
           ins.execute(
-            hash[:datetime].iso8601,
-            hash[:remote_host],
-            hash[:user],
-            hash[:datetime].strftime("%Y-%m-%d") + " " + hash[:remote_host] + " " + hash[:user_agent],
-            hash[:request][:method],
-            hash[:request][:path],
-            (hash[:request][:path] ? File.extname(hash[:request][:path]) : ""),
+            DateTime.parse("#{hash[:date]}T#{hash[:time]}").iso8601,
+            hash[:ip],
+            hash[:userid],
+            unique_visitor_id(hash),
+            hash[:method],
+            hash[:url],
+            (hash[:url] ? File.extname(hash[:url]) : ""),
             hash[:status],
             hash[:size].to_i,
             hash[:referer],
@@ -75,13 +73,17 @@ module LogSense
             (ua.platform.name || ""),
             (ua.platform.version || "")
           )
-        rescue
-          STDERR.puts "Apache Log parser error: could not parse #{line}"
+        rescue StandardError => e
+          STDERR.puts e.message
         end
       end
       
       db
     end
 
+    def self.unique_visitor_id hash
+      "#{hash[:date]} #{hash[:ip]} #{hash[:user_agent]}"
+    end
+
   end
 end

data/lib/log_sense/templates/apache.html.erb

@@ -29,14 +29,14 @@
      }
 
      #offCanvas {
-       color: white;
-       background: #0D0630;
+       color: #DEDEDE;
+       background: #1C1C1C;
        border-right: none;
        box-shadow: none;
        padding: 0.5rem;
      }
      #offCanvas a {
-       color: #E6F9AF;
+       color: #FFFFFF;
      }
 
      .contents-button {
@@ -69,7 +69,7 @@
 
      .card-divider {
        padding: 0.2rem 0.4rem 0.2rem 0.4rem;
-       background: #0d0630;
+       background: #1C1C1C;
        color: white;
      }
 

data/lib/log_sense/templates/rails.html.erb

@@ -29,14 +29,14 @@
      }
 
      #offCanvas {
-       color: white;
-       background: #0D0630;
+       color: #CECECE;
+       background: #BD000D;
        border-right: none;
        box-shadow: none;
        padding: 0.5rem;
      }
      #offCanvas a {
-       color: #E6F9AF;
+       color: #FFFFFF;
      }
 
      .contents-button {

data/lib/log_sense/version.rb

@@ -1,3 +1,3 @@
 module LogSense
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

data/lib/log_sense.rb

@@ -1,5 +1,6 @@
 require 'log_sense/version'
 require 'log_sense/options_parser'
+require 'log_sense/apache_log_line_parser'
 require 'log_sense/apache_log_parser'
 require 'log_sense/apache_data_cruncher'
 require 'log_sense/rails_log_parser'

data/log_sense.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "apache_log-parser"
   spec.add_dependency "browser"
   spec.add_dependency "ipaddr"
   spec.add_dependency "iso_country_codes"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: log_sense
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: apache_log-parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +130,7 @@ files:
 - ip_locations/dbip-country-lite.sqlite3
 - lib/log_sense.rb
 - lib/log_sense/apache_data_cruncher.rb
+- lib/log_sense/apache_log_line_parser.rb
 - lib/log_sense/apache_log_parser.rb
 - lib/log_sense/emitter.rb
 - lib/log_sense/ip_locator.rb