wazuh-ruby-client 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ded83ec025b9d8642e903ca794ce1993d466effbc2bb022d89350d925a74dde1
-  data.tar.gz: 377684edb28efde74086e4c3ce1ed1b256d87903bc565686ff22ac054d3bd2e7
+  metadata.gz: 15da6e2031a3436d1aa11ec4131497d2d616f3c27d997a92183f4a8e3e94d19e
+  data.tar.gz: a47ef14bb2e13720cf96f37942d88d496de56767e4a0a451fddc1cf7df3eb45d
 SHA512:
-  metadata.gz: 8e764f47349a4af81238a58b7afb7a0d3ba010d97128882ee9f4ba51778b191b8d7f234cf47522e09f9077a8909759e58608513364a32d7dad3e852aa55a8161
-  data.tar.gz: 91bbf1387a1c54e4531f95c97443c307af46d8039c39f8d5b37653f616638eb3bdd850a818445e30270dd3dfb71d0ab44739c8c3c04f227966fd93717b44d3a4
+  metadata.gz: d8914b3341e3d265defb99a63a8cde65218deb403f0b08eeac95de57f4381cce16b185a86a5c7bd027f1dfe06ee195bee02debe9f2b68f7425432bcf30601e86
+  data.tar.gz: ac233ed7ba42fded2d84806fa2517a1517474795cf01940adab08aa5cce8ca9a72008c36d727f6404009f6eaa78cb714162877164df24457acfa5bc917364fb9

data/CHANGELOG.md

@@ -0,0 +1,35 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+Bump up to 0.2.0
+
+## [0.2.0] - 2019-02-03
+
+### Adds
+
+- `Wazuh::Client#delete_agent`
+- `Wazuh::Client#syscheck_files`
+
+### Changed
+
+- `Wazuh::Client#cdb_files` rename to `Wazuh::Client#cdb_files_path`
+- Using sawyer instead of faraday for http client.
+  - This can the return vaule to be handle like an object.
+
+```ruby
+> agents = client.all_agents
+> agents.class
+=> Array
+> agent = agents.first
+> agent.id
+=> "000"
+> agent.os.arch
+=> "x86_64"
+```
+

data/README.md

@@ -56,7 +56,95 @@ Wazuh.configure do |config|
 end
 ```
 
-## Support API
+### Global Settings
+
+The following global settings are supported via `Wazuh.configure` .
+
+| setting | description |
+|:--------|:------------|
+| user_agent | User-Agent |
+| client_cert | Client certificate (if use Client Certificate Authentication) |
+| client_key | Client Key (if use Client Certificate Authentication) |
+| basic_user | Basic Authentication user name |
+| basic_password | Basic Authentication password |
+| verify_ssl | Skip the SSL/TLS verify |
+| logger | loggeer object |
+| endpoint | Wazuh API endpoint URL |
+
+
+### Agents
+
+Get all agents list.
+
+```ruby
+> client.all_agents
+# => {"error"=>0,
+ "data"=>
+  {"items"=>
+    [{"os"=>
+       {"arch"=>"x86_64",
+        "codename"=>"Xenial Xerus",
+        "major"=>"16",
+        "minor"=>"04",
+        "name"=>"Ubuntu",
+        "platform"=>"ubuntu",
+        "uname"=>"Linux |wazuh-manager-master-0 |4.14.138+ |#1 SMP Tue Sep 3 02:58:08 PDT 2019 |x86_64",
+        "version"=>"16.04.6 LTS"},
+      "status"=>"Active",
+      "dateAdd"=>"2020-01-07 16:13:05",
+      "ip"=>"127.0.0.1",
+      "id"=>"000",
+      "registerIP"=>"127.0.0.1",
+      "node_name"=>"wazuh-manager-master",
+      "manager"=>"wazuh-manager-master-0",
+      "name"=>"wazuh-manager-master-0",
+      "lastKeepAlive"=>"9999-12-31 23:59:59",
+      "version"=>"Wazuh v3.11.1"}],
+    ...
+   "totalItems"=>5}}
+```
+
+filter by options. (see https://mrtc0.github.io/wazuh-ruby-client/Wazuh/Api/Endpoints/Agents.html#all_agents-instance_method )
+
+```ruby
+# Filter by status is active
+> client.all_agents({ status: 'active' })
+# Filter by agent os.name is ubuntu
+> client.all_agents({ 'os.name' => 'ubuntu' })
+```
+
+### Syscollector
+
+List agent's packages.
+
+```ruby
+> client.packages('000')['data']['items'].map { |package| package['name'] }
+=> ["python-apt-common",
+ "python-idna",
+ "libedit2",
+ "libncurses5",
+ "libpam-runtime",
+ "python3.5",
+ "libgsasl7",
+ "vim-tiny",
+ ...
+```
+
+List agents' processes.
+
+```ruby
+> client.processes('000')['data']['items'].map { |p| p['name'] }
+=> ["entrypoint.sh",
+ "my_init",
+ "syslog-ng",
+ "runsvdir",
+ "runsv",
+ ...
+```
+
+### Other
+
+wazuh-ruby-client is support to all Wazuh API.  
 
 - [x] Active Response
 - [x] Agents
@@ -74,6 +162,18 @@ end
 - [x] Syscheck
 - [x] Syscollector
 
+Refer to the document of wazuh-ruby-client and Wazuh API Reference for the list of all available methods.
+
+- https://mrtc0.github.io/wazuh-ruby-client/Wazuh/Api/Endpoints.html
+- https://documentation.wazuh.com/3.10/user-manual/api/reference.html
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/mrtc0/wazuh-ruby-client.
+
+## Copyright and License
+
+Copyright (c) 2015-2019, [Kohei Morita](https://blog.ssrf.in)
+
+This project is licensed under the [MIT License](https://github.com/mrtc0/wazuh-ruby-client/blob/master/LICENSE) .
+

data/lib/wazuh/api/endpoints/agents.rb

@@ -5,26 +5,26 @@ module Wazuh
         #
         # Returns a list with the available agents.
         # 
-        # @option options [offset] :offset
+        # @option options [String] :offset
         #   First element to return in the collection.
-        # @option options [limit] :limit
+        # @option options [String] :limit
         #   Maximum number of elements to return.
-        # @option options [select] :select
+        # @option options [String] :select
         #   Select which fields to return (separated by comma).
-        # @option options [sort] :sort
+        # @option options [String] :sort
         #   Sorts the collection by a field or fields (separated by comma). Use +/- at the beginning to list in ascending or descending order.
-        # @option options [search] :search
+        # @option options [String] :search
         #   Looks for elements with the specified string.
-        # @option options [status] :status
+        # @option options [String] :status
         #   Filters by agent status. Use commas to enter multiple statuses.
         #   Allowed values: active, pending, neverconnected, disconnected
-        # @option options [q] :q
-        #   Query to filter results by. For example q=”status=Active”
-        # @option options [order_than] :order_than
+        # @option options [String] :order_than
         #   Filters out disconnected agents for longer than specified. Time in seconds, ‘[n_days]d’, ‘[n_hours]h’, ‘[n_minutes]m’ or ‘[n_seconds]s’. For never connected agents, uses the register date.
+        # @return [Array] Returns Array containing agents
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-all-agents
         def all_agents(options = {})
-          get '/agents', options
+          data = get '/agents', options
+          data.items
         end
 
         # Returns various information from an agent.
@@ -33,6 +33,7 @@ module Wazuh
         #   ID to agent
         # @option options [select] :select
         #   List of selected fields separated by commas.
+        # @return [Sawyer::Resource] Returns Sawyer::Resource
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-an-agent
         def agent(agent_id, options = {})
           get "/agents/#{agent_id}", options
@@ -44,15 +45,18 @@ module Wazuh
         #   Name to agent
         # @option options [select] :select
         #   List of selected fields separated by commas.
+        # @return [Sawyer::Resource] Returns Sawyer::Resource
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-an-agent-by-its-name
         def agent_by_name(agent_name, options = {})
           get "/agents/name/#{agent_name}", options
         end
 
+        # Get agent key
         # Returns the key of an agent.
         #
         # @param [String] agent_id
         #   ID to agent
+        # @return [String] Returns the key of an agent
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-agent-key
         def agent_key(agent_id, options = {})
           get "/agents/#{agent_id}/key"
@@ -144,13 +148,24 @@ module Wazuh
           post '/agents', options
         end
 
+        # Delete an agent
+        # Removes an agent.
+        #
+        # @param [String] agent_id
+        # @option options [Bool] purge
+        #   Delete an agent from the key store. This parameter is only valid if purge is set to no in the manager’s ossec.conf.
+        # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#delete-an-agent
+        def delete_agent(agent_id, options = {})
+          delete "/agents/#{agent_id}", options
+        end
+
         # Adds a new agent with name :agent_name. This agent will use ANY as IP.
         #
-        # @option options [name] :name
+        # @param [String] agent_name
         #   Name to agent
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#add-agent-quick-method
-        def add_agent_quick(options = {})
-          put '/agents', options
+        def add_agent_quick(agent_name)
+          put "/agents/#{agent_name}"
         end
 
         # Insert an agent with an existing id and key.

data/lib/wazuh/api/endpoints/ciscat.rb

@@ -35,7 +35,8 @@ module Wazuh
         #   Filters by final score.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-cis-cat-results-from-an-agent
         def ciscat_result(agent_id, options = {})
-          get "/ciscat/#{agent_id}/results", options
+          data = get "/ciscat/#{agent_id}/results", options
+          data.items
         end
       end
     end

data/lib/wazuh/api/endpoints/cluster.rb

@@ -116,7 +116,8 @@ module Wazuh
         # @option options [category] :category
         #   Filters by category of log
         def cluster_logs_by_node(node_id, options)
-          get "/cluster/#{node_id}/logs", options
+          data = get "/cluster/#{node_id}/logs", options
+          data.items
         end
 
         # Get summary of ossec.log from a specific node in cluster
@@ -141,7 +142,8 @@ module Wazuh
         # Get nodes info
         #
         def nodes(options = {})
-          get '/cluster/nodes', options
+          data = get '/cluster/nodes', options
+          data.items
         end
 
         # Restart a specific node in cluster

data/lib/wazuh/api/endpoints/decoders.rb

@@ -23,7 +23,8 @@ module Wazuh
         #   Allowed values: enabled, disabled, all
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-all-decoders
         def all_decoders(options = {})
-          get '/decoders', options
+          data = get '/decoders', options
+          data.items
         end
 
         # Get all decoders files
@@ -49,7 +50,8 @@ module Wazuh
         #   Name of the decoder file to download.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-all-decoders-files
         def all_decoders_files(options = {})
-          get '/decoders/files', options
+          data = get '/decoders/files', options
+          data.items
         end
 
         # Get all parent decoders
@@ -65,7 +67,8 @@ module Wazuh
         #   Looks for elements with the specified string.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-all-parent-decoders
         def all_parent_decoders(options = {})
-          get '/decoders/parents', options
+          data = get '/decoders/parents', options
+          data.items
         end
 
         # Get decoders by name
@@ -83,7 +86,8 @@ module Wazuh
         #   Looks for elements with the specified string.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-decoders-by-name
         def decoders_by_name(decoder_name, options = {})
-          get "/decoders/#{decoder_name}", options
+          data = get "/decoders/#{decoder_name}", options
+          data.items
         end
       end
     end

data/lib/wazuh/api/endpoints/experimental.rb

@@ -42,7 +42,8 @@ module Wazuh
         #   Filters by board_serial.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-hardware-info-of-all-agents
         def experimental_hardware(options = {})
-          get '/experimental/syscollector/hardware', options
+          data = get '/experimental/syscollector/hardware', options
+          data.items
         end
 
         # Get network address info of all agents
@@ -71,7 +72,8 @@ module Wazuh
         #   Filters by netmask.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-network-address-info-of-all-agents
         def experimental_netaddr(options = {})
-          get '/experimental/syscollector/netaddr', options
+          data = get '/experimental/syscollector/netaddr', options
+          data.items
         end
 
         # Get network interface info of all agents
@@ -107,7 +109,8 @@ module Wazuh
         # @option options [rx_dropped] :rx_dropped
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-network-interface-info-of-all-agents
         def experimental_netiface(options = {})
-          get '/experimental/syscollector/netiface', options
+          data = get '/experimental/syscollector/netiface', options
+          data.items
         end
 
         # Get network protocol info of all agents
@@ -134,7 +137,8 @@ module Wazuh
         #   Filters by dhcp.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-network-protocol-info-of-all-agents
         def experimental_netproto(options = {})
-          get '/experimental/syscollector/netproto', options
+          data = get '/experimental/syscollector/netproto', options
+          data.items
         end
 
         # Get os info of all agents
@@ -164,7 +168,8 @@ module Wazuh
         #   Filters by release.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-os-info-of-all-agents
         def experimental_os(options = {})
-          get '/experimentalsyscollector/os', options
+          data = get '/experimentalsyscollector/os', options
+          data.items
         end
 
         # Get packages info of all agents
@@ -193,7 +198,8 @@ module Wazuh
         #   Filters by format.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-packages-info-of-all-agents
         def experimental_packages(options = {})
-          get '/experimental/syscollector/packages', options
+          data = get '/experimental/syscollector/packages', options
+          data.items
         end
 
         # Get ports info of all agents
@@ -226,7 +232,8 @@ module Wazuh
         #   Filters by state.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-ports-info-of-all-agents
         def experimental_ports(options = {})
-          get '/experimental/syscollector/ports', options
+          data = get '/experimental/syscollector/ports', options
+          data.items
         end
 
         # Get processes info of all agents
@@ -273,7 +280,8 @@ module Wazuh
         #   Filters by process suser.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-processes-info-of-all-agents
         def experimental_processes(options = {})
-          get '/experimental/syscollector/processes', options
+          data = get '/experimental/syscollector/processes', options
+          data.items
         end
 
         # Get CIS-CAT results
@@ -301,7 +309,8 @@ module Wazuh
         # @option options [score] :score
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-cis-cat-results
         def experimental_ciscat_results(options = {})
-          get '/experimental/ciscat/results', options
+          data = get '/experimental/ciscat/results', options
+          data.items
         end
       end
     end

data/lib/wazuh/api/endpoints/lists.rb

@@ -18,7 +18,8 @@ module Wazuh
         #   Filters by path.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-all-lists
         def cdb_lists(options = {})
-          get '/lists', options
+          data = get '/lists', options
+          data.items
         end
 
         # Get paths from all lists
@@ -33,8 +34,9 @@ module Wazuh
         # @option options [search] :search
         #   Looks for elements with the specified string.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-paths-from-all-lists
-        def cdb_files(options = {})
-          get '/lists/files', options
+        def cdb_files_path(options = {})
+          data = get '/lists/files', options
+          data.items
         end
       end
     end

data/lib/wazuh/api/endpoints/manager.rb

@@ -90,7 +90,8 @@ module Wazuh
         #
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-ossec-log
         def manager_log
-          get '/manager/logs'
+          data = get '/manager/logs'
+          data.items
         end
 
         # Get summary of ossec.log

data/lib/wazuh/api/endpoints/rootcheck.rb

@@ -39,7 +39,8 @@ module Wazuh
         # @option options [search] :search
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rootcheck-cis-requirements
         def rootcheck_cis_requirements(agent_id, options = {})
-          get "/rootcheck/#{agent_id}/cis", options
+          data = get "/rootcheck/#{agent_id}/cis", options
+          data.items
         end
 
         # Get rootcheck database
@@ -55,7 +56,8 @@ module Wazuh
         # @option options [status] :status
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rootcheck-database
         def rootcheck_database(agent_id, options = {})
-          get "/rootcheck/#{agent_id}", options
+          data = get "/rootcheck/#{agent_id}", options
+          data.items
         end
 
         # Get rootcheck pci requirements
@@ -68,7 +70,8 @@ module Wazuh
         # @option options [search] :search
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rootcheck-pci-requirements
         def rootcheck_pic_requirements(agent_id, options = {})
-          get "/rootcheck/#{agent_id}/pci", options
+          data = get "/rootcheck/#{agent_id}/pci", options
+          data.items
         end
 
         # Run rootcheck scan in all agents

data/lib/wazuh/api/endpoints/rules.rb

@@ -7,56 +7,64 @@ module Wazuh
         #
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-all-rules
         def all_rules(options = {})
-          get '/rules', options
+          data = get '/rules', options
+          data.items
         end
 
         # Returns the files of all rules.
         #
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-files-of-rules
         def rule_files(options = {})
-          get '/rules/files', options
+          data = get '/rules/files', options
+          data.items
         end
 
         # Returns the GDPR requirements of all rules.
         #
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rule-gdpr-requirements
         def gdpr_rules(options = {})
-          get '/rules/gdpr', options
+          data = get '/rules/gdpr', options
+          data.items
         end
 
         # Returns the GPG13 requirements of all rules.
         #
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rule-gpg13-requirements
         def gpg13_rules(options = {})
-          get '/rules/gpg13', options
+          data = get '/rules/gpg13', options
+          data.items
         end
 
         # Returns the groups of all rules.
         #
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rule-groups
         def rules_groups(options = {})
-          get '/rules/groups', options
+          data = get '/rules/groups', options
+          data.items
         end
 
         # Returns the HIPAA requirements of all rules.
         #
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rule-hipaa-requirements
         def hipaa_rules(options = {})
-          get '/rules/hipaa', options
+          data = get '/rules/hipaa', options
+          data.items
         end
 
         # Returns the NIST-800-53 requirements of all rules.
         #
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rule-nist-800-53-requirements
         def nist_800_53_rules(options = {})
-          get '/rules/nist-800-53', options
+          data = get '/rules/nist-800-53', options
+          data.items
         end
 
         # Returns the PCI requirements of all rules
         #
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rule-pci-requirements
         def pic_rules(options = {})
-          get '/rules/pci', options
+          data = get '/rules/pci', options
+          data.items
         end
 
         # Returns the rules with the specified id.
@@ -72,7 +80,8 @@ module Wazuh
         #   Looks for elements with the specified string.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-rules-by-id
         def rule_by_id(rule_id, options = {})
-          get "/rules/#{rule_id}", options
+          data = get "/rules/#{rule_id}", options
+          data.items
         end
       end
     end

data/lib/wazuh/api/endpoints/security_configuration_assessment.rb

@@ -39,7 +39,8 @@ module Wazuh
         #   Looks for elements with the specified string.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-security-configuration-assessment-sca-checks-database
         def checks_sca_database(agent_id, policy_id, options = {})
-          get "/sca/#{agent_id}/checks/#{policy_id}", options
+          data = get "/sca/#{agent_id}/checks/#{policy_id}", options
+          data.items
         end
 
         # Get security configuration assessment (SCA) database
@@ -65,7 +66,8 @@ module Wazuh
         #   Query to filter results by. This is specially useful to filter by total checks passed, failed or total score (fields pass, fail, score).
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-security-configuration-assessment-sca-database
         def sca_database(agent_id, options = {})
-          get "/sca/#{agent_id}", options
+          data = get "/sca/#{agent_id}", options
+          data.items
         end
       end
     end

data/lib/wazuh/api/endpoints/syscheck.rb

@@ -3,6 +3,40 @@ module Wazuh
     module Endpoints
       module Syscheck
         #
+        # Get syscheck files
+        # Returns the syscheck files of an agent.
+        #
+        # @param [String] agent_id
+        # @option options [offset] :offset
+        #   First element to return in the collection.
+        # @option options [limit] :limit
+        #   Maximum number of elements to return.
+        # @option options [sort] :sort
+        #   Sorts the collection by a field or fields (separated by comma). Use +/- at the beginning to list in ascending or descending order.
+        # @option options [search] :search
+        #   Looks for elements with the specified string.
+        # @option options [file] :file
+        #   Filters file by filename.
+        # @option options [type] :type
+        #   Selects type of file. Allowed values: file, registry
+        # @option options [summary] :summary
+        #   Returns a summary grouping by filename. Allowed values: yes, no
+        # @option options [select] :select
+        #   List of selected fields separated by commas.
+        # @option options [md5] :md5
+        #   Returns the files with the specified md5 hash.
+        # @option options [sha1] :sha1
+        #   Returns the files with the specified sha1 hash.
+        # @option options [sha256] :sha256
+        #   Returns the files with the specified sha256 hash.
+        # @option options [hash] :hash
+        #   Returns the files with the specified hash (md5, sha1 or sha256).
+        # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-syscheck-files
+        def syscheck_files(agent_id, options = {})
+          data = get "/syscheck/#{agent_id}"
+          data.items
+        end
+
         # Clears the syscheck database for the specified agent.
         #
         # @param [String] agent_id

data/lib/wazuh/api/endpoints/syscollector.rb

@@ -38,7 +38,8 @@ module Wazuh
         #   Filters by netmask.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-network-address-info-of-an-agent
         def netaddr(agent_id, options = {})
-          get "/syscollector/#{agent_id}/netaddr", options
+          data = get "/syscollector/#{agent_id}/netaddr", options
+          data.items
         end
 
         # Returns the agent’s network interface info
@@ -74,7 +75,8 @@ module Wazuh
         # @option options [rx_dropped] :rx_dropped
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-network-interface-info-of-an-agent
         def netiface(agent_id, options = {})
-          get "/syscollector/#{agent_id}/netiface", options
+          data = get "/syscollector/#{agent_id}/netiface", options
+          data.items
         end
 
         # Returns the agent’s network protocol info.
@@ -100,7 +102,8 @@ module Wazuh
         #   Filters by dhcp.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-network-protocol-info-of-an-agent
         def netproto(agent_id, options = {})
-          get "/syscollector/#{agent_id}/netproto", options
+          data = get "/syscollector/#{agent_id}/netproto", options
+          data.items
         end
 
         # Returns the agent’s OS info.
@@ -138,7 +141,8 @@ module Wazuh
         #   Filters by format.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-packages-info
         def packages(agent_id, options = {})
-          get "/syscollector/#{agent_id}/packages", options
+          data = get "/syscollector/#{agent_id}/packages", options
+          data.items
         end
 
         # Get ports info of an agent
@@ -171,7 +175,8 @@ module Wazuh
         #   Filters by state.
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-ports-info-of-an-agent
         def ports(agent_id, options = {})
-          get "/syscollector/#{agent_id}/ports", options
+          data = get "/syscollector/#{agent_id}/ports", options
+          data.items
         end
 
         # Get processes info
@@ -219,7 +224,8 @@ module Wazuh
         # 
         # @see https://documentation.wazuh.com/3.10/user-manual/api/reference.html#get-processes-info
         def processes(agent_id, options = {})
-          get "/syscollector/#{agent_id}/processes", options
+          data = get "/syscollector/#{agent_id}/processes", options
+          data.items
         end
       end
     end

data/lib/wazuh/api/errors/wazuh_error.rb

@@ -1,7 +1,7 @@
 module Wazuh
   module Api
     module Errors
-      class WazuhError < ::Faraday::Error
+      class WazuhError < StandardError
         attr_reader :response, :message
 
         def initialize(message, response = nil)

data/lib/wazuh/client.rb

@@ -1,7 +1,7 @@
 module Wazuh
   class Client
-    include Faraday::Connection
-    include Faraday::Request
+    include Sawyer::Connection
+    include Sawyer::Request
     include Api::Endpoints
 
     attr_accessor(*Config::ATTRIBUTES)

data/lib/wazuh/sawyer/connection.rb

@@ -0,0 +1,35 @@
+module Wazuh
+  module Sawyer
+    module Connection
+      private
+
+      def connection
+        options = {
+          headers: {
+            'Accept' => 'application/json; charset=utf-8',
+            'Content-Type' => 'application/json'
+          },
+          ssl: {}
+        }
+
+        options[:headers]['User-Agent'] = user_agent if user_agent
+        options[:ssl].merge!({ client_cert: client_cert, client_key: client_key }) if client_cert || client_key
+
+        if basic_user || basic_password
+          authorization_header = "Basic " + Base64.encode64(basic_user + ':' + basic_password).strip
+          options[:headers].merge!({'Authorization' => authorization_header})
+        end
+
+        options[:ssl].merge!({ verify: false }) unless verify_ssl
+
+        opts = {
+          :links_parser => ::Sawyer::LinkParsers::Simple.new
+        }
+
+        opts[:faraday] = ::Faraday.new(options)
+
+        ::Sawyer::Agent.new(endpoint, opts)
+      end
+    end
+  end
+end

data/lib/wazuh/sawyer/request.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+module Wazuh
+  module Sawyer
+    module Request
+      def get(path, options = {})
+        request(:get, path, options)
+      end
+
+      def post(path, options = {})
+        request(:post, path, options)
+      end
+
+      def put(path, options = {})
+        request(:put, path, options)
+      end
+
+      def delete(path, options = {})
+        request(:delete, path, options)
+      end
+
+      private
+
+      def request(method, path, options)
+        response = case method
+        when :get, :delete
+          connection.call(method, URI::Parser.new.escape(path), nil, {query: options})
+        when :post, :put
+          data = options unless options.empty?
+          connection.call(method, URI::Parser.new.escape(path), data)
+        end
+
+        return response.data.data if response.status == 200 || response.data.error == 0
+        
+        error_message = response.data.message
+        raise Wazuh::Api::Errors::WazuhError.new(error_message, response)
+      end
+    end
+  end
+end

data/lib/wazuh/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Wazuh
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/wazuh-ruby-client/version.rb

@@ -1,3 +1,3 @@
 module WazuhRubyClient
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/wazuh-ruby-client.rb

@@ -1,16 +1,15 @@
 require_relative 'wazuh/version'
 require_relative 'wazuh/logger'
 
-require 'faraday'
-require 'faraday_middleware'
 require 'json'
 require 'logger'
 require 'base64'
+require 'faraday'
+require 'sawyer'
 
 require_relative 'wazuh/config'
-require_relative 'wazuh/faraday/response/raise_error'
-require_relative 'wazuh/faraday/connection'
-require_relative 'wazuh/faraday/request'
+require_relative 'wazuh/sawyer/connection'
+require_relative 'wazuh/sawyer/request'
 require_relative 'wazuh/api/endpoints'
 require_relative 'wazuh/api/errors/wazuh_error'
 require_relative 'wazuh/api/error'

data/wazuh-ruby-client.gemspec

@@ -39,7 +39,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
 
-  spec.add_dependency 'faraday', '>= 0.9'
-  spec.add_dependency 'faraday_middleware'
+  spec.add_dependency 'faraday'
+  spec.add_dependency 'sawyer'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wazuh-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - mrtc0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,22 +80,50 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: sawyer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -188,14 +216,12 @@ files:
 - lib/wazuh/api/endpoints/syscheck.rb
 - lib/wazuh/api/endpoints/syscollector.rb
 - lib/wazuh/api/error.rb
-- lib/wazuh/api/errors/too_many_requests_error.rb
 - lib/wazuh/api/errors/wazuh_error.rb
 - lib/wazuh/client.rb
 - lib/wazuh/config.rb
-- lib/wazuh/faraday/connection.rb
-- lib/wazuh/faraday/request.rb
-- lib/wazuh/faraday/response/raise_error.rb
 - lib/wazuh/logger.rb
+- lib/wazuh/sawyer/connection.rb
+- lib/wazuh/sawyer/request.rb
 - lib/wazuh/version.rb
 - lib/wazuh_ruby_client.rb
 - wazuh-ruby-client.gemspec

data/lib/wazuh/api/errors/too_many_requests_error.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-module Wazuh
-  module Api
-    module Errors
-      class TooManyRequestsError < ::Faraday::Error
-        attr_reader :response
-
-        def initialize(response)
-          @response = response
-        end
-
-        def message
-          "Retry after #{retry_after} seconds"
-        end
-
-        def retry_after
-          response.headers['retry-after'].to_i
-        end
-      end
-    end
-  end
-end

data/lib/wazuh/faraday/connection.rb

@@ -1,38 +0,0 @@
-module Wazuh
-  module Faraday
-    module Connection
-      private
-
-      def connection
-        options = {
-          headers: { 'Accept' => 'application/json; charset=utf-8' },
-          ssl: {}
-        }
-
-        options[:headers]['User-Agent'] = user_agent if user_agent
-        # options[:certificate] = certificate if cartificate
-        # options[:private_key] = private_key if private_key
-        options[:ssl].merge!({ client_cert: client_cert, client_key: client_key }) if client_cert || client_key
-
-        if basic_user || basic_password
-          authorization_header = "Basic " + Base64.encode64(basic_user + ':' + basic_password).strip
-          options[:headers].merge!({'Authorization' => authorization_header})
-        end
-
-        options[:ssl].merge!({ verify: false }) unless verify_ssl
-
-        # request_options = {}
-
-        ::Faraday::Connection.new(endpoint, options) do |connection|
-          connection.use ::Faraday::Request::Multipart
-          connection.use ::Faraday::Request::UrlEncoded
-          connection.use ::Faraday::Response::RaiseError
-          connection.use ::Wazuh::Faraday::Response::RaiseError
-          connection.use ::FaradayMiddleware::ParseJson
-          connection.response :logger, logger if logger
-          connection.adapter ::Faraday.default_adapter
-        end
-      end
-    end
-  end
-end

data/lib/wazuh/faraday/request.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-module Wazuh
-  module Faraday
-    module Request
-      def get(path, options = {})
-        request(:get, path, options)
-      end
-
-      def post(path, options = {})
-        request(:post, path, options)
-      end
-
-      def put(path, options = {})
-        request(:put, path, options)
-      end
-
-      def delete(path, options = {})
-        request(:delete, path, options)
-      end
-
-      private
-
-      def request(method, path, options)
-        response = connection.send(method) do |request|
-          case method
-          when :get, :delete
-            request.url(path, options)
-          when :post, :put
-            request.path = path
-            request.body = options unless options.empty?
-          end
-          request.options.merge!(options.delete(:request)) if options.key?(:request)
-        end
-        response.body
-      end
-    end
-  end
-end

data/lib/wazuh/faraday/response/raise_error.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-module Wazuh
-  module Faraday
-    module Response
-      class RaiseError < ::Faraday::Response::Middleware
-        def on_complete(env)
-          return if env.status == 200 || env.body['error'] == 0
-          error_message = env.body['message']
-          raise Wazuh::Api::Errors::WazuhError.new(error_message, env.response)
-        end
-      end
-    end
-  end
-end