zpng 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b6418f5582a71d006e8b8181884884eef0d2287bded6771b6dda3abf1da3cc
-  data.tar.gz: dc6e8aa63943cbc3f505d0b8635a61c9f0c4da1fb9abd2dc655f1c3869ef7ada
+  metadata.gz: '08acddd8ec4b1ea91695bbf1bed88b1f32a472b573c5e2397851f14e902f6ee9'
+  data.tar.gz: eb1aa1bd33ef7fcd21ed31e99011e8e1a86f321197f42cbef4d3b463c712a85d
 SHA512:
-  metadata.gz: 3a9063b7a4864fb7f172c17124a3aa24653a86768ba6c2c69d1daf7b3b14d646bacc199f8705dd2ca1238ad8e3397a93b86c03c11dbcd9ca525396327564c39e
-  data.tar.gz: 335c9e814b351dc42fc46ff7dbaf1ab808f16155722a9cfc0832242778d9b47efcd4c106393105e9ccd005f665d584c75032d47508435bff68013e8e3570c676
+  metadata.gz: d74bbcad37d8ea609561ccfb64e1099a508bb2f8a06a7619b881888a4c06880d4bdf804a7d734df20ddeb3038e73c722fc7b360be0e464b407f550935d8642cc
+  data.tar.gz: 9b287b661f4a5e831349c04ceca8dfa8cb1c38c0a6b5721d2fe986eb368222e51bc416267be151b1c655455fe84518795484e58f3225516dff5620eda217f177

data/Gemfile

@@ -10,6 +10,6 @@ group :development do
   gem "rspec",   "~> 3.9.0"
   gem "rspec-its", "~> 1.3.0"
   gem "bundler", "~> 2.2.3"
-  gem "jeweler", "~> 2.3.9"
+  gem "juwelier"
   gem "what_methods"
 end

data/Gemfile.lock

@@ -1,57 +1,83 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.4.4)
-    faraday (0.9.2)
+    diff-lcs (1.5.0)
+    faraday (1.9.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
-    git (1.8.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    git (1.10.2)
       rchardet (~> 1.8)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
+    github_api (0.19.0)
+      addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
+      faraday (>= 0.8, < 2)
+      hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    hashie (4.1.0)
+    hashie (3.6.0)
     highline (2.0.3)
-    jeweler (2.3.9)
+    juwelier (2.4.9)
       builder
       bundler
-      git (>= 1.2.5)
-      github_api (~> 0.16.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
+      git
+      github_api
+      highline
+      kamelcase (~> 0)
+      nokogiri
       psych
       rake
       rdoc
       semver2
-    jwt (2.2.2)
-    mime-types (2.99.3)
-    mini_portile2 (2.5.0)
+    jwt (2.3.0)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
+    mini_portile2 (2.7.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    oauth2 (1.4.4)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.3.0)
-    racc (1.5.2)
+    psych (4.0.3)
+      stringio
+    public_suffix (4.0.6)
+    racc (1.6.0)
     rack (2.2.3)
-    rainbow (3.0.0)
-    rake (13.0.3)
+    rainbow (3.1.1)
+    rake (13.0.6)
     rchardet (1.8.0)
-    rdoc (6.3.0)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -68,7 +94,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.4)
+    ruby2_keywords (0.0.5)
     semver2 (3.4.2)
+    stringio (3.0.1)
     thread_safe (0.3.6)
     what_methods (1.0.1)
 
@@ -77,11 +105,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.2.3)
-  jeweler (~> 2.3.9)
+  juwelier
   rainbow
   rspec (~> 3.9.0)
   rspec-its (~> 1.3.0)
   what_methods
 
 BUNDLED WITH
-   2.2.3
+   2.2.32

data/README.md

@@ -36,8 +36,10 @@ Usage
     
         -C, --crop GEOMETRY              crop image, {WIDTH}x{HEIGHT}+{X}+{Y},
                                          puts results on stdout unless --ascii given
+        -R, --rebuild NEW_FILENAME       rebuild image, useful in restoring borked images
     
         -A, --ascii                      Try to convert image to ASCII (works best with monochrome images)
+            --ascii-string STRING        Use specific string to map pixels to ASCII characters
         -N, --ansi                       Try to display image as ANSI colored text
         -2, --256                        Try to display image as 256-colored text
         -W, --wide                       Use 2 horizontal characters per one pixel
@@ -52,7 +54,7 @@ Usage
 
     [.] image size 35x35, 24bpp, COLOR_RGB
     [.] uncompressed imagedata size = 3710 bytes
-    [.] <Chunk #00 IHDR size=    13, crc=91bb240e, color=2, compression=0, depth=8, filter=0, height=35, interlace=0, width=35> CRC OK
+    [.] <Chunk #00 IHDR size=    13, crc=91bb240e, color=2, compression=0, depth=8, filter=0, height=35, interlace=0, offset=8, width=35> CRC OK
     [.] <Chunk #01 sRGB size=     1, crc=aece1ce9 > CRC OK
     [.] <Chunk #02 IDAT size=   399, crc=59790716 > CRC OK
     [.] <Chunk #03 IEND size=     0, crc=ae426082 > CRC OK
@@ -66,7 +68,7 @@ Usage
         01 ff ff ff 00 00 00 00  00 00 00 00 00 00 00 00  |................|
         00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................| + 3678 bytes
     
-    [.] <Chunk #00 IHDR size=    13, crc=91bb240e, color=2, compression=0, depth=8, filter=0, height=35, idx=0, interlace=0, width=35> CRC OK
+    [.] <Chunk #00 IHDR size=    13, crc=91bb240e, color=2, compression=0, depth=8, filter=0, height=35, idx=0, interlace=0, offset=8, width=35> CRC OK
         00 00 00 23 00 00 00 23  08 02 00 00 00           |...#...#.....   |
     
     [.] <Chunk #01 sRGB size=     1, crc=aece1ce9 > CRC OK
@@ -84,7 +86,7 @@ Usage
 
     # zpng --chunks qr_aux_chunks.png
 
-    [.] <Chunk #00 IHDR size=    13, crc=36a28ef4, color=0, compression=0, depth=1, filter=0, height=35, interlace=0, width=35> CRC OK
+    [.] <Chunk #00 IHDR size=    13, crc=36a28ef4, color=0, compression=0, depth=1, filter=0, height=35, interlace=0, offset=8, width=35> CRC OK
     [.] <Chunk #01 gAMA size=     4, crc=0bfc6105 > CRC OK
     [.] <Chunk #02 sRGB size=     1, crc=aece1ce9 > CRC OK
     [.] <Chunk #03 cHRM size=    32, crc=9cba513c > CRC OK

data/Rakefile

@@ -11,8 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "zpng"
   gem.homepage = "http://github.com/zed-0xff/zpng"
@@ -25,7 +25,7 @@ Jeweler::Tasks.new do |gem|
   gem.files.include "lib/**/*.rb"
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.1

data/lib/zpng/chunk.rb

@@ -1,6 +1,9 @@
 module ZPNG
   class Chunk
-    attr_accessor :size, :type, :data, :crc, :idx
+    attr_accessor :size, :type, :data, :crc, :idx, :offset
+
+    KNOWN_TYPES = %w'IHDR PLTE IDAT IEND cHRM gAMA iCCP sBIT sRGB bKGD hIST tRNS pHYs sPLT tIME iTXt tEXt zTXt'
+    VALID_SIZE_RANGE = 0..((2**31)-1)
 
     include DeepCopyable
 
@@ -10,21 +13,27 @@ module ZPNG
       begin
         if const_defined?(type.upcase)
           klass = const_get(type.upcase)
-          klass.new(io)
-        else
-          Chunk.new(io)
+          return klass.new(io)
         end
       rescue NameError
         # invalid chunk type?
-        Chunk.new(io)
       end
+      # putting this out of rescue makes better non-confusing exception messages
+      # if exception occurs somewhere in Chunk.new
+      Chunk.new(io)
     end
 
     def initialize x = {}
       if x.respond_to?(:read)
         # IO
+        @offset = x.tell
         @size, @type = x.read(8).unpack('Na4')
-        @data        = x.read(size)
+        begin
+          @data = x.read(size)
+        rescue Errno::EINVAL
+          # TODO: show warning?
+          @data = x.read if size > VALID_SIZE_RANGE.end
+        end
         @crc         = x.read(4).to_s.unpack('N').first
       elsif x.respond_to?(:[])
         # Hash
@@ -66,6 +75,22 @@ module ZPNG
       expected_crc == crc
     end
 
+    def check checks = {type: true, crc: true, size: true}
+      checks.each do |check_type, check_mode|
+        case check_type
+        when :type
+          return false if check_mode != KNOWN_TYPES.include?(self.type)
+        when :crc
+          return false if check_mode != crc_ok?
+        when :size
+          return false if check_mode != VALID_SIZE_RANGE.include?(self.size)
+        end
+      end
+      true
+    end
+
+    def valid?; check; end
+
     def fix_crc!
       @crc = Zlib.crc32(data, Zlib.crc32(type))
     end

data/lib/zpng/cli.rb

@@ -52,6 +52,10 @@ module ZPNG
           @actions << [:crop, x]
         end
 
+        opts.on "-R", "--rebuild NEW_FILENAME", "rebuild image, useful in restoring borked images" do |x|
+          @actions << [:rebuild, x]
+        end
+
         opts.separator ""
         opts.on "-A", '--ascii', 'Try to convert image to ASCII (works best with monochrome images)' do
           @actions << :ascii
@@ -137,6 +141,10 @@ module ZPNG
       print @img.export unless @actions.include?(:ascii)
     end
 
+    def rebuild fname
+      File.binwrite(fname, @img.export)
+    end
+
     def load_file fname
       @img = Image.load fname, :verbose => @options[:verbose]+1
     end

data/lib/zpng/image.rb

@@ -108,11 +108,43 @@ module ZPNG
       end
     end
 
+    HEUR_CHUNK_SIZE_RANGE = -16..16
+
+    # assume previous chunk size is not right, try to iterate over neighbour data
+    def _apply_heuristics io, prev_chunk, chunk
+      prev_pos = io.tell
+      HEUR_CHUNK_SIZE_RANGE.each do |delta|
+        next if delta == 0
+        next if prev_chunk.data.size + delta < 0
+        io.seek(chunk.offset+delta, IO::SEEK_SET)
+        potential_chunk = Chunk.new(io)
+        if potential_chunk.valid?
+          STDERR.puts "[!] heuristics: found invalid chunk at offset #{chunk.offset}, but valid one at #{chunk.offset+delta}. using latter".red
+          if delta > 0
+            io.seek(chunk.offset, IO::SEEK_SET)
+            data = io.read(delta)
+            STDERR.puts "[!] #{delta} extra bytes of data: #{data.inspect}".red
+          else
+            io.seek(chunk.offset+delta, IO::SEEK_SET)
+          end
+          return true
+        end
+      end
+      false
+    end
+
     def _read_png io
+      prev_chunk = nil
       while !io.eof?
         chunk = Chunk.from_stream(io)
+        # heuristics
+        if prev_chunk && prev_chunk.check(type: true, crc: false) &&
+            chunk.check(type: false, crc: false) && chunk.data
+          redo if _apply_heuristics(io, prev_chunk, chunk)
+        end
         chunk.idx = @chunks.size
         @chunks << chunk
+        prev_chunk = chunk
         break if chunk.is_a?(Chunk::IEND)
       end
     end
@@ -137,7 +169,7 @@ module ZPNG
       unless io.eof?
         offset     = io.tell
         @extradata << io.read
-        puts "[?] #{@extradata.last.size} bytes of extra data after image end (IEND), offset = 0x#{offset.to_s(16)}".red if @verbose >= 1
+        STDERR.puts "[?] #{@extradata.last.size} bytes of extra data after image end (IEND), offset = 0x#{offset.to_s(16)}".red if @verbose >= 1
       end
     end
 
@@ -250,16 +282,16 @@ module ZPNG
         r << zi.inflate(pos==0 ? data : data[pos..-1])
         if zi.total_in < data.size
           @extradata << data[zi.total_in..-1]
-          puts "[?] #{@extradata.last.size} bytes of extra data after zlib stream".red if @verbose >= 1
+          STDERR.puts "[?] #{@extradata.last.size} bytes of extra data after zlib stream".red if @verbose >= 1
         end
         # decompress OK
       rescue Zlib::BufError
         # tried to decompress, but got EOF - need more data
-        puts "[!] #{$!.inspect}".red if @verbose >= -1
+        STDERR.puts "[!] #{$!.inspect}".red if @verbose >= -1
         # collect any remaining data in decompress buffer
         r << zi.flush_next_out
       rescue Zlib::DataError
-        puts "[!] #{$!.inspect}".red if @verbose >= -1
+        STDERR.puts "[!] #{$!.inspect}".red if @verbose >= -1
         #p [pos, zi.total_in, zi.total_out, data.size, r.size]
         r << zi.flush_next_out
         # XXX TODO try to skip error and continue
@@ -273,7 +305,7 @@ module ZPNG
 #        pos = 0
 #        retry if pos < data.size
       rescue Zlib::NeedDict
-        puts "[!] #{$!.inspect}".red if @verbose >= -1
+        STDERR.puts "[!] #{$!.inspect}".red if @verbose >= -1
         # collect any remaining data in decompress buffer
         r << zi.flush_next_out
       end
@@ -288,7 +320,7 @@ module ZPNG
     def imagedata
       @imagedata ||=
         begin
-          puts "[?] no image header, assuming non-interlaced RGB".yellow unless header
+          STDERR.puts "[?] no image header, assuming non-interlaced RGB".yellow unless header
           data = _imagedata
           (data && data.size > 0) ? _safe_inflate(data) : ''
         end

data/lib/zpng/scan_line.rb

@@ -7,6 +7,8 @@ module ZPNG
     FILTER_AVERAGE        = 3
     FILTER_PAETH          = 4
 
+    VALID_FILTERS = FILTER_NONE..FILTER_PAETH
+
     attr_accessor :image, :idx, :filter, :offset, :bpp
     attr_writer :decoded_bytes
 
@@ -44,6 +46,10 @@ module ZPNG
       !@filter
     end
 
+    def valid_filter?
+      VALID_FILTERS.include?(@filter)
+    end
+
     # total scanline size in bytes, INCLUDING leading 'filter' byte
     def size
       @size ||=
@@ -286,7 +292,9 @@ module ZPNG
               )
             end
 
-          else raise "invalid ScanLine filter #{@filter}"
+          else
+            STDERR.puts "[!] #{self.class}: ##@idx: invalid filter #@filter, assuming FILTER_NONE".red
+            s = raw
           end
 
           s

data/zpng.gemspec

@@ -1,17 +1,17 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: zpng 0.3.2 ruby lib
+# stub: zpng 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "zpng".freeze
-  s.version = "0.3.2"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andrey \"Zed\" Zaikin".freeze]
-  s.date = "2021-02-18"
+  s.date = "2022-01-31"
   s.email = "zed.0xff@gmail.com".freeze
   s.executables = ["zpng".freeze]
   s.extra_rdoc_files = [
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
     "misc/chars.png",
     "misc/gen_ascii_map.rb",
     "samples/bad/000000.png",
+    "samples/bad/149511457-47db5096-662d-4221-84f9-1c2a0e20e323.png",
     "samples/bad/b1.png",
     "samples/captcha_4bpp.png",
     "samples/cats.png",
@@ -94,7 +95,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/zed-0xff/zpng".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.2.3".freeze
+  s.rubygems_version = "3.2.32".freeze
   s.summary = "pure ruby PNG file manipulation & validation".freeze
 
   if s.respond_to? :specification_version then
@@ -106,14 +107,14 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<rspec>.freeze, ["~> 3.9.0"])
     s.add_development_dependency(%q<rspec-its>.freeze, ["~> 1.3.0"])
     s.add_development_dependency(%q<bundler>.freeze, ["~> 2.2.3"])
-    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
+    s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
     s.add_development_dependency(%q<what_methods>.freeze, [">= 0"])
   else
     s.add_dependency(%q<rainbow>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.9.0"])
     s.add_dependency(%q<rspec-its>.freeze, ["~> 1.3.0"])
     s.add_dependency(%q<bundler>.freeze, ["~> 2.2.3"])
-    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
     s.add_dependency(%q<what_methods>.freeze, [">= 0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zpng
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.3
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: what_methods
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,7 @@ files:
 - misc/chars.png
 - misc/gen_ascii_map.rb
 - samples/bad/000000.png
+- samples/bad/149511457-47db5096-662d-4221-84f9-1c2a0e20e323.png
 - samples/bad/b1.png
 - samples/captcha_4bpp.png
 - samples/cats.png
@@ -194,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: pure ruby PNG file manipulation & validation