openc3 7.3.0 → 7.4.0

data/lib/openc3/utilities/python_venv.rb

@@ -0,0 +1,135 @@
+# encoding: ascii-8bit
+
+# Copyright 2026 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
+#
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'open3'
+require 'openc3/models/target_model'
+require 'openc3/utilities/target_file'
+
+module OpenC3
+  module PythonVenv
+    PLUGIN_VENVS_DIR = '/gems/plugin_venvs'
+
+    # Shared user site-packages directory used by plugins that predate the
+    # per-plugin UV venvs. Every caller that falls back off a plugin venv points
+    # PYTHONUSERBASE here, so keep it in one place rather than repeating the
+    # literal in script.rb, running_script.rb, microservice_operator.rb and
+    # microservice_model.rb.
+    DEFAULT_PYTHONUSERBASE = '/gems/python_packages'
+
+    # Packages a plugin venv must never supply itself. The scripts and
+    # microservices that use a plugin venv still run the base venv's Python
+    # binary, and CPython searches every PYTHONPATH entry ahead of the running
+    # venv's own site-packages. A plugin that declares openc3 as a dependency
+    # would therefore shadow the system library with its own copy, silently
+    # swapping the API client the script talks to COSMOS with. Reordering
+    # PYTHONPATH cannot fix this - the whole variable outranks the base venv -
+    # so the copy is removed at install time instead.
+    RESERVED_PACKAGES = ['openc3'].freeze
+
+    # Resolve a script's plugin venv and expose its packages to a child process.
+    # Returns the venv path when configured, or nil when the system environment
+    # should be used.
+    def self.configure_for_script(environment, name:, scope:, python_venv: nil)
+      venv_dir = resolve_script_venv(name: name, scope: scope, python_venv: python_venv)
+      return nil unless venv_dir
+
+      configure_environment(environment, venv_dir)
+      venv_dir
+    end
+
+    def self.configure_environment(environment, venv_dir)
+      environment['VIRTUAL_ENV'] = venv_dir
+      environment['PATH'] = "#{venv_dir}/bin:#{ENV.fetch('PATH', '')}"
+      environment['PYTHONUSERBASE'] = venv_dir
+
+      site_packages = Dir.glob("#{venv_dir}/lib/python*/site-packages").first
+      # Prefer a PYTHONPATH the caller already seeded on `environment` over the
+      # ambient one. Script.process_suite sets it to ENV['PYTHONPATH'] || '.'
+      # before calling here, and reading ENV directly would drop that value.
+      existing_pythonpath = environment['PYTHONPATH'] || ENV.fetch('PYTHONPATH', '')
+      if site_packages
+        environment['PYTHONPATH'] = existing_pythonpath.empty? ? site_packages : "#{site_packages}:#{existing_pythonpath}"
+      else
+        environment['PYTHONPATH'] = existing_pythonpath.empty? ? nil : existing_pythonpath
+      end
+
+      environment
+    end
+
+    # Remove any RESERVED_PACKAGES a plugin installed into its own venv.
+    # Returns the names that were removed so callers can report them.
+    def self.purge_reserved_packages(venv_dir)
+      return [] if venv_dir.nil? || venv_dir.empty?
+
+      purged = []
+      RESERVED_PACKAGES.each do |package|
+        next unless package_installed?(venv_dir, package)
+
+        Logger.warn("Plugin venv #{venv_dir} declares '#{package}', which would shadow the " \
+                    "system library. Removing it; the plugin will use the system #{package}.")
+        _output, status = Open3.capture2e('uv', 'pip', 'uninstall', '--python', venv_dir, package)
+        if status.success?
+          purged << package
+        else
+          Logger.error("Failed to remove '#{package}' from plugin venv #{venv_dir}")
+        end
+      end
+      purged
+    rescue => e
+      Logger.error("Could not purge reserved packages from #{venv_dir}: #{e.message}")
+      []
+    end
+
+    def self.package_installed?(venv_dir, package)
+      _output, status = Open3.capture2e('uv', 'pip', 'show', '--python', venv_dir, package)
+      status.success?
+    end
+    private_class_method :package_installed?
+
+    def self.plugin_venv_path(scope:, plugin_name:)
+      sanitized_name = "#{scope}__#{plugin_name}".tr('^a-zA-Z0-9_-', '_')
+      candidate = File.join(PLUGIN_VENVS_DIR, sanitized_name, '.venv')
+      candidate if File.directory?(candidate)
+    end
+
+    def self.resolve_script_venv(name:, scope:, python_venv: nil)
+      target_name = name.split('/')[0].to_s.upcase
+      if target_name == TargetFile::TEMP_FOLDER && python_venv
+        # File.basename strips directory components; the tr() then whitelists the
+        # name down to the character set PluginModel.plugin_venv_name builds it
+        # from. That leaves no path separators and no glob metacharacters, so
+        # the value cannot escape PLUGIN_VENVS_DIR or widen the Dir.glob in
+        # configure_environment.
+        safe_name = File.basename(python_venv.to_s).tr('^a-zA-Z0-9_-', '_')
+        # The venv name is client-supplied, so it must also be confined to the
+        # caller's scope. Venv directories are named "<scope>__<plugin>" by
+        # PluginModel.plugin_venv_name; without this check a user in one scope
+        # could name another scope's venv and run against its packages.
+        return nil unless safe_name.start_with?("#{scope}__".tr('^a-zA-Z0-9_-', '_'))
+
+        candidate = File.join(PLUGIN_VENVS_DIR, safe_name, '.venv')
+        return candidate if File.directory?(candidate)
+      else
+        target_info = TargetModel.get(name: target_name, scope: scope)
+        if target_info && target_info['plugin']
+          return plugin_venv_path(scope: scope, plugin_name: target_info['plugin'])
+        end
+      end
+      nil
+    rescue => e
+      Logger.debug("Could not resolve plugin venv for script '#{name}': #{e.message}")
+      nil
+    end
+    private_class_method :resolve_script_venv
+  end
+end

data/lib/openc3/utilities/rubygems_url.rb

@@ -0,0 +1,39 @@
+# encoding: ascii-8bit
+
+# Copyright 2026 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
+#
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'uri'
+require 'openc3/utilities/logger'
+
+module OpenC3
+  class RubygemsUrl
+    DEFAULT = 'https://rubygems.org'
+
+    # Validate that a resolved rubygems_url is an http(s) URL before it is used
+    # as a Gem source. The value can come from a user-writable setting or ENV, so
+    # a malformed or non-http value is rejected and replaced with the default
+    # rather than passed through to RubyGems.
+    #
+    # @param rubygems_url [String] the resolved rubygems source url to validate
+    # @return [String] the original url if valid, otherwise DEFAULT
+    def self.validate(rubygems_url)
+      uri = URI.parse(rubygems_url)
+      unless uri.is_a?(URI::HTTP) && !uri.host.to_s.empty?
+        raise URI::InvalidURIError, "not an http(s) URL"
+      end
+      rubygems_url
+    rescue URI::InvalidURIError => e
+      Logger.error("Invalid rubygems_url '#{rubygems_url}' (#{e.message}); falling back to #{DEFAULT}")
+      DEFAULT
+    end
+  end
+end

data/lib/openc3/utilities/running_script.rb

@@ -28,6 +28,7 @@ require 'openc3/utilities/script'
 require 'openc3/utilities/store'
 require 'openc3/utilities/store_queued'
 require 'openc3/utilities/bucket_require'
+require 'openc3/utilities/python_venv'
 require 'openc3/models/offline_access_model'
 require 'openc3/models/environment_model'
 require 'openc3/models/script_engine_model'
@@ -36,7 +37,7 @@ require 'fileutils'
 
 if not defined? RAILS_ROOT
   if ENV['RAILS_ROOT']
-    RAILS_ROOT = ENV['RAILS_ROOT']
+    RAILS_ROOT = ENV.fetch('RAILS_ROOT')
   elsif defined? Rails
     RAILS_ROOT = Rails.root
   else
@@ -436,7 +437,7 @@ class RunningScript
     extension = File.extname(name).to_s.downcase
     script_engine = nil
     if extension == '.py'
-      process_name = ENV['OPENC3_PYTHON_BIN'] || '/openc3/python/.venv/bin/python'
+      process_name = ENV.fetch('OPENC3_PYTHON_BIN', '/openc3/python/.venv/bin/python')
       runner_path = File.join(RAILS_ROOT, 'scripts', 'run_script.py')
     elsif extension == '.rb'
       process_name = 'ruby'
@@ -449,7 +450,7 @@ class RunningScript
       if script_engine_model
         script_engine = script_engine_model.filename
         if File.extname(script_engine).to_s.downcase == '.py'
-          process_name = ENV['OPENC3_PYTHON_BIN'] || '/openc3/python/.venv/bin/python'
+          process_name = ENV.fetch('OPENC3_PYTHON_BIN', '/openc3/python/.venv/bin/python')
           runner_path = File.join(RAILS_ROOT, 'scripts', 'run_script.py')
         else
           process_name = 'ruby'
@@ -521,17 +522,17 @@ class RunningScript
 
       # Set proper secrets for running script
       process.environment['SECRET_KEY_BASE'] = nil
-      process.environment['OPENC3_REDIS_USERNAME'] = ENV['OPENC3_SR_REDIS_USERNAME']
-      process.environment['OPENC3_REDIS_PASSWORD'] = ENV['OPENC3_SR_REDIS_PASSWORD']
-      process.environment['OPENC3_BUCKET_USERNAME'] = ENV['OPENC3_SR_BUCKET_USERNAME']
-      process.environment['OPENC3_BUCKET_PASSWORD'] = ENV['OPENC3_SR_BUCKET_PASSWORD']
+      process.environment['OPENC3_REDIS_USERNAME'] = ENV.fetch('OPENC3_SR_REDIS_USERNAME', nil)
+      process.environment['OPENC3_REDIS_PASSWORD'] = ENV.fetch('OPENC3_SR_REDIS_PASSWORD', nil)
+      process.environment['OPENC3_BUCKET_USERNAME'] = ENV.fetch('OPENC3_SR_BUCKET_USERNAME', nil)
+      process.environment['OPENC3_BUCKET_PASSWORD'] = ENV.fetch('OPENC3_SR_BUCKET_PASSWORD', nil)
       process.environment['OPENC3_SR_REDIS_USERNAME'] = nil
       process.environment['OPENC3_SR_REDIS_PASSWORD'] = nil
       process.environment['OPENC3_SR_BUCKET_USERNAME'] = nil
       process.environment['OPENC3_SR_BUCKET_PASSWORD'] = nil
-      process.environment['OPENC3_API_CLIENT'] = ENV['OPENC3_API_CLIENT']
+      process.environment['OPENC3_API_CLIENT'] = ENV.fetch('OPENC3_API_CLIENT', nil)
       if model and model.offline_access_token
-        auth = OpenC3::OpenC3KeycloakAuthentication.new(ENV['OPENC3_KEYCLOAK_URL'])
+        auth = OpenC3::OpenC3KeycloakAuthentication.new(ENV.fetch('OPENC3_KEYCLOAK_URL', nil))
         valid_token = auth.get_token_from_refresh_token(model.offline_access_token)
         if valid_token
           process.environment['OPENC3_API_TOKEN'] = model.offline_access_token
@@ -541,58 +542,26 @@ class RunningScript
           raise "offline_access token invalid for script"
         end
       else
-        process.environment['OPENC3_API_USER'] = ENV['OPENC3_API_USER']
+        process.environment['OPENC3_API_USER'] = ENV.fetch('OPENC3_API_USER', nil)
         if ENV['OPENC3_SERVICE_PASSWORD']
-          process.environment['OPENC3_API_PASSWORD'] = ENV['OPENC3_SERVICE_PASSWORD']
+          process.environment['OPENC3_API_PASSWORD'] = ENV.fetch('OPENC3_SERVICE_PASSWORD')
         else
           raise "No authentication available for script"
         end
       end
-      process.environment['GEM_HOME'] = ENV['GEM_HOME']
+      process.environment['GEM_HOME'] = ENV.fetch('GEM_HOME', nil)
 
-      # Resolve the per-plugin Python venv for this script. For saved scripts
-      # we look up which plugin owns the target and check whether that plugin
-      # has an isolated UV venv. For temp scripts the frontend can pass a
-      # python_venv name directly, skipping the target lookup entirely.
-      python_venv_dir = nil
-      begin
-        target_name = name.split('/')[0].to_s.upcase
-        if target_name == '__TEMP__' && python_venv
-          # File.basename prevents path traversal (strips directory components)
-          safe_name = File.basename(python_venv.to_s)
-          candidate = "/gems/plugin_venvs/#{safe_name}/.venv"
-          python_venv_dir = candidate if File.directory?(candidate)
-        else
-          target_info = OpenC3::TargetModel.get(name: target_name, scope: scope)
-          if target_info && target_info['plugin']
-            sanitized_name = "#{scope}__#{target_info['plugin']}".tr('^a-zA-Z0-9_-', '_')
-            candidate = "/gems/plugin_venvs/#{sanitized_name}/.venv"
-            python_venv_dir = candidate if File.directory?(candidate)
-          end
-        end
-      rescue => e
-        OpenC3::Logger.debug("Could not resolve plugin venv for script '#{name}': #{e.message}")
-      end
-
-      if python_venv_dir
-        process.environment['VIRTUAL_ENV'] = python_venv_dir
-        process.environment['PATH'] = "#{python_venv_dir}/bin:#{ENV.fetch('PATH', '')}"
-        process.environment['PYTHONUSERBASE'] = python_venv_dir
-        # Add plugin venv site-packages to PYTHONPATH so the base venv's Python
-        # binary can find plugin-specific packages. PYTHONPATH is always respected
-        # by CPython regardless of venv activation state.
-        site_packages = Dir.glob("#{python_venv_dir}/lib/python*/site-packages").first
-        existing_pythonpath = ENV.fetch('PYTHONPATH', '')
-        if site_packages
-          process.environment['PYTHONPATH'] = existing_pythonpath.empty? ? site_packages : "#{site_packages}:#{existing_pythonpath}"
-        else
-          process.environment['PYTHONPATH'] = existing_pythonpath.empty? ? nil : existing_pythonpath
-        end
-      else
-        system_venv = File.dirname(ENV['OPENC3_PYTHON_BIN'] || '/openc3/python/.venv/bin/python').chomp('/bin')
+      python_venv_dir = OpenC3::PythonVenv.configure_for_script(
+        process.environment, name: name, scope: scope, python_venv: python_venv
+      )
+      unless python_venv_dir
+        system_venv = File.dirname(ENV.fetch('OPENC3_PYTHON_BIN', '/openc3/python/.venv/bin/python')).chomp('/bin')
         process.environment['VIRTUAL_ENV'] = system_venv
-        process.environment['PYTHONUSERBASE'] = ENV['PYTHONUSERBASE']
-        process.environment['PYTHONPATH'] = ENV['PYTHONPATH']
+        process.environment['PYTHONUSERBASE'] = ENV.fetch('PYTHONUSERBASE', OpenC3::PythonVenv::DEFAULT_PYTHONUSERBASE)
+        # Deliberately nil when PYTHONPATH is unset rather than defaulting to
+        # something like '.', which would put the script's own working directory
+        # on the import path and let a local file shadow a real module.
+        process.environment['PYTHONPATH'] = ENV.fetch('PYTHONPATH', nil)
       end
 
       # Spawned process should not be controlled by same Bundler constraints as spawning process
@@ -1556,7 +1525,7 @@ class RunningScript
     $stdout = OpenC3::Stdout.instance
     $stderr = OpenC3::Stderr.instance
     OpenC3::Logger.stdout = true
-    OpenC3::Logger.level = OpenC3::Logger::INFO
+    OpenC3::Logger.level = OpenC3::Logger.default_level
   end
 
   def output_thread

data/lib/openc3/utilities/s3_autoload.rb

@@ -3,9 +3,9 @@ require 'aws-sdk-s3'
 if ENV['OPENC3_CLOUD'] == 'local'
   Aws.config.update(
     s3: {
-      endpoint: ENV['OPENC3_BUCKET_URL'] || (ENV['OPENC3_DEVEL'] ? 'http://127.0.0.1:9000' : 'http://openc3-buckets:9000'),
-      access_key_id: ENV['OPENC3_BUCKET_USERNAME'],
-      secret_access_key: ENV['OPENC3_BUCKET_PASSWORD'],
+      endpoint: ENV.fetch('OPENC3_BUCKET_URL', nil) || (ENV['OPENC3_DEVEL'] ? 'http://127.0.0.1:9000' : 'http://openc3-buckets:9000'),
+      access_key_id: ENV.fetch('OPENC3_BUCKET_USERNAME', nil),
+      secret_access_key: ENV.fetch('OPENC3_BUCKET_PASSWORD', nil),
       force_path_style: true,
       region: 'us-east-1',
       # Disable automatic checksum calculation for S3-compatible backends (versitygw)
@@ -20,9 +20,9 @@ if ENV['OPENC3_CLOUD'] == 'local'
 else # AWS
   Aws.config.update(
     s3: {
-      endpoint: "https://s3.#{ENV['AWS_REGION']}.amazonaws.com",
+      endpoint: "https://s3.#{ENV.fetch('AWS_REGION', nil)}.amazonaws.com",
       force_path_style: true,
-      region: ENV['AWS_REGION']
+      region: ENV.fetch('AWS_REGION', nil)
     }
   )
 end

data/lib/openc3/utilities/script.rb

@@ -17,6 +17,7 @@
 
 require 'tempfile'
 require 'openc3/utilities/target_file'
+require 'openc3/utilities/python_venv'
 require 'openc3/utilities/running_script'
 require 'openc3/script/suite'
 require 'openc3/script/suite_runner'
@@ -37,12 +38,6 @@ class Script < OpenC3::TargetFile
     super(scope, nil, target: target) # No path matchers
   end
 
-  # Split off the '*' that indicates a file is modified on the server
-  def self.strip_modified(name)
-    name.split('*')[0]
-  end
-  private_class_method :strip_modified
-
   def self.lock(scope, name, username)
     OpenC3::Store.hset("#{scope}__script-locks", strip_modified(name), username)
   end
@@ -88,7 +83,7 @@ class Script < OpenC3::TargetFile
                                  username: username, comment: comment)
   end
 
-  def self.process_suite(name, contents, new_process: true, username: nil, scope:)
+  def self.process_suite(name, contents, new_process: true, username: nil, scope:, python_venv: nil)
     python = false
     python = true if File.extname(name) == '.py'
 
@@ -155,10 +150,19 @@ class Script < OpenC3::TargetFile
         end
       end
       process.environment['GEM_HOME'] = ENV['GEM_HOME'] || '/gems'
-      process.environment['PYTHONUSERBASE'] = ENV['PYTHONUSERBASE'] || '/gems/python_packages'
+      process.environment['PYTHONUSERBASE'] = ENV['PYTHONUSERBASE'] || OpenC3::PythonVenv::DEFAULT_PYTHONUSERBASE
       # Preserve PYTHONPATH to ensure Python can find both UV venv and user packages
       process.environment['PYTHONPATH'] = ENV['PYTHONPATH'] || '.'
 
+      # Suite analysis executes Python in a separate process before the script
+      # itself is started. Give that process the same plugin venv visibility as
+      # RunningScript so imports used while defining a suite can be resolved.
+      if python
+        OpenC3::PythonVenv.configure_for_script(
+          process.environment, name: name, scope: scope, python_venv: python_venv
+        )
+      end
+
       # Spawned process should not be controlled by same Bundler constraints as spawning process
       ENV.each do |key, _value|
         if key =~ /^BUNDLE/

data/lib/openc3/utilities/secrets.rb

@@ -15,13 +15,58 @@ ENV['OPENC3_SECRET_BACKEND'] ||= 'redis'
 
 module OpenC3
   class Secrets
+    # Default base directory that FILE type secret paths must reside under.
+    # FILE type secrets are written by the operator (or mounted by Kubernetes)
+    # and then read back by the microservice, so the path is a destination we
+    # control, not an arbitrary file on the host.
+    DEFAULT_SECRET_FILE_DIR = '/tmp'
+
     def initialize
       @local_secrets = {}
     end
 
+    # Base directory that FILE type secret paths must reside under
+    def self.secret_file_dir
+      dir = ENV.fetch('OPENC3_SECRET_FILE_DIR', nil)
+      dir = DEFAULT_SECRET_FILE_DIR if dir.nil? or dir.empty?
+      dir
+    end
+
+    # Validates a FILE type secret path. The path must expand to a location
+    # strictly inside Secrets.secret_file_dir. This prevents a plugin
+    # configuration such as 'SECRET FILE KEY /root/.ssh/id_rsa' or
+    # 'SECRET FILE KEY /tmp/../etc/shadow' from reading or overwriting arbitrary
+    # files as the OpenC3 process user.
+    #
+    # @param path [String] Path from a SECRET FILE definition
+    # @return [String] The validated absolute path
+    def self.validate_file_path(path)
+      raise ArgumentError, "Secret file path must be a String but is a #{path.class}" unless path.is_a?(String)
+      raise ArgumentError, "Secret file path must not be blank" if path.strip.empty?
+      raise ArgumentError, "Secret file path must not contain a null byte" if path.include?("\x00")
+
+      # expand_path collapses '..' and '.', expands '~', and makes a relative path
+      # absolute, so the comparison below can't be walked out of. This is
+      # deliberately a purely lexical check: it does not touch the filesystem, so
+      # a path validates identically at plugin install time (cmd-tlm-api) and at
+      # write time (openc3-operator), which are separate containers. Symlinks are
+      # rejected by the operator when it writes the secret.
+      base = File.expand_path(secret_file_dir)
+      absolute = File.expand_path(path)
+      unless absolute.start_with?(base + File::SEPARATOR)
+        raise ArgumentError, "Secret file path '#{path}' must be under '#{base}'"
+      end
+      absolute
+    end
+
+    # @return true if path is inside base, or is base itself
+    def self.path_contained?(base, path)
+      path == base or path.start_with?(base.end_with?(File::SEPARATOR) ? base : base + File::SEPARATOR)
+    end
+
     def self.getClient
       raise 'OPENC3_SECRET_BACKEND environment variable is required' unless ENV['OPENC3_SECRET_BACKEND']
-      secrets_class = ENV['OPENC3_SECRET_BACKEND'].capitalize + 'Secrets'
+      secrets_class = ENV.fetch('OPENC3_SECRET_BACKEND').capitalize + 'Secrets'
       klass = OpenC3.require_class('openc3/utilities/' + secrets_class.class_name_to_filename)
       klass.new
     end
@@ -50,9 +95,9 @@ module OpenC3
         type, key, data, _secret_store = secret
         case type
         when 'ENV'
-          @local_secrets[key] = ENV[data]
+          @local_secrets[key] = ENV.fetch(data, nil)
         when 'FILE'
-          @local_secrets[key] = File.read(data)
+          @local_secrets[key] = File.read(Secrets.validate_file_path(data))
         else
           raise "Unknown secret type: #{type}"
         end

data/lib/openc3/utilities/store_autoload.rb

@@ -116,8 +116,8 @@ module OpenC3
     end
 
     def initialize(pool_size = 10, db_shard: 0)
-      @redis_username = ENV['OPENC3_REDIS_USERNAME']
-      @redis_key = ENV['OPENC3_REDIS_PASSWORD']
+      @redis_username = ENV.fetch('OPENC3_REDIS_USERNAME', nil)
+      @redis_key = ENV.fetch('OPENC3_REDIS_PASSWORD', nil)
       hostname = ENV['OPENC3_REDIS_HOSTNAME'].to_s.gsub("SHARDNUM", db_shard.to_s)
       @redis_url = "redis://#{hostname}:#{ENV.fetch('OPENC3_REDIS_PORT', 6379)}"
       @redis_pool = StoreConnectionPool.new(size: pool_size) { build_redis() }

data/lib/openc3/utilities/target_file.rb

@@ -21,6 +21,16 @@ module OpenC3
     # Matches ScriptRunner.vue const TEMP_FOLDER
     TEMP_FOLDER = '__TEMP__'
 
+    # self.all appends '*' to a name to mark it as modified on the server. The
+    # marker is display-only, so every path in and out of the bucket strips it.
+    #
+    # Strip only '*' at the end of a file name. '*' is a legal S3 object key character
+    # and is allowed by FileOpenSaveDialog's filename charset, so files named that
+    # way exist in the field and have to stay addressable.
+    def self.strip_modified(name)
+      name.sub(/\*$/, '')
+    end
+
     def self.all(scope, path_matchers, target: nil)
       target = target.upcase if target
 
@@ -89,7 +99,7 @@ module OpenC3
     end
 
     def self.body(scope, name)
-      name = name.split('*')[0] # Split '*' that indicates modified
+      name = strip_modified(name) # Remove '*' that indicates modified
       # First try opening a potentially modified version by looking for the modified target
       if ENV['OPENC3_LOCAL_MODE']
         local_file = OpenC3::LocalMode.open_local_file(name, scope: scope)
@@ -122,6 +132,10 @@ module OpenC3
 
     def self.create(scope, name, text, content_type: 'text/plain')
       return false unless text
+      # A trailing '*' here is the display-only modified marker leaking in from a
+      # file listing, not a name any caller means to write. Remove it to avoid 
+      # creating a file with a '*' in the name.
+      name = strip_modified(name)
       if ENV['OPENC3_LOCAL_MODE']
         OpenC3::LocalMode.put_target_file("#{scope}/targets_modified/#{name}", text, scope: scope)
       end
@@ -146,6 +160,9 @@ module OpenC3
     end
 
     def self.destroy(scope, name)
+      # Match body/create so deleting a name taken straight from a listing
+      # removes the file the user actually picked
+      name = strip_modified(name)
       if ENV['OPENC3_LOCAL_MODE']
         OpenC3::LocalMode.delete_local("#{scope}/targets_modified/#{name}")
       end

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '7.3.0'
+OPENC3_VERSION = '7.4.0'
 module OpenC3
   module Version
     MAJOR = '7'
-    MINOR = '3'
+    MINOR = '4'
     PATCH = '0'
     OTHER = ''
-    BUILD = 'ec6ac203728234fada5e3a2ecab59fba8a94b935'
+    BUILD = 'ed0cb44ca3c661eaf2babb77664d0063c955c68c'
   end
-  VERSION = '7.3.0'
-  GEM_VERSION = '7.3.0'
+  VERSION = '7.4.0'
+  GEM_VERSION = '7.4.0'
 end

data/lib/openc3.rb

@@ -30,9 +30,9 @@ $VERBOSE = saved_verbose
 # Add OpenC3 bin folder to PATH
 require 'openc3/core_ext/kernel'
 if Kernel.is_windows?
-  ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + ENV['PATH']
+  ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + ENV.fetch('PATH')
 else
-  ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ':' + ENV['PATH']
+  ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ':' + ENV.fetch('PATH')
 end
 require 'openc3/ext/platform' if RUBY_ENGINE == 'ruby' and !ENV['OPENC3_NO_EXT']
 require 'openc3/version'