htb 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e6caea0b99b8c05235a7d882577af1a106b5313efdbe8e8034bdd18a18f1c83
-  data.tar.gz: d8e9addfbe08acc7acaaf30d5a033871b93b9271bcc93a0d85dd2bd33c914da5
+  metadata.gz: 1c61e897e5256a77995c2c6b07d1990805855cc59495576e5925d13196192b92
+  data.tar.gz: 686ab280f44de1aa5d59ef2b6bd28607b3aefdbd9db3807152f89d3533f22ca5
 SHA512:
-  metadata.gz: 053eb8609fd604dd1921c30279a686bc86d4362f9e4756e518168a505deeb720210d75aea4e2d84ddedf8510da71e49a036e7076560f304ab19076a2a96f3787
-  data.tar.gz: 853a12f640c67d268078cbf8fbf540bf5d7875d186ee8c1b0896d58db2b3f1f0f64b5c58bfcc3d4702fae675a2b902c401d631bdbd9c53cc71be2b2d94294e81
+  metadata.gz: 1ff67688442edf583e9d1b81961199e078ebfa9425efc981c23e254af7cc26ddfd08fcfffca5dac4f3eea380cac20c8bf55720fdf4bf5109428d1c949243de25
+  data.tar.gz: e1a7c7efb65dbff32c972a040c83db23041665d7df32f610c8497f209bfe93ef933f32ec3f7a451b5fae4fadc96f37e0e909bad83c8f6e007b2c2fd45d81ca8c

data/CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.1] - 2026-01-17
+
+### Fixed
+
+- Fixed VPN status endpoint from `/connections/status` to `/connection/status`
+- Fixed VPN status response handling to properly parse Array response
+- Fixed VM active endpoint from `/vm/active` to `/machine/active`
+- Fixed config file YAML parsing to handle non-Hash responses gracefully
+- Changed "Machine" label to "Challenge" in status output
+
 ## [0.1.0] - 2025-01-17
 
 ### Added

data/htb.gemspec

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative "lib/htb/version"
+
 Gem::Specification.new do |spec|
   spec.name          = "htb"
-  spec.version       = "0.1.0"
+  spec.version       = HTB::VERSION
   spec.authors       = ["usiegj00"]
   spec.email         = ["usiegj00@users.noreply.github.com"]
 

data/lib/htb/cli/machines.rb

@@ -7,9 +7,11 @@ module HTB
         true
       end
 
-      desc "list", "List all active machines"
+      desc "list", "List machines"
       option :retired, type: :boolean, desc: "Show retired machines instead"
       option :sp, type: :boolean, desc: "Show Starting Point machines"
+      option :unsolved, type: :boolean, desc: "Show only unsolved machines"
+      option :difficulty, type: :string, desc: "Filter by difficulty (Easy, Medium, Hard, Insane)"
       def list
         client = CLI.client
 
@@ -24,23 +26,42 @@ module HTB
         end
 
         if machines && machines["info"]
-          rows = machines["info"].map do |m|
+          machine_list = machines["info"]
+
+          if options[:unsolved]
+            machine_list = machine_list.reject do |m|
+              m["authUserInUserOwns"] && m["authUserInRootOwns"]
+            end
+          end
+
+          if options[:difficulty]
+            diff = options[:difficulty].downcase
+            machine_list = machine_list.select do |m|
+              (m["difficultyText"] || "").downcase == diff
+            end
+          end
+
+          rows = machine_list.map do |m|
             difficulty = m["difficultyText"] || m["difficulty"] || "N/A"
             os = m["os"] || "N/A"
+            user_own = m["authUserInUserOwns"] ? CLI.pastel.green("Y") : CLI.pastel.red("-")
+            root_own = m["authUserInRootOwns"] ? CLI.pastel.green("Y") : CLI.pastel.red("-")
             [
               m["id"],
               m["name"],
               os,
               difficulty,
-              m["user_owns_count"] || 0,
-              m["root_owns_count"] || 0,
-              m["release"] || "N/A"
+              user_own,
+              root_own,
+              m["release"]&.slice(0, 10) || "N/A"
             ]
           end
 
-          puts CLI.pastel.bold("\nMachines:")
+          label = options[:retired] ? "Retired" : options[:sp] ? "Starting Point" : "Active"
+          label += " (unsolved)" if options[:unsolved]
+          puts CLI.pastel.bold("\n#{label} Machines:")
           CLI.print_table(
-            ["ID", "Name", "OS", "Difficulty", "User Owns", "Root Owns", "Released"],
+            ["ID", "Name", "OS", "Difficulty", "User", "Root", "Released"],
             rows
           )
           puts "\nTotal: #{rows.size} machines"

data/lib/htb/cli/main.rb

@@ -44,7 +44,7 @@ module HTB
             CLI.print_table(
               ["Field", "Value"],
               [
-                ["Machine", info["name"] || "N/A"],
+                ["Challenge", info["name"] || "N/A"],
                 ["IP", info["ip"] || "N/A"],
                 ["Type", info["type"] || "N/A"],
                 ["Expires", info["expires_at"] || "N/A"]
@@ -60,18 +60,26 @@ module HTB
         puts CLI.pastel.bold("\n=== VPN Status ===")
         begin
           vpn_status = CLI.spinner("Fetching VPN status...") { client.vpn.status }
-          if vpn_status && vpn_status["data"]
-            data = vpn_status["data"]
-            CLI.print_table(
-              ["Field", "Value"],
-              [
-                ["Connected", data["connection"] ? "Yes" : "No"],
-                ["Server", data["server"] || "N/A"],
-                ["IP", data["ip"] || "N/A"]
-              ]
-            )
+          if vpn_status.is_a?(Array) && !vpn_status.empty?
+            vpn_status.each do |conn|
+              server = conn["server"] || {}
+              connection = conn["connection"] || {}
+              CLI.print_table(
+                ["Field", "Value"],
+                [
+                  ["Type", conn["type"] || "N/A"],
+                  ["Location", conn["location_type_friendly"] || "N/A"],
+                  ["Server", server["friendly_name"] || "N/A"],
+                  ["Connected", connection["name"] ? "Yes" : "No"],
+                  ["IPv4", connection["ip4"] || "N/A"],
+                  ["IPv6", connection["ip6"] || "N/A"],
+                  ["Down", connection["down"] ? "#{connection['down']} KB/s" : "N/A"],
+                  ["Up", connection["up"] ? "#{connection['up']} KB/s" : "N/A"]
+                ]
+              )
+            end
           else
-            CLI.print_info("VPN status unavailable")
+            CLI.print_info("No active VPN connections")
           end
         rescue HTB::Error => e
           CLI.print_error(e.message)

data/lib/htb/cli.rb

@@ -6,12 +6,12 @@ require "tty-spinner"
 require "tty-prompt"
 require "pastel"
 
-require_relative "cli/main"
 require_relative "cli/machines"
 require_relative "cli/vm"
 require_relative "cli/users"
 require_relative "cli/challenges"
 require_relative "cli/vpn"
+require_relative "cli/main"
 
 module HTB
   module CLI

data/lib/htb/config.rb

@@ -12,7 +12,8 @@ module HTB
         return {} unless File.exist?(CONFIG_FILE)
 
         content = File.read(CONFIG_FILE)
-        YAML.safe_load(content, symbolize_names: true) || {}
+        result = YAML.safe_load(content, symbolize_names: true)
+        result.is_a?(Hash) ? result : {}
       rescue StandardError
         {}
       end

data/lib/htb/machines.rb

@@ -6,10 +6,16 @@ module HTB
       @client = client
     end
 
-    # List all machines
-    # GET /api/v4/machine/list
+    # List active machines (current season)
+    # GET /api/v4/machine/paginated
     def list
-      @client.get("/machine/list")
+      paginate("/machine/paginated")
+    end
+
+    # List all retired machines (full VIP+ back catalog)
+    # GET /api/v4/machine/list/retired/paginated
+    def retired
+      paginate("/machine/list/retired/paginated")
     end
 
     # Get machine profile by ID or name
@@ -38,9 +44,6 @@ module HTB
 
     # Submit flag for machine ownership
     # POST /api/v4/machine/own
-    # @param machine_id [Integer] Machine ID
-    # @param flag [String] The flag to submit
-    # @param difficulty [Integer] Difficulty rating (10-100)
     def own(machine_id:, flag:, difficulty: 50)
       @client.post("/machine/own", {
         id: machine_id,
@@ -87,10 +90,6 @@ module HTB
 
     # Submit machine review
     # POST /api/v4/machine/review
-    # @param machine_id [Integer] Machine ID
-    # @param stars [Integer] Star rating (1-5)
-    # @param headline [String] Review headline
-    # @param review [String] Review text
     def review(machine_id:, stars:, headline:, review:)
       @client.post("/machine/review", {
         id: machine_id,
@@ -112,31 +111,37 @@ module HTB
       @client.get("/machine/spawned")
     end
 
-    # Get retired machines
-    # GET /api/v4/machine/list/retired
-    def retired
-      @client.get("/machine/list/retired")
-    end
-
     # Get starting point machines
     # GET /api/v4/machine/list/sp
     def starting_point
       @client.get("/machine/list/sp")
     end
 
-    # Get paginated machine list
-    # GET /api/v4/machine/paginated
-    def paginated(page: 1, per_page: 20, sort_by: nil, sort_type: nil)
-      params = { page: page, per_page: per_page }
-      params[:sort_by] = sort_by if sort_by
-      params[:sort_type] = sort_type if sort_type
-      @client.get("/machine/paginated", params)
-    end
-
     # Search machines
     # GET /api/v4/search/fetch?query={query}&tags=[]
     def search(query, tags: [])
       @client.get("/search/fetch", { query: query, tags: tags })
     end
+
+    private
+
+    # Fetch all pages from a paginated endpoint and return unified hash
+    # with "info" key for CLI compatibility
+    def paginate(path)
+      all_machines = []
+      page = 1
+      loop do
+        result = @client.get(path, { page: page, per_page: 100 })
+        data = result["data"] || []
+        break if data.empty?
+
+        all_machines.concat(data)
+        last_page = result.dig("meta", "last_page") || 1
+        break if page >= last_page
+
+        page += 1
+      end
+      { "info" => all_machines }
+    end
   end
 end

data/lib/htb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTB
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/htb/vm.rb

@@ -49,9 +49,9 @@ module HTB
     end
 
     # Get active VM
-    # GET /api/v4/vm/active
+    # GET /api/v4/machine/active
     def active
-      @client.get("/vm/active")
+      @client.get("/machine/active")
     end
 
     # Transfer VM to another lab

data/lib/htb/vpn.rb

@@ -13,9 +13,9 @@ module HTB
     end
 
     # Get current VPN connection status
-    # GET /api/v4/connections/status
+    # GET /api/v4/connection/status
     def status
-      @client.get("/connections/status")
+      @client.get("/connection/status")
     end
 
     # Switch VPN server

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - usiegj00
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-17 00:00:00.000000000 Z
+date: 2026-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -203,7 +203,7 @@ metadata:
   homepage_uri: https://github.com/aluminumio/htb-ruby
   source_code_uri: https://github.com/aluminumio/htb-ruby
   changelog_uri: https://github.com/aluminumio/htb-ruby/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,8 +218,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Ruby client for the Hack The Box API v4
 test_files: []