peplum-john 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3557101f19534057d6928e39832552c6d3f752efc61ab5818f32dc12c4bf73fa
-  data.tar.gz: 9f52968910d916f5f29066a21d68afa0d12b9e0e1839145d77c907e4ab485437
+  metadata.gz: f14dd32ae9417ae6a13bc1343fa0eb530facc0ef42b1a72288e80198ea229a9b
+  data.tar.gz: '0882f77f99ce3f5ea1551c0a80a1873c5225e630c96e2a7e55109efb379972cf'
 SHA512:
-  metadata.gz: 3dea930e2f89973e7bd90830352d709db0274aceb90daad387760c6f3e83df2422f488ed262c0a22aeb76993fc6c24e0639e959a3fa11f6e8e52a382b5ca210c
-  data.tar.gz: 3bbf00ab6898ce84806a4dc92e082705ec1134ec32d656c4d7e2a861006cc86652a30074d8f38ede56680ac935f14cbd5cf26e2f1f5dbe1093e406e34ec38671
+  metadata.gz: 7febba6d06ad2ead542a9a385e4a6c492e444bde62f970eb43ca60b20ec526d3815fe969354200b2c1dc3440b39298352b425f4ad9516fce02785d834bbbc2c8
+  data.tar.gz: 5901c23f40cc93ab786789a14de96df493a5442dd32e1ec4f5e9dcbdb6d2de231e8c68686919f94c99e31ebae8643b9340a9d0a4a8ea365ce52d88e9f611c01c

data/examples/rest.rb

@@ -28,8 +28,10 @@ request :post, 'instances', {
     objects:     %w(
       6ca13d52ca70c883e0f0bb101e425a89e8624de51db2d2392593af6a84118090
       36f583dd16f4e1e201eb1e6f6d8e35a2ccb3bbe2658de46b4ffae7b0e9ed872e
+      c6b3e5102f268d17a60562720abeb625b0d3398289f46f51861f1bab3055e89d
+      b962ac55407c25c159c4c9f3764145e1ecc9ae6a37cf376e8bc98d31633e9a61
     ),
-    max_workers: 2
+    max_workers: 4
   },
   payload: {
     format: 'raw-sha256'
@@ -40,6 +42,9 @@ request :post, 'instances', {
 instance_id = response_data['id']
 
 while sleep( 1 )
+  request :get, "instances/#{instance_id}/info/progress"
+  ap response_data
+
   # Continue looping while instance status is 'busy'.
   request :get, "instances/#{instance_id}"
   break if !response_data['busy']

data/examples/rpc.rb

@@ -15,8 +15,10 @@ john.run(
     objects:     %w(
       6ca13d52ca70c883e0f0bb101e425a89e8624de51db2d2392593af6a84118090
       36f583dd16f4e1e201eb1e6f6d8e35a2ccb3bbe2658de46b4ffae7b0e9ed872e
+      c6b3e5102f268d17a60562720abeb625b0d3398289f46f51861f1bab3055e89d
+      b962ac55407c25c159c4c9f3764145e1ecc9ae6a37cf376e8bc98d31633e9a61
     ),
-    max_workers: 2
+    max_workers: 4
   },
   payload: {
     format: 'raw-sha256'
@@ -24,7 +26,10 @@ john.run(
 )
 
 # Waiting to complete.
-sleep 1 while john.running?
+while john.running?
+  ap john.info.progress
+  sleep 1
+end
 
 # Hooray!
 puts JSON.pretty_generate( john.generate_report.data )

data/lib/peplum/john/application/payload.rb

@@ -8,10 +8,10 @@ class Application
 module Payload
 
   # For some reason doesn't work when specifying sane directories.
-  HASHES_FILE = "hashes.#{Process.pid}.txt"
+  HASHES_FILE = "hashes.#{rand(99999)}.#{Process.pid}.txt"
   at_exit { FileUtils.rm_f HASHES_FILE }
 
-  POT_FILE = "hashes.#{Process.pid}.pot"
+  POT_FILE = "hashes.#{rand(99999)}.#{Process.pid}.pot"
   at_exit { FileUtils.rm_f POT_FILE }
 
   JOHN = 'john-the-ripper'
@@ -85,7 +85,9 @@ module Payload
       end
     end
 
-    _run options
+    r = _run( options )
+    John::Application.master.info.update r
+    r
   end
 
   # Distribute `objects` into `chunks` amount of groups, one for each worker.
@@ -94,8 +96,7 @@ module Payload
   # @param  [Integer] chunks  Amount of object groups that should be generated.
   #
   # @return [Array<Array<Object>>]  `objects` split in `chunks` amount of groups
-  # @abstract
-  def group( objects, chunks )
+  def split( objects, chunks )
     objects.chunk chunks
   end
 
@@ -119,15 +120,23 @@ module Payload
   end
 
   def _run( options )
-    `#{executable} --no-log --pot=#{POT_FILE} --format=#{options['format']} #{HASHES_FILE} 2> /dev/null`
-    `#{executable} --format=#{options['format']} #{HASHES_FILE} 2> /dev/null`
+    `#{executable} --no-log --session=#{Process.pid} --pot=#{POT_FILE} --format=#{options['format']} #{HASHES_FILE} 2> /dev/null`
+    self.report
+  end
 
+  def report
     results = {}
+
+    return results if !File.exists? POT_FILE
+
     File.open( POT_FILE , 'r' ) do |f|
-      line = f.readline
-      hash, password = line.split( '$' ).last.split( ':' )
-      results[hash] = password.strip
+      while !f.eof?
+        line = f.readline
+        hash, password = line.split( '$' ).last.split( ':' )
+        results[hash] = password.strip
+      end
     end
+
     results
   end
 

data/lib/peplum/john/application/services/info.rb

@@ -0,0 +1,28 @@
+module Peplum
+class John
+class Application
+module Services
+
+class Info
+
+  class <<self
+    def progress_data
+      @progress_data ||= {}
+    end
+  end
+
+  def progress
+    self.class.progress_data
+  end
+
+  def update( data )
+    self.class.progress_data.merge! Payload.merge( [self.class.progress_data, data] )
+    nil
+  end
+
+end
+
+end
+end
+end
+end

data/lib/peplum/john/application/services/rest_proxy.rb

@@ -0,0 +1,19 @@
+module Peplum
+class John
+class Application
+module Services
+module RESTProxy
+def self.registered( app )
+
+  app.get '/progress' do
+    instance_for( params[:instance] ) do |instance|
+      json instance.info.progress
+    end
+  end
+
+end
+end
+end
+end
+end
+end

data/lib/peplum/john/application.rb

@@ -11,6 +11,12 @@ class Application < Peplum::Application
   provision_memory 100 * 1024 * 1024
   provision_disk   100 * 1024 * 1024
 
+  require_relative "application/services/info"
+  instance_service_for :info, Services::Info
+
+  require_relative "application/services/rest_proxy"
+  rest_service_for :info, Services::RESTProxy
+
   def payload
     Payload
   end

data/lib/peplum/john/version.rb

@@ -2,6 +2,6 @@
 
 module Peplum
 class John
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peplum-john
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Tasos Laskos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: peplum
@@ -39,6 +39,8 @@ files:
 - lib/peplum/john.rb
 - lib/peplum/john/application.rb
 - lib/peplum/john/application/payload.rb
+- lib/peplum/john/application/services/info.rb
+- lib/peplum/john/application/services/rest_proxy.rb
 - lib/peplum/john/version.rb
 - peplum-john.gemspec
 homepage: http://ecsypno.com/