pwntools 1.0.1 → 1.1.0

data/test/tubes/tube_test.rb

@@ -60,7 +60,7 @@ class TubeTest < MiniTest::Test
 
     class << t
       def recv_raw(_n)
-        raise EOFError if io.eof?
+        raise ::Pwnlib::Errors::EndOfTubeError if io.eof?
         io.read
       end
 
@@ -73,13 +73,32 @@ class TubeTest < MiniTest::Test
       end
 
       def io
-        @fakeio ||= Tempfile.new('pwntools_ruby_test')
+        @io ||= Tempfile.new('pwntools_ruby_test')
+      end
+
+      def io_out
+        io
       end
     end
 
     t
   end
 
+  def test_not_implement
+    t = Tube.new
+    # io_out
+    assert_raises(NotImplementedError) { context.local(log_level: :fatal) { t.interact } }
+    # send_raw
+    assert_raises(NotImplementedError) { t.puts }
+    # timeout_raw=
+    assert_raises(NotImplementedError) { t.recv(timeout: 1) }
+    class << t
+      def timeout_raw=(_) end
+    end
+    # recv_raw
+    assert_raises(NotImplementedError) { t.gets }
+  end
+
   def test_recv
     t = hello_tube
     assert_equal('Hello, world', t.recv)
@@ -110,11 +129,14 @@ class TubeTest < MiniTest::Test
     assert_equal('worldHello, ', t.recvuntil(' '))
     t.unrecv('Hello, world!')
     assert_equal('Hello,', t.recvuntil(' wor', drop: true))
-    assert_equal('', t.recvuntil('DARKHH', drop: true, timeout: 0.1))
+
+    # test timeout
+    assert_raises(::Pwnlib::Errors::TimeoutError) { t.recvuntil('DARKHH', drop: true, timeout: 0.1) }
 
     t = basic_tube
     t.unrecv('meow')
-    assert_equal('', t.recvuntil('DARKHH'))
+    # test EOF
+    assert_raises(::Pwnlib::Errors::EndOfTubeError) { t.recvuntil('DARKHH') }
     assert_equal('meow', t.recv)
   end
 
@@ -132,19 +154,37 @@ class TubeTest < MiniTest::Test
 
     t = basic_tube
     t.unrecv('Hello, world')
-    assert_equal('', t.recvline)
+    # test EOF
+    assert_raises(::Pwnlib::Errors::EndOfTubeError) { assert_equal('', t.recvline) }
     assert_equal('Hello, world', t.recv)
   end
 
+  def test_gets
+    t = Tube.new
+    t.unrecv("Foo\nBar\r\nBaz\n")
+    assert_equal("Foo\n", t.gets)
+    assert_equal("Bar\r\n", t.gets)
+    assert_equal('Baz', t.gets(drop: true))
+
+    t = hello_tube
+    assert_equal('Hello,', t.gets(','))
+    assert_equal(' world', t.gets('H', drop: true))
+    assert_equal('ello', t.gets(4))
+    assert_raises(ArgumentError) { t.gets(t) }
+  end
+
   def test_recvpred
     t = hello_tube
     r = /H.*w/
     10.times { assert_match(r, t.recvpred { |data| data =~ r }) }
     r = /H.*W/
-    assert_match('', t.recvpred(timeout: 0.01) { |data| data =~ r })
+
+    # test timeout
+    assert_raises(::Pwnlib::Errors::TimeoutError) { t.recvpred(timeout: 0.01) { |data| data =~ r } }
     t = basic_tube
     t.unrecv('darkhh')
-    assert_match('', t.recvpred { |data| data =~ r })
+    # test EOF
+    assert_raises(::Pwnlib::Errors::EndOfTubeError) { t.recvpred { |data| data =~ r } }
   end
 
   def test_recvregex
@@ -157,11 +197,11 @@ class TubeTest < MiniTest::Test
 
   def test_send
     t = hello_tube
-    t.write('DARKHH')
+    assert_equal(6, t.write('DARKHH'))
     assert_equal('DARKHH', t.buf)
-    t.write(' QQ')
+    assert_equal(3, t.write(' QQ'))
     assert_equal('DARKHH QQ', t.buf)
-    t.write(333)
+    assert_equal(3, t.write(333))
     assert_equal('DARKHH QQ333', t.buf)
 
     context.local(log_level: 'debug') do
@@ -192,8 +232,38 @@ class TubeTest < MiniTest::Test
     t = hello_tube
     t.write('DARKHH')
     assert_equal('DARKHH', t.buf)
-    t.puts(' QQ')
+    assert_equal(4, t.sendline(' QQ'))
     assert_equal("DARKHH QQ\n", t.buf)
+    assert_equal(1, t.sendline(''))
+    assert_equal("DARKHH QQ\n\n", t.buf)
+  end
+
+  def test_puts
+    t = hello_tube
+    assert_equal(1, t.puts)
+    assert_equal("\n", t.buf)
+    assert_equal(17, t.puts("darkhh i4 so sad\n"))
+    assert_equal("\ndarkhh i4 so sad\n", t.buf)
+
+    t = hello_tube
+    assert_equal(14, t.puts('shik', 'hao', '', 123))
+    assert_equal("shik\nhao\n\n123\n", t.buf)
+
+    t = hello_tube
+    assert_equal(15, t.puts(['shik', '', "\n", 'hao', 123]))
+    assert_equal("shik\n\n\nhao\n123\n", t.buf)
+    assert_equal(0, t.puts([]))
+    assert_equal("shik\n\n\nhao\n123\n", t.buf)
+
+    t = hello_tube
+    assert_equal(20, t.puts(["darkhh\n\n", 'wei shi', 360]))
+    assert_equal("darkhh\n\nwei shi\n360\n", t.buf)
+
+    context.local(newline: '!!!') do
+      t = hello_tube
+      assert_equal(5, t.puts('hi'))
+      assert_equal('hi!!!', t.buf)
+    end
   end
 
   FLAG_FILE = File.expand_path('../data/flag', __dir__)
@@ -204,11 +274,11 @@ class TubeTest < MiniTest::Test
     begin
       t = basic_tube
       t.interact
-    rescue EOFError
+    rescue ::Pwnlib::Errors::EndOfTubeError
       t.io.rewind
       assert_equal(IO.binread(FLAG_FILE), t.io.read)
     end
-    assert_equal("[INFO] Switching to interactive mode\n", @log.string)
+    assert_equal("[INFO] Switching to interactive mode\n[INFO] Got EOF in interactive mode\n", @log.string)
     $stdin.close
     t.io.close
     $stdin = save_stdin
@@ -222,13 +292,13 @@ class TubeTest < MiniTest::Test
     @log.clear
     begin
       t = basic_tube
-      t.instance_variable_set(:@fakeio, File.new(FLAG_FILE, File::RDONLY))
+      t.instance_variable_set(:@io, File.new(FLAG_FILE, File::RDONLY))
       t.interact
-    rescue EOFError
+    rescue ::Pwnlib::Errors::EndOfTubeError
       $stdout.rewind
       assert_equal(IO.binread(FLAG_FILE), $stdout.read)
     end
-    assert_equal("[INFO] Switching to interactive mode\n", @log.string)
+    assert_equal("[INFO] Switching to interactive mode\n[INFO] Got EOF in interactive mode\n", @log.string)
     $stdout.close
     t.io.close
     $stdin = save_stdin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwntools
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - peter50216@gmail.com
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crabstone
@@ -30,16 +30,22 @@ dependencies:
   name: dentaku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: elftools
   requirement: !ruby/object:Gem::Requirement
@@ -69,33 +75,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: method_source
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: rubyserial
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -144,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.55'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.55'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +259,7 @@ files:
 - lib/pwnlib/context.rb
 - lib/pwnlib/dynelf.rb
 - lib/pwnlib/elf/elf.rb
+- lib/pwnlib/errors.rb
 - lib/pwnlib/ext/array.rb
 - lib/pwnlib/ext/helper.rb
 - lib/pwnlib/ext/integer.rb
@@ -237,9 +278,12 @@ files:
 - lib/pwnlib/shellcraft/generators/amd64/common/pushstr_array.rb
 - lib/pwnlib/shellcraft/generators/amd64/common/ret.rb
 - lib/pwnlib/shellcraft/generators/amd64/common/setregs.rb
+- lib/pwnlib/shellcraft/generators/amd64/linux/cat.rb
 - lib/pwnlib/shellcraft/generators/amd64/linux/execve.rb
+- lib/pwnlib/shellcraft/generators/amd64/linux/exit.rb
 - lib/pwnlib/shellcraft/generators/amd64/linux/linux.rb
 - lib/pwnlib/shellcraft/generators/amd64/linux/ls.rb
+- lib/pwnlib/shellcraft/generators/amd64/linux/open.rb
 - lib/pwnlib/shellcraft/generators/amd64/linux/sh.rb
 - lib/pwnlib/shellcraft/generators/amd64/linux/syscall.rb
 - lib/pwnlib/shellcraft/generators/helper.rb
@@ -250,9 +294,12 @@ files:
 - lib/pwnlib/shellcraft/generators/i386/common/pushstr.rb
 - lib/pwnlib/shellcraft/generators/i386/common/pushstr_array.rb
 - lib/pwnlib/shellcraft/generators/i386/common/setregs.rb
+- lib/pwnlib/shellcraft/generators/i386/linux/cat.rb
 - lib/pwnlib/shellcraft/generators/i386/linux/execve.rb
+- lib/pwnlib/shellcraft/generators/i386/linux/exit.rb
 - lib/pwnlib/shellcraft/generators/i386/linux/linux.rb
 - lib/pwnlib/shellcraft/generators/i386/linux/ls.rb
+- lib/pwnlib/shellcraft/generators/i386/linux/open.rb
 - lib/pwnlib/shellcraft/generators/i386/linux/sh.rb
 - lib/pwnlib/shellcraft/generators/i386/linux/syscall.rb
 - lib/pwnlib/shellcraft/generators/x86/common/common.rb
@@ -261,15 +308,20 @@ files:
 - lib/pwnlib/shellcraft/generators/x86/common/pushstr.rb
 - lib/pwnlib/shellcraft/generators/x86/common/pushstr_array.rb
 - lib/pwnlib/shellcraft/generators/x86/common/setregs.rb
+- lib/pwnlib/shellcraft/generators/x86/linux/cat.rb
 - lib/pwnlib/shellcraft/generators/x86/linux/execve.rb
+- lib/pwnlib/shellcraft/generators/x86/linux/exit.rb
 - lib/pwnlib/shellcraft/generators/x86/linux/linux.rb
 - lib/pwnlib/shellcraft/generators/x86/linux/ls.rb
+- lib/pwnlib/shellcraft/generators/x86/linux/open.rb
 - lib/pwnlib/shellcraft/generators/x86/linux/sh.rb
 - lib/pwnlib/shellcraft/generators/x86/linux/syscall.rb
 - lib/pwnlib/shellcraft/registers.rb
 - lib/pwnlib/shellcraft/shellcraft.rb
 - lib/pwnlib/timer.rb
 - lib/pwnlib/tubes/buffer.rb
+- lib/pwnlib/tubes/process.rb
+- lib/pwnlib/tubes/serialtube.rb
 - lib/pwnlib/tubes/sock.rb
 - lib/pwnlib/tubes/tube.rb
 - lib/pwnlib/util/cyclic.rb
@@ -313,9 +365,12 @@ files:
 - test/memleak_test.rb
 - test/reg_sort_test.rb
 - test/shellcraft/infloop_test.rb
+- test/shellcraft/linux/cat_test.rb
 - test/shellcraft/linux/ls_test.rb
 - test/shellcraft/linux/sh_test.rb
 - test/shellcraft/linux/syscalls/execve_test.rb
+- test/shellcraft/linux/syscalls/exit_test.rb
+- test/shellcraft/linux/syscalls/open_test.rb
 - test/shellcraft/linux/syscalls/syscall_test.rb
 - test/shellcraft/memcpy_test.rb
 - test/shellcraft/mov_test.rb
@@ -330,6 +385,8 @@ files:
 - test/test_helper.rb
 - test/timer_test.rb
 - test/tubes/buffer_test.rb
+- test/tubes/process_test.rb
+- test/tubes/serialtube_test.rb
 - test/tubes/sock_test.rb
 - test/tubes/tube_test.rb
 - test/util/cyclic_test.rb
@@ -358,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: pwntools
@@ -390,9 +447,12 @@ test_files:
 - test/shellcraft/ret_test.rb
 - test/shellcraft/popad_test.rb
 - test/shellcraft/nop_test.rb
+- test/shellcraft/linux/cat_test.rb
 - test/shellcraft/linux/ls_test.rb
 - test/shellcraft/linux/sh_test.rb
+- test/shellcraft/linux/syscalls/open_test.rb
 - test/shellcraft/linux/syscalls/syscall_test.rb
+- test/shellcraft/linux/syscalls/exit_test.rb
 - test/shellcraft/linux/syscalls/execve_test.rb
 - test/shellcraft/shellcraft_test.rb
 - test/shellcraft/pushstr_test.rb
@@ -412,7 +472,9 @@ test_files:
 - test/util/lists_test.rb
 - test/timer_test.rb
 - test/tubes/sock_test.rb
+- test/tubes/serialtube_test.rb
 - test/tubes/buffer_test.rb
+- test/tubes/process_test.rb
 - test/tubes/tube_test.rb
 - test/abi_test.rb
 - test/files/use_pwnlib.rb