meshtastic 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc432f90a8545cad1027f5514f0676a60d776f617db87b394436e1657693e98
-  data.tar.gz: 5a461b32da2516b164ab789f2a27653b5f46a4f7d36020ddca1ba161931162e0
+  metadata.gz: 94567b95fcf287b1a47b7af7ea3efb4b6f15a5a0daf81137127b6f5dede9a8fd
+  data.tar.gz: aa07f4271ac1cb1953492ab508f2f8f4f2c7c0c51fb306195b096b950b917c25
 SHA512:
-  metadata.gz: 1094355139b2e703dda03bf60ff7034aeb94e1d7d335ba8cd73aae0d9c3bae4c64e61cfb3b8e2dcbdd8894174ab5e3f77b29fde04617fedc3f578b5e469a2678
-  data.tar.gz: d5677d5b337b4f1b8cbff41da88eafaeab8377f3235085f6ba2df384b7c19dd24cbece877d1d6c39f4cf3c4b9d6674f93ed6cb783bc62bd739e12379f3a8a552
+  metadata.gz: 77093a3977ef63ad7c15d255c679771e5fe02448741147acbc608f19c057d9b9f8f47fe214e0f0a2799cca331726450f978bbda99248fb5d3f592e4d37b09a43
+  data.tar.gz: 4c617b139c876db4b3fff9f4357fba3785972e47e88e85a9a9a1656db8c5ced40e42699b737aa7b84f3cc86ced3f66480a3def02e6e1a2272bdd23ac70d82858

data/Gemfile

@@ -23,4 +23,5 @@ gem 'rubocop', '1.63.4'
 gem 'rubocop-rake', '0.6.0'
 gem 'rubocop-rspec', '2.29.1'
 gem 'rvm', '1.11.3.9'
+gem 'tty-prompt', '0.23.1'
 gem 'yard', '0.9.36'

data/lib/meshtastic/mqtt.rb

@@ -6,6 +6,7 @@ require 'json'
 require 'mqtt'
 require 'openssl'
 require 'securerandom'
+require 'tty-prompt'
 
 # Avoiding Namespace Collisions
 MQTTClient = MQTT::Client
@@ -42,13 +43,33 @@ module Meshtastic
       raise e
     end
 
+    # Supported Method Parameters::
+    # Meshtastic::MQQT.get_cipher_keys(
+    #  psks: 'required - hash of channel / pre-shared key value pairs'
+    #  )
+
+    private_class_method def self.get_cipher_keys(opts = {})
+      psks = opts[:psks]
+
+      psks.each_key do |key|
+        psk = psks[key]
+        padded_psk = psk.ljust(psk.length + ((4 - (psk.length % 4)) % 4), '=')
+        replaced_psk = padded_psk.gsub('-', '+').gsub('_', '/')
+        psks[key] = replaced_psk
+      end
+
+      psks
+    rescue StandardError => e
+      raise e
+    end
+
     # Supported Method Parameters::
     # Meshtastic::MQQT.subscribe(
     #   mqtt_obj: 'required - mqtt_obj returned from #connect method'
     #   root_topic: 'optional - root topic (default: msh)',
     #   region: 'optional - region e.g. 'US/VA', etc (default: US)',
     #   channel: 'optional - channel name e.g. "2/stat/#" (default: "2/e/LongFast/#")',
-    #   psk: 'optional - channel pre-shared key (default: AQ==)',
+    #   psks: 'optional - hash of :channel => psk key value pairs (default: { LongFast: "AQ==" })',
     #   qos: 'optional - quality of service (default: 0)',
     #   filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',
     #   gps_metadata: 'optional - include GPS metadata in output (default: false)'
@@ -60,34 +81,29 @@ module Meshtastic
       region = opts[:region] ||= 'US'
       channel = opts[:channel] ||= '2/e/LongFast/#'
       # TODO: Support Array of PSKs and attempt each until decrypted
-      psk = opts[:psk] ||= 'AQ=='
+
+      public_psk = '1PG7OiApB1nwvP+rz05pAQ=='
+      psks = opts[:psks] ||= { LongFast: public_psk }
+      raise 'ERROR: psks parameter must be a hash of :channel => psk key value pairs' unless psks.is_a?(Hash)
+
+      psks[:LongFast] = public_psk if psks[:LongFast] == 'AQ=='
+      psks = get_cipher_keys(psks: psks)
+
       qos = opts[:qos] ||= 0
       json = opts[:json] ||= false
       filter = opts[:filter]
       gps_metadata = opts[:gps_metadata] ||= false
 
-      # TODO: Find JSON URI for this
+      # NOTE: Use MQTT Explorer for topic discovery
       full_topic = "#{root_topic}/#{region}/#{channel}"
       puts "Subscribing to: #{full_topic}"
       mqtt_obj.subscribe(full_topic, qos)
 
-      # Decrypt the message
-      # Our AES key is 128 or 256 bits, shared as part of the 'Channel' specification.
-
-      # Actual pre-shared key for LongFast channel
-      psk = '1PG7OiApB1nwvP+rz05pAQ==' if psk == 'AQ=='
-      padded_psk = psk.ljust(psk.length + ((4 - (psk.length % 4)) % 4), '=')
-      replaced_psk = padded_psk.gsub('-', '+').gsub('_', '/')
-      psk = replaced_psk
-      dec_psk = Base64.strict_decode64(psk)
-
-      # cipher = OpenSSL::Cipher.new('AES-256-CTR')
-      cipher = OpenSSL::Cipher.new('AES-128-CTR')
       filter_arr = filter.to_s.split(',').map(&:strip)
       mqtt_obj.get_packet do |packet_bytes|
         # raw_packet = packet_bytes.to_s.b
         raw_topic = packet_bytes.topic ||= ''
-        raw_payload = packet_bytes.payload
+        raw_payload = packet_bytes.payload ||= ''
 
         begin
           disp = false
@@ -110,15 +126,21 @@ module Meshtastic
           encrypted_message = message[:encrypted]
           # If encrypted_message is not nil, then decrypt the message
           if encrypted_message.to_s.length.positive?
+
             packet_id = message[:id]
             packet_from = message[:from]
+
             nonce_packet_id = [packet_id].pack('V').ljust(8, "\x00")
             nonce_from_node = [packet_from].pack('V').ljust(8, "\x00")
             nonce = "#{nonce_packet_id}#{nonce_from_node}".b
 
-            # Decrypt the message
-            # Key must be 32 bytes
-            # IV mustr be 16 bytes
+            psk = psks[:LongFast]
+            target_chanel = decoded_payload_hash[:channel_id].to_s.to_sym
+            psk = psks[target_chanel] if psks.keys.include?(target_chanel)
+            dec_psk = Base64.strict_decode64(psk)
+
+            cipher = OpenSSL::Cipher.new('AES-128-CTR')
+            cipher = OpenSSL::Cipher.new('AES-256-CTR') if dec_psk.length == 32
             cipher.decrypt
             cipher.key = dec_psk
             cipher.iv = nonce
@@ -320,7 +342,7 @@ module Meshtastic
           root_topic: 'optional - root topic (default: msh)',
           region: 'optional - region e.g. 'US/VA', etc (default: US)',
           channel: 'optional - channel name e.g. '2/stat/#' (default: '2/e/LongFast/#')',
-          psk: 'optional - channel pre-shared key (default: AQ==)',
+          psks: 'optional - hash of :channel => psk key value pairs (default: { LongFast: 'AQ==' })',
           qos: 'optional - quality of service (default: 0)',
           json: 'optional - JSON output (default: false)',
           filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',

data/lib/meshtastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meshtastic
-  VERSION = '0.0.40'
+  VERSION = '0.0.41'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.11.3.9
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement