firebug 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c7ae866f5a57fc4cd5782c1d42232a83b473541e
-  data.tar.gz: ea21d35182344dedc599830d373177714098963e
+SHA256:
+  metadata.gz: 8fbd5a9dfb24f6bda1c0a1f14541a19874ce2ba4947dfe9942968df5d95ce612
+  data.tar.gz: 20cba9c06d691fdc45f397d458b638b5313f6fedf445ef42ef1f805df9cd8751
 SHA512:
-  metadata.gz: 543016ca23566df1e2e76790e0c85688a30102851df90f137f19bbbed502141e1308576613768292d56c468bfd5bfbf6bb1abdd2d3d5a4a4b1f65642071ab6ca
-  data.tar.gz: b5776e9dbc85cb9f3b7e35984c4a2047fcc9b2484b467c100c2f48898671b4e57f256f054cee3bf3f8a3a927901bc78da98145d12ef7a254c6ffcb2e09235c1b
+  metadata.gz: b055339ae79941d211791a4248fbdf88a3a1190ef214abb7e8e5d2d846e6075b662f104ee2e888f56302229146176d65fc658cd2944c6df8b24d0d0791b1d022
+  data.tar.gz: d3dec6a39184d14ab579e1c286cd792100943b8e58a52a89b4237b3d6e0482653886840de227035b0feaf3019b38a81b1deb9cfba9a042ffe5eb1aeb0d8b362f

data/.circleci/config.yml

@@ -6,7 +6,7 @@ workspace_root: &workspace_root
 defaults: &defaults
   working_directory: *workspace_root
   docker:
-    - image: afrase/firebug-ruby:2.4
+    - image: afrase/firebug-ruby:2.6
 
 attach_workspace: &attach_workspace
   attach_workspace:
@@ -42,6 +42,7 @@ jobs:
       - run:
           name: Install Bundler dependencies
           command: |
+            gem install bundler
             bin/bundle install --path=vendor/bundle \
                                --jobs=4 \
                                --retry=3
@@ -62,7 +63,9 @@ jobs:
       - *attach_workspace
       - run:
           name: Set bundler path
-          command: bin/bundle --path vendor/bundle
+          command: |
+            gem install bundler
+            bin/bundle --path vendor/bundle
       - run:
           name: Run tests
           command: |
@@ -87,7 +90,9 @@ jobs:
       - *attach_workspace
       - run:
           name: Set bundler path
-          command: bin/bundle --path vendor/bundle
+          command: |
+            gem install bundler
+            bin/bundle --path vendor/bundle
       - run:
           name: Run rubocop
           command: bin/bundle exec rubocop

data/.circleci/images/primary/Dockerfile

@@ -1,3 +1,12 @@
-FROM circleci/ruby:2.4
+FROM ruby:2.6-slim
 
-RUN sudo apt-get update && sudo apt-get install mcrypt libmcrypt-dev
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    curl \
+    default-libmysqlclient-dev \
+    git \
+    libmcrypt-dev \
+    file \
+    sudo \
+    libsqlite3-dev \
+  && rm -rf /var/lib/apt/lists/*

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-2.6.1

data/README.md

@@ -63,8 +63,8 @@ Encrypt and decrypt data.
 key = 'password'
 data = 'super secret data'
 
-encrypted = Firebug.encrypt(key, data)
-decrypted = Firebug.decrypt(key, encrypted)
+encrypted = Firebug.encrypt(data, key)
+decrypted = Firebug.decrypt(encrypted, key)
 
 data == decrypted # => true
 ```

data/firebug.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'firebug/version'
 
@@ -24,19 +24,19 @@ Gem::Specification.new do |spec| # rubocop:disable BlockLength
 
   spec.metadata['yard.run'] = 'yri' # use "yard" to build full HTML docs.
 
-  spec.add_dependency 'actionpack', '~> 5.0'
-  spec.add_dependency 'activerecord', '~> 5.0'
+  spec.add_dependency 'actionpack', '<= 6.0'
+  spec.add_dependency 'activerecord', '<= 6.0'
   spec.add_dependency 'ruby-mcrypt', '~> 0.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'database_cleaner', '~> 1.6', '>= 1.6.2'
-  spec.add_development_dependency 'pry', '~> 0.11.3'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.52.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.22', '>= 1.22.2'
-  spec.add_development_dependency 'simplecov', '~> 0.15.1'
-  spec.add_development_dependency 'sqlite3', '~> 1.3', '>= 1.3.13'
-  spec.add_development_dependency 'yard', '~> 0.9.12'
+  spec.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.1'
+  spec.add_development_dependency 'database_cleaner', '~> 1.7'
+  spec.add_development_dependency 'pry', '~> 0.12.2'
+  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.2'
+  spec.add_development_dependency 'rspec', '~> 3.8'
+  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
+  spec.add_development_dependency 'rubocop', '~> 0.66.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.32'
+  spec.add_development_dependency 'simplecov', '~> 0.16.1'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
+  spec.add_development_dependency 'yard', '~> 0.9.18'
 end

data/lib/action_dispatch/session/code_igniter_store.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'action_dispatch'
-require_relative '../../firebug/session'
-
 module ActionDispatch
   module Session
+    require 'action_dispatch'
+    require_relative '../../firebug/session'
+
     # A session store for Rails to handle Pyro sessions.
     class CodeIgniterStore < AbstractStore
       SESSION_RECORD_KEY = 'rack.session.record'
@@ -78,6 +78,7 @@ module ActionDispatch
           }
           # Returning false will cause Rack to output a warning.
           return false unless model.update(model_params)
+
           req.env[SESSION_RECORD_KEY] = model
           # Return the encrypted cookie format of the data. Rack sets this value as the cookie in the response
           model.cookie_data
@@ -99,6 +100,7 @@ module ActionDispatch
           # Get the current database record for this session then delete it.
           find_session_model(req, sid).delete
           return if options[:drop]
+
           req.env[SESSION_RECORD_KEY] = nil
           # Generate a new one and return it's ID
           find_session_model(req).tap { |s| s.save if options[:renew] }.session_id
@@ -119,6 +121,7 @@ module ActionDispatch
         return generate_sid if sid.nil?
         # sometimes the cookie contains just the session ID.
         return sid if sid.size <= 32
+
         Firebug.decrypt_cookie(sid)[:session_id]
       end
 
@@ -129,6 +132,7 @@ module ActionDispatch
         if sid
           model = req.env[SESSION_RECORD_KEY] || Firebug::Session.find_by(find_by_params(req, sid))
           return model if model
+
           # use a different session ID in case the reason for not finding the record is because the user_agent
           # or ip_address didn't match.
           sid = generate_sid

data/lib/firebug.rb

@@ -2,6 +2,7 @@
 
 require_relative 'firebug/version'
 require_relative 'firebug/crypto'
+require_relative 'firebug/errors'
 require_relative 'firebug/serializer'
 require_relative 'firebug/unserializer'
 require_relative 'firebug/configuration'

data/lib/firebug/crypto.rb

@@ -20,7 +20,7 @@ module Firebug
       # Create a random 32 byte string to act as the initialization vector.
       iv = SecureRandom.random_bytes(32)
       # Pyro pads the data with zeros
-      cipher = Mcrypt.new(:rijndael_256, :cbc, @key, iv, :zeros)
+      cipher = FirebugMcrypt.new(:rijndael_256, :cbc, @key, iv, :zeros)
       add_noise(iv + cipher.encrypt(data))
     end
 
@@ -32,7 +32,7 @@ module Firebug
       data = remove_noise(data)
       # The first 32 bytes of the data is the original IV
       iv = data[0..31]
-      cipher = Mcrypt.new(:rijndael_256, :cbc, @key, iv, :zeros)
+      cipher = FirebugMcrypt.new(:rijndael_256, :cbc, @key, iv, :zeros)
       cipher.decrypt(data[32..-1])
     end
 
@@ -64,4 +64,14 @@ module Firebug
       Array.new(data.size) { |i| (data[i].ord.send(operator, key[i % key.size].ord) % 256).chr }.join
     end
   end
+
+  # To prevent errors about @opened being uninitialized.
+  class FirebugMcrypt < ::Mcrypt
+    # rubocop:disable Naming/UncommunicativeMethodParamName
+    def initialize(algorithm, mode, key=nil, iv=nil, padding=nil)
+      @opened = nil
+      super
+    end
+    # rubocop:enable Naming/UncommunicativeMethodParamName
+  end
 end

data/lib/firebug/errors.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Firebug
+  FirebugError = Class.new(StandardError)
+  ParserError = Class.new(FirebugError)
+end

data/lib/firebug/serializer.rb

@@ -23,9 +23,9 @@ module Firebug
       when String, Symbol
         "s:#{obj.to_s.bytesize}:\"#{obj}\";"
       when Array
-        "a:#{obj.length}:{#{obj.collect.with_index { |e, i| "#{parse(i)}#{parse(e)}" }.join}}"
+        "a:#{obj.length}:{#{obj.map.with_index { |e, i| "#{parse(i)}#{parse(e)}" }.join}}"
       when Hash
-        "a:#{obj.length}:{#{obj.collect { |k, v| "#{parse(k)}#{parse(v)}" }.join}}"
+        "a:#{obj.length}:{#{obj.map { |k, v| "#{parse(k)}#{parse(v)}" }.join}}"
       else
         raise ArgumentError, "unsupported type #{obj.class.name}"
       end

data/lib/firebug/string_io_reader.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Firebug
+  class StringIOReader < StringIO
+    # Reads data from the buffer until +char+ is found.
+    #
+    # @param [String] char The character to look for.
+    # @param [Boolean] include If +char+ should be included in the result.
+    # @return [String, nil]
+    def read_until(char, include: true)
+      if (idx = string.index(char, pos)) # rubocop:disable Style/GuardClause
+        read(idx - pos + (include ? 1 : 0))
+      end
+    end
+  end
+end

data/lib/firebug/unserializer.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
 module Firebug
-  require 'strscan'
+  require_relative 'errors'
+  require_relative 'string_io_reader'
 
   # This class will unserialize a PHP serialized string into a ruby object.
   #
-  # @attr [StringScanner] str
+  # @attr [StringIOReader] str
   class Unserializer
     attr_accessor :str
 
     # @param [String] string
     def initialize(string)
-      self.str = StringScanner.new(string)
+      self.str = StringIOReader.new(string)
     end
 
     # Convenience method for unserializing a PHP serialized string.
@@ -30,23 +31,24 @@ module Firebug
     #
     # @raise [ParserError]
     # @return [Hash, Array, String, Integer, Float, nil]
-    def parse # rubocop:disable AbcSize,CyclomaticComplexity
-      ch = str.getch
+    def parse # rubocop:disable CyclomaticComplexity
+      ch = str.getc
       return if ch.nil?
 
+      str.getc # : or ;
       case ch
       when 'a'
-        parse_enumerable.tap { expect('}') }
+        parse_enumerable
       when 's'
-        parse_string.tap { expect(';') }
+        parse_string
       when 'i'
-        parse_int.tap { expect(';') }
+        parse_int
       when 'd'
-        parse_double.tap { expect(';') }
+        parse_double
       when 'b'
-        parse_bool.tap { expect(';') }
+        parse_bool
       when 'N'
-        expect(';')
+        nil
       else
         raise ParserError, "Unknown token '#{ch}' at position #{str.pos} (#{str.string})"
       end
@@ -57,63 +59,41 @@ module Firebug
     # @raise [ParseError]
     # @return [Hash, Array]
     def parse_enumerable
-      size = parse_int
-      expect('{')
+      size = str.read_until('{')[0..-3].to_i # n:{
       return {} if size.zero?
-      if str.peek(1) == 'i'
-        # Multiply the size by 2 since the array index isn't counted in the size.
-        # Odd number element will be the index value so drop it.
-        Array.new(size * 2) { parse }.select.with_index { |_, i| i.odd? }
+
+      val = Array.new(size) { [parse, parse] }
+      str.getc # }
+      if val[0][0].is_a?(Integer)
+        val.map! { |_, v| v }
       else
-        Array.new(size) { [parse.to_sym, parse] }.to_h
+        val = Hash[val].transform_keys!(&:to_sym)
       end
+      val
     end
 
     # @return [String]
     def parse_string
-      size = parse_int
-      str.getch # consume quote '"'
-      read(size).tap { str.getch }
+      size = str.read_until(':').to_i + 3 # add 3 for the 2 double quotes and semicolon
+      String.new(str.read(size)[1..-3], encoding: Encoding::UTF_8)
     end
 
     # @raise [ParserError]
     # @return [Integer]
     def parse_int
-      str.scan(/:(\d+):?/)
-      raise ParserError, "Failed to parse integer at position #{str.pos}" unless str.matched?
-      str[1].to_i
+      str.read_until(';')[0..-1].to_i
     end
 
     # @raise [ParserError]
     # @return [Float]
     def parse_double
-      str.scan(/:(\d+(?:\.\d+)?)/)
-      raise ParserError, "Failed to parse double at position #{str.pos}" unless str.matched?
-      str[1].to_f
+      str.read_until(';')[0..-1].to_f
     end
 
     # @raise [ParserError]
     # @return [Boolean]
     def parse_bool
-      str.scan(/:([01])/)
-      raise ParserError, "Failed to parse boolean at position #{str.pos}" unless str.matched?
-      str[1] == '1'
-    end
-
-    # @param [Integer] size
-    # @return [String]
-    def read(size)
-      Array.new(size) { str.get_byte }.join
+      str.read(2)[0] == '1'
     end
-
-    # @param [String] s
-    # @raise [ParserError] if the next character is not `s`
-    def expect(s)
-      char = str.getch
-      raise ParserError, "expected '#{s}' but got '#{char}' at position #{str.pos}" unless char == s
-    end
-  end
-
-  class ParserError < StandardError
   end
 end

data/lib/firebug/version.rb

@@ -2,5 +2,5 @@
 
 module Firebug
   # The current version of Firebug
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: firebug
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Aaron Frase
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: ruby-mcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -58,48 +58,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,116 +117,107 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.66.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.66.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.22.2
+        version: '1.32'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.22.2
+        version: '1.32'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.18
 description: Gem for working with CodeIgniter sessions
 email:
 - aaron@rvshare.com
@@ -253,8 +247,10 @@ files:
 - lib/firebug.rb
 - lib/firebug/configuration.rb
 - lib/firebug/crypto.rb
+- lib/firebug/errors.rb
 - lib/firebug/serializer.rb
 - lib/firebug/session.rb
+- lib/firebug/string_io_reader.rb
 - lib/firebug/unserializer.rb
 - lib/firebug/version.rb
 homepage: https://github.com/rvshare/firebug
@@ -277,8 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Gem for working with CodeIgniter sessions