RubyGems - pwntools - Versions diffs - 1.0.1 → 1.1.0 - Mend

pwntools 1.0.1 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (60) hide show

checksums.yaml +5 -5
data/README.md +4 -3
data/Rakefile +3 -1
data/lib/pwnlib/asm.rb +172 -2
data/lib/pwnlib/constants/constants.rb +10 -3
data/lib/pwnlib/context.rb +1 -3
data/lib/pwnlib/elf/elf.rb +3 -3
data/lib/pwnlib/errors.rb +30 -0
data/lib/pwnlib/ext/helper.rb +1 -1
data/lib/pwnlib/logger.rb +140 -2
data/lib/pwnlib/pwn.rb +3 -0
data/lib/pwnlib/reg_sort.rb +1 -1
data/lib/pwnlib/shellcraft/generators/amd64/common/infloop.rb +9 -3
data/lib/pwnlib/shellcraft/generators/amd64/common/pushstr_array.rb +6 -2
data/lib/pwnlib/shellcraft/generators/amd64/common/setregs.rb +6 -2
data/lib/pwnlib/shellcraft/generators/amd64/linux/cat.rb +23 -0
data/lib/pwnlib/shellcraft/generators/amd64/linux/execve.rb +6 -4
data/lib/pwnlib/shellcraft/generators/amd64/linux/exit.rb +23 -0
data/lib/pwnlib/shellcraft/generators/amd64/linux/ls.rb +6 -2
data/lib/pwnlib/shellcraft/generators/amd64/linux/open.rb +23 -0
data/lib/pwnlib/shellcraft/generators/amd64/linux/sh.rb +6 -2
data/lib/pwnlib/shellcraft/generators/amd64/linux/syscall.rb +6 -4
data/lib/pwnlib/shellcraft/generators/i386/common/infloop.rb +9 -3
data/lib/pwnlib/shellcraft/generators/i386/common/pushstr_array.rb +6 -2
data/lib/pwnlib/shellcraft/generators/i386/common/setregs.rb +6 -2
data/lib/pwnlib/shellcraft/generators/i386/linux/cat.rb +23 -0
data/lib/pwnlib/shellcraft/generators/i386/linux/execve.rb +8 -4
data/lib/pwnlib/shellcraft/generators/i386/linux/exit.rb +23 -0
data/lib/pwnlib/shellcraft/generators/i386/linux/ls.rb +6 -2
data/lib/pwnlib/shellcraft/generators/i386/linux/open.rb +23 -0
data/lib/pwnlib/shellcraft/generators/i386/linux/sh.rb +6 -2
data/lib/pwnlib/shellcraft/generators/i386/linux/syscall.rb +8 -4
data/lib/pwnlib/shellcraft/generators/x86/linux/cat.rb +53 -0
data/lib/pwnlib/shellcraft/generators/x86/linux/exit.rb +33 -0
data/lib/pwnlib/shellcraft/generators/x86/linux/open.rb +46 -0
data/lib/pwnlib/shellcraft/shellcraft.rb +3 -2
data/lib/pwnlib/timer.rb +5 -2
data/lib/pwnlib/tubes/process.rb +153 -0
data/lib/pwnlib/tubes/serialtube.rb +112 -0
data/lib/pwnlib/tubes/sock.rb +24 -25
data/lib/pwnlib/tubes/tube.rb +191 -39
data/lib/pwnlib/util/packing.rb +3 -9
data/lib/pwnlib/version.rb +1 -1
data/test/asm_test.rb +85 -2
data/test/constants/constants_test.rb +2 -2
data/test/data/echo.rb +2 -7
data/test/elf/elf_test.rb +10 -15
data/test/files/use_pwn.rb +2 -6
data/test/logger_test.rb +38 -0
data/test/shellcraft/linux/cat_test.rb +86 -0
data/test/shellcraft/linux/syscalls/exit_test.rb +56 -0
data/test/shellcraft/linux/syscalls/open_test.rb +86 -0
data/test/shellcraft/shellcraft_test.rb +5 -4
data/test/test_helper.rb +22 -2
data/test/timer_test.rb +19 -1
data/test/tubes/process_test.rb +99 -0
data/test/tubes/serialtube_test.rb +165 -0
data/test/tubes/sock_test.rb +20 -21
data/test/tubes/tube_test.rb +86 -16
metadata +75 -13

data/lib/pwnlib/pwn.rb CHANGED

@@ -8,9 +8,12 @@ require 'pwnlib/constants/constants'
 require 'pwnlib/context'
 require 'pwnlib/dynelf'
 require 'pwnlib/elf/elf'
+require 'pwnlib/errors'
 require 'pwnlib/logger'
 require 'pwnlib/reg_sort'
 require 'pwnlib/shellcraft/shellcraft'
+require 'pwnlib/tubes/process'
+require 'pwnlib/tubes/serialtube'
 require 'pwnlib/tubes/sock'
 require 'pwnlib/util/cyclic'

data/lib/pwnlib/reg_sort.rb CHANGED

@@ -70,7 +70,7 @@ module Pwnlib
         first_reg, val = list.shift
         # Special case for val.zero? because zeroify registers is cheaper than mov.
         next if list.empty? || all_regs.include?(val) || val.zero?
-        list.each do |reg, _|
+        list.each do |(reg, _)|
           hash[reg] = first_reg
           in_out.delete(reg)
         end

data/lib/pwnlib/shellcraft/generators/amd64/common/infloop.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/amd64/common/common'
 require 'pwnlib/shellcraft/generators/x86/common/infloop'
@@ -6,9 +8,13 @@ module Pwnlib
     module Generators
       module Amd64
         module Common
-          # See {X86::Common#infloop}.
-          def infloop
-            cat Generators::X86::Common.infloop
+          # @overload infloop
+          #
+          # @see Generators::X86::Common#infloop
+          def infloop(*args)
+            context.local(arch: :amd64) do
+              cat X86::Common.infloop(*args)
+            end
           end
         end
       end

data/lib/pwnlib/shellcraft/generators/amd64/common/pushstr_array.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/amd64/common/common'
 require 'pwnlib/shellcraft/generators/x86/common/pushstr_array'
@@ -6,9 +8,11 @@ module Pwnlib
     module Generators
       module Amd64
         module Common
-          # See {Pwnlib::Shellcraft::Generators::X86::Common#pushstr_array}.
+          # @overload pushstr_array(reg, array)
+          #
+          # @see Generators::X86::Common#pushstr_array
           def pushstr_array(*args)
-            context.local(arch: 'amd64') do
+            context.local(arch: :amd64) do
               cat X86::Common.pushstr_array(*args)
             end
           end

data/lib/pwnlib/shellcraft/generators/amd64/common/setregs.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/amd64/common/common'
 require 'pwnlib/shellcraft/generators/x86/common/setregs'
@@ -6,9 +8,11 @@ module Pwnlib
     module Generators
       module Amd64
         module Common
-          # See {Generators::X86::Common#setregs}.
+          # @overload setregs(reg_context, stack_allowed: true)
+          #
+          # @see Generators::X86::Common#setregs
           def setregs(*args)
-            context.local(arch: 'amd64') do
+            context.local(arch: :amd64) do
               cat X86::Common.setregs(*args)
             end
           end

data/lib/pwnlib/shellcraft/generators/amd64/linux/cat.rb ADDED

@@ -0,0 +1,23 @@
+# encoding: ASCII-8BIT
+require 'pwnlib/shellcraft/generators/amd64/linux/linux'
+require 'pwnlib/shellcraft/generators/x86/linux/cat'
+module Pwnlib
+  module Shellcraft
+    module Generators
+      module Amd64
+        module Linux
+          # @overload cat(filename, fd: 1)
+          #
+          # @see Generators::X86::Linux#cat
+          def cat(*args)
+            context.local(arch: :amd64) do
+              cat X86::Linux.cat(*args)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pwnlib/shellcraft/generators/amd64/linux/execve.rb CHANGED

@@ -8,10 +8,12 @@ module Pwnlib
     module Generators
       module Amd64
         module Linux
-          # See {Generators::X86::Linux#execve}.
-          def execve(*arguments)
-            context.local(arch: 'amd64') do
-              cat X86::Linux.execve(*arguments)
+          # @overload execve(path, argv, envp)
+          #
+          # @see Generators::X86::Linux#execve
+          def execve(*args)
+            context.local(arch: :amd64) do
+              cat X86::Linux.execve(*args)
             end
           end
         end

data/lib/pwnlib/shellcraft/generators/amd64/linux/exit.rb ADDED

@@ -0,0 +1,23 @@
+# encoding: ASCII-8BIT
+require 'pwnlib/shellcraft/generators/amd64/linux/linux'
+require 'pwnlib/shellcraft/generators/x86/linux/exit'
+module Pwnlib
+  module Shellcraft
+    module Generators
+      module Amd64
+        module Linux
+          # @overload exit(status = 0)
+          #
+          # @see Generators::X86::Linux#exit
+          def exit(*args)
+            context.local(arch: :amd64) do
+              cat X86::Linux.exit(*args)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pwnlib/shellcraft/generators/amd64/linux/ls.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/amd64/linux/linux'
 require 'pwnlib/shellcraft/generators/x86/linux/ls'
@@ -6,9 +8,11 @@ module Pwnlib
     module Generators
       module Amd64
         module Linux
-          # See #{Generators::X86::Linux#ls}.
+          # @overload ls(dir = '.')
+          #
+          # @see Generators::X86::Linux#ls
           def ls(*args)
-            context.local(arch: 'amd64') do
+            context.local(arch: :amd64) do
               cat X86::Linux.ls(*args)
             end
           end

data/lib/pwnlib/shellcraft/generators/amd64/linux/open.rb ADDED

@@ -0,0 +1,23 @@
+# encoding: ASCII-8BIT
+require 'pwnlib/shellcraft/generators/amd64/linux/linux'
+require 'pwnlib/shellcraft/generators/x86/linux/open'
+module Pwnlib
+  module Shellcraft
+    module Generators
+      module Amd64
+        module Linux
+          # @overload open(filename, flags = 'O_RDONLY', mode = 0)
+          #
+          # @see Generators::X86::Linux#open
+          def open(*args)
+            context.local(arch: :amd64) do
+              cat X86::Linux.open(*args)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pwnlib/shellcraft/generators/amd64/linux/sh.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/amd64/linux/linux'
 require 'pwnlib/shellcraft/generators/x86/linux/sh'
@@ -6,9 +8,11 @@ module Pwnlib
     module Generators
       module Amd64
         module Linux
-          # See #{Generators::X86::Linux#sh}.
+          # @overload sh(argv: false)
+          #
+          # @see Generators::X86::Linux#sh
           def sh(*args)
-            context.local(arch: 'amd64') do
+            context.local(arch: :amd64) do
               cat X86::Linux.sh(*args)
             end
           end

data/lib/pwnlib/shellcraft/generators/amd64/linux/syscall.rb CHANGED

@@ -8,10 +8,12 @@ module Pwnlib
     module Generators
       module Amd64
         module Linux
-          # See {Generators::X86::Linux#syscall}.
-          def syscall(*arguments)
-            context.local(arch: 'amd64') do
-              cat X86::Linux.syscall(*arguments)
+          # @overload syscall(*arguments)
+          #
+          # @see Generators::X86::Linux#syscall
+          def syscall(*args)
+            context.local(arch: :amd64) do
+              cat X86::Linux.syscall(*args)
             end
           end
         end

data/lib/pwnlib/shellcraft/generators/i386/common/infloop.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/i386/common/common'
 require 'pwnlib/shellcraft/generators/x86/common/infloop'
@@ -6,9 +8,13 @@ module Pwnlib
     module Generators
       module I386
         module Common
-          # See {X86::Common#infloop}.
-          def infloop
-            cat X86::Common.infloop
+          # @overload infloop
+          #
+          # @see Generators::X86::Common#infloop
+          def infloop(*args)
+            context.local(arch: :i386) do
+              cat X86::Common.infloop(*args)
+            end
           end
         end
       end

data/lib/pwnlib/shellcraft/generators/i386/common/pushstr_array.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/i386/common/common'
 require 'pwnlib/shellcraft/generators/x86/common/pushstr_array'
@@ -6,9 +8,11 @@ module Pwnlib
     module Generators
       module I386
         module Common
-          # See {Pwnlib::Shellcraft::Generators::X86::Common#pushstr_array}.
+          # @overload pushstr_array(reg, array)
+          #
+          # @see Generators::X86::Common#pushstr_array
           def pushstr_array(*args)
-            context.local(arch: 'i386') do
+            context.local(arch: :i386) do
               cat X86::Common.pushstr_array(*args)
             end
           end

data/lib/pwnlib/shellcraft/generators/i386/common/setregs.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/i386/common/common'
 require 'pwnlib/shellcraft/generators/x86/common/setregs'
@@ -6,9 +8,11 @@ module Pwnlib
     module Generators
       module I386
         module Common
-          # See {Generators::X86::Common#setregs}.
+          # @overload setregs(reg_context, stack_allowed: true)
+          #
+          # @see Generators::X86::Common#setregs
           def setregs(*args)
-            context.local(arch: 'i386') do
+            context.local(arch: :i386) do
               cat X86::Common.setregs(*args)
             end
           end

data/lib/pwnlib/shellcraft/generators/i386/linux/cat.rb ADDED

@@ -0,0 +1,23 @@
+# encoding: ASCII-8BIT
+require 'pwnlib/shellcraft/generators/i386/linux/linux'
+require 'pwnlib/shellcraft/generators/x86/linux/cat'
+module Pwnlib
+  module Shellcraft
+    module Generators
+      module I386
+        module Linux
+          # @overload cat(filename, fd: 1)
+          #
+          # @see Generators::X86::Linux#cat
+          def cat(*args)
+            context.local(arch: :i386) do
+              cat X86::Linux.cat(*args)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pwnlib/shellcraft/generators/i386/linux/execve.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/i386/linux/linux'
 require 'pwnlib/shellcraft/generators/x86/linux/execve'
@@ -6,10 +8,12 @@ module Pwnlib
     module Generators
       module I386
         module Linux
-          # See {Generators::X86::Linux#execve}.
-          def execve(*arguments)
-            context.local(arch: 'i386') do
-              cat X86::Linux.execve(*arguments)
+          # @overload execve(path, argv, envp)
+          #
+          # @see Generators::X86::Linux#execve
+          def execve(*args)
+            context.local(arch: :i386) do
+              cat X86::Linux.execve(*args)
             end
           end
         end

data/lib/pwnlib/shellcraft/generators/i386/linux/exit.rb ADDED

@@ -0,0 +1,23 @@
+# encoding: ASCII-8BIT
+require 'pwnlib/shellcraft/generators/i386/linux/linux'
+require 'pwnlib/shellcraft/generators/x86/linux/exit'
+module Pwnlib
+  module Shellcraft
+    module Generators
+      module I386
+        module Linux
+          # @overload exit(status = 0)
+          #
+          # @see Generators::X86::Linux#exit
+          def exit(*args)
+            context.local(arch: :i386) do
+              cat X86::Linux.exit(*args)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pwnlib/shellcraft/generators/i386/linux/ls.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/i386/linux/linux'
 require 'pwnlib/shellcraft/generators/x86/linux/ls'
@@ -6,9 +8,11 @@ module Pwnlib
     module Generators
       module I386
         module Linux
-          # See #{Generators::X86::Linux#ls}.
+          # @overload ls(dir = '.')
+          #
+          # @see Generators::X86::Linux#ls
           def ls(*args)
-            context.local(arch: 'i386') do
+            context.local(arch: :i386) do
               cat X86::Linux.ls(*args)
             end
           end

data/lib/pwnlib/shellcraft/generators/i386/linux/open.rb ADDED

@@ -0,0 +1,23 @@
+# encoding: ASCII-8BIT
+require 'pwnlib/shellcraft/generators/i386/linux/linux'
+require 'pwnlib/shellcraft/generators/x86/linux/open'
+module Pwnlib
+  module Shellcraft
+    module Generators
+      module I386
+        module Linux
+          # @overload open(filename, flags = 'O_RDONLY', mode = 0)
+          #
+          # @see Generators::X86::Linux#open
+          def open(*args)
+            context.local(arch: :i386) do
+              cat X86::Linux.open(*args)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pwnlib/shellcraft/generators/i386/linux/sh.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/i386/linux/linux'
 require 'pwnlib/shellcraft/generators/x86/linux/sh'
@@ -6,9 +8,11 @@ module Pwnlib
     module Generators
       module I386
         module Linux
-          # See #{Generators::X86::Linux#sh}.
+          # @overload sh(argv: false)
+          #
+          # @see Generators::X86::Linux#sh
           def sh(*args)
-            context.local(arch: 'i386') do
+            context.local(arch: :i386) do
               cat X86::Linux.sh(*args)
             end
           end

data/lib/pwnlib/shellcraft/generators/i386/linux/syscall.rb CHANGED

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
 require 'pwnlib/shellcraft/generators/i386/linux/linux'
 require 'pwnlib/shellcraft/generators/x86/linux/syscall'
@@ -6,10 +8,12 @@ module Pwnlib
     module Generators
       module I386
         module Linux
-          # See {Generators::X86::Linux#syscall}.
-          def syscall(*arguments)
-            context.local(arch: 'i386') do
-              cat X86::Linux.syscall(*arguments)
+          # @overload syscall(*arguments)
+          #
+          # @see Generators::X86::Linux#syscall
+          def syscall(*args)
+            context.local(arch: :i386) do
+              cat X86::Linux.syscall(*args)
             end
           end
         end