openc3 7.0.0.pre.rc2 → 7.0.0

data/lib/openc3/utilities/authorization.rb

@@ -29,6 +29,13 @@ rescue LoadError
     end
 
     module Authorization
+      ANONYMOUS_USER = "anonymous"
+
+      def self.generate_otp(user)
+        raise AuthError.new("Invalid OTP user") unless user == ANONYMOUS_USER
+        return OpenC3::AuthModel.generate_session(otp: true)
+      end
+
       private
 
       # Raises an exception if unauthorized, otherwise does nothing
@@ -41,7 +48,7 @@ rescue LoadError
             raise AuthError.new("Token is invalid")
           end
         end
-        return "anonymous"
+        return ANONYMOUS_USER
       end
 
       def user_info(_token)

data/lib/openc3/utilities/aws_bucket.rb

@@ -30,8 +30,7 @@ module OpenC3
       @use_checksum = if ENV.key?('OPENC3_NO_S3_CHECKSUM')
         ENV['OPENC3_NO_S3_CHECKSUM'].to_s.empty?  # Empty string means use checksum
       else
-        # If OPENC3_BUCKET_URL is set, we're using a non-AWS S3 backend
-        !ENV.key?('OPENC3_BUCKET_URL')
+        ENV.fetch('OPENC3_CLOUD', 'local').downcase == 'aws'
       end
     end
 
@@ -48,7 +47,7 @@ module OpenC3
     end
 
     def ensure_public(bucket)
-      unless ENV['OPENC3_NO_BUCKET_POLICY']
+      unless ENV.fetch('OPENC3_NO_BUCKET_POLICY', false)
         policy = <<~EOL
         {
           "Version": "2012-10-17",

data/lib/openc3/utilities/bucket_utilities.rb

@@ -117,7 +117,9 @@ module OpenC3
       # Allow caching for files that have a filename versioning strategy
       has_version_number = /(-|_|\.)\d+(-|_|\.)\d+(-|_|\.)\d+\./.match(filename)
       has_content_hash = /[\.-][a-f0-9]{20}\./.match(filename)
-      return nil if has_version_number or has_content_hash
+      # Font files are immutable assets deployed with plugins and safe to cache
+      is_font = /\.(woff2?|eot|ttf|otf)$/.match(filename)
+      return nil if has_version_number or has_content_hash or is_font
       return 'no-store'
     end
 

data/lib/openc3/utilities/cli_generator.rb

@@ -197,6 +197,8 @@ module OpenC3
       target_lib_filename = "#{target_name.downcase}.#{@@language}"
       target_class = target_lib_filename.filename_to_class_name
       target_object = target_name.downcase
+      target_class.inspect # Remove unused variable warning. These are used in binding for generator
+      target_object.inspect # Remove unused variable warning. These are used in binding for generator
 
       process_template("#{TEMPLATES_DIR}/target", binding) do |filename|
         # Rename the template TARGET to our actual target named after the plugin
@@ -292,6 +294,7 @@ RUBY
       end
       microservice_filename = "#{microservice_name.downcase}.#{@@language}"
       microservice_class = microservice_filename.filename_to_class_name
+      microservice_class.inspect # Remove unused variable warning. These are used in binding for generator
 
       process_template("#{TEMPLATES_DIR}/microservice", binding) do |filename|
         # Rename the template MICROSERVICE to our actual microservice name
@@ -547,6 +550,7 @@ RUBY
       conversion_name = "#{args[2].upcase.gsub(/_+|-+/, '_')}_CONVERSION"
       conversion_basename = "#{conversion_name.downcase}.#{@@language}"
       conversion_class = conversion_basename.filename_to_class_name
+      conversion_class.inspect # Remove unused variable warning. These are used in binding for generator
       conversion_filename = "targets/#{target_name}/lib/#{conversion_basename}"
       if File.exist?(conversion_filename)
         abort("Conversion #{conversion_filename} already exists!")
@@ -601,6 +605,7 @@ RUBY
       processor_name = "#{args[2].upcase.gsub(/_+|-+/, '_')}_PROCESSOR"
       processor_basename = "#{processor_name.downcase}.#{@@language}"
       processor_class = processor_basename.filename_to_class_name
+      processor_class.inspect # Remove unused variable warning. These are used in binding for generator
       processor_filename = "targets/#{target_name}/lib/#{processor_basename}"
       if File.exist?(processor_filename)
         abort("Processor #{processor_filename} already exists!")
@@ -656,6 +661,7 @@ RUBY
       response_basename = "#{response_name.downcase}.#{@@language}"
       response_filename = "targets/#{target_name}/lib/#{response_basename}"
       response_class = response_basename.filename_to_class_name
+      response_class.inspect # Remove unused variable warning. These are used in binding for generator
       if File.exist?(response_filename)
         abort("response #{response_filename} already exists!")
       end
@@ -709,6 +715,7 @@ RUBY
       validator_name = "#{args[2].upcase.gsub(/_+|-+/, '_')}_COMMAND_VALIDATOR"
       validator_basename = "#{validator_name.downcase}.#{@@language}"
       validator_class = validator_basename.filename_to_class_name
+      validator_class.inspect # Remove unused variable warning. These are used in binding for generator
       validator_filename = "targets/#{target_name}/lib/#{validator_basename}"
       if File.exist?(validator_filename)
         abort("Command validator #{validator_filename} already exists!")

data/lib/openc3/utilities/cmd_log.rb

@@ -11,7 +11,7 @@
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
-require 'openc3/packets/packet'
+# require 'openc3/packets/packet' # Circular require
 
 module OpenC3
   module CmdLog

data/lib/openc3/utilities/local_mode.rb

@@ -450,6 +450,7 @@ module OpenC3
     end
 
     def self.save_tool_config(scope, tool, name, data)
+      return unless ENV['OPENC3_LOCAL_MODE'] and Dir.exist?(OPENC3_LOCAL_MODE_PATH)
       json = JSON.parse(data, allow_nan: true, create_additions: true)
       config_path = "#{OPENC3_LOCAL_MODE_PATH}/#{scope}/tool_config/#{tool}/#{name}.json"
       return unless File.expand_path(config_path).start_with?(OPENC3_LOCAL_MODE_PATH)
@@ -460,6 +461,7 @@ module OpenC3
     end
 
     def self.delete_tool_config(scope, tool, name)
+      return unless ENV['OPENC3_LOCAL_MODE'] and Dir.exist?(OPENC3_LOCAL_MODE_PATH)
       config_path = "#{OPENC3_LOCAL_MODE_PATH}/#{scope}/tool_config/#{tool}/#{name}.json"
       return unless File.expand_path(config_path).start_with?(OPENC3_LOCAL_MODE_PATH)
       FileUtils.rm_f(config_path)
@@ -479,6 +481,7 @@ module OpenC3
     end
 
     def self.save_setting(scope, name, data)
+      return unless ENV['OPENC3_LOCAL_MODE'] and Dir.exist?(OPENC3_LOCAL_MODE_PATH)
       config_path = "#{OPENC3_LOCAL_MODE_PATH}/#{scope}/settings/#{name}.json"
       return unless File.expand_path(config_path).start_with?(OPENC3_LOCAL_MODE_PATH)
       FileUtils.mkdir_p(File.dirname(config_path))

data/lib/openc3/utilities/process_manager.rb

@@ -17,7 +17,7 @@
 
 require 'openc3/operators/operator'
 require 'openc3/models/process_status_model'
-require 'openc3/models/scope_model'
+# require 'openc3/models/scope_model' # Circular require
 require 'openc3/utilities/logger'
 require 'socket'
 

data/lib/openc3/utilities/python_proxy.rb

@@ -11,13 +11,13 @@
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
-# TODO: Delegate to actual Python to verify that classes exist
-# and to get proper data from them like converted_type
-
 module OpenC3
   class PythonProxy
     attr_accessor :name
     attr_accessor :args
+    attr_accessor :converted_type
+    attr_accessor :converted_bit_size
+    attr_accessor :converted_array_size
 
     def initialize(type, class_name, *params)
       @type = type
@@ -25,6 +25,9 @@ module OpenC3
       @params = params
       @args = params
       @name = nil
+      @converted_type = nil
+      @converted_bit_size = nil
+      @converted_array_size = nil
     end
 
     def class
@@ -36,7 +39,11 @@ module OpenC3
       when "Processor"
         return { 'name' => @name, 'class' => @class_name, 'params' => @params }
       when "Conversion"
-        return { 'class' => @class_name, 'params' => @params }
+        result = { 'class' => @class_name, 'params' => @params }
+        result['converted_type'] = @converted_type.to_s if @converted_type
+        result['converted_bit_size'] = @converted_bit_size if @converted_bit_size
+        result['converted_array_size'] = @converted_array_size if @converted_array_size
+        return result
       when "LimitsResponse"
         return { "class" => @class_name, 'params' => @params }
       else