pwn 0.4.781 → 0.4.782

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 121672a13a6ed2a9612bdff41f5a6d3a9b2738c0d0786f6280b9b7b9b4da8cc3
-  data.tar.gz: c32e53c870610a547ebd1e24a2eaf741a71aeadf5f3368cf007a4b1abdb2d23b
+  metadata.gz: 1450ae82baf714135135ab6704a4e64b727a2f736cae7e32f4a12e6f24fca5bf
+  data.tar.gz: 608fb1826e49e092b84872842d2c0c407a5d3993aaa64364714fcc9073ca61c4
 SHA512:
-  metadata.gz: ee8d7b6ecda36fe032d27b1f4dff3925046a35cb37dae7eb5657875c69251113f7432542ec5f5301f0fea98c26629f2b285eedacf6c108734753af583f3b57d5
-  data.tar.gz: 2460e3f9557132f856d3be6c6578b2ddffaad22e9145f786cfbe5520c1000a3744290db3524859bc2509dabd8f5205e5f6a546286c338ea5f806b604199a82a4
+  metadata.gz: 51cd7e78554f70f786fef5eab7025d8395fd954162887cfb4bd990abc36664b89198bc32f76bf68a22b665375c5b113cca3e8abf540d68d1270ec780310c76fc
+  data.tar.gz: 1686ea1951933bda3152f39293d9291bfde83ae49acdf6484094e6451c5e5a1a39091ab45a380da16c87339808bbcd45c166ba786be7fafb6108b3817958132f

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.2.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.781]:001 >>> PWN.help
+pwn[v0.4.782]: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.2.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.781]:001 >>> PWN.help
+pwn[v0.4.782]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_jenkins_install_plugin

@@ -28,7 +28,7 @@ OptionParser.new do |options|
     opts[:plugins] = plugins
   end
 
-  options.on('-L', '--[no-]list-available', '<Optional - List Available Jenkins Plugins for Installation>') do |list_available_bool|
+  options.on('-L', '--list-available', '<Optional - List Available Jenkins Plugins for Installation>') do |list_available_bool|
     opts[:list_available_bool] = list_available_bool
   end
 
@@ -42,54 +42,52 @@ if opts.empty?
   exit 1
 end
 
-ip = opts[:ip].to_s.scrub
-port = opts[:port].to_i
-username = opts[:username]
-api_key = opts[:api_key]
-plugins = opts[:plugins].to_s.scrub
-list_available_bool = if opts[:list_available_bool]
-                        true
-                      else
-                        false
-                      end
+begin
+  ip = opts[:ip].to_s.scrub
+  port = opts[:port].to_i
+  username = opts[:username]
+  api_key = opts[:api_key]
+  plugins = opts[:plugins].to_s.scrub
+  list_available_bool = true if opts[:list_available_bool] ||= false
+  restart_jenkins = true if opts[:restart_jenkins] ||= false
+
+  if port.positive?
+    jenkins_obj = PWN::Plugins::Jenkins.connect(
+      ip: ip,
+      port: port,
+      username: username,
+      api_key: api_key
+    )
+  else
+    jenkins_obj = PWN::Plugins::Jenkins.connect(
+      ip: ip,
+      username: username,
+      api_key: api_key
+    )
+  end
 
-restart_jenkins = true if opts[:restart_jenkins] ||= false
-if restart_jenkins
-  puts 'Restarting Jenkins...'
-  jenkins_obj.system.restart
-  exit 0
-end
+  if restart_jenkins
+    puts 'Restarting Jenkins...'
+    jenkins_obj.system.restart
+    exit 0
+  end
 
-if port.positive?
-  jenkins_obj = PWN::Plugins::Jenkins.connect(
-    ip: ip,
-    port: port,
-    username: username,
-    api_key: api_key
-  )
-else
-  jenkins_obj = PWN::Plugins::Jenkins.connect(
-    ip: ip,
-    username: username,
-    api_key: api_key
-  )
-end
+  if list_available_bool
+    puts jenkins_obj.plugin.list_available
+  else
+    plugin_arr = []
+    plugins.split(',').each do |p|
+      plugin_arr.push(p.strip.chomp)
+    end
 
-if list_available_bool
-  puts jenkins_obj.plugin.list_available
-else
-  plugin_arr = []
-  plugins.split(',').each do |p|
-    plugin_arr.push(p.strip.chomp)
+    jenkins_obj.plugin.install(plugin_arr)
   end
-
-  # In Reference to https://github.com/arangamani/jenkins_api_client/issues/287
-  # Bug in RubyGem jenkins_api_client 1.5.3 when interacting w/ Jenkins > 2.190
-  # i.e.
-  # Crumbs turned on...
-  # JenkinsApi::Exceptions::Forbidden: Access Denied...
-  # Crumb expired...
-  jenkins_obj.plugin.install(plugin_arr)
+rescue Interrupt
+  puts "\nGoodbye."
+rescue JenkinsApi::Exceptions::ServiceUnavailable
+  puts 'Jenkins Server Unavailable.' unless restart_jenkins
+rescue StandardError => e
+  raise e
+ensure
+  PWN::Plugins::Jenkins.disconnect(jenkins_obj: jenkins_obj) unless restart_jenkins
 end
-
-PWN::Plugins::Jenkins.disconnect(jenkins_obj: jenkins_obj)

data/lib/pwn/plugins/jenkins.rb

@@ -23,20 +23,12 @@ module PWN
 
       public_class_method def self.connect(opts = {})
         ip = opts[:ip]
-        port = if opts[:port]
-                 opts[:port].to_i
-               else
-                 8080
-               end
+        port = opts[:port].to_i ||= 8888
         username = opts[:username].to_s.scrub
         base_jenkins_api_uri = "https://#{ip}/ase/services".to_s.scrub
         api_key = opts[:api_key].to_s.scrub
         identity_file = opts[:identity_file].to_s.scrub
-        ssl_bool = if opts[:ssl] == true
-                     opts[:ssl]
-                   else
-                     false
-                   end
+        ssl_bool = true if opts[:ssl] ||= false
 
         if opts[:proxy]
           proxy = URI(opts[:proxy])

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.781
+  version: 0.4.782
 platform: ruby
 authors:
 - 0day Inc.