pwnix-api-client 1.3 → 1.4

data/.bundle/config

@@ -1,3 +1,4 @@
 ---
 BUNDLE_PATH: .bundle
+BUNDLE_WITHOUT: development
 BUNDLE_DISABLE_SHARED_GEMS: '1'

data/Gemfile

@@ -1,7 +1,5 @@
 source :rubygems
 
-group :development do
-  gem 'pry'
-end
+gem 'pry'
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pwnix-api-client (1.0)
+    pwnix-api-client (1.4)
       httparty
       json
 

data/bin/console.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Get current directory
+DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Execute console
+bundle exec ruby $DIR/../util/console.rb

data/lib/pwnix-api-client/api_client.rb

@@ -1,46 +1,137 @@
 require 'httparty'
+require 'json'
+require 'singleton'
+
+require_relative 'config/config_file'
 
 module Pwnix
   module Api
     module Client
-      if ENV['PWNIX_DEV']
-        BASE_URI = "http://localhost:9292/v1"
-      else
-        BASE_URI = "https://localhost:7967/v1" 
+      class Config < Pwnix::Api::Client::ConfigFile
+        
+        include Singleton
+
+        def initialize
+          @config_file = "/opt/pwnix/pwnix-config/pwnix-ui/config.json"
+          read
+        end
+
+        def base_uri
+          @config_hash['api_uri']
+        end
+
+        def debug_mode
+          @config_hash['debug_mode']
+        end
+
+        def [](key)
+          @config_hash[key]
+        end
       end
     end
   end
 end
 
-require_relative 'system'
-require_relative 'shell'
-require_relative 'shell_receiver_config'
-require_relative 'mode'
-require_relative 'service'
+module Pwnix
+  module Api
+    module Client
+      class ErrorQueue
+        include Singleton
+
+          attr_accessor :queue
+
+          def initialize 
+            @queue =[]
+          end
+
+          def clear
+            @queue = []
+          end
+
+      end
+    end
+  end
+end
 
 module Pwnix
   module Api
     module Client
+      module HTTPartyTime
 
+        def self.included(base)
+          base.base_uri Pwnix::Api::Client::Config.instance['api_base_uri']
+          base.basic_auth Pwnix::Api::Client::Config.instance['api_username'], 
+            Pwnix::Api::Client::Config.instance['api_password']
+          base.debug_output
+          base.format :json
 
-=begin
-      module AuthdClient
-        include Httparty
-      
-        def initialize(config={})
-          username = config[:username]
-          password = config[:password]
-          server = config[:server] || "localhost"
+          @@errors = ErrorQueue.instance
+        end
+
+        def has_errors?
+          !@@errors.queue.empty?
+        end
+
+        def errors
+          @@errors.queue
+        end
+
+        def last_error
+          @@errors.queue.last
+        end
+
+        def clear_errors
+          @@errors.queue = []
+        end
+
+        def safe_api_call(endpoint,params={})
+          begin
+            
+            response = self.class.post(endpoint,{:body => params})
+            case response.code 
+              
+              when 200
+                
+                # TODO - everything should return a hash
+                parsed_response = response.parsed_response['result']
+                
+                if parsed_response.is_a? Hash
+                  
+                  if parsed_response['error']
+                     @@errors.queue.push "Handled exception: #{parsed_response['error']}"
+                  end
+                
+                end
 
-          # Configure with Basic auth for the API
-          if username && password
-            self.class.basic_auth username,password
+                return parsed_response
+              
+              when 404
+                @@errors.queue.push "404 - not found! #{endpoint} #{parsed_response}"
+              
+              when 500...600
+                @@errors.queue.push "500 - server exception! #{response}"
+            end
+          rescue Exception => e
+            @@errors.queue.push "Client error: #{e}"
+            return nil
           end
         end
 
       end
-=end
+    end
+  end
+end
 
+require_relative 'system'
+require_relative 'shell'
+require_relative 'shell_receiver_config'
+require_relative 'mode'
+require_relative 'node'
+require_relative 'service'
+
+module Pwnix
+  module Api
+    module Client
       class ApiClient
 
         attr_accessor :base_uri
@@ -49,10 +140,13 @@ module Pwnix
         attr_accessor :shell_receiver_config
         attr_accessor :services
         attr_accessor :modes
+        attr_accessor :node
+        attr_accessor :error_string
 
+        include HTTParty
+        include HTTPartyTime
 
         def initialize(config={})
-          
           @shell_receiver_config = ShellReceiverConfig.new
 
           @shells = {
@@ -66,9 +160,11 @@ module Pwnix
           }
 
           @modes = {
-            "normal_mode" => Mode.new("normal_mode"),
+            "normal_mode" => Mode.new("normal_mode")
           }
 
+          @node = Node.new
+
           @system = System.new
           
           @services = { 
@@ -80,8 +176,12 @@ module Pwnix
             "stealth" => Service.new("stealth"),
             "text_to_bash" => Service.new("text_to_bash")
           }
+        end
 
+        def connected?
+           safe_api_call("/node/connected") == "ok"
         end
+
       end
     end
   end

data/lib/pwnix-api-client/config/config_file.rb

@@ -0,0 +1,30 @@
+module Pwnix
+  module Api
+    module Client
+      class ConfigFile
+
+        def initialize(config_file)
+          @config_file=config_file
+          @config_hash = JSON.parse(File.read(@config_file))
+        end
+
+        def [](key, value=nil)
+          if value
+            @config_hash[key] = value
+          else
+            @config_hash[key]
+          end
+        end
+
+        def read
+          @config_hash = JSON.parse(File.read(@config_file))
+        end
+
+        def write
+          File.open(@config_file,'w'){ |f| JSON.dump(@config_hash, f) }
+        end
+
+      end
+    end
+  end
+end

data/lib/pwnix-api-client/mode.rb

@@ -3,36 +3,34 @@ module Pwnix
     module Client
       class Mode
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
 
         def initialize(mode_name)
           @mode_name = mode_name
         end
 
         def start
-          self.class.post("/mode/#{@mode_name}/start", :body => {}).parsed_response['result']
+          safe_api_call("/mode/#{@mode_name}/start")
         end
 
         def stop
-          self.class.post("/mode/#{@mode_name}/stop", :body => {}).parsed_response['result']
+          safe_api_call("/mode/#{@mode_name}/stop")
         end
 
         def status
-          self.class.post("/mode/#{@mode_name}/status", :body => {}).parsed_response['result']
+          safe_api_call("/mode/#{@mode_name}/status")
         end
 
         def status_string
-          self.class.post("/mode/#{@mode_name}/status_string", :body => {}).parsed_response['result']
+          safe_api_call("/mode/#{@mode_name}/status_string")
         end
 
         def running?
-          self.class.post("/mode/#{@mode_name}/running", :body => {}).parsed_response['result']
+          safe_api_call("/mode/#{@mode_name}/running")
         end
 
         def available?
-          self.class.post("/mode/#{@mode_name}/available", :body => {}).parsed_response['result']
+          safe_api_call("/mode/#{@mode_name}/available")
         end
 
       end

data/lib/pwnix-api-client/node.rb

@@ -0,0 +1,68 @@
+require_relative 'node/api_config'
+require_relative 'node/cookbook'
+require_relative 'node/client/client_manager'
+require_relative 'node/client/console_client'
+
+module Pwnix
+  module Api
+    module Client
+      class Node
+        include HTTParty
+        include HTTPartyTime
+
+        attr_accessor :client_manager, :api_config
+
+        def initialize
+          @client_manager = Pwnix::Api::Client::ClientManager.new
+          @api_config = Pwnix::Api::Client::ApiConfig.new
+        end
+
+        def connected?
+          return true if safe_api_call("/node/check") == "ok"
+        end
+
+        def cookbooks
+          cookbook_list = safe_api_call("/node/cookbook/list")
+          cookbooks = []
+          cookbook_list.each do |cookbook_name|
+            cookbooks << Cookbook.new(cookbook_name)
+          end
+        cookbooks
+        end
+
+        def status
+          safe_api_call("/node/status")
+        end
+
+        def version
+          safe_api_call("/node/version")
+        end
+
+        def release
+          safe_api_call("/node/release")
+        end
+
+        def last_commit(product)
+          safe_api_call("/node/last_commit", { :product => product } )
+        end
+
+        def update
+          safe_api_call("/node/update", { :options => {:timeout => 600} } )
+        end
+
+        def updating?
+          safe_api_call("/node/updating")
+        end
+        
+        def clear
+          safe_api_call("/node/clear")
+        end
+
+        def restart
+          safe_api_call("/node/restart")
+        end
+
+      end
+    end
+  end
+end

data/lib/pwnix-api-client/node/api_config.rb

@@ -0,0 +1,19 @@
+module Pwnix
+  module Api
+    module Client
+      class ApiConfig
+        include HTTParty
+        include HTTPartyTime
+
+        def dump
+          safe_api_call("/node/config/api/dump")
+        end
+
+        def set(config)
+          safe_api_call("/node/config/api/set", :config => config)
+        end
+
+      end
+    end
+  end
+end

data/lib/pwnix-api-client/node/client/client_manager.rb

@@ -0,0 +1,79 @@
+module Pwnix
+  module Api
+    module Client
+      class ClientManager
+        include HTTParty
+        include HTTPartyTime
+
+        #attr_accessor :clients
+
+        def initialize 
+          @clients = []
+        end
+
+        def status
+          safe_api_call("/node/clients/status")
+        end
+
+        # Public: Check if the client exists in the API
+        #
+        # API might be down, so lets make sure this returns a true or false 
+        # othewise it could be an exception string  
+        #
+        def client_exists?(id)
+          return true if safe_api_call("/node/clients/#{id}/exist") == true 
+        false
+        end
+
+        def create(type)
+          # Go ahead and try to create the client
+          id = safe_api_call("/node/clients/create", :type => type )
+          
+          # Check to make sure it was successfully created before adding it to our
+          # local list of clients
+          if client_exists?(id)
+            @clients << Pwnix::Api::Client::ConsoleClient.new(id)
+            return true
+          end
+
+        false
+        end
+
+        def get_client(id)
+            @clients.select{|c| c.id == id }.first
+        end
+
+        def destroy_client(id)
+          if client_exists?(id)
+            destroyable_client = @clients.select{|c| c.id == id }.first
+            destroyable_client.disconnect
+            destroyable_client.destroy # destroy it remotely
+            @clients.delete(destroyable_client)
+            return true
+          end
+        false
+        end
+
+        def list
+          @clients = []
+
+          # Since the API & UI are disconnected, we need to check to see if there are
+          # any other remote clients at this time - we might be out of sync.
+          remote_clients = safe_api_call("/node/clients/list")
+          if remote_clients
+            remote_clients.each do |remote_client_id|
+            # Now go through our clients and see if we have an id that matches
+            # TODO - these ids should probably be hard to spoof - needs more 
+            # thought than i have time for right now.
+            unless (@clients.select{|c| c.id == remote_client_id }).count > 0
+              @clients << Pwnix::Api::Client::ConsoleClient.new(remote_client_id) 
+            end
+            end
+          end
+        @clients
+        end
+
+      end
+    end
+  end
+end

data/lib/pwnix-api-client/node/client/console_client.rb

@@ -0,0 +1,51 @@
+module Pwnix
+  module Api
+    module Client
+      class ConsoleClient
+        include HTTParty
+        include HTTPartyTime
+
+        attr_reader :id
+        attr_reader :type
+
+        def initialize(id)
+          @id = id
+          @type = "console_client"
+        end
+
+        def status
+          safe_api_call("/node/clients/#{@id}/status")
+        end
+
+        def config
+          safe_api_call("/node/clients/#{@id}/config")
+        end
+
+        def get_config_value(key)
+          safe_api_call("/node/clients/#{@id}/config/#{key}")
+        end
+
+        def set_config_value(key,value)
+          safe_api_call("/node/clients/#{@id}/config/#{key}/set", :value => value)
+        end        
+
+        def connected?
+          safe_api_call("/node/clients/#{@id}/connected") == true
+        end
+
+        def connect
+          safe_api_call("/node/clients/#{@id}/connect")
+        end
+
+        def disconnect
+          safe_api_call("/node/clients/#{@id}/disconnect")
+        end
+
+        def destroy
+          safe_api_call("/node/clients/#{@id}/destroy")
+        end
+
+      end
+    end
+  end
+end

data/lib/pwnix-api-client/node/cookbook.rb

@@ -0,0 +1,23 @@
+module Pwnix
+  module Api
+    module Client
+      class Cookbook
+        include HTTParty
+        include HTTPartyTime
+
+        def initialize(name)
+          @name = name
+        end
+
+        def metadata
+          safe_api_call("/node/cookbook/#{@name}/metadata")
+        end
+
+        def name
+          safe_api_call("/node/cookbook/#{@name}/name")
+        end
+
+      end
+    end
+  end
+end

data/lib/pwnix-api-client/service.rb

@@ -3,44 +3,42 @@ module Pwnix
     module Client
       class Service
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
         
         def initialize(service_name)
           @service_name = service_name
         end
 
         def status
-          self.class.post("/services/#{@service_name}/status", :body => {}).parsed_response['result']
+          safe_api_call("/services/#{@service_name}/status")
         end
 
         def status_string
-          self.class.post("/services/#{@service_name}/status_string", :body => {}).parsed_response['result']
+          safe_api_call("/services/#{@service_name}/status_string")
         end
 
         def running?
-          self.class.post("/services/#{@service_name}/running", :body => {}).parsed_response['result']
+          safe_api_call("/services/#{@service_name}/running")
         end
 
         def available?
-          self.class.post("/services/#{@service_name}/available", :body => {}).parsed_response['result']
+          safe_api_call("/services/#{@service_name}/available")
         end
 
         def start(params)
-          self.class.post("/services/#{@service_name}/start", :body => params).parsed_response['result']
+          safe_api_call("/services/#{@service_name}/start", params )
         end
 
         def stop
-          self.class.post("/services/#{@service_name}/stop", :body => {}).parsed_response['result']
+          safe_api_call("/services/#{@service_name}/stop")
         end
 
         def enable(params={})
-          self.class.post("/services/#{@service_name}/enable", :body => params).parsed_response['result']
+          safe_api_call("/services/#{@service_name}/enable", params )
         end
 
         def disable
-          self.class.post("/services/#{@service_name}/disable", :body => {}).parsed_response['result']
+          safe_api_call("/services/#{@service_name}/disable")
         end
         
       end

data/lib/pwnix-api-client/shell.rb

@@ -3,32 +3,30 @@
     module Client
       class Shell
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
 
         def initialize(shell_name)
           @shell_name = shell_name
         end
 
         def status
-          self.class.post("/shells/#{@shell_name}/status", :body => {}).parsed_response['result']
+          safe_api_call("/shells/#{@shell_name}/status")
         end
 
         def running?
-          self.class.post("/shells/#{@shell_name}/running", :body => {}).parsed_response['result']
+          safe_api_call("/shells/#{@shell_name}/running")
         end
 
         def configure(config={}) # Configuration options
-          self.class.post("/shells/#{@shell_name}/configure", :body => config ).parsed_response['result']
+          safe_api_call("/shells/#{@shell_name}/configure", config )
         end
 
         def enable
-          self.class.post("/shells/#{@shell_name}/enable", :body => {}).parsed_response['result']
+          safe_api_call("/shells/#{@shell_name}/enable")
         end
 
         def disable
-          self.class.post("/shells/#{@shell_name}/disable", :body => {}).parsed_response['result']
+          safe_api_call("/shells/#{@shell_name}/disable")
         end
 
       end

data/lib/pwnix-api-client/shell_receiver_config.rb

@@ -3,16 +3,14 @@ module Pwnix
     module Client
       class ShellReceiverConfig
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
         
         def backtrack_generate
-          self.class.post("/shells/backtrack_receiver_config/generate", :body => {}).parsed_response['result']
+          safe_api_call("/shells/backtrack_receiver_config/generate")
         end
 
         def pwnix_generate
-          self.class.post("/shells/pwnix_receiver_config/generate", :body => {}).parsed_response['result']
+          safe_api_call("/shells/pwnix_receiver_config/generate")
         end
         
       end

data/lib/pwnix-api-client/system.rb

@@ -2,34 +2,32 @@ require_relative 'system/hardware'
 require_relative 'system/logs'
 require_relative 'system/network'
 require_relative 'system/os'
-require_relative 'system/server'
 require_relative 'system/sms'
 require_relative 'system/ssh'
+require_relative 'system/utility'
 
 module Pwnix
   module Api
     module Client
       class System
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
 
         attr_accessor :logs, :network, :hardware
-        attr_accessor :os, :server, :sms, :ssh
+        attr_accessor :os, :sms, :ssh, :utility
 
         def initialize
           @hardware = Hardware.new
           @logs = Logs.new
           @network = Network.new
           @os = Os.new
-          @server = Server.new
           @sms = Sms.new
           @ssh = Ssh.new
+          @utility = Utility.new
         end
 
         def status
-          self.class.post("/system/status", :body => {}).parsed_response['result']
+          safe_api_call("/system/status")
         end
 
       end

data/lib/pwnix-api-client/system/hardware.rb

@@ -3,12 +3,10 @@ module Pwnix
     module Client
       class Hardware
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
 
         def status
-          self.class.post("/system/hardware/status", :body => {}).parsed_response['result']
+          safe_api_call("/system/hardware/status")
         end
       end
     end

data/lib/pwnix-api-client/system/logs.rb

@@ -3,24 +3,22 @@ module Pwnix
     module Client
       class Logs
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
 
         def list
-          self.class.post("/system/logs/list", :body => {}).parsed_response['result']
+          safe_api_call("/system/logs/list")
         end
 
         def tail(name)
-          self.class.post("/system/logs/tail", :body => { :log_name => name }).parsed_response['result']
+          safe_api_call("/system/logs/tail", { :log_name => name } )
         end
 
         def head(name)
-          self.class.post("/system/logs/head", :body => { :log_name => name }).parsed_response['result']
+          safe_api_call("/system/logs/head", { :log_name => name } )
         end
 
         def contents(name)
-          self.class.post("/system/logs/contents", :body => { :log_name => name }).parsed_response['result']
+          safe_api_call("/system/logs/contents", { :log_name => name } )
         end
 
       end

data/lib/pwnix-api-client/system/network.rb

@@ -3,41 +3,49 @@ module Pwnix
     module Client
       class Network
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
 
         def status
-          self.class.post("/system/network/status", :body => {}).parsed_response['result']
+          safe_api_call("/system/network/status")
+        end
+
+
+        def primary_dns
+          safe_api_call("/system/network/primary_dns")
         end
 
         def list_interfaces
-          details = self.class.post("/system/network/status", :body => {}).parsed_response['result']
+          details = safe_api_call("/system/network/status")
           # Read http://blog.jayfields.com/2008/03/ruby-inject.html if you're not super-familiar w/ inject
           details.inject([]){|interface_list, (interface,interface_details)| interface_list << interface; }
         end
 
         # Done
         def interface_status(interface)
-          self.class.post("/system/network/#{interface}/status", :body => {}).parsed_response['result']
+          safe_api_call("/system/network/#{interface}/status")
+        end
+
+        # Done
+        def interface_mode(interface)
+          safe_api_call("/system/network/#{interface}/mode")
         end
 
         # Done
         def interface_reset(interface)
-          self.class.post("/system/network/#{interface}/reset", :body => {}).parsed_response['result']
+          safe_api_call("/system/network/#{interface}/reset")
         end
 
         def interface_set_dhcp(interface)
-          self.class.post("/system/network/#{interface}/dhcp/enable", :body => {}).parsed_response['result']
+          safe_api_call("/system/network/#{interface}/dhcp/enable")
         end
 
         def interface_set_static_ip(interface,options)
           # [ :ip, :netmask, :gateway, :dns]
-          self.class.post("/system/network/#{interface}/static_ip/set", :body => options).parsed_response['result']
+          safe_api_call("/system/network/#{interface}/static_ip/set", options )
         end
 
         def interface_set_mac(interface, mac=nil)
-            self.class.post("/system/network/#{interface}/mac/set", :body => { :mac => mac } ).parsed_response['result']
+            safe_api_call("/system/network/#{interface}/mac/set", { :mac => mac } )
         end
 
       end

data/lib/pwnix-api-client/system/os.rb

@@ -3,36 +3,38 @@ module Pwnix
     module Client
       class Os
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
 
         def status
-          self.class.post("/system/os/status", :body => {}).parsed_response['result']
+          safe_api_call("/system/os/status")
         end
 
         def filesystem
-          self.class.post("/system/os/filesystem", :body => {}).parsed_response['result']
+          safe_api_call("/system/os/filesystem")
         end
 
         def netstat
-          self.class.post("/system/os/netstat", :body => {}).parsed_response['result']
+          safe_api_call("/system/os/netstat")
         end
 
         def cleanup
-          self.class.post("/system/os/cleanup", :body => {}).parsed_response['result']
+          safe_api_call("/system/os/cleanup")
         end
 
         def restart
-          self.class.post("/system/os/restart", :body => {}).parsed_response['result']
+          safe_api_call("/system/os/restart")
         end
 
         def hostname
-          self.class.post("/system/os/hostname", :body => {}).parsed_response['result']
+          safe_api_call("/system/os/hostname")
         end
 
         def set_hostname(hostname)
-          self.class.post("/system/os/hostname/set", :body => {:hostname => hostname}).parsed_response['result']
+          safe_api_call("/system/os/hostname/set", { :hostname => hostname } )
+        end
+
+        def set_password(username,password)
+          safe_api_call("/system/os/password/set", { :username => username, :password => password } )
         end
 
       end

data/lib/pwnix-api-client/system/sms.rb

@@ -3,30 +3,19 @@ module Pwnix
     module Client
       class Sms
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
 
         def status
-          self.class.post("/system/sms/status", :body => {}).parsed_response['result']
+          safe_api_call("/system/sms/status")
         end
 
         def set(options={})
-          self.class.post(
-            "/system/sms/set",
-            :body => {
-              :configuration => options
-            }
-          ).parsed_response['result']
+          safe_api_call("/system/sms/set", { :configuration => options })
         end
 
         def test(options={})
-          self.class.post(
-            "/system/sms/test",
-            :body => {
-              :configuration => options
-            }
-          ).parsed_response['result']
+          safe_api_call("/system/sms/test", { :configuration => options })
+
         end
 
         def hint

data/lib/pwnix-api-client/system/ssh.rb

@@ -3,16 +3,14 @@ module Pwnix
     module Client
       class Ssh
         include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
+        include HTTPartyTime
 
         def public_key
-          self.class.post("/system/ssh/public_key", :body => {}).parsed_response['result']
+          safe_api_call("/system/ssh/public_key")
         end
 
         def reset
-          self.class.post("/system/ssh/reset", :body => {}).parsed_response['result']
+          safe_api_call("/system/ssh/reset")
         end
 
       end

data/lib/pwnix-api-client/system/utility.rb

@@ -0,0 +1,30 @@
+module Pwnix
+  module Api
+    module Client
+      class Utility
+        include HTTParty
+        include HTTPartyTime
+
+        def initialize
+        end
+
+        def ping(ip)
+          safe_api_call("/system/utility/ping", { :ip => ip } )
+        end
+
+        def nmap(ip)
+          safe_api_call("/system/utility/nmap", { :ip => ip } )
+        end
+
+        def traceroute(ip)
+          safe_api_call("/system/utility/traceroute", { :ip => ip } )
+        end
+
+        def run_command(command)
+          safe_api_call("/system/utility/run_command", { :command => command } )
+        end
+
+      end
+    end
+  end
+end

data/lib/pwnix-api-client/version.rb

@@ -1,7 +1,7 @@
 module Pwnix
   module Api
     module Client
-      VERSION = "1.3"
+      VERSION = "1.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwnix-api-client
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &9767620 !ruby/object:Gem::Requirement
+  requirement: &23148180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9767620
+  version_requirements: *23148180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9767200 !ruby/object:Gem::Requirement
+  requirement: &23147380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,11 +32,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9767200
+  version_requirements: *23147380
 description: ! ' Manage a Pwnix device. '
 email:
 - info@pwnieexpress.com
-executables: []
+executables:
+- console.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -46,10 +47,17 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/console.sh
 - examples/configure_shells.rb
 - lib/pwnix-api-client.rb
 - lib/pwnix-api-client/api_client.rb
+- lib/pwnix-api-client/config/config_file.rb
 - lib/pwnix-api-client/mode.rb
+- lib/pwnix-api-client/node.rb
+- lib/pwnix-api-client/node/api_config.rb
+- lib/pwnix-api-client/node/client/client_manager.rb
+- lib/pwnix-api-client/node/client/console_client.rb
+- lib/pwnix-api-client/node/cookbook.rb
 - lib/pwnix-api-client/service.rb
 - lib/pwnix-api-client/shell.rb
 - lib/pwnix-api-client/shell_receiver_config.rb
@@ -59,9 +67,9 @@ files:
 - lib/pwnix-api-client/system/logs.rb
 - lib/pwnix-api-client/system/network.rb
 - lib/pwnix-api-client/system/os.rb
-- lib/pwnix-api-client/system/server.rb
 - lib/pwnix-api-client/system/sms.rb
 - lib/pwnix-api-client/system/ssh.rb
+- lib/pwnix-api-client/system/utility.rb
 - lib/pwnix-api-client/version.rb
 - pwnix-api-client.gemspec
 - util/console.rb

data/lib/pwnix-api-client/system/server.rb

@@ -1,37 +0,0 @@
-module Pwnix
-  module Api
-    module Client
-      class Server
-        include HTTParty
-        base_uri Pwnix::Api::Client::BASE_URI
-        debug_output
-        format :json
-        
-        def status
-          self.class.post("/system/server/status", :body => {}).parsed_response['result']
-        end
-
-        def version
-          self.class.post("/system/server/version", :body => {}).parsed_response['result']
-        end
-
-        def release
-          self.class.post("/system/server/release", :body => {}).parsed_response['result']
-        end
-
-        def update
-          self.class.post("/system/server/update", :options => {:timeout => 600}, :body => {}).parsed_response['result']
-        end
-
-        def clear
-          self.class.post("/system/server/clear", :body => {}).parsed_response['result']
-        end
-
-        def restart
-          self.class.post("/system/server/restart", :body => {}).parsed_response['result']
-        end
-
-      end
-    end
-  end
-end