pwntools 1.1.0 → 1.2.0

data/test/shellcraft/infloop_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/linux/cat_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/linux/ls_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/linux/sh_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/linux/sleep_test.rb

@@ -0,0 +1,68 @@
+# encoding: ASCII-8BIT
+# frozen_string_literal: true
+
+require 'benchmark'
+
+require 'test_helper'
+
+require 'pwnlib/context'
+require 'pwnlib/runner'
+require 'pwnlib/shellcraft/shellcraft'
+
+class SleepTest < MiniTest::Test
+  include ::Pwnlib::Context
+
+  def setup
+    @shellcraft = ::Pwnlib::Shellcraft::Shellcraft.instance
+  end
+
+  def test_amd64
+    context.local(arch: :amd64) do
+      assert_equal(<<-'EOS', @shellcraft.sleep(10))
+  /* push "\n\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" */
+  push 1
+  dec byte ptr [rsp]
+  push 0xb
+  dec byte ptr [rsp]
+  /* call nanosleep("rsp", 0) */
+  push 0x23 /* (SYS_nanosleep) */
+  pop rax
+  mov rdi, rsp
+  xor esi, esi /* 0 */
+  syscall
+  add rsp, 16 /* recover rsp */
+      EOS
+    end
+  end
+
+  def test_i386
+    context.local(arch: :i386) do
+      assert_equal(<<-'EOS', @shellcraft.sleep(1 + 3e-9))
+  /* push "\x01\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00" */
+  push 1
+  dec byte ptr [esp]
+  push 3
+  push 1
+  dec byte ptr [esp]
+  push 1
+  /* call nanosleep("esp", 0) */
+  xor eax, eax
+  mov al, 0xa2 /* (SYS_nanosleep) */
+  mov ebx, esp
+  xor ecx, ecx /* 0 */
+  int 0x80
+  add esp, 16 /* recover esp */
+      EOS
+    end
+  end
+
+  def test_run
+    linux_only
+
+    context.local(arch: :amd64) do
+      asm = @shellcraft.sleep(0.3) + @shellcraft.exit(0)
+      t = Benchmark.realtime { ::Pwnlib::Runner.run_assembly(asm).recvall }
+      assert_operator t, :>=, 0.3
+    end
+  end
+end

data/test/shellcraft/linux/syscalls/execve_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/linux/syscalls/exit_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/linux/syscalls/open_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/linux/syscalls/syscall_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/memcpy_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -22,12 +23,26 @@ class MemcpyTest < MiniTest::Test
   mov cl, 0xff
   rep movsb
       EOS
-      assert_equal(<<-'EOS', @shellcraft.memcpy('rdi', 'rbx', 255))
-  /* memcpy("rdi", "rbx", 0xff) */
+      assert_equal(<<-'EOS', @shellcraft.memcpy('rdi', 0x602020, 10))
+  /* memcpy("rdi", 0x602020, 0xa) */
   cld
-  mov rsi, rbx
-  xor ecx, ecx
-  mov cl, 0xff
+  mov esi, 0x1010101
+  xor esi, 0x1612121 /* 0x602020 == 0x1010101 ^ 0x1612121 */
+  push 9 /* mov ecx, '\n' */
+  pop rcx
+  inc ecx
+  rep movsb
+      EOS
+    end
+  end
+
+  def test_i386
+    context.local(arch: :i386) do
+      assert_equal(<<-'EOS', @shellcraft.memcpy('eax', 'ebx', 'ecx'))
+  /* memcpy("eax", "ebx", "ecx") */
+  cld
+  mov edi, eax
+  mov esi, ebx
   rep movsb
       EOS
     end

data/test/shellcraft/mov_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/nop_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/popad_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/pushstr_array_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/pushstr_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/registers_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/ret_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/shellcraft/setregs_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -14,27 +15,27 @@ class SetregsTest < MiniTest::Test
 
   def test_amd64
     context.local(arch: 'amd64') do
-      assert_equal(<<-'EOS', @shellcraft.setregs(rax: 1, rbx: 'rax'))
+      assert_equal(<<-'EOS', @shellcraft.setregs({ rax: 1, rbx: 'rax' }))
   mov rbx, rax
   push 1
   pop rax
       EOS
-      assert_equal(<<-'EOS', @shellcraft.setregs(rax: 'SYS_write', rbx: 'rax'))
+      assert_equal(<<-'EOS', @shellcraft.setregs({ rax: 'SYS_write', rbx: 'rax' }))
   mov rbx, rax
   push 1 /* (SYS_write) */
   pop rax
       EOS
-      assert_equal(<<-'EOS', @shellcraft.setregs(rax: 'rbx', rbx: 'rax', rcx: 'rbx'))
+      assert_equal(<<-'EOS', @shellcraft.setregs({ rax: 'rbx', rbx: 'rax', rcx: 'rbx' }))
   mov rcx, rbx
   xchg rax, rbx
       EOS
-      assert_equal(<<-'EOS', @shellcraft.setregs(rax: 1, rdx: 0))
+      assert_equal(<<-'EOS', @shellcraft.setregs({ rax: 1, rdx: 0 }))
   push 1
   pop rax
   cdq /* rdx=0 */
       EOS
       # issue #50
-      assert_equal(<<-'EOS', @shellcraft.setregs(rdi: :rax, rsi: :rdi))
+      assert_equal(<<-'EOS', @shellcraft.setregs({ rdi: :rax, rsi: :rdi }))
   mov rsi, rdi
   mov rdi, rax
       EOS
@@ -43,16 +44,16 @@ class SetregsTest < MiniTest::Test
 
   def test_i386
     context.local(arch: 'i386') do
-      assert_equal(<<-EOS, @shellcraft.setregs(eax: 1, ebx: 'eax'))
+      assert_equal(<<-EOS, @shellcraft.setregs({ eax: 1, ebx: 'eax' }))
   mov ebx, eax
   push 1
   pop eax
       EOS
-      assert_equal(<<-EOS, @shellcraft.setregs(eax: 'ebx', ebx: 'eax', ecx: 'ebx'))
+      assert_equal(<<-EOS, @shellcraft.setregs({ eax: 'ebx', ebx: 'eax', ecx: 'ebx' }))
   mov ecx, ebx
   xchg eax, ebx
       EOS
-      assert_equal(<<-'EOS', @shellcraft.setregs(eax: 1, edx: 0))
+      assert_equal(<<-'EOS', @shellcraft.setregs({ eax: 1, edx: 0 }))
   push 1
   pop eax
   cdq /* edx=0 */

data/test/shellcraft/shellcraft_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/test_helper.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'rainbow'
 require 'simplecov'
+require 'tty/platform'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
   [SimpleCov::Formatter::HTMLFormatter]
@@ -20,6 +23,14 @@ module MiniTest
       Rainbow.enabled = false
     end
 
+    def linux_only(msg = 'Only tested on Linux')
+      skip msg unless TTY::Platform.new.linux?
+    end
+
+    def skip_windows(msg = 'Skip on Windows')
+      skip msg if TTY::Platform.new.windows?
+    end
+
     # Methods for hooking logger,
     # require 'pwnlib/logger' before using these methods.
 
@@ -40,5 +51,22 @@ module MiniTest
         ::Pwnlib::Logger.log.instance_variable_set(:@logdev, old)
       end
     end
+
+    # Hooks +$stdin+.
+    #
+    # @param [IO] io
+    #   IO object to be used as +$stdin+.
+    #
+    # @return [Object]
+    #   Returns what the block returned.
+    def hook_stdin(io)
+      org_stdin = $stdin
+      $stdin = io
+      begin
+        yield
+      ensure
+        $stdin = org_stdin
+      end
+    end
   end
 end

data/test/timer_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -34,7 +35,7 @@ class TimerTest < MiniTest::Test
   def test_nested_countdown_false_positve_115
     t = Timer.new
     assert_raises(::Pwnlib::Errors::TimeoutError) do
-      t.countdown(0.01) { sleep(0.02) }
+      t.countdown(0.01) { sleep(1) }
     end
     t.countdown(0.01) {}
   end

data/test/tubes/buffer_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/tubes/process_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'socket'
 require 'tty-platform'
@@ -13,7 +14,7 @@ class ProcessTest < MiniTest::Test
   include ::Pwnlib::Context
 
   def setup
-    skip 'Skip on Windows' if TTY::Platform.new.windows?
+    skip_windows
   end
 
   def test_io
@@ -33,7 +34,8 @@ class ProcessTest < MiniTest::Test
   end
 
   def test_aslr
-    skip 'Only tested on linux' unless TTY::Platform.new.linux?
+    linux_only
+
     map1 = ::Pwnlib::Tubes::Process.new('cat /proc/self/maps', aslr: false).read
     map2 = ::Pwnlib::Tubes::Process.new(['cat', '/proc/self/maps'], aslr: false).read
     assert_match('/bin/cat', map1) # make sure it read something
@@ -84,6 +86,10 @@ class ProcessTest < MiniTest::Test
     # In cooked mode, tty should echo the input, so we can gets twice.
     assert_equal("Hi\r\n", cat.gets)
     assert_equal("Hi\r\n", cat.gets)
+    class << cat
+      # hook shutdown to silence the +cat: -: Input/output error+ message.
+      def shutdown; end
+    end
     cat.close
   end
 

data/test/tubes/serialtube_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'open3'
 
@@ -19,10 +20,6 @@ end
 class SerialTest < MiniTest::Test
   include ::Pwnlib::Tubes
 
-  def skip_windows
-    skip 'Not test tube/serialtube on Windows' if TTY::Platform.new.windows?
-  end
-
   def open_pair
     Open3.popen3('socat -d -d pty,raw,echo=0 pty,raw,echo=0') do |_i, _o, stderr, thread|
       devs = []

data/test/tubes/sock_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'open3'
 

data/test/tubes/tube_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 # This test use UTF-8 encoding for strings since the output for hexdump contains lots of UTF-8 characters.
 
@@ -34,7 +35,7 @@ class TubeTest < MiniTest::Test
 
     class << t
       def buf
-        @buf ||= ''
+        @buf ||= +''
       end
 
       private
@@ -61,6 +62,7 @@ class TubeTest < MiniTest::Test
     class << t
       def recv_raw(_n)
         raise ::Pwnlib::Errors::EndOfTubeError if io.eof?
+
         io.read
       end
 
@@ -195,6 +197,13 @@ class TubeTest < MiniTest::Test
     5.times { assert_match(r, t.recvregex(r)) }
   end
 
+  def test_recvall
+    t = basic_tube
+    t.unrecv('meow')
+    assert_equal('meow', t.recvall)
+    assert_equal('', t.recvall)
+  end
+
   def test_send
     t = hello_tube
     assert_equal(6, t.write('DARKHH'))

data/test/ui_test.rb

@@ -0,0 +1,18 @@
+# encoding: ASCII-8BIT
+# frozen_string_literal: true
+
+require 'stringio'
+
+require 'test_helper'
+
+require 'pwnlib/ui'
+
+class UITest < MiniTest::Test
+  def test_pause
+    hook_stdin(StringIO.new("\n")) do
+      assert_output(<<-EOS) { log_stdout { ::Pwnlib::UI.pause } }
+[INFO] Paused (press enter to continue)
+      EOS
+    end
+  end
+end