openc3 6.10.4 → 6.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6cc1e03ca8cd4ac75025fc7cd4758099c513957b012291e7b332e8c61c513cf
-  data.tar.gz: '058a71978241f50cc97a1ebefe70a7a6ecc69a9f1fb51e11690d50fd167ae60f'
+  metadata.gz: 1439206d21d96fe96217e987cf7fe76c61810fbad73bde8dd26a3206154f3b2f
+  data.tar.gz: 114eff9211c6c9eb997f14e67b6e4c278a0a73781ef4c5097248b693049fa3dd
 SHA512:
-  metadata.gz: a96529177ee05a9f04257e4668f245c7346692b039e000f970166fb311c80992401f19def70cbe63844510aa97b2a90ab89bafd835b377aecd14ef0505cb2feb
-  data.tar.gz: 3a1c5152b36c733009daaefb07786087b428bbf172dd3ecbee2cfb4bb82de88c84ac0af727c25287cd4af5d1038812e1f4a3d2566c935cf0c519b984163013f5
+  metadata.gz: 4f1fa618d7da541bb161d2f545810399be14877b42caa1f9f0d12c6d257c903de578dc032816eeb31fa8b000e04f116e471660097adfbd7cf69d82fd6a4bf892
+  data.tar.gz: c1af9b3d8c5403d83388036ac591ece57b8c677a7d038b1f63e1bf8e5f0560958200ac5e15a4eacc53c4578e6c154a195454aa9c633e66531544e926d8496c5b

data/lib/openc3/accessors/template_accessor.rb

@@ -58,6 +58,9 @@ module OpenC3
       return nil if item.data_type == :DERIVED
       configure()
 
+      # No template items to read (e.g. command with fixed template string)
+      return nil if @item_keys.empty?
+
       # Scan the response for all the variables in brackets <VARIABLE>
       values = buffer.scan(@read_regexp)[0]
       if !values || (values.length != @item_keys.length)
@@ -78,6 +81,12 @@ module OpenC3
       result = {}
       configure()
 
+      # No template items to read (e.g. command with fixed template string)
+      if @item_keys.empty?
+        items.each { |item| result[item.name] = nil }
+        return result
+      end
+
       # Scan the response for all the variables in brackets <VARIABLE>
       values = buffer.scan(@read_regexp)[0]
       if !values || (values.length != @item_keys.length)

data/lib/openc3/models/auth_model.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2024, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -81,6 +81,7 @@ module OpenC3
         raise "old_token incorrect" unless verify(old_token)
       end
       Store.set(key, hash(token))
+      logout()
     end
 
     def self.generate_session

data/lib/openc3/models/tool_config_model.rb

@@ -24,6 +24,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
@@ -31,19 +36,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/utilities/secrets.rb

@@ -48,7 +48,11 @@ module OpenC3
     end
 
     def setup(secrets)
-      secrets.each do |type, key, data, secret_store|
+      secrets.each do |secret|
+        if secret.length < 3
+          raise ArgumentError, "Secret must have at least 3 items (type, key, data), got #{secret.length}"
+        end
+        type, key, data, secret_store = secret
         case type
         when 'ENV'
           @local_secrets[key] = ENV[data]

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.10.4'
+OPENC3_VERSION = '6.10.5'
 module OpenC3
   module Version
     MAJOR = '6'
     MINOR = '10'
-    PATCH = '4'
+    PATCH = '5'
     OTHER = ''
-    BUILD = '3ec40189fe2728ada6e0be2dd347073fafed95aa'
+    BUILD = '8d61f63fc7011fc77e974d0f5031950740d20ebb'
   end
-  VERSION = '6.10.4'
-  GEM_VERSION = '6.10.4'
+  VERSION = '6.10.5'
+  GEM_VERSION = '6.10.5'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.10.4",
+  "version": "6.10.5",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -23,7 +23,7 @@
     "@angular/platform-browser-dynamic": "^18.2.6",
     "@angular/router": "^18.2.6",
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.10.4",
+    "@openc3/js-common": "6.10.5",
     "rxjs": "~7.8.0",
     "single-spa": "^5.9.5",
     "single-spa-angular": "^9.2.0",

data/templates/tool_react/package.json

@@ -16,7 +16,7 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^6.1.1",
-    "@openc3/js-common": "6.10.4",
+    "@openc3/js-common": "6.10.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "single-spa-react": "^5.1.4"

data/templates/tool_svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.10.4",
+    "@openc3/js-common": "6.10.5",
     "@smui/button": "^7.0.0",
     "@smui/common": "^7.0.0",
     "@smui/card": "^7.0.0",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.10.4",
+  "version": "6.10.5",
   "private": true,
   "type": "module",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.10.4",
-    "@openc3/vue-common": "6.10.4",
+    "@openc3/js-common": "6.10.5",
+    "@openc3/vue-common": "6.10.5",
     "axios": "^1.7.7",
     "date-fns": "^4.1.0",
     "lodash": "^4.17.21",

data/templates/widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= widget_name %>",
-  "version": "6.10.4",
+  "version": "6.10.5",
   "private": true,
   "type": "module",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/vue-common": "6.10.4",
+    "@openc3/vue-common": "6.10.5",
     "vuetify": "^3.7.1"
   },
   "devDependencies": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 6.10.4
+  version: 6.10.5
 platform: ruby
 authors:
 - Ryan Melton