pwn 0.5.70 → 0.5.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7252c1a48d7fc6cf89352a2ae7452010d5e682be89de7dba0b12a2b6e8ddb8c
-  data.tar.gz: 12b3b90c5a54cd920d0830d18db02aeccc3eb971828d809c37f8930935424011
+  metadata.gz: 677f7ef65de4483663672b6b2006281e018c9d9c91755f0d0d632bd35206ece1
+  data.tar.gz: d8210c6c330cd488410abb098809685ab68636b455d36779e6dd96d9247b1b6f
 SHA512:
-  metadata.gz: ad965a67d10190a987cb5adf7ee73c24f15cca447a4ec24cdfc418a14e433524ac6784d74b9d2862cc3b1429ef0c9ed93a54991ded43175388d7c1947c655e69
-  data.tar.gz: 22f71e17f9b6191d7952b764c25a35a8ac13d59e441dea07c35197e480cff0026ee2d983dc625aba82dc38bdbd8e7deddd21e2a3c5c314d28590b67a500ef509
+  metadata.gz: b4998737e42a14a97bb9abd13130fcd9dea70f32b061f22c895839a993545ad3703690de76507c0b01dcd952e1576cb9349aebaf2e9403af210b9bb7a0088ad3
+  data.tar.gz: 2145a9689d3174b5b3864ffb3079045e459e736f8594eae7667c56f35a81063b1c91b7ec6f504abaa9295ff1aeb3d25336273f7906b303a3fc310cd154538cef

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.70]:001 >>> PWN.help
+pwn[v0.5.71]: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.70]:001 >>> PWN.help
+pwn[v0.5.71]: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.70]:001 >>> PWN.help
+pwn[v0.5.71]: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,10 +3,9 @@
 ai_engine: 'openai'
 
 openai:
-  key: 'OPENAI API KEY'
+  key: 'OpenAI API Key'
 
 ollama:
   fqdn: 'FQDN for Open WebUI - e.g. https://ollama.local'
-  user: 'Open WebUI username'
-  pass: 'Open WebUI password'
+  key: 'Open WebUI API Key Under Settings  >> Account >> JWT Token'
   model: 'Ollama model to use'

data/lib/pwn/plugins/ollama.rb

@@ -100,36 +100,6 @@ module PWN
         spinner.stop
       end
 
-      # Supported Method Parameters::
-      # response = PWN::Plugins::Ollama.get_key(
-      #   fqdn: 'required - base URI for the Ollama API',
-      #   user: 'required - ollama user',
-      #   pass: 'required - ollama password',
-      # )
-
-      public_class_method def self.get_key(opts = {})
-        fqdn = opts[:fqdn]
-        user = opts[:user]
-        pass = opts[:pass]
-
-        http_body = {
-          email: user,
-          password: pass
-        }
-
-        response = ollama_rest_call(
-          fqdn: fqdn,
-          http_method: :post,
-          rest_call: 'api/v1/auths/signin',
-          http_body: http_body
-        )
-
-        json_resp = JSON.parse(response, symbolize_names: true)
-        json_resp[:token]
-      rescue StandardError => e
-        raise e
-      end
-
       # Supported Method Parameters::
       # response = PWN::Plugins::Ollama.get_models(
       #   token: 'required - Bearer token',
@@ -169,10 +139,10 @@ module PWN
         request = opts[:request]
 
         model = opts[:model]
-        model ||= 'llama2:latest'
+        raise 'ERROR: Model is required.  Call #get_models method for details' if model.nil?
 
         temp = opts[:temp].to_f
-        temp = 0 unless temp.positive?
+        temp = 1 if temp.zero?
 
         rest_call = 'ollama/v1/chat/completions'
 

data/lib/pwn/plugins/repl.rb

@@ -186,17 +186,9 @@ module PWN
             when :openai
               pi.config.pwn_ai_key = yaml_config[:openai][:key]
             when :ollama
-              ollama_fqdn = yaml_config[:ollama][:fqdn]
-              Pry.config.pwn_ai_fqdn = ollama_fqdn
-
-              ollama_user = yaml_config[:ollama][:user]
-              ollama_pass = yaml_config[:ollama][:pass]
-              ollama_ai_key = PWN::Plugins::Ollama.get_key(
-                fqdn: ollama_fqdn,
-                user: ollama_user,
-                pass: ollama_pass
-              )
-              pi.config.pwn_ai_key = ollama_ai_key
+              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
@@ -252,11 +244,13 @@ module PWN
             case ai_engine
             when :ollama
               fqdn = pi.config.pwn_ai_fqdn
+              model = pi.config.pwn_ai_model
+
               response = PWN::Plugins::Ollama.chat(
                 fqdn: fqdn,
                 token: ai_key,
+                model: model,
                 request: request.chomp,
-                temp: 1,
                 response_history: response_history,
                 speak_answer: speak_answer
               )
@@ -264,7 +258,6 @@ module PWN
               response = PWN::Plugins::OpenAI.chat(
                 token: ai_key,
                 request: request.chomp,
-                temp: 1,
                 response_history: response_history,
                 speak_answer: speak_answer
               )

data/lib/pwn/version.rb

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

metadata

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