pwn 0.4.552 → 0.4.554

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e99d054c32a3080283ed394aa8711220266af5e2ca115e59e99ff55101b87e
-  data.tar.gz: 892cf61a00ea0d0e090f0cb458635c0188fce92735a41f5b00ad7831776bf52a
+  metadata.gz: 5845a117a0a0e7c58a9bee3b8def4d40d5459079dba07ced63445bd79165d5fb
+  data.tar.gz: b52393e4b3361dc2bce767583ccfcd17be00cf0bb8283f8b5349141015b82650
 SHA512:
-  metadata.gz: ffca232d03cd3f35338e22c4f58957db41f45b247097aa57c5338720c51187b87fe4f1d416426326a652a99ca608b05fed522b1844eff15ebc72eaaf09e96063
-  data.tar.gz: 2cad3d29f583cf0307e26bc6077d86d96dc75fd7ecb4c8f4ef9053064da847ec9c91d667f2fdd9e7b099373bf843468f95c609755b21e9f074fbd127a49467c5
+  metadata.gz: 50e687553229086fb9f38753cc29a40a496deafed3d6491aa115fa42ba6b4b1380407f2cc325ae5bf5cd7765d7209cc8d9f5e9cf572c0cbe94a171dc9a3257c5
+  data.tar.gz: d81f50b569dfeb6c2dd438f0cc2eba17ba99378216360260130f470c1f9d2301888a47d8d9e3b9ea8c8b94d7f09ef710d7ef521edc25f441d770f5a1ceb978aa

data/Gemfile

@@ -18,7 +18,7 @@ gem 'aws-sdk', '3.1.0'
 gem 'bettercap', '1.6.2'
 gem 'brakeman', '5.3.1'
 gem 'bson', '4.15.0'
-gem 'bundler', '>=2.3.23'
+gem 'bundler', '>=2.3.24'
 gem 'bundler-audit', '0.9.1'
 gem 'bunny', '2.19.0'
 gem 'colorize', '0.8.1'

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.1.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.552]:001 >>> PWN.help
+pwn[v0.4.554]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.1.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.552]:001 >>> PWN.help
+pwn[v0.4.554]:001 >>> PWN.help
 ```
 
 

data/lib/pwn/plugins/baresip.rb

@@ -143,10 +143,6 @@ module PWN
           '-v'
         )
 
-        baresip_obj[:session_thread] = init_session_thread(
-          baresip_obj: baresip_obj
-        )
-
         ok = 'registered successfully'
         gone = 'account: No SIP accounts found'
         forb = '403 Forbidden'
@@ -154,7 +150,13 @@ module PWN
         # TODO: Make this faster.
         print 'Starting baresip...'
         loop do
-          break if @session_data.select { |s| s.include?(ok) }.length.positive?
+          next unless File.exist?(screenlog_path)
+
+          dump_session_data = File.readlines(screenlog_path)
+          dump_session_data.delete_if do |line|
+            line.include?('ua: using best effort AF: af=AF_INET')
+          end
+          break if dump_session_data.select { |s| s.include?(ok) }.length.positive?
 
           next unless dump_session_data.select { |s| s.include?(gone) }.length.positive?
           next unless dump_session_data.select { |s| s.include?(forb) }.length.positive?
@@ -170,53 +172,6 @@ module PWN
         raise e
       end
 
-      # Supported Method Parameters::
-      # session_thread = init_session_thread(
-      #   serial_conn: 'required - SerialPort.new object'
-      # )
-
-      private_class_method def self.init_session_thread(opts = {})
-        baresip_obj = opts[:baresip_obj]
-
-        session_root = baresip_obj[:session_root]
-        screenlog_path = baresip_obj[:screenlog_path]
-
-        # Spin up a baresip_obj session_thread
-        Thread.new do
-          loop do
-            next unless File.exist?(screenlog_path)
-
-            # Continuously consume contents of screenlog_path
-            @session_data = File.readlines(screenlog_path)
-            @session_data.delete_if do |line|
-              line.include?('ua: using best effort AF: af=AF_INET')
-            end
-          end
-        end
-      rescue StandardError => e
-        session_thread&.terminate
-
-        raise e
-      end
-
-      # Supported Method Parameters::
-      # session_data = PWN::Plugins::BareSIP.dump_session_data
-
-      public_class_method def self.dump_session_data
-        @session_data
-      rescue StandardError => e
-        raise e
-      end
-
-      # Supported Method Parameters::
-      # session_data = PWN::Plugins::BareSIP.flush_session_data
-
-      public_class_method def self.flush_session_data
-        @session_data.clear
-      rescue StandardError => e
-        raise e
-      end
-
       # Supported Method Parameters::
       # cmd_resp = PWN::Plugins::BareSIP.baresip_exec(
       #   baresip_obj: 'Required - baresip obj returned from #start method',
@@ -244,13 +199,8 @@ module PWN
 
       public_class_method def self.stop(opts = {})
         baresip_obj = opts[:baresip_obj]
-        session_thread = baresip_obj[:session_thread]
         screen_session = baresip_obj[:screen_session]
 
-        flush_session_data
-
-        session_thread.terminate
-
         puts "STOPPING #{baresip_obj[:screen_session]}"
         cmd_resp = baresip_exec(
           baresip_obj: baresip_obj,
@@ -509,8 +459,11 @@ module PWN
           print "#{seconds_to_record}s to record - remaining: #{format('%-9.9s', countdown)}"
           print "\r"
 
-          # TODO: Fix known issue - if remote terminates call early
-          # all calls in thread pool will be stopped prematurely :-/
+          dump_session_data = File.readlines(screenlog_path)
+          dump_session_data.delete_if do |line|
+            line.include?('ua: using best effort AF: af=AF_INET')
+          end
+
           if dump_session_data.select { |s| s.include?(terminated) }.length.positive?
             reason = 'call terminated by other party'
             break
@@ -716,8 +669,6 @@ module PWN
             screen_session: 'Optional name of screen session (Defaults baresip)'
           )
 
-          session_data_arr = #{self}.dump_session_data
-
           cmd_resp = #{self}.baresip_exec(
             baresip_obj: 'Required - baresip obj returned from #start method',
             cmd: 'Required - command to send to baresip HTTP daemon'

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.4.552'
+  VERSION = '0.4.554'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.552
+  version: 0.4.554
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.23
+        version: 2.3.24
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.23
+        version: 2.3.24
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement