pwn 0.5.72 → 0.5.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cdfe3bc86c040b0c31076d7b5d6510d5e957fda3f4d76530c44875bd9d7ae6d
-  data.tar.gz: f974719311b791ddc81716dd45c55ae7ca301cc9f25863bb37332f7284e16ec5
+  metadata.gz: 6d22687be26dd2efb462c08c0fd075f9d2b907a050e58ee01e765892e5654a01
+  data.tar.gz: 76ecf4144fccc062c20143cdaa773db2f5fad30bc2f63e6bca3a84e9c8421f76
 SHA512:
-  metadata.gz: 9a476f8d05bcc55083b543b72bbc72c5679f1c97134ca0b790d83a33d39bac5a0bdac70017f71170f8d1287b2383c3aaf1627c0d26b8e6be87a3758909185f90
-  data.tar.gz: 76f297b86b0e88219b946c0fe4343018e2418a47e20591aa602f027e9fa51c927069d4c4ff4cc4f8903cea9bd2926eb2a4adbcc8200583f4d005bc65f6e08baa
+  metadata.gz: 0225e701ff060cbc35fa91038bf2a9603ea3596d355471a2c62b0c4ca08b645c45cf863d4e2f290bd2844d295ada836cfa1462a36f5da171961b3e22b00a0a2c
+  data.tar.gz: f70688109e619bdb2e0070734dfe4f3aa2dd1a55f3a2b2250fab45777d6a3bd30e2e4e7538bb5f6721a5a8dd5d2a3b7d743d08249d38296f5e2e9b3e79c0f036

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.72]:001 >>> PWN.help
+pwn[v0.5.73]: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.3.0@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.5.72]:001 >>> PWN.help
+pwn[v0.5.73]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.3.0@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.5.72]:001 >>> PWN.help
+pwn[v0.5.73]:001 >>> PWN.help
 ```
 
 PWN periodically upgrades to the latest version of Ruby which is reflected in `/opt/pwn/.ruby-version`.  The easiest way to upgrade to the latest version of Ruby from a previous PWN installation is to run the following script:

data/etc/pwn.yaml.EXAMPLE

@@ -3,9 +3,10 @@
 ai_engine: 'openai'
 
 openai:
-  key: 'OpenAI API Key'
+  key: 'required - OpenAI API Key'
+  model: 'optional - OpenAI model to use'
 
 ollama:
-  fqdn: 'FQDN for Open WebUI - e.g. https://ollama.local'
-  key: 'Open WebUI API Key Under Settings  >> Account >> JWT Token'
-  model: 'Ollama model to use'
+  fqdn: 'required - FQDN for Open WebUI - e.g. https://ollama.local'
+  key: 'required - Open WebUI API Key Under Settings  >> Account >> JWT Token'
+  model: 'required - Ollama model to use'

data/lib/pwn/plugins/repl.rb

@@ -38,8 +38,13 @@ module PWN
           end
 
           if pi.config.pwn_ai
-            pi.config.prompt_name = 'pwn.ai'
-            pi.config.prompt_name = 'pwn.ai.SPEAKING' if pi.config.pwn_ai_speak
+            ai_engine = pi.config.pwn_ai_engine
+            model = pi.config.pwn_ai_model
+            pname = "pwn.ai:#{ai_engine}"
+            pname = "pwn.ai:#{ai_engine}/#{model}" if model
+            pname = "pwn.ai:#{ai_engine}/#{model}.SPEAK" if pi.config.pwn_ai_speak
+            pi.config.prompt_name = pname
+
             name = "\001\e[1m\002\001\e[33m\002#{pi.config.prompt_name}\001\e[0m\002"
             dchars = "\001\e[32m\002>>>\001\e[33m\002"
             dchars = "\001\e[33m\002***\001\e[33m\002" if mode == :splat
@@ -180,20 +185,27 @@ module PWN
               yaml_config = YAML.load_file(yaml_config_path, symbolize_names: true)
             end
 
+            valid_ai_engines = %i[
+              openai
+              ollama
+            ]
             ai_engine = yaml_config[:ai_engine].to_s.to_sym
+
+            raise "ERROR: Unsupported AI Engine: #{ai_engine} in #{yaml_config_path}" unless valid_ai_engines.include?(ai_engine)
+
             pi.config.pwn_ai_engine = ai_engine
-            case ai_engine
-            when :openai
-              pi.config.pwn_ai_key = yaml_config[:openai][:key]
-            when :ollama
-              pi.config.pwn_ai_key = yaml_config[:ollama][:key]
-              Pry.config.pwn_ai_fqdn = yaml_config[:ollama][:fqdn]
-              Pry.config.pwn_ai_model = yaml_config[:ollama][:model]
-            else
-              raise "ERROR: Unsupported AI Engine: #{ai_engine} in #{yaml_config_path}"
-            end
+            Pry.config.pwn_ai_engine = ai_engine
+
+            pi.config.pwn_ai_fqdn = yaml_config[ai_engine][:fqdn]
+            Pry.config.pwn_ai_fqdn = yaml_config[ai_engine][:fqdn]
 
-            Pry.config.pwn_ai_key = pi.config.pwn_ai_key
+            pi.config.pwn_ai_key = yaml_config[ai_engine][:key]
+            Pry.config.pwn_ai_key = yaml_config[ai_engine][:key]
+
+            pi.config.pwn_ai_model = yaml_config[ai_engine][:model]
+            Pry.config.pwn_ai_model = yaml_config[ai_engine][:model]
+
+            true
           end
         end
 
@@ -241,10 +253,11 @@ module PWN
 
             response_history = pi.config.pwn_ai_response_history
             speak_answer = pi.config.pwn_ai_speak
+            model = pi.config.pwn_ai_model
+
             case ai_engine
             when :ollama
               fqdn = pi.config.pwn_ai_fqdn
-              model = pi.config.pwn_ai_model
 
               response = PWN::Plugins::Ollama.chat(
                 fqdn: fqdn,

data/lib/pwn/plugins/vault.rb

@@ -168,10 +168,8 @@ module PWN
 
       public_class_method def self.encrypt(opts = {})
         file = opts[:file].to_s.scrub if File.exist?(opts[:file].to_s.scrub)
-        key = opts[:key]
-        iv = opts[:iv]
-
-        raise 'ERROR: key and iv parameters are required.' if key.nil? || iv.nil?
+        key = opts[:key] ||= PWN::Plugins::AuthenticationHelper.mask_password(prompt: 'Key')
+        iv = opts[:iv] ||= PWN::Plugins::AuthenticationHelper.mask_password(prompt: 'IV')
 
         cipher = OpenSSL::Cipher.new('aes-256-cbc')
         cipher.encrypt

data/lib/pwn/version.rb

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

metadata

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