db_sucker 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8074c1cae68f9c791d50bb5494ff86eb51bb840470bd2bf94d72cebbc2822a5
-  data.tar.gz: 8fbfadaf58d757f5bc626e23288c0056ffe4eaf1db470718784ad25c3403db3c
+  metadata.gz: 3428652bd57c60d1fe769767084d16087d233435ddae9feedf26d079c65b7cde
+  data.tar.gz: d9f2e97f08011eb2df0bdf168cca219c113607fc2b615afb4d90dc5a58098f14
 SHA512:
-  metadata.gz: 6f5784e1d45ed9878c412de70ba0a1d3a243a38c1c6528c790a9aba1dadfcd74b223792b8060647ecf660e0703bb21da0110421c0581c6984127264129246506
-  data.tar.gz: 4ad5f0a6e3bc1466eb6e92de0d39eab511435fd06510c6e60380f9ac6b3a8eec7cc3458b18dbb73787b290f2949726897fc4feefd2918464cc48db1f4ecb42dd
+  metadata.gz: 52110571e911566e55534ffab44718254393d99eacab96db9b3acef3378db2a8d539b3e32e868465b46639f03f6fec3206bf14ce0b1ae173cdd7cfc2a694e366
+  data.tar.gz: bcbba5adddf4b577d91c85bb25fa081c808f8fc66095609daa2396d47360d5103cb9f59978ed167c162e6fae6dcfafdede8e815a8f2abf2550032c4c3adb5a7f

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## 4.0.0
+
+### Updates
+
+* Updated net-ssh and net-sftp by major versions (to support OpenSSL 3)
+* Added ed25519 and bcrypt_pbkdf dependency for ed25519 key support
+
+### Fixes
+
+* native sftp downloads will immediately stop if worker is cancelled
+* fix copying downloaded file (`file` option / `with_copy` example)
+
+-------------------
+
+## 3.2.1
+
+### Updates
+
+* Added means to signal all threads in order to wake them up as they occasionally get stuck for some reason. Press `S` or use `:signal-threads` to execute. Have yet to find the culprint :)
+* Slight UX improvements, silent commands briefly flash the screen, invalid commands ring the bell
+
+### Fixes
+
+* don't warn about orphaned concurrent-ruby threads, debug log trace of remaining threads
+* join killed threads to ensure they are dead
+* minor sshdiag fixes/enhancements
+
+-------------------
+
 ## 3.2.0
 
 ### Updates

data/VERSION

@@ -1 +1 @@
-3.2.0
+4.0.0

data/db_sucker.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "curses", "~> 1.2"
   spec.add_dependency "activesupport", ">= 4.1"
-  spec.add_dependency "net-ssh", "~> 4.2"
-  spec.add_dependency "net-sftp", "~> 2.1"
+  spec.add_dependency "net-ssh", "~> 7.0"
+  spec.add_dependency "ed25519", ">= 1.2", "< 2.0"
+  spec.add_dependency "bcrypt_pbkdf", ">= 1.0", "< 2.0"
+  spec.add_dependency "net-sftp", "~> 4.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"

data/lib/db_sucker/application/core.rb

@@ -1,6 +1,12 @@
 module DbSucker
   class Application
     module Core
+      def filtered_threads
+        Thread.list.reject do |thr|
+          thr.backtrace[0]["gems/concurrent-ruby"] rescue false
+        end
+      end
+
       def sandboxed &block
         block.call
       rescue StandardError => ex
@@ -49,20 +55,22 @@ module DbSucker
           end
 
           # worker info
-          f.puts "\n\n#{sklaventreiber.workers.length} workers:\n"
-          sklaventreiber.workers.each do |w|
-            f.puts "#{"[SSH] " if w.sshing} #{w.descriptive} #{w.state}".strip
-          end
-
-          # slot pool
-          f.puts "\n\n#{sklaventreiber.slot_pools.length} slot pools:\n"
-          sklaventreiber.slot_pools.each do |name, pool|
-            f.puts "#{name}: #{pool.slots}"
-            pool.active.each do |thr|
-              f.puts "\tactive\t #{thr} [#{thr[:itype]}]"
+          if sklaventreiber
+            f.puts "\n\n#{sklaventreiber.workers.length} workers:\n"
+            sklaventreiber.workers.each do |w|
+              f.puts "#{"[SSH] " if w.sshing} #{w.descriptive} #{w.state}".strip
             end
-            pool.waiting.each do |wthr, tthr|
-              f.puts "\twaiting\t #{tthr} [#{tthr[:itype]}]"
+
+            # slot pool
+            f.puts "\n\n#{sklaventreiber.slot_pools.length} slot pools:\n"
+            sklaventreiber.slot_pools.each do |name, pool|
+              f.puts "#{name}: #{pool.slots}"
+              pool.active.each do |thr|
+                f.puts "\tactive\t #{thr} [#{thr[:itype]}]"
+              end
+              pool.waiting.each do |wthr, tthr|
+                f.puts "\twaiting\t #{tthr} [#{tthr[:itype]}]"
+              end
             end
           end
         end

data/lib/db_sucker/application/dispatch.rb

@@ -101,7 +101,7 @@ module DbSucker
             i += 1
           end
         end
-        t.kill
+        t.kill.join
         puts "Thread priority: -#{m[1].abs}..+#{m[2].abs}"
       end
 
@@ -112,6 +112,10 @@ module DbSucker
         varstr = ARGV.shift
 
         configful_dispatch(idstr, varstr) do |identifier, ctn, variation, var|
+          unless ctn
+            abort "This test requires a config identifier with an SSH connection!"
+          end
+
           log c("\nPlease wait while we run some tests...\n", :blue)
           _identifier = identifier
           _ctn = ctn
@@ -136,7 +140,7 @@ module DbSucker
             }
             250.times do
               break if monitor.synchronize { stop }
-              c, r = ctn.blocking_channel_result("sleep 60", blocking: false, channel: true, use_sh: true)
+              c, r = ctn.blocking_channel_result("sleep 900", blocking: false, channel: true, use_sh: true)
               monitor.synchronize do
                 channels << c
                 print "+"
@@ -145,6 +149,7 @@ module DbSucker
             end
           ensure
             debug "Stopping sessions (#{channels.length})..."
+            puts # newline for style
             i = 1
             loop do
               break if monitor.synchronize { channels.empty? }
@@ -154,6 +159,7 @@ module DbSucker
               print "-"
               i += 1
             end
+            maxsessions = "#{maxsessions}+" if maxsessions.to_i >= 250
             log c("\n\nSSH MaxSessions: #{c maxsessions, :magenta}", :cyan)
             log "This value determines how many sessions we can multiplex over a single TCP connection."
             log "Currently, DbSucker can only utilize one connection, thus this value defines the maxmium concurrency."
@@ -161,7 +167,7 @@ module DbSucker
             log "  * increase the SSHd `MaxSessions' setting on the remote (if you can)"
             log "  * reduce the amount of workers and/or remote slots"
             log "  * fix the mess that is this tool, visit #{c "https://github.com/2called-chaos/db_sucker", :blue}"
-            t.kill
+            t.kill.join
           end
         end
       rescue Net::SSH::AuthenticationFailed => ex

data/lib/db_sucker/application/sklaven_treiber/worker/accessors.rb

@@ -91,12 +91,12 @@ module DbSucker
             d, dt = Time.current.strftime("%Y-%m-%d"), Time.current.strftime("%H-%M-%S")
 
             File.expand_path dstfile.dup
-              .gsub!(":combined", ":datetime_-_:table")
-              .gsub!(":datetime", "#{d}_#{dt}")
-              .gsub!(":date", d)
-              .gsub!(":time", dt)
-              .gsub!(":table", table)
-              .gsub!(":id", sklaventreiber.trxid)
+              .gsub(":combined", ":datetime_-_:table")
+              .gsub(":datetime", "#{d}_#{dt}")
+              .gsub(":date", d)
+              .gsub(":time", dt)
+              .gsub(":table", table)
+              .gsub(":id", sklaventreiber.trxid)
           end
         end
       end

data/lib/db_sucker/application/sklaven_treiber/worker/io/pv_wrapper.rb

@@ -63,7 +63,7 @@ module DbSucker
               end
               killer.signal.join
             ensure
-              killer.kill
+              killer.kill.join
             end
           end
         end

data/lib/db_sucker/application/sklaven_treiber/worker/io/sftp_native_download.rb

@@ -51,7 +51,7 @@ module DbSucker
 
                   @state = :downloading
                   debug "Opening process `#{cmd}'"
-                  Open3.popen2e(cmd, pgroup: true) do |_stdin, _stdouterr, _thread|
+                  Open3.popen2e(cmd) do |_stdin, _stdouterr, _thread|
                     # close & exit status
                     _stdin.close_write
                     exit_status = _thread.value

data/lib/db_sucker/application/window/core.rb

@@ -83,6 +83,10 @@ module DbSucker
           init_pair(Window::COLOR_GRAY, 0, -1)
         end
 
+        def flashbang
+          flash
+        end
+
         def set_cursor visibility
           curs_set(visibility)
         end

data/lib/db_sucker/application/window/keypad.rb

@@ -20,12 +20,14 @@ module DbSucker
             ["T", "create core dump and open in editor"],
             ["q", "quit prompt"],
             ["Q", "same as ctrl-c"],
+            ["S", "signal/wakeup all threads"],
             [":", "main prompt"],
           ],
           main_commands: [
             [["?", %w[h elp]], [], "shows this help"],
             [[%w[q uit]], [], "quit prompt"],
             [["q!", "quit!"], [], "same as ctrl-c"],
+            [["signal-threads"], [], "signal/wakeup all threads"],
             [["kill"], [], "(dirty) interrupts all workers"],
             [["kill!"], [], "(dirty) essentially SIGKILL (no cleanup)"],
             [["dump"], [], "create and open coredump"],
@@ -50,6 +52,7 @@ module DbSucker
               when "?" then show_help
               when "q" then quit_dialog
               when "Q" then $core_runtime_exiting = 1
+              when "S" then signal_threads
               end
             end
           end
@@ -71,6 +74,8 @@ module DbSucker
               when "eval" then args.any? ? _eval(args.join(" ")) : eval_prompt
               when "p", "pause" then pause_workers(args)
               when "r", "resume" then resume_workers(args)
+              when "signal-threads" then signal_threads
+              else app.print("\a")
             end
           end
         end
@@ -125,6 +130,7 @@ module DbSucker
 
         def pause_workers args
           if args[0].is_a?(String)
+            window.flashbang
             _detect_worker(args.join(" "), &:pause)
           else
             prompt!("Usage: :p(ause) <table_name|--all>", color: :yellow)
@@ -133,6 +139,7 @@ module DbSucker
 
         def resume_workers args
           if args[0].is_a?(String)
+            window.flashbang
             _detect_worker(args.join(" "), &:unpause)
           else
             prompt!("Usage: :r(esume) <table_name|--all>", color: :yellow)
@@ -141,6 +148,7 @@ module DbSucker
 
         def cancel_workers args
           if args[0].is_a?(String)
+            window.flashbang
             _detect_worker(args.join(" ")) do |wrk|
               wrk.cancel! "canceled by user"
             end
@@ -150,16 +158,29 @@ module DbSucker
         end
 
         def kill_ssh_poll
-          return if sklaventreiber.workers.select{|w| !w.done? || w.sshing }.any?
-          sklaventreiber.poll.try(:kill)
+          if sklaventreiber.workers.select{|w| !w.done? || w.sshing }.any?
+            app.print("\a")
+            prompt!("Error: cannot kill SSH poll whilst in use", color: :red)
+          else
+            window.flashbang
+            sklaventreiber.poll.try(:kill)
+          end
         end
 
         def kill_workers
+          window.flashbang
           Thread.list.each do |thr|
             thr.raise(Interrupt) if thr[:managed_worker]
           end
         end
 
+        def signal_threads
+          window.flashbang
+          Thread.list.each do |thr|
+            thr.signal if thr.respond_to?(:signal)
+          end
+        end
+
         def kill_app
           exit!
         end
@@ -171,4 +192,3 @@ module DbSucker
     end
   end
 end
-

data/lib/db_sucker/application.rb

@@ -37,10 +37,17 @@ module DbSucker
             else "Unhandled exception terminated application!"
           end
         ensure
+          $core_runtime_exiting = 1
           app.fire(:core_shutdown)
-          remain = Thread.list.length
-          if remain > 1
-            app.warning "#{remain} threads remain (should be 1)..."
+          remain = app.filtered_threads
+          if remain.length > 1
+            app.error "[WARN] #{remain.length} threads remain (should be 1)..."
+            remain.each do |thr|
+              app.debug "[THR] #{Thread.main == thr ? "MAIN" : "THREAD"}\t#{thr.alive? ? "ALIVE" : "DEAD"}\t#{thr.inspect}", 10
+              thr.backtrace.each do |l|
+                app.debug "[THR]\t#{l}", 20
+              end
+            end
           else
             app.debug "1 thread remains..."
           end

data/lib/db_sucker/patches/developer.rb

@@ -12,7 +12,7 @@ module DbSucker
             end
             app.debug "IO-stats: {#{iostats * ", "}}"
           end
-          app.dump_core if Thread.list.length > 1
+          app.dump_core if app.filtered_threads.length > 1
           app.debug "RSS: #{app.human_bytes(`ps h -p #{Process.pid} -o rss`.strip.split("\n").last.to_i * 1024)}"
         end
 

data/lib/db_sucker/version.rb

@@ -1,4 +1,4 @@
 module DbSucker
-  VERSION = "3.2.0"
+  VERSION = "4.0.0"
   UPDATE_URL = "https://raw.githubusercontent.com/2called-chaos/db_sucker/master/VERSION"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_sucker
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Sven Pachnit
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -44,28 +44,68 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +235,7 @@ homepage: https://github.com/2called-chaos/db_sucker
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -210,9 +250,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Sucks your remote databases via SSH for local tampering.
 test_files: []