zsteg 0.0.1 → 0.1.0

data/lib/zsteg/extractor.rb

@@ -35,22 +35,22 @@ module ZSteg
       end
     end
 
-    def bits2masks bits
-      masks = []
+    def bit_indexes bits
       if (1..8).include?(bits)
         # number of bits
-        bits.times do |i|
-          masks << (1<<(bits-i-1))
-        end
+        # 1 => [0]
+        # ...
+        # 8 => [7,6,5,4,3,2,1,0]
+        bits.times.to_a.reverse
       else
         # mask
-        bits &= 0xff
+        mask = bits & 0xff
+        r = []
         8.times do |i|
-          mask = (1<<(bits-i-1))
-          masks << mask if (bits & mask) != 0
+          r << i if mask[i] == 1
         end
+        r.reverse
       end
-      masks
     end
   end
 end

data/lib/zsteg/extractor/byte_extractor.rb

@@ -5,12 +5,12 @@ module ZSteg
     module ByteExtractor
 
       def byte_extract params = {}
-        masks = bits2masks params[:bits]
+        bidxs = bit_indexes params[:bits]
 
         if params[:prime]
           pregenerate_primes(
             :max   => @image.scanlines[0].size * @image.height,
-            :count => (@limit*8.0/masks.size).ceil
+            :count => (@limit*8.0/bidxs.size).ceil
           )
         end
 
@@ -20,8 +20,8 @@ module ZSteg
           sl = @image.scanlines[y]
 
           value = sl.decoded_bytes.getbyte(x)
-          masks.each do |mask|
-            a << ((value & mask) == 0 ? 0 : 1)
+          bidxs.each do |bidx|
+            a << value[bidx]
           end
 
           if a.size >= 8

data/lib/zsteg/extractor/color_extractor.rb

@@ -11,11 +11,16 @@ module ZSteg
         case channels.first.size
         when 1
           # ['r', 'g', 'b']
-          channels.each{ |c| ch_masks << [c[0], bits2masks(params[:bits])] }
+          channels.each{ |c| ch_masks << [c[0], bit_indexes(params[:bits])] }
         when 2
           # ['r3', 'g2', 'b3']
-          channels.each{ |c| ch_masks << [c[0], bits2masks(c[1].to_i)] }
+          channels.each{ |c| ch_masks << [c[0], bit_indexes(c[1].to_i)] }
         else
+          raise "invalid channels: #{channels.inspect}" if channels.size != 1
+          t = channels.first
+          if t =~ /\A[rgba]+\Z/
+            return color_extract(params.merge(:channels => t.split('')))
+          end
           raise "invalid channels: #{channels.inspect}"
         end
 
@@ -36,10 +41,10 @@ module ZSteg
           coord_iterator(params) do |x,y|
             color = @image[x,y]
 
-            ch_masks.each do |c,masks|
+            ch_masks.each do |c,bidxs|
               value = color.send(c)
-              masks.each do |mask|
-                a << ((value & mask) == 0 ? 0 : 1)
+              bidxs.each do |bidx|
+                a << value[bidx]
               end
             end
             #p [x,y,a.size,a]

data/lib/zsteg/result.rb

@@ -42,6 +42,10 @@ module ZSteg
             text.inspect
           end
       end
+
+      def self.from_matchdata m
+        self.new m[0], m.begin(0)
+      end
     end
 
     # whole data is text
@@ -53,15 +57,6 @@ module ZSteg
     # unicode text
     class UnicodeText < Text; end
 
-    class Zlib < Struct.new(:data, :offset)
-      MAX_SHOW_SIZE = 100
-      def to_s
-        x = data
-        x=x[0,MAX_SHOW_SIZE] + "..." if x.size > MAX_SHOW_SIZE
-        "zlib: data=#{x.inspect.bright_red}, offset=#{offset}, size=#{data.size}"
-      end
-    end
-
     class OneChar < Struct.new(:char, :size)
       def to_s
         "[#{char.inspect} repeated #{size} times]".gray

data/spec/bin_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+Dir['bin/*'].each do |fname|
+  describe fname do
+    it "should run" do
+      system "#{fname} > /dev/null"
+      $?.should be_success
+    end
+  end
+end

data/spec/checker_spec.rb

@@ -30,13 +30,13 @@ describe Checker do
         end
 
         describe "results" do
-          it "should not have text results shorter than #{Checker::MIN_TEXT_LENGTH}" do
+          it "should not have text results shorter than #{Checker::DEFAULT_MIN_STR_LEN}" do
             @results.each do |result|
               case result
               when Result::WholeText
-                result.text.size.should(be >= Checker::MIN_WHOLETEXT_LENGTH, result.inspect)
+                result.text.size.should(be >= Checker::DEFAULT_MIN_STR_LEN-2, result.inspect)
               when Result::Text
-                result.text.size.should(be >= Checker::MIN_TEXT_LENGTH, result.inspect)
+                result.text.size.should(be >= Checker::DEFAULT_MIN_STR_LEN, result.inspect)
               end
             end
           end

data/spec/extradata_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe "samples/extradata.png" do
+  subject{ cli(sample("extradata.png")) }
+  it { should include("foobar1") }
+  it { should include("foobar2") }
+  it { should include("foobar3") }
+
+  describe "--extract" do
+    before do
+      @out = subject
+    end
+    it "should extract all" do
+      keys = []
+      @out.split(/[\r\n]+/).each do |line|
+        if line[/foobar\d/]
+          keys << line.split.first
+        end
+      end
+      keys.size.should == 3
+      r = cli(sample("extradata.png"), *keys.map{|k| "--extract #{k}"} )
+      r.should include("foobar1")
+      r.should include("foobar2")
+      r.should include("foobar3")
+      r.size.should == 7*3
+    end
+  end
+end

data/spec/mask_spec.rb

@@ -5,7 +5,7 @@ sample("Steganography_original.png") do |fname|
     it "extracts hidden image" do
       tname = "tmp/mask.tmp.png"
       File.unlink(tname) if File.exist?(tname)
-      cli(ZSteg::MaskCLI, fname, "-m 00000011 -O #{tname}")
+      cli(:mask, fname, "-m 00000011 -O #{tname}")
       img1 = ZPNG::Image.load tname
       img2 = ZPNG::Image.load fname.sub(/\.png$/,".00000011.png")
       img1.should == img2

data/spec/newbiecontest_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+# scanline extradata
+sample("newbiecontest/alph1-surprise.bmp") do |fname|
+  describe fname do
+    subject{ cli(fname) }
+
+    it { should include "PE32 executable for MS Windows" }
+    it { should include "is program canno" }
+
+    describe "--extract" do
+      subject{ cli(fname, "--extract scanline") }
+
+      it { should include "MessageBoxA" }
+      it { should include "PVUAC PY HCHY UCYL AOPCISV WJHXY JDVYZJI YXH NIDSYRFBRCASVMFWVY" }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
 $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 require 'zsteg'
-require 'zsteg/cli'
-require 'zsteg/mask_cli'
 
 SAMPLES_DIR = File.expand_path("../samples", File.dirname(__FILE__))
 
@@ -33,7 +31,14 @@ def cli *args
   args.flatten!
   @@cli_cache[args.inspect] ||=
     begin
-      klass = args.first.is_a?(Class) ? args.shift : ZSteg::CLI
+      klass =
+        if args.first.is_a?(Symbol)
+          cli_name = args.shift.to_s
+          require "zsteg/cli/#{cli_name}"
+          ZSteg::CLI.const_get(cli_name.capitalize)
+        else
+          ZSteg::CLI
+        end
       args << "--no-color" unless args.any?{|x| x['color']}
       orig_stdout, out = $stdout, ""
       begin
@@ -48,9 +53,9 @@ end
 
 RSpec.configure do |config|
   config.before :suite do
-    Dir[File.join(SAMPLES_DIR, "*.7z")].each do |fname|
+    Dir[File.join(SAMPLES_DIR, "**", "*.7z")].each do |fname|
       next if File.exist?(fname.sub(/\.7z$/,''))
-      system "7z", "x", fname, "-o#{SAMPLES_DIR}"
+      system "7z", "x", fname, "-o#{File.dirname(fname)}"
     end
   end
 end

data/spec/wechall_spec.rb

@@ -17,7 +17,7 @@ sample("wechall/5ZMGcCLxpcpsru03.png") do |fname|
     it "extracts hidden image" do
       tname = "tmp/wechall.tmp.png"
       File.unlink(tname) if File.exist?(tname)
-      cli(ZSteg::MaskCLI, fname, "--green 00000010 -O #{tname}")
+      cli(:mask, fname, "--green 00000010 -O #{tname}")
       img1 = ZPNG::Image.load tname
       img2 = ZPNG::Image.load fname.sub(/\.png$/,".g00000010.png")
       img1.should == img2

data/writers/chunk_append.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+require 'zpng'
+
+class ChunkAppender
+  def initialize image
+    @image = image.is_a?(ZPNG::Image) ? image : ZPNG::Image.load(image)
+  end
+
+  def list_chunks
+    @image.chunks.each_with_index do |c, idx|
+      printf "%3d: type=%4s size=%d\n", idx, c.type, c.size
+    end
+  end
+
+  def append chunk_no, data
+    @image.chunks[chunk_no].define_singleton_method :export_data do
+      super() + data
+    end
+    self
+  end
+
+  def save fname
+    @image.save(fname, :repack => false)
+  end
+end
+
+if $0 == __FILE__
+  case ARGV.size
+  when 1
+    ChunkAppender.new(ARGV[0]).list_chunks
+  when 3,4
+    fname, chunk_no, data, oname = ARGV
+    oname ||= fname.chomp(File.extname(fname)) + ".out" + File.extname(fname)
+    ChunkAppender.new(fname).
+      append(chunk_no.to_i, data).
+      save(oname)
+    puts "[=] #{oname} saved"
+  else
+    bname = File.basename($0)
+    puts "USAGE:"
+    puts "  Append data to specified chunk:"
+    puts "    #{bname} input.png <chunk_no> <data> [output.png]"
+    puts
+    puts "  List chunks:"
+    puts "    #{bname} input.png"
+    exit
+  end
+end

data/writers/zlib_append.rb

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+require 'zpng'
+
+class ZlibAppender
+  def initialize image
+    @image = image.is_a?(ZPNG::Image) ? image : ZPNG::Image.load(image)
+  end
+
+  def _guess_compress_method
+    zdata = @image.chunks.find_all{ |c| c.is_a?(ZPNG::Chunk::IDAT) }.map(&:data).join
+    puts "[.] old zdata size  = #{zdata.size}"
+    9.downto(0) do |i|
+      if zdata == Zlib::Deflate.deflate(@image.imagedata, i)
+        puts "[.] compress_method = #{i}"
+        return i
+      end
+    end
+    9.downto(0) do |i|
+      if zdata.size == Zlib::Deflate.deflate(@image.imagedata, i).size
+        puts "[.] compress_method = #{i}"
+        return i
+      end
+    end
+    puts "[?] failed to guess compress method, using default".yellow
+    nil
+  end
+
+  def append appendum
+    m = _guess_compress_method
+    new_data = @image.imagedata + appendum
+    new_zdata = Zlib::Deflate.deflate(new_data, m)
+    puts "[.] new zdata size  = #{new_zdata.size}"
+
+    idats = @image.chunks.find_all{ |c| c.is_a?(ZPNG::Chunk::IDAT) }
+    idats[0].data = new_zdata
+
+    # delete other IDAT chunks, if any
+    image.chunks -= idats[1..-1] if idats.size > 1
+
+    self
+  end
+
+  def save fname
+    @image.save(fname, :repack => false)
+  end
+end
+
+if $0 == __FILE__
+  case ARGV.size
+  when 2,3
+    fname, data, oname = ARGV
+    oname ||= fname.chomp(File.extname(fname)) + ".out" + File.extname(fname)
+    ZlibAppender.new(fname).
+      append(data).
+      save(oname)
+    puts "[=] #{oname} saved"
+  else
+    bname = File.basename($0)
+    puts "USAGE:"
+    puts "  Append data to zlib stream:"
+    puts "    #{bname} input.png <data> [output.png]"
+    exit
+  end
+end

data/zsteg.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = "zsteg"
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2013-01-15"
+  s.date = "2013-01-24"
   s.email = "zed.0xff@gmail.com"
-  s.executables = ["zsteg", "zsteg-mask"]
+  s.executables = ["zsteg", "zsteg-mask", "zsteg-reflow"]
   s.extra_rdoc_files = [
     "README.md",
     "README.md.tpl",
@@ -27,22 +27,28 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/zsteg",
     "bin/zsteg-mask",
+    "bin/zsteg-reflow",
     "cmp_bmp.rb",
     "cmp_png.rb",
     "lib/zsteg.rb",
+    "lib/zsteg/analyzer.rb",
     "lib/zsteg/checker.rb",
+    "lib/zsteg/checker/scanline_checker.rb",
     "lib/zsteg/checker/wbstego.rb",
-    "lib/zsteg/cli.rb",
+    "lib/zsteg/checker/zlib.rb",
+    "lib/zsteg/cli/cli.rb",
+    "lib/zsteg/cli/mask.rb",
+    "lib/zsteg/cli/reflow.rb",
     "lib/zsteg/extractor.rb",
     "lib/zsteg/extractor/byte_extractor.rb",
     "lib/zsteg/extractor/color_extractor.rb",
     "lib/zsteg/file_cmd.rb",
-    "lib/zsteg/mask_cli.rb",
     "lib/zsteg/masker.rb",
     "lib/zsteg/result.rb",
     "pngsteg.gemspec",
     "samples/hackquest/crypt.bmp",
     "samples/hackquest/square.bmp",
+    "samples/newbiecontest/alph1-surprise.bmp.7z",
     "samples/wbstego/wbsteg_blowfish_pass_1.bmp",
     "samples/wbstego/wbsteg_cast128_pass_1.bmp",
     "samples/wbstego/wbsteg_enc_pass_pass.bmp",
@@ -69,13 +75,16 @@ Gem::Specification.new do |s|
     "samples/wechall/5ZMGcCLxpcpsru03.g00000010.png",
     "samples/wechall/5ZMGcCLxpcpsru03.png",
     "samples/wechall/stegano1.bmp",
+    "spec/bin_spec.rb",
     "spec/camouflage_spec.rb",
     "spec/cats_spec.rb",
     "spec/checker_spec.rb",
     "spec/easybmp_spec.rb",
+    "spec/extradata_spec.rb",
     "spec/flowers_spec.rb",
     "spec/hackquest_spec.rb",
     "spec/mask_spec.rb",
+    "spec/newbiecontest_spec.rb",
     "spec/openstego_spec.rb",
     "spec/polictf2012_spec.rb",
     "spec/prime_spec.rb",
@@ -86,6 +95,8 @@ Gem::Specification.new do |s|
     "spec/wechall_spec.rb",
     "spec/zlib_spec.rb",
     "tmp/.keep",
+    "writers/chunk_append.rb",
+    "writers/zlib_append.rb",
     "zsteg.gemspec"
   ]
   s.homepage = "http://github.com/zed-0xff/zsteg"
@@ -98,20 +109,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<zpng>, [">= 0.2.2"])
+      s.add_runtime_dependency(%q<zpng>, [">= 0.2.3"])
       s.add_runtime_dependency(%q<iostruct>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
-      s.add_dependency(%q<zpng>, [">= 0.2.2"])
+      s.add_dependency(%q<zpng>, [">= 0.2.3"])
       s.add_dependency(%q<iostruct>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
-    s.add_dependency(%q<zpng>, [">= 0.2.2"])
+    s.add_dependency(%q<zpng>, [">= 0.2.3"])
     s.add_dependency(%q<iostruct>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])