cosmos 4.4.0-java → 4.5.1-java

data/lib/cosmos/packets/parsers/xtce_converter.rb

@@ -196,7 +196,7 @@ module Cosmos
           # TODO: Handle nonunique item names
           if item.array_size
             # Requiring parameterRef for argument arrays appears to be a defect in the schema
-            xml['xtce'].send("Array#{type}RefEntry".intern, :parameterRef => item.name) do
+            xml['xtce'].public_send("Array#{type}RefEntry".intern, :parameterRef => item.name) do
               set_fixed_value(xml, item) if !packed
               xml['xtce'].DimensionList do
                 xml['xtce'].Dimension do
@@ -211,9 +211,9 @@ module Cosmos
             end
           else
             if packed
-              xml['xtce'].send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name)
+              xml['xtce'].public_send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name)
             else
-              xml['xtce'].send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name) do
+              xml['xtce'].public_send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name) do
                 set_fixed_value(xml, item)
               end
             end
@@ -256,7 +256,7 @@ module Cosmos
         attrs[:shortDescription] = item.description if item.description
         attrs[:arrayTypeRef] = (item.name + '_Type')
         attrs[:numberOfDimensions] = '1' # COSMOS Only supports one-dimensional arrays
-        xml['xtce'].send('Array' + param_or_arg + 'Type', attrs)
+        xml['xtce'].public_send('Array' + param_or_arg + 'Type', attrs)
       end
     end
 
@@ -289,7 +289,7 @@ module Cosmos
         encoding = 'unsigned'
       end
       if item.states
-        xml['xtce'].send('Enumerated' + param_or_arg + 'Type', attrs) do
+        xml['xtce'].public_send('Enumerated' + param_or_arg + 'Type', attrs) do
           to_xtce_endianness(item, xml)
           to_xtce_units(item, xml)
           xml['xtce'].IntegerDataEncoding(:sizeInBits => item.bit_size, :encoding => encoding)
@@ -308,7 +308,7 @@ module Cosmos
           type_string = 'Integer' + param_or_arg + 'Type'
           attrs[:signed] = signed
         end
-        xml['xtce'].send(type_string, attrs) do
+        xml['xtce'].public_send(type_string, attrs) do
           to_xtce_endianness(item, xml)
           to_xtce_units(item, xml)
           if (item.read_conversion and item.read_conversion.class == PolynomialConversion) or (item.write_conversion and item.write_conversion.class == PolynomialConversion)
@@ -330,7 +330,7 @@ module Cosmos
       attrs = { :name => (item.name + '_Type'), :sizeInBits => item.bit_size }
       attrs[:initialValue] = item.default if item.default and !item.array_size
       attrs[:shortDescription] = item.description if item.description
-      xml['xtce'].send('Float' + param_or_arg + 'Type', attrs) do
+      xml['xtce'].public_send('Float' + param_or_arg + 'Type', attrs) do
         to_xtce_endianness(item, xml)
         to_xtce_units(item, xml)
         if (item.read_conversion and item.read_conversion.class == PolynomialConversion) or (item.write_conversion and item.write_conversion.class == PolynomialConversion)
@@ -359,7 +359,7 @@ module Cosmos
         end
       end
       attrs[:shortDescription] = item.description if item.description
-      xml['xtce'].send(string_or_binary + param_or_arg + 'Type', attrs) do
+      xml['xtce'].public_send(string_or_binary + param_or_arg + 'Type', attrs) do
         # Don't call to_xtce_endianness for Strings or Blocks
         to_xtce_units(item, xml)
         if string_or_binary == 'String'
@@ -382,9 +382,9 @@ module Cosmos
 
     def to_xtce_item(item, param_or_arg, xml)
       if item.array_size
-        xml['xtce'].send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_ArrayType')
+        xml['xtce'].public_send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_ArrayType')
       else
-        xml['xtce'].send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_Type')
+        xml['xtce'].public_send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_Type')
       end
     end
 

data/lib/cosmos/packets/parsers/xtce_parser.rb

@@ -59,6 +59,9 @@ module Cosmos
     end
 
     def parse(filename, target_name)
+      # Fortify complains about Path Manipulation here
+      # We have previously validated the file is a .xtce file in packet_config
+      # The file is opened read-only and then immediately parsed by Nokogiri
       doc = File.open(filename) { |f| Nokogiri::XML(f, nil, nil, Nokogiri::XML::ParseOptions::STRICT | Nokogiri::XML::ParseOptions::NOBLANKS) }
       # Determine the @current_target_name
       xtce_process_element(doc.root)

data/lib/cosmos/packets/structure.rb

@@ -303,6 +303,23 @@ module Cosmos
       end
     end
 
+    # @param name [String] Name of the item to delete in the items Hash
+    def delete_item(name)
+      item = @items[name.upcase]
+      raise ArgumentError, "Unknown item: #{name}" unless item
+
+      # Find the item to delete in the sorted_items array
+      item_index = nil
+      @sorted_items.each_with_index do |sorted_item, index|
+        if sorted_item.name == item.name
+          item_index = index
+          break
+        end
+      end
+      @sorted_items.delete_at(item_index)
+      @items.delete(name.upcase)
+    end
+
     # Write a value to the buffer based on the item definition
     #
     # @param item [StructureItem] Instance of StructureItem or one of its subclasses
@@ -445,12 +462,14 @@ module Cosmos
       extend(MethodMissing)
     end
 
-    protected
-
     # Take the structure mutex to ensure the buffer does not change while you perform activities
     def synchronize
-      @mutex ||= Mutex.new
-      @mutex.synchronize {|| yield}
+      setup_mutex()
+      if @mutex.owned?
+        yield
+      else
+        @mutex.synchronize {|| yield}
+      end
     end
 
     # Take the structure mutex to ensure the buffer does not change while you perform activities
@@ -459,7 +478,7 @@ module Cosmos
     #      lower level calls to go forward without getting the mutex
     def synchronize_allow_reads(top = false)
       @mutex_allow_reads ||= false
-      @mutex ||= Mutex.new
+      setup_mutex()
       if top
         @mutex.synchronize do
           @mutex_allow_reads = Thread.current
@@ -483,6 +502,17 @@ module Cosmos
       end
     end
 
+    protected
+
+    MUTEX = Mutex.new
+
+    def setup_mutex
+      return if @mutex
+      MUTEX.synchronize do
+        @mutex ||= Mutex.new
+      end
+    end
+
     module MethodMissing
       # Method missing provides reading/writing item values as if they were methods to the class
       def method_missing(name, value = nil)

data/lib/cosmos/packets/structure_item.rb

@@ -11,7 +11,6 @@
 require 'cosmos/ext/packet' if RUBY_ENGINE == 'ruby' and !ENV['COSMOS_NO_EXT']
 
 module Cosmos
-
   # Maintains knowledge of an item in a Structure. Multiple StructureItems
   # compose a Structure.
   class StructureItem
@@ -59,6 +58,9 @@ module Cosmos
     # @return [Symbol] {BinaryAccessor::OVERFLOW_TYPES}
     attr_reader :overflow
 
+    # @return [Boolean] Whether this structure item can overlap another item in the same packet
+    attr_accessor :overlap
+
     # A large buffer size in bits (1 Megabyte)
     LARGE_BUFFER_SIZE_BITS = 1024 * 1024 * 8
 
@@ -73,6 +75,7 @@ module Cosmos
     # @param endianness [Symbol] {BinaryAccessor::ENDIANNESS}
     # @param array_size [Integer, nil] Size of the array item in bits. For
     #   example, if the bit_size is 8, an array_size of 16 holds two values.
+    # @param overflow [Symbol] {BinaryAccessor::OVERFLOW_TYPES}
     def initialize(name, bit_offset, bit_size, data_type, endianness, array_size = nil, overflow = :ERROR)
       @structure_item_constructed = false
       # Assignment order matters due to verifications!
@@ -83,6 +86,7 @@ module Cosmos
       self.bit_size = bit_size
       self.array_size = array_size
       self.overflow = overflow
+      self.overlap = false
       @create_index = @@create_index
       @@create_index += 1
       @structure_item_constructed = true

data/lib/cosmos/packets/telemetry.rb

@@ -437,7 +437,13 @@ module Cosmos
           splash.progress = index / total
         end
 
-        ignored_items = System.targets[target_name].ignored_items
+        # Note: System only has declared target structures but telemetry may have more
+        system_target = System.targets[target_name]
+        if system_target
+          ignored_items = system_target.ignored_items
+        else
+          ignored_items = []
+        end
 
         packets(target_name).each do |packet_name, packet|
           # We don't audit against hidden or disabled packets

data/lib/cosmos/script/api_shared.rb

@@ -9,6 +9,13 @@
 # attribution addendums as found in the LICENSE.txt
 
 module Cosmos
+  # Error raised by the API when a check fails
+  class CheckError < RuntimeError; end
+  # Error raised when a Script should be stopped
+  class StopScript < StandardError; end
+  # Error raised when a TestCase should be skipped by TestRunner
+  class SkipTestCase < StandardError; end
+
   module ApiShared
     DEFAULT_TLM_POLLING_RATE = 0.25
 
@@ -825,6 +832,8 @@ module Cosmos
       while true
         work_start = Time.now.sys
         value = tlm_variable(target_name, packet_name, item_name, value_type)
+        # Fortify: Dynamic Code Evaluation: Code Injection
+        # TODO: Is there anyway to sanitize the exp_to_eval?
         if eval(exp_to_eval)
           return true, value
         end
@@ -839,6 +848,8 @@ module Cosmos
 
         if canceled
           value = tlm_variable(target_name, packet_name, item_name, value_type)
+          # Fortify: Dynamic Code Evaluation: Code Injection
+          # TODO: Is there anyway to sanitize the exp_to_eval?
           if eval(exp_to_eval)
             return true, value
           else
@@ -879,6 +890,8 @@ module Cosmos
 
       while true
         work_start = Time.now.sys
+        # Fortify: Dynamic Code Evaluation: Code Injection
+        # TODO: Is there anyway to sanitize the exp_to_eval?
         if eval(exp_to_eval, context)
           return true
         end
@@ -892,6 +905,8 @@ module Cosmos
         canceled = cosmos_script_sleep(sleep_time)
 
         if canceled
+          # Fortify: Dynamic Code Evaluation: Code Injection
+          # TODO: Is there anyway to sanitize the exp_to_eval?
           if eval(exp_to_eval, context)
             return true
           else
@@ -907,6 +922,8 @@ module Cosmos
       string = "value " + comparison_to_eval
       check_str = "CHECK: #{_upcase(target_name, packet_name, item_name)} #{comparison_to_eval}"
       value_str = "with value == #{value}"
+      # Fortify: Dynamic Code Evaluation: Code Injection
+      # TODO: Is there anyway to sanitize the comparison_to_eval?
       if eval(string)
         Logger.info "#{check_str} success #{value_str}"
       else
@@ -942,7 +959,7 @@ module Cosmos
     end
 
     def run_tlm_viewer(action, display_name = '')
-      tlm_viewer = JsonDRbObject.new System.connect_hosts['TLMVIEWER_API'], System.ports['TLMVIEWER_API']
+      tlm_viewer = JsonDRbObject.new System.connect_hosts['TLMVIEWER_API'], System.ports['TLMVIEWER_API'], 1.0, Cosmos::System.x_csrf_token
       begin
         yield tlm_viewer
         tlm_viewer.disconnect

data/lib/cosmos/script/extract.rb

@@ -130,7 +130,7 @@ module Cosmos
       return [target_name, packet_name, item_name, comparison_to_eval] if split_string.length == 3
       raise "ERROR: Check improperly specified: #{text}" if split_string.length < 4
       split_string = text.split(/ /) # Split on regex spaces to preserve spaces in comparison
-      index = split_string.index(item_name)
+      index = split_string.rindex(item_name)
       comparison_to_eval = split_string[(index + 1)..(split_string.length - 1)].join(" ")
       raise "ERROR: Use '==' instead of '=': #{text}" if split_string[3] == '='
       return [target_name, packet_name, item_name, comparison_to_eval]

data/lib/cosmos/script/script.rb

@@ -25,13 +25,6 @@ $disconnect_all_targets = false
 $cmd_tlm_replay_mode = false
 
 module Cosmos
-  # Error raised by the API when a check fails
-  class CheckError < RuntimeError; end
-  # Error raised when a Script should be stopped
-  class StopScript < StandardError; end
-  # Error raised when a TestCase should be skipped by TestRunner
-  class SkipTestCase < StandardError; end
-
   # Provides a proxy to both a disconnected CmdTlmServer instance and the real
   # JsonDRbObject which communicates with the real CmdTlmServer. If targets
   # are disconnected their method calls are forwarded to the disconnected
@@ -49,9 +42,9 @@ module Cosmos
       end
       # Start a Json connect to the real server
       if $cmd_tlm_replay_mode
-        @cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['REPLAY_API'], System.ports['REPLAY_API'])
+        @cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['REPLAY_API'], System.ports['REPLAY_API'], 1.0, Cosmos::System.x_csrf_token)
       else
-        @cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['CTS_API'], System.ports['CTS_API'])
+        @cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['CTS_API'], System.ports['CTS_API'], 1.0, Cosmos::System.x_csrf_token)
       end
     end
 
@@ -69,7 +62,7 @@ module Cosmos
         @cmd_tlm_server.disconnect
       else
         if $disconnect_all_targets
-          return @disconnected.send(method_name, *method_params)
+          return @disconnected.public_send(method_name, *method_params)
         elsif $disconnected_targets
           name_string = nil
           if method_params[0].is_a?(String)
@@ -86,7 +79,7 @@ module Cosmos
           if name_string
             target = name_string.split(" ")[0]
             if $disconnected_targets.include?(target)
-              return @disconnected.send(method_name, *method_params)
+              return @disconnected.public_send(method_name, *method_params)
             end
           end
         end

data/lib/cosmos/streams/serial_stream.rb

@@ -35,8 +35,10 @@ module Cosmos
     #   complete. Pass nil to create no timeout. The {SerialDriver} will
     #   continously try to read data until it has received data or an error
     #   occurs.
-    # @param flow_control [Symbol] Currently supported :NONE and :RTSCTS (default :NONE)
+    # @param flow_control [Symbol] Currently supported :NONE, :RTSCTS (default :NONE)
     # @param data_bits [Integer] Number of data bits (default 8)
+    # @param struct [Array] Array of arrays of fields and values to set in the
+    #   Windows DCB or POSIX structure
     def initialize(write_port_name,
                    read_port_name,
                    baud_rate,
@@ -45,7 +47,8 @@ module Cosmos
                    write_timeout,
                    read_timeout,
                    flow_control = :NONE,
-                   data_bits = 8)
+                   data_bits = 8,
+                   struct = [])
       super()
 
       # The SerialDriver class will validate the parameters
@@ -69,7 +72,8 @@ module Cosmos
                                               @write_timeout,
                                               @read_timeout,
                                               @flow_control,
-                                              @data_bits)
+                                              @data_bits,
+                                              struct)
       else
         @write_serial_port = nil
       end
@@ -84,7 +88,8 @@ module Cosmos
                                                @write_timeout,
                                                @read_timeout,
                                                @flow_control,
-                                               @data_bits)
+                                               @data_bits,
+                                               struct)
         end
       else
         @read_serial_port = nil
@@ -151,5 +156,5 @@ module Cosmos
         @connected = false
       end
     end
-  end # class SerialStream
-end # module Cosmos
+  end
+end