openc3 7.0.0.pre.rc2 → 7.0.0

data/lib/openc3/models/tool_config_model.rb

@@ -19,6 +19,11 @@ require 'openc3/utilities/local_mode'
 
 module OpenC3
   class ToolConfigModel
+    class InvalidNameError < StandardError; end
+
+    # Allowlist: letters, digits, hyphens, underscores, spaces, and periods
+    VALID_NAME_PATTERN = /\A[A-Za-z0-9_\-. ]+\z/
+
     def self.config_tool_names(scope: $openc3_scope)
       _, keys = Store.scan(0, match: "#{scope}__config__*", type: 'hash', count: 100)
       # Just return the tool name that is used in the other APIs
@@ -26,19 +31,26 @@ module OpenC3
     end
 
     def self.list_configs(tool, scope: $openc3_scope)
+      raise InvalidNameError, "Invalid tool name: #{tool}" unless tool.match?(VALID_NAME_PATTERN)
       Store.hkeys("#{scope}__config__#{tool}")
     end
 
     def self.load_config(tool, name, scope: $openc3_scope)
+      raise InvalidNameError, "Invalid tool name: #{tool}" unless tool.match?(VALID_NAME_PATTERN)
+      raise InvalidNameError, "Invalid config name: #{name}" unless name.match?(VALID_NAME_PATTERN)
       Store.hget("#{scope}__config__#{tool}", name)
     end
 
     def self.save_config(tool, name, data, local_mode: true, scope: $openc3_scope)
+      raise InvalidNameError, "Invalid tool name: #{tool}" unless tool.match?(VALID_NAME_PATTERN)
+      raise InvalidNameError, "Invalid config name: #{name}" unless name.match?(VALID_NAME_PATTERN)
       Store.hset("#{scope}__config__#{tool}", name, data)
       LocalMode.save_tool_config(scope, tool, name, data) if local_mode
     end
 
     def self.delete_config(tool, name, local_mode: true, scope: $openc3_scope)
+      raise InvalidNameError, "Invalid tool name: #{tool}" unless tool.match?(VALID_NAME_PATTERN)
+      raise InvalidNameError, "Invalid config name: #{name}" unless name.match?(VALID_NAME_PATTERN)
       Store.hdel("#{scope}__config__#{tool}", name)
       LocalMode.delete_tool_config(scope, tool, name) if local_mode
     end

data/lib/openc3/models/tool_model.rb

@@ -16,7 +16,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'openc3/models/model'
-require 'openc3/models/scope_model'
+# require 'openc3/models/scope_model' # Circular require
 require 'openc3/utilities/bucket'
 require 'openc3/utilities/bucket_utilities'
 require 'rack'
@@ -179,7 +179,7 @@ module OpenC3
         end
       end
 
-      if @url and !@url.start_with?('/') and @url !~ URI::regexp
+      if @url and !@url.start_with?('/') and @url !~ URI::RFC2396_PARSER.make_regexp
         raise "URL must be a full URL (http://domain.com/path) or a relative path (/path)"
       end
 
@@ -250,9 +250,22 @@ module OpenC3
 
       variables["tool_name"] = @name
       start_path = "/tools/#{@folder_name}/"
-      Dir.glob(gem_path + start_path + "**/*") do |filename|
-        next if filename == '.' or filename == '..' or File.directory?(filename)
-
+      # Sort files so dependencies are uploaded before dependents:
+      # fonts first, then CSS, then index.html last (it triggers all other loads)
+      filenames = Dir.glob(gem_path + start_path + "**/*")
+      filenames.reject! { |f| f == '.' or f == '..' or File.directory?(f) }
+      filenames.sort_by! do |filename|
+        if filename.include?('/fonts/')
+          [0, filename]
+        elsif filename.include?('/css/')
+          [1, filename]
+        elsif File.basename(filename) == 'index.html'
+          [3, filename]
+        else
+          [2, filename]
+        end
+      end
+      filenames.each do |filename|
         key = filename.split(gem_path + '/tools/')[-1]
         extension = filename.split('.')[-1]
         content_type = Rack::Mime.mime_type(".#{extension}")

data/lib/openc3/models/trigger_model.rb

@@ -19,7 +19,7 @@ require 'openc3/models/model'
 require 'openc3/models/microservice_model'
 require 'openc3/models/target_model'
 require 'openc3/models/trigger_group_model'
-require 'openc3/models/reaction_model'
+# require 'openc3/models/reaction_model' # Remove circular require
 require 'openc3/topics/autonomic_topic'
 
 module OpenC3

data/lib/openc3/models/widget_model.rb

@@ -15,9 +15,8 @@
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
-require 'openc3/top_level'
 require 'openc3/models/model'
-require 'openc3/models/scope_model'
+# require 'openc3/models/scope_model' # Circular require
 require 'openc3/utilities/bucket'
 require 'openc3/utilities/bucket_utilities'
 
@@ -126,13 +125,6 @@ module OpenC3
     end
 
     def deploy(gem_path, variables, validate_only: false)
-      # Ensure tools bucket exists
-      bucket = nil
-      unless validate_only
-        bucket = Bucket.getClient()
-        bucket.ensure_public(ENV['OPENC3_TOOLS_BUCKET'])
-      end
-
       filename = gem_path + "/tools/widgets/" + @full_name + '/' + @filename
 
       # Load widget file
@@ -146,6 +138,7 @@ module OpenC3
       unless validate_only
         cache_control = BucketUtilities.get_cache_control(@filename)
         # TODO: support widgets that aren't just a single js file (and its associated map file)
+        bucket = Bucket.getClient()
         bucket.put_object(bucket: ENV['OPENC3_TOOLS_BUCKET'], content_type: 'application/javascript', cache_control: cache_control, key: @bucket_key, body: data)
         data = File.read(filename + '.map', mode: "rb")
         bucket.put_object(bucket: ENV['OPENC3_TOOLS_BUCKET'], content_type: 'application/json', cache_control: cache_control, key: @bucket_key + '.map', body: data)

data/lib/openc3/operators/operator.rb

@@ -54,8 +54,10 @@ module OpenC3
     end
 
     def finalize
-      extract()
-      close()
+      unless closed?
+        extract()
+        close()
+      end
       unlink()
 
       output = ''
@@ -174,7 +176,7 @@ module OpenC3
         end
         @process.stop
       end
-      FileUtils.remove_entry_secure(@temp_dir, true)
+      FileUtils.remove_entry_secure(@temp_dir, true) if @temp_dir
       @process = nil
     end
 
@@ -300,6 +302,7 @@ module OpenC3
             # Respawn process
             output = p.extract_output
             Logger.error("Unexpected process died... respawning! #{p.cmd_line}\n#{output}\n", scope: p.scope)
+            p.hard_stop
             p.start
           end
         end
@@ -308,6 +311,7 @@ module OpenC3
 
     def shutdown_processes(processes)
       # Make a copy so we don't mutate original
+      hard_stop_processes = processes.dup
       processes = processes.dup
 
       Logger.info("Commanding soft stops...")
@@ -331,10 +335,8 @@ module OpenC3
         end
         sleep(0.1)
       end
-      if processes.length > 0
-        Logger.debug("Commanding hard stops...")
-        processes.each { |_name, p| p.hard_stop }
-      end
+      Logger.debug("Commanding hard stops...")
+      hard_stop_processes.each { |_name, p| p.output_increment; p.extract_output; p.hard_stop }
     end
 
     def shutdown

data/lib/openc3/packets/json_packet.rb

@@ -189,6 +189,8 @@ module OpenC3
           postfix = 'C'
         when :FORMATTED, :WITH_UNITS
           postfix = 'F'
+        else
+          raise "Unsupported value type: #{value_type}"
         end
         case reduced_type
         when :MIN

data/lib/openc3/packets/packet.rb

@@ -16,6 +16,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'digest'
+require 'active_support/core_ext/object/deep_dup'
 require 'openc3/packets/structure'
 require 'openc3/packets/packet_item'
 require 'openc3/ext/packet' if RUBY_ENGINE == 'ruby' and !ENV['OPENC3_NO_EXT']

data/lib/openc3/packets/packet_config.rb

@@ -252,7 +252,7 @@ module OpenC3
           #######################################################################
           when 'STATE', 'READ_CONVERSION', 'WRITE_CONVERSION', 'POLY_READ_CONVERSION',\
               'POLY_WRITE_CONVERSION', 'SEG_POLY_READ_CONVERSION', 'SEG_POLY_WRITE_CONVERSION',\
-              'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START', 'REQUIRED',\
+              'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START', 'CONVERTED_DATA', 'REQUIRED',\
               'LIMITS', 'LIMITS_RESPONSE', 'UNITS', 'FORMAT_STRING', 'DESCRIPTION',\
               'MINIMUM_VALUE', 'MAXIMUM_VALUE', 'DEFAULT_VALUE', 'OVERFLOW', 'OVERLAP', 'KEY', 'VARIABLE_BIT_SIZE',\
               'OBFUSCATE'
@@ -675,11 +675,6 @@ module OpenC3
             klass = OpenC3.require_class(params[0])
             conversion = klass.new(*params[1..(params.length - 1)])
             @current_item.public_send("#{keyword.downcase}=".to_sym, conversion)
-            if klass != ProcessorConversion and (conversion.converted_type.nil? or conversion.converted_bit_size.nil?)
-              msg = "Read Conversion #{params[0]} on item #{@current_item.name} does not specify converted type or bit size"
-              @warnings << msg
-              Logger.instance.warn @warnings[-1]
-            end
           else
             conversion = PythonProxy.new('Conversion', params[0], *params[1..(params.length - 1)])
             @current_item.public_send("#{keyword.downcase}=".to_sym, conversion)
@@ -719,8 +714,9 @@ module OpenC3
       # All config.lines following this config.line are considered part
       # of the conversion until an end of conversion marker is found
       when 'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START'
-        usage = "#{keyword} <Converted Type (optional)> <Converted Bit Size (optional)>"
-        parser.verify_num_parameters(0, 2, usage)
+        # As of COSMOS 7 the converted type and bit size are deprecated
+        # but we're still allowing them to be defined as parameters for backward compatibility
+        parser.verify_num_parameters(0, 2, keyword)
         @proc_text = ''
         @building_generic_conversion = true
         parser.set_preserve_lines(true)
@@ -731,10 +727,30 @@ module OpenC3
           raise parser.error("Invalid converted_type: #{@converted_type}.") unless CONVERTED_DATA_TYPES.include? @converted_type
         end
         @converted_bit_size = Integer(params[1]) if params[1]
-        if @converted_type.nil? or @converted_bit_size.nil?
-          msg = "Generic Conversion on item #{@current_item.name} does not specify converted type or bit size"
-          @warnings << msg
-          Logger.instance.warn @warnings[-1]
+
+      # Define the converted data type, bit size, and optional array size
+      # for items with read conversions (especially DERIVED items)
+      when 'CONVERTED_DATA'
+        usage = "CONVERTED_DATA <Converted Bit Size> <Converted Type> <Converted Array Size (optional)>"
+        parser.verify_num_parameters(2, 3, usage)
+        raise parser.error("#{keyword} requires a current item") unless @current_item
+        raise parser.error("#{keyword} requires a current item with a conversion") unless @current_item.read_conversion or @current_item.write_conversion
+        converted_bit_size = Integer(params[0])
+        converted_type = params[1].upcase.intern
+        raise parser.error("Invalid converted_type: #{converted_type}.") unless CONVERTED_DATA_TYPES.include? converted_type
+        if @current_item.read_conversion
+          @current_item.read_conversion.converted_type = converted_type
+          @current_item.read_conversion.converted_bit_size = converted_bit_size
+          if params[2]
+            @current_item.read_conversion.converted_array_size = Integer(params[2])
+          end
+        end
+        if @current_item.write_conversion
+          @current_item.write_conversion.converted_type = converted_type
+          @current_item.write_conversion.converted_bit_size = converted_bit_size
+          if params[2]
+            @current_item.write_conversion.converted_array_size = Integer(params[2])
+          end
         end
 
       # Define a set of limits for the current telemetry item

data/lib/openc3/script/calendar.rb

@@ -52,6 +52,14 @@ module OpenC3
       return _cal_handle_response(response, 'Failed to delete timeline')
     end
 
+    # Creates an activity for the specified timeline.
+    #
+    # @param name [String] The name of the timeline.
+    # @param kind [String] The kind of activity. Must be one of "COMMAND", "SCRIPT", or "RESERVE".
+    # @param start [DateTime] The start time of the activity.
+    # @param stop [DateTime] The stop time of the activity.
+    # @param data [Hash, optional] Additional data to associate with the activity. Defaults to {}. Any activity can provide "username", "notes", and "customTitle". "command", "script", and "reserve" keys are reserves for the corresponding activity kind, with "environment" also available for script activities.
+    # @param scope [String, optional] The scope of the activity. Defaults to OPENC3_SCOPE, must correspond to the timeline.
     def create_timeline_activity(name, kind:, start:, stop:, data: {}, scope: $openc3_scope)
       kind = kind.to_s.downcase()
       kinds = %w(command script reserve)

data/lib/openc3/script/script.rb

@@ -47,6 +47,9 @@ $disconnect = false
 $openc3_scope = ENV['OPENC3_SCOPE'] || 'DEFAULT'
 $openc3_in_cluster = false
 
+saved_verbose = $VERBOSE
+$VERBOSE = false
+
 module OpenC3
   module Script
     private
@@ -177,6 +180,10 @@ module OpenC3
       message_box(string, *items, **options)
     end
 
+    def check_box(string, *items, **options)
+      message_box(string, *items, **options)
+    end
+
     def _file_dialog(title, message, filter:)
       answer = ''
       path = "./*"
@@ -199,6 +206,16 @@ module OpenC3
       _file_dialog(title, message, filter)
     end
 
+    def open_bucket_dialog(title, message = "Open Bucket File")
+      answer = ''
+      while answer.empty?
+        print "#{title}\n#{message}\n<Type bucket file path (e.g. BUCKET/path/to/file)>:"
+        answer = gets
+        answer.chomp!
+      end
+      return answer
+    end
+
     def prompt(string, text_color: nil, background_color: nil, font_size: nil, font_family: nil, details: nil)
       print "#{string}: "
       print "Details: #{details}\n" if details
@@ -363,3 +380,5 @@ module OpenC3
     end
   end
 end
+
+$VERBOSE = saved_verbose

data/lib/openc3/script/storage.rb

@@ -110,7 +110,7 @@ module OpenC3
           end
 
           return _get_storage_file("#{part}/#{path}", scope: scope)
-        rescue => e
+        rescue
           if part == "targets_modified"
             part = "targets"
             redo
@@ -141,13 +141,13 @@ module OpenC3
       return result['url']
     end
 
-    def _get_storage_file(path, scope: $openc3_scope)
+    def _get_storage_file(path, bucket: 'OPENC3_CONFIG_BUCKET', scope: $openc3_scope)
       # Create Tempfile to store data
       file = Tempfile.new('target', binmode: true)
       file.filename = path
 
       endpoint = "/openc3-api/storage/download/#{scope}/#{path}"
-      result = _get_presigned_request(endpoint, scope: scope)
+      result = _get_presigned_request(endpoint, bucket: bucket, scope: scope)
       puts "Reading #{scope}/#{path}"
 
       # Try to get the file
@@ -186,11 +186,11 @@ module OpenC3
       end
     end
 
-    def _get_presigned_request(endpoint, external: nil, scope: $openc3_scope)
+    def _get_presigned_request(endpoint, external: nil, bucket: 'OPENC3_CONFIG_BUCKET', scope: $openc3_scope)
       if external or !$openc3_in_cluster
-        response = $api_server.request('get', endpoint, query: { bucket: 'OPENC3_CONFIG_BUCKET' }, scope: scope)
+        response = $api_server.request('get', endpoint, query: { bucket: bucket }, scope: scope)
       else
-        response = $api_server.request('get', endpoint, query: { bucket: 'OPENC3_CONFIG_BUCKET', internal: true }, scope: scope)
+        response = $api_server.request('get', endpoint, query: { bucket: bucket, internal: true }, scope: scope)
       end
       if response.nil? || response.status != 201
         raise "Failed to get presigned URL for #{endpoint}"

data/lib/openc3/script/web_socket_api.rb

@@ -121,7 +121,7 @@ module OpenC3
     # Connect to the websocket with authorization in query params
     def connect
       disconnect()
-      final_url = @url + "?scope=#{@scope}&authorization=#{@authentication.token(include_bearer: false)}"
+      final_url = @url + "?scope=#{@scope}&authorization=#{@authentication.get_otp(scope: @scope)}"
       @stream = WebSocketClientStream.new(final_url, @write_timeout, @read_timeout, @connect_timeout)
       @stream.headers = {
         'Sec-WebSocket-Protocol' => 'actioncable-v1-json, actioncable-unsupported',

data/lib/openc3/system/system.rb

@@ -81,22 +81,22 @@ module OpenC3
       # Nothing to do if there are no targets
       return if target_names.nil? or target_names.length == 0
       if @@instance.nil?
-        FileUtils.mkdir_p("#{base_dir}/targets")
+        targets_path = "#{base_dir}/_targets"
+        FileUtils.mkdir_p(targets_path)
         bucket = Bucket.getClient()
         target_names.each do |target_name|
           # Retrieve bucket/targets/target_name/<TARGET>_current.zip
-          zip_path = "#{base_dir}/targets/#{target_name}_current.zip"
+          zip_path = "#{targets_path}/#{target_name}_current.zip"
           FileUtils.mkdir_p(File.dirname(zip_path))
           bucket_key = "#{scope}/target_archives/#{target_name}/#{target_name}_current.zip"
           Logger.info("Retrieving #{bucket_key} from targets bucket")
           bucket.get_object(bucket: ENV['OPENC3_CONFIG_BUCKET'], key: bucket_key, path: zip_path)
-          targets_path = "#{base_dir}/targets"
-          FileUtils.mkdir_p(targets_path)
           Zip::File.open(zip_path) do |zip_file|
             zip_file.each do |entry|
               zip_file.extract(entry.name, destination_directory: targets_path)
             end
           end
+          FileUtils.rm(zip_path) if File.exist?(zip_path)
 
           # Now add any modifications in targets_modified/TARGET/cmd_tlm
           # This adds support for remembering dynamically created packets
@@ -106,13 +106,13 @@ module OpenC3
           _, files = bucket.list_files(bucket: ENV['OPENC3_CONFIG_BUCKET'], path: bucket_path)
           files.each do |file|
             bucket_key = File.join(bucket_path, file['name'])
-            local_path = "#{base_dir}/targets/#{target_name}/cmd_tlm/#{file['name']}"
+            local_path = "#{targets_path}/#{target_name}/cmd_tlm/#{file['name']}"
             bucket.get_object(bucket: ENV['OPENC3_CONFIG_BUCKET'], key: bucket_key, path: local_path)
           end
         end
 
         # Build System from targets
-        System.instance(target_names, "#{base_dir}/targets")
+        System.instance(target_names, targets_path)
       end
     end
 

data/lib/openc3/tools/cmd_tlm_server/interface_thread.rb

@@ -221,7 +221,6 @@ module OpenC3
           else
             Logger.error connect_error.formatted
             unless @connection_failed_messages.include?(connect_error.message)
-              OpenC3.write_exception_file(connect_error)
               @connection_failed_messages << connect_error.message
             end
           end
@@ -242,7 +241,6 @@ module OpenC3
           else
             Logger.error err.formatted
             unless @connection_lost_messages.include?(err.message)
-              OpenC3.write_exception_file(err)
               @connection_lost_messages << err.message
             end
           end

data/lib/openc3/top_level.rb

@@ -1,4 +1,4 @@
-# encoding: ascii-8bit
+# encoding: utf-8
 
 # Copyright 2022 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
@@ -101,6 +101,20 @@ module OpenC3
     end
   end
 
+  def self.sanitize_path(path)
+    return '' if path.nil?
+    # path is passed as a parameter thus we have to sanitize it or the code scanner detects:
+    # "Uncontrolled data used in path expression"
+    # This method is taken directly from the Rails source:
+    #   https://api.rubyonrails.org/v5.2/classes/ActiveStorage/Filename.html#method-i-sanitized
+    # NOTE: I removed the '/' character because we have to allow this in order to traverse the path
+    sanitized = path.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: "�").strip.tr("\u{202E}%$|:;\t\r\n\\", "-").gsub('..', '-')
+    if sanitized != path
+      raise StorageError, "Invalid path: #{path}"
+    end
+    sanitized
+  end
+
   require 'openc3/utilities/logger'
 
   # Creates a marshal file by serializing the given obj
@@ -280,65 +294,6 @@ module OpenC3
     return log_file
   end
 
-  # Writes a log file with information about the current configuration
-  # including the Ruby version, OpenC3 version, whether you are on Windows, the
-  # OpenC3 path, and the Ruby path along with the exception that
-  # is passed in.
-  #
-  # @param [String] filename String to append to the exception log filename.
-  #   The filename will start with a date/time stamp.
-  # @param [String] log_dir By default this method will write to the OpenC3
-  #   default log directory. By setting this parameter you can override the
-  #   directory the log will be written to.
-  # @return [String|nil] The fully pathed log filename or nil if there was
-  #   an error creating the log file.
-  def self.write_exception_file(exception, filename = 'exception', log_dir = nil)
-    log_file = create_log_file(filename, log_dir) do |file|
-      file.puts "Exception:"
-      if exception
-        file.puts exception.formatted
-        file.puts
-      else
-        file.puts "No Exception Given"
-        file.puts caller.join("\n")
-        file.puts
-      end
-      file.puts "Caller Backtrace:"
-      file.puts caller().join("\n")
-      file.puts
-
-      file.puts "Ruby Version: ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE} patchlevel #{RUBY_PATCHLEVEL}) [#{RUBY_PLATFORM}]"
-      file.puts "Rubygems Version: #{Gem::VERSION}"
-      file.puts "OpenC3 Version: #{OpenC3::VERSION}"
-      file.puts "OpenC3::PATH: #{OpenC3::PATH}"
-      file.puts ""
-      file.puts "Environment:"
-      file.puts "RUBYOPT: #{ENV['RUBYOPT']}"
-      file.puts "RUBYLIB: #{ENV['RUBYLIB']}"
-      file.puts "GEM_PATH: #{ENV['GEM_PATH']}"
-      file.puts "GEMRC: #{ENV['GEMRC']}"
-      file.puts "RI_DEVKIT: #{ENV['RI_DEVKIT']}"
-      file.puts "GEM_HOME: #{ENV['GEM_HOME']}"
-      file.puts "PYTHONUSERBASE: #{ENV['PYTHONUSERBASE']}"
-      file.puts "PATH: #{ENV['PATH']}"
-      file.puts ""
-      file.puts "Ruby Path:\n  #{$:.join("\n  ")}\n\n"
-      file.puts "Gems:"
-      Gem.loaded_specs.values.map { |x| file.puts "#{x.name} #{x.version} #{x.platform}" }
-      file.puts ""
-      file.puts "All Threads Backtraces:"
-      Thread.list.each do |thread|
-        file.puts thread.backtrace.join("\n")
-        file.puts
-      end
-      file.puts ""
-      file.puts ""
-    ensure
-      file.close
-    end
-    return log_file
-  end
-
   # Writes a log file with information about unexpected output
   #
   # @param [String] text The unexpected output text
@@ -367,7 +322,6 @@ module OpenC3
   def self.handle_fatal_exception(error, _try_gui = true)
     unless SystemExit === error or SignalException === error
       $openc3_fatal_exception = error
-      self.write_exception_file(error)
       Logger.fatal "Fatal Exception! Exiting..."
       Logger.fatal error.formatted
       if $stdout != STDOUT
@@ -392,7 +346,6 @@ module OpenC3
   # @param try_gui [Boolean] Whether to try and create a GUI exception popup
   def self.handle_critical_exception(error, _try_gui = true)
     Logger.error "Critical Exception! #{error.formatted}"
-    self.write_exception_file(error)
   end
 
   # Creates a Ruby Thread to run the given block. Rescues any exceptions and
@@ -412,7 +365,6 @@ module OpenC3
         Logger.error e.formatted
         retry_count += 1
         if retry_count <= retry_attempts
-          self.write_exception_file(e)
           retry
         end
         handle_fatal_exception(e)

data/lib/openc3/topics/command_topic.rb

@@ -21,6 +21,7 @@ require 'openc3/utilities/open_telemetry'
 
 module OpenC3
   class CommandTopic < Topic
+    # TODO: This is in several places, should maybe be a parameter in settings?
     COMMAND_ACK_TIMEOUT_S = 30
 
     def self.write_packet(packet, scope:)

data/lib/openc3/topics/limits_event_topic.rb

@@ -53,7 +53,7 @@ module OpenC3
         limits['red_high'] = event[:red_high]
         limits['green_low'] = event[:green_low] if event[:green_low] && event[:green_high]
         limits['green_high'] = event[:green_high] if event[:green_low] && event[:green_high]
-        limits_settings[event[:limits_set]] = limits
+        limits_settings[event[:limits_set].to_s] = limits
         limits_settings['persistence_setting'] = event[:persistence] if event[:persistence]
         limits_settings['enabled'] = event[:enabled] if not event[:enabled].nil?
         Store.hset("#{scope}__current_limits_settings", field, JSON.generate(limits_settings, allow_nan: true))

data/lib/openc3/utilities/authentication.rb

@@ -33,8 +33,10 @@ module OpenC3
         raise OpenC3AuthenticationError, "Authentication requires environment variable OPENC3_API_PASSWORD"
       end
       @service = password == ENV['OPENC3_SERVICE_PASSWORD']
-      response = _make_auth_request(password)
-      @token = response.body
+      retry_faraday_request do
+        response = _make_auth_request(password)
+        @token = response.body
+      end
       if @token.nil? or @token.empty?
         raise OpenC3AuthenticationError, "Authentication failed. Please check the password in the environment variable OPENC3_API_PASSWORD"
       end
@@ -45,23 +47,60 @@ module OpenC3
       @token
     end
 
+    def get_otp(scope: 'DEFAULT')
+      session_token = token()
+      if session_token.nil? or session_token.empty?
+        raise OpenC3AuthenticationError, "Uninitialized authentication: unable to get OTP"
+      end
+      retry_faraday_request do
+        response = _make_otp_request(scope: scope)
+        return response.body
+      end
+    end
+
     def _make_auth_request(password)
       Faraday.new.post(_generate_auth_url, '{"password": "' + password + '"}', {'Content-Type' => 'application/json'})
     end
 
-    def _generate_auth_url
+    def _make_otp_request(scope: 'DEFAULT')
+      params = {
+        'scope' => scope
+      }
+      headers = {
+        'Authorization' => token,
+      }
+      Faraday.new.get(_generate_auth_url('/auth/otp'), params, headers)
+    end
+
+    def _generate_auth_url(endpoint = nil)
       schema = ENV['OPENC3_API_SCHEMA'] || 'http'
       hostname = ENV['OPENC3_API_HOSTNAME'] || (ENV['OPENC3_DEVEL'] ? '127.0.0.1' : 'openc3-cosmos-cmd-tlm-api')
       port = ENV['OPENC3_API_PORT'] || '2901'
       port = port.to_i
-      endpoint = if @service
-        "auth/verify_service"
-      else
-        "auth/verify"
+      unless endpoint
+        endpoint = if @service
+          "auth/verify_service"
+        else
+          "auth/verify"
+        end
       end
       return "#{schema}://#{hostname}:#{port}/openc3-api/#{endpoint}"
     end
 
+    def retry_faraday_request(max_retries: 3)
+      retries = 0
+      begin
+        yield
+      rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
+        retries += 1
+        if retries <= max_retries
+          STDOUT.puts "Authentication request failed (attempt #{retries}/3): #{e.message}. Retrying in #{retries}s..."
+          sleep(retries)
+          retry
+        end
+        raise
+      end
+    end
   end
 
   # OpenC3 enterprise Keycloak authentication code