nomeaning-ctf 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3a7148c4238a98d0574bc50be9b388b0548ed7e
-  data.tar.gz: 367fe6f527bf7bc3a41d49234914ef6e21c9c374
+  metadata.gz: b798e5a019552fa793d9ff1dd9227212345847e2
+  data.tar.gz: 900662a06d5586294292c6c387a821268c446d8a
 SHA512:
-  metadata.gz: 00af00ff18cb4c1b208ab194a69bd1daab0ccc61d9bf476fe59116e2b4f6564c03a810c1768f5753fc681bd2eff9fd3086f6017d6143ed7e565b669ca58357ca
-  data.tar.gz: dedf64cbae558382b59f8d47fd5baadb1f3cb4485f5ea59e33132e89e5700bfb2628eb55d759f208798e65265134ab306f5b2f2707abb428964a355ec437df21
+  metadata.gz: dc70ee080590b76ece422feb4a44812c88f26580772208d62577b66eca1375165b692a533d59c7cf3a255251feadeb82b1fbcea9cb11451e80764037cb3a2b5c
+  data.tar.gz: 1ab010c57b77cf88057aa23d9f32cdff340f5dd629941df2173fa1f289949eb7da0b0ee43375127594451a660573c7862d7917e73df61c394c5022e5780e7f9a

data/lib/ctf.rb

@@ -1,5 +1,5 @@
 require "ctf/version"
-require 'ctf/socket'
+require 'ctf/io_with_echo'
 require 'ctf/utils'
 require 'ctf/math'
 require 'ctf/rop'

data/lib/ctf/{socket.rb → io_with_echo.rb}

@@ -5,7 +5,7 @@ require 'stringio'
 require 'io/interactive'
 
 module CTF
-  module SocketWithEcho
+  module IOWithEcho
     attr_accessor :echo, :echo_input, :echo_output, :echo_color
     def echo_input
       @echo_input || STDOUT
@@ -24,10 +24,8 @@ module CTF
       super str
     end
 
-    def read(length = nil, outbuf = '')
-      result = super length, outbuf
-      echo_input_print result if result
-      result
+    def read(length = nil, outbuf = nil)
+      super(length, outbuf).tap {|result| echo_input_print(result || '') }
     end
 
     def interactive!(input = STDIN, output = STDOUT)
@@ -36,7 +34,11 @@ module CTF
     end
 
     def gets
-      expect("\n")[0]
+      super.tap {|result| echo_input_print(result || '') }
+    end
+
+    def getc
+      super.tap {|result| echo_input_print(result || '') }
     end
 
     # TODO: Don't ignore timeout
@@ -48,15 +50,17 @@ module CTF
         else
           break if result && result.end_with?(pattern)
         end
-        data = read(1)
+        data = getc
         break unless data
-        result ||= ''
-        result.force_encoding('ASCII-8BIT')
-        result << data
+        if result
+          result << data.chr
+        else
+          result = data.chr
+        end
       end
       return result unless result
       if pattern.is_a?(Regexp)
-        [result] + result.match(pattern).to_a[1..-1]
+        [result] + (result.match(pattern) || [nil]).to_a[1..-1]
       else
         [result]
       end
@@ -87,6 +91,6 @@ module CTF
   end
 end
 
-class BasicSocket
-  prepend CTF::SocketWithEcho
+class IO
+  prepend CTF::IOWithEcho
 end

data/lib/ctf/version.rb

@@ -1,3 +1,3 @@
 module CTF
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/io_with_echo_spec.rb

@@ -0,0 +1,31 @@
+# coding: UTF-8
+require 'spec_helper'
+require 'ctf'
+require 'tempfile'
+
+describe CTF::IOWithEcho do
+  describe '#read' do
+    let(:utf8_io) do
+      io = Tempfile.open
+      io.set_encoding(Encoding::UTF_8, Encoding::UTF_8)
+      io.puts 'ほげほげ'
+      io.seek 0
+      io
+    end
+
+    let(:ascii8bit_io) do
+      io = Tempfile.open
+      io.set_encoding(Encoding::ASCII_8BIT, Encoding::ASCII_8BIT)
+      io.puts 'ほげほげ'
+      io.seek 0
+      io
+    end
+
+    it 'returns with correct encoding' do
+      expect(utf8_io.read.encoding).to eq Encoding::UTF_8
+      expect(ascii8bit_io.read.encoding).to eq Encoding::ASCII_8BIT
+      ascii8bit_io.seek 0
+      expect(ascii8bit_io.read(1).encoding).to eq Encoding::ASCII_8BIT
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nomeaning-ctf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - nomeaning
@@ -109,12 +109,13 @@ files:
 - ctf.gemspec
 - examples/socket-example.rb
 - lib/ctf.rb
+- lib/ctf/io_with_echo.rb
 - lib/ctf/math.rb
 - lib/ctf/rop.rb
 - lib/ctf/shellcode.rb
-- lib/ctf/socket.rb
 - lib/ctf/utils.rb
 - lib/ctf/version.rb
+- spec/io_with_echo_spec.rb
 - spec/math_spec.rb
 - spec/spec_helper.rb
 homepage: https://bitbucket.org/nomeaning777/ctf
@@ -142,5 +143,6 @@ signing_key:
 specification_version: 4
 summary: Utils for CTF
 test_files:
+- spec/io_with_echo_spec.rb
 - spec/math_spec.rb
 - spec/spec_helper.rb