cosmos 4.4.1-java → 4.5.2-java

data/lib/cosmos/system/system.rb

@@ -76,9 +76,18 @@ module Cosmos
     instance_attr_reader :classificiation_banner
     # @return [String] Which hashing algorithm is in use
     instance_attr_reader :hashing_algorithm
+    # @return [Boolean] Allow router commanding - defaults to false
+    instance_attr_reader :allow_router_commanding
+    # @return [String] API access secret using X-Csrf-Token - defaults to SuperSecret
+    instance_attr_reader :x_csrf_token
+    # @return [Array<String>] Allowed origins in http origin header - defaults to no origin header only
+    instance_attr_reader :allowed_origins
+    # @return [Array<String>] Allowed hosts in http host header - defaults to '127.0.0.1:7777' only
+    instance_attr_reader :allowed_hosts
 
     # Known COSMOS ports
     KNOWN_PORTS = ['CTS_API', 'TLMVIEWER_API', 'CTS_PREIDENTIFIED', 'CTS_CMD_ROUTER', 'REPLAY_API', 'REPLAY_PREIDENTIFIED', 'REPLAY_CMD_ROUTER', 'DART_STREAM', 'DART_DECOM', 'DART_MASTER']
+    API_PORTS = ['CTS_API', 'TLMVIEWER_API', 'REPLAY_API', 'DART_DECOM', 'DART_MASTER']
     # Known COSMOS hosts
     KNOWN_HOSTS = ['CTS_API', 'TLMVIEWER_API', 'CTS_PREIDENTIFIED', 'CTS_CMD_ROUTER', 'REPLAY_API', 'REPLAY_PREIDENTIFIED', 'REPLAY_CMD_ROUTER', 'DART_STREAM', 'DART_DECOM', 'DART_MASTER']
     # Known COSMOS paths
@@ -88,6 +97,7 @@ module Cosmos
 
     @@instance = nil
     @@instance_mutex = Mutex.new
+    @@instance_filename = nil
 
     # Create a new System object. Note, this should not be called directly but
     # you should instead use System.instance and treat this class as a
@@ -97,6 +107,7 @@ module Cosmos
     #   read. Be default this is <Cosmos::USERPATH>/config/system/system.txt
     def initialize(filename = nil)
       raise "Cosmos::System created twice" unless @@instance.nil?
+      @@instance_filename = filename
       reset_variables(filename)
       @@instance = self
     end
@@ -217,6 +228,7 @@ module Cosmos
             parser.verify_num_parameters(2, 2, usage)
             port_name = parameters[0].to_s.upcase
             @ports[port_name] = Integer(parameters[1])
+            @allowed_hosts << "127.0.0.1:#{parameters[1]}" if API_PORTS.include?(port_name)
             Logger.warn("Unknown port name given: #{port_name}") unless KNOWN_PORTS.include?(port_name)
 
           when 'LISTEN_HOST', 'CONNECT_HOST'
@@ -373,6 +385,22 @@ module Cosmos
             @classificiation_banner = {'display_text' => parameters[0],
                                        'color'        => color}
 
+          when 'ALLOW_ROUTER_COMMANDING'
+            parser.verify_num_parameters(0, 0, "#{keyword}")
+            @allow_router_commanding = true
+
+          when 'X_CSRF_TOKEN'
+            parser.verify_num_parameters(1, 1, "#{keyword} <Token>")
+            @x_csrf_token = ConfigParser.handle_nil(parameters[0])
+
+          when 'ALLOW_ORIGIN'
+            parser.verify_num_parameters(1, 1, "#{keyword} <Origin>")
+            @allowed_origins << parameters[0]
+
+          when 'ALLOW_HOST'
+            parser.verify_num_parameters(1, 1, "#{keyword} <Host:Port>")
+            @allowed_hosts << parameters[0]
+
           else
             # blank lines will have a nil keyword and should not raise an exception
             raise parser.error("Unknown keyword '#{keyword}'") if keyword
@@ -521,7 +549,7 @@ module Cosmos
                     # Zip file configuration so unzip and reset configuration path
                     configuration = unzip(configuration)
                   end
-                  
+
                   Logger.info "Switching to configuration: #{name}"
                   process_file(File.join(configuration, 'system.txt'), configuration)
                   load_packets(name, false)
@@ -547,7 +575,7 @@ module Cosmos
           Logger.info "Switching to initial configuration: #{@initial_config.name}"
           update_config(@initial_config)
         end
-        
+
         return @config.name, nil
       end
     end
@@ -596,16 +624,14 @@ module Cosmos
       @listen_hosts = {}
       @listen_hosts['CTS_API'] = '127.0.0.1'
       @listen_hosts['TLMVIEWER_API'] = '127.0.0.1'
-      # Localhost would be more secure but historically these are open to allow for chaining servers by default
-      @listen_hosts['CTS_PREIDENTIFIED'] = '0.0.0.0'
-      @listen_hosts['CTS_CMD_ROUTER'] = '0.0.0.0'
+      @listen_hosts['CTS_PREIDENTIFIED'] = '127.0.0.1'
+      @listen_hosts['CTS_CMD_ROUTER'] = '127.0.0.1'
       @listen_hosts['REPLAY_API'] = '127.0.0.1'
-      # Localhost would be more secure but historically these are open to allow for chaining servers by default
-      @listen_hosts['REPLAY_PREIDENTIFIED'] = '0.0.0.0'
-      @listen_hosts['REPLAY_CMD_ROUTER'] = '0.0.0.0'
-      @listen_hosts['DART_STREAM'] = '0.0.0.0'
-      @listen_hosts['DART_DECOM'] = '0.0.0.0'
-      @listen_hosts['DART_MASTER'] = '0.0.0.0'
+      @listen_hosts['REPLAY_PREIDENTIFIED'] = '127.0.0.1'
+      @listen_hosts['REPLAY_CMD_ROUTER'] = '127.0.0.1'
+      @listen_hosts['DART_STREAM'] = '127.0.0.1'
+      @listen_hosts['DART_DECOM'] = '127.0.0.1'
+      @listen_hosts['DART_MASTER'] = '127.0.0.1'
 
       @connect_hosts = {}
       @connect_hosts['CTS_API'] = '127.0.0.1'
@@ -630,6 +656,11 @@ module Cosmos
       @paths['DART_DATA'] = File.join(USERPATH, 'outputs', 'dart', 'data')
       @paths['DART_LOGS'] = File.join(USERPATH, 'outputs', 'dart', 'logs')
 
+      @allow_router_commanding = false
+      @x_csrf_token = 'SuperSecret'
+      @allowed_origins = []
+      @allowed_hosts = ['127.0.0.1:7777', '127.0.0.1:7778', '127.0.0.1:7877', '127.0.0.1:8779', '127.0.0.1:8780']
+
       unless filename
         system_arg = false
         ARGV.each do |arg|
@@ -650,7 +681,7 @@ module Cosmos
     end
 
     # Reset variables and load packets
-    def reset(filename = nil)
+    def reset(filename = @@instance_filename)
       reset_variables(filename)
       load_packets()
     end
@@ -961,7 +992,10 @@ module Cosmos
       cmd_meta.disabled = true
       tlm_meta = @telemetry.packet('SYSTEM', 'META')
       tlm_meta.sorted_items.each do |item|
-        next if item.name.include?("RECEIVED") # Tlm only items
+        # Ignore reserved items as these are all DERIVED and thus will throw an exception
+        # in CommandSender since they don't have write conversions due to:
+        # commands.build_cmd -> packet.restore_defaults -> packet.write_item
+        next if Packet::RESERVED_ITEM_NAMES.include?(item.name)
         cmd_meta.define(item.clone)
       end
       @config.commands['SYSTEM'] ||= {}

data/lib/cosmos/tools/cmd_sender/cmd_param_table_item_delegate.rb

@@ -42,6 +42,9 @@ module Cosmos
     def paint(painter, option, index)
       packet_item, _, _ = @widgets[index.row]
       if index.column == 1 and packet_item and packet_item.states
+        painter.save
+        option = Qt::StyleOptionViewItemV4.new(option)
+        initStyleOption(option, index)
         # This code simply draws the current combo box text inside a button to
         # give the user an idea that they have to click it to activate it
         opt = Qt::StyleOptionButton.new
@@ -49,6 +52,18 @@ module Cosmos
         opt.text = @table.item(index.row, index.column).text.to_s
         Qt::Application.style.drawControl(Qt::Style::CE_PushButton, opt, painter)
         opt.dispose
+        painter.restore
+      # Not sure why but once we re-implement paint() the word wrapping
+      # doesn't work when we simply call super(painter, option, index)
+      # Thus we implement this to support word wrapping on the description
+      elsif index.column == 4
+        painter.save
+        option = Qt::StyleOptionViewItemV4.new(option)
+        initStyleOption(option, index)
+        option.text = index.data().toString()
+        option.features = Qt::StyleOptionViewItemV2::WrapText
+        self.parent().style().drawControl(Qt::Style.CE_ItemViewItem, option, painter)
+        painter.restore
       else
         super(painter, option, index)
       end

data/lib/cosmos/tools/cmd_sender/cmd_params.rb

@@ -67,7 +67,7 @@ module Cosmos
     # @return [Hash] Hash keyed by parameter name with String formatted value
     def params_text(raw = false)
       params = {}
-      Qt.execute_in_main_thread do 
+      Qt.execute_in_main_thread do
         @param_widgets.each do |packet_item, value_item, state_value_item|
           text = value_item.text
           text = state_value_item.text if state_value_item && (text == MANUALLY or raw)
@@ -197,7 +197,7 @@ module Cosmos
       end
     end
 
-    private 
+    private
 
     def get_params(show_ignored)
       params = {}
@@ -322,7 +322,7 @@ module Cosmos
         value_text = "0x" + value_text.simple_formatted
       # Add quotes around STRING or BLOCK defaults so they are interpreted correctly
       elsif (packet_item.data_type == :STRING or packet_item.data_type == :BLOCK)
-        value_text = "'#{packet_item.default}'"
+        value_text = "'#{value_text}'"
       end
       value_item = Qt::TableWidgetItem.new(value_text)
       value_item.setTextAlignment(Qt::AlignRight | Qt::AlignVCenter)
@@ -338,6 +338,14 @@ module Cosmos
         if item.column == 1
           if packet_item.states
             value = packet_item.states[value_item.text]
+            if packet_item.hazardous && packet_item.hazardous.key?(value_item.text)
+              desc = packet_item.hazardous[value]
+              # Hazardous states aren't required to have a description so use the item description
+              desc = packet_item.description unless desc
+              @table.item(item.row, 4).setText("(Hazardous) #{desc}")
+            else
+              @table.item(item.row, 4).setText(packet_item.description)
+            end
             @table.blockSignals(true)
             if CmdParams.states_in_hex && value.kind_of?(Integer)
               state_value_item.setText(sprintf("0x%X", value))
@@ -351,10 +359,24 @@ module Cosmos
           @table.item(item.row, 1).setText(MANUALLY)
           @table.blockSignals(false)
         end
+        calculate_height()
         emit modified()
       end
+      calculate_height()
+    end
+
+    def calculate_height
       @table.resizeColumnsToContents()
       @table.resizeRowsToContents()
+      height = @table.horizontalHeader.height + 2 # 2 = Header frame?
+      @table.rowCount.times do |i|
+        # TODO: rowHeight does not reflect word wrapping ... it's always 37
+        height += @table.rowHeight(i)
+        # NOTE: Checking the fontMetrics boundingRect also does not refect word wrapping
+        #   e.g. Cosmos.getFontMetrics(@table.font).boundingRect(@table.item(x,y).text).height
+      end
+      @table.setMaximumHeight(height)
+      @table.setMinimumHeight(height)
     end
   end
 end

data/lib/cosmos/tools/cmd_sender/cmd_sender.rb

@@ -491,6 +491,13 @@ module Cosmos
       packet_name = @cmd_select.text
       if target_name && packet_name
         packet = System.commands.packet(target_name, packet_name)
+        # Directly update packet description ... safe because always in GUI thread
+        hazardous, _ = System.commands.cmd_hazardous?(target_name, packet_name)
+        if hazardous
+          @description.text = "(Hazardous) #{packet.description}"
+        else
+          @description.text = packet.description
+        end
         table = @cmd_params.update_cmd_params(packet, show_ignored: checked)
         @table_layout.addWidget(table, 500) if table
       end

data/lib/cosmos/tools/cmd_sequence/sequence_item.rb

@@ -56,11 +56,6 @@ module Cosmos
 
     def add_table(table)
       return unless table
-      table.setSizePolicy(Qt::SizePolicy.Minimum, Qt::SizePolicy.Minimum)
-      table.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff)
-      table.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff)
-      table.setFixedSize(table.horizontalHeader.length + table.verticalHeader.width,
-                         2 + table.verticalHeader.length + table.horizontalHeader.height)
       @table_layout.addWidget(table) 
     end
       

data/lib/cosmos/tools/cmd_tlm_server/api.rb

@@ -591,14 +591,16 @@ module Cosmos
       end
 
       # Update current value table
-      cvt_packet.buffer = packet.buffer(false)
-      cvt_packet.received_time = received_time
-
-      # The interface does the following line, but I don't think inject_tlm should because it could confuse the interface
-      target.tlm_cnt += 1
-      packet.received_count += 1
-      cvt_packet.received_count += 1
-      CmdTlmServer.instance.identified_packet_callback(packet)
+      cvt_packet.synchronize do
+        cvt_packet.buffer = packet.buffer(false)
+        cvt_packet.received_time = received_time
+
+        # The interface does the following line, but I don't think inject_tlm should because it could confuse the interface
+        target.tlm_cnt += 1
+        packet.received_count += 1
+        cvt_packet.received_count += 1
+        CmdTlmServer.instance.identified_packet_callback(cvt_packet)
+      end
 
       # Find the interface for this target
       interface = target.interface

data/lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server.rb

@@ -201,9 +201,9 @@ module Cosmos
         @json_drb.method_whitelist = @api_whitelist
         begin
           if @mode == :CMD_TLM_SERVER
-            @json_drb.start_service(System.listen_hosts['CTS_API'], System.ports['CTS_API'], self)
+            @json_drb.start_service(System.listen_hosts['CTS_API'], System.ports['CTS_API'], self, 1000, System)
           else
-            @json_drb.start_service(System.listen_hosts['REPLAY_API'], System.ports['REPLAY_API'], self)
+            @json_drb.start_service(System.listen_hosts['REPLAY_API'], System.ports['REPLAY_API'], self, 1000, System)
           end
         rescue Exception
           # Call packet_logging shutdown here to explicitly kill the logging

data/lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb

@@ -96,7 +96,7 @@ module Cosmos
         button_layout.addWidget(button, location[0], location[1])
         button.connect(SIGNAL('clicked()')) do
           begin
-            CmdTlmServer.instance.send(method, 'ALL')
+            CmdTlmServer.instance.public_send(method, 'ALL')
           rescue Exception => error
             statusBar.showMessage(error.message)
           end

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

@@ -148,51 +148,54 @@ module Cosmos
         if packet.identified?
           begin
             # Preidentifed packet - place it into the current value table
-            identified_packet = System.telemetry.update!(packet.target_name,
-                                                         packet.packet_name,
-                                                         packet.buffer)
+            identified_packet = System.telemetry.packet(packet.target_name, packet.packet_name)
           rescue RuntimeError
             # Packet identified but we don't know about it
             # Clear packet_name and target_name and try to identify
             Logger.warn "Received unknown identified telemetry: #{packet.target_name} #{packet.packet_name}"
             packet.target_name = nil
             packet.packet_name = nil
-            identified_packet = System.telemetry.identify!(packet.buffer,
-                                                           @interface.target_names)
+            identified_packet = System.telemetry.identify(packet.buffer, @interface.target_names)
           end
         else
           # Packet needs to be identified
-          identified_packet = System.telemetry.identify!(packet.buffer,
-                                                         @interface.target_names)
+          identified_packet = System.telemetry.identify(packet.buffer, @interface.target_names)
         end
       end
 
-      if identified_packet
+      unknown = false
+      unless identified_packet
+        unknown = true
+        identified_packet = System.telemetry.packet('UNKNOWN', 'UNKNOWN')
+      end
+      
+      identified_packet.synchronize do
+        identified_packet.buffer = packet.buffer unless packet.stored
         identified_packet.received_time = packet.received_time
         identified_packet.stored = packet.stored
         identified_packet.extra = packet.extra
         packet = identified_packet
-      else
-        unknown_packet = System.telemetry.update!('UNKNOWN', 'UNKNOWN', packet.buffer)
-        unknown_packet.received_time = packet.received_time
-        unknown_packet.stored = packet.stored
-        unknown_packet.extra = packet.extra
-        packet = unknown_packet
-        data_length = packet.length
-        string = "#{@interface.name} - Unknown #{data_length} byte packet starting: "
-        num_bytes_to_print = [UNKNOWN_BYTES_TO_PRINT, data_length].min
-        data_to_print = packet.buffer(false)[0..(num_bytes_to_print - 1)]
-        data_to_print.each_byte do |byte|
-          string << sprintf("%02X", byte)
+        
+        if unknown
+          data_length = packet.length
+          string = "#{@interface.name} - Unknown #{data_length} byte packet starting: "
+          num_bytes_to_print = [UNKNOWN_BYTES_TO_PRINT, data_length].min
+          data_to_print = packet.buffer(false)[0..(num_bytes_to_print - 1)]
+          data_to_print.each_byte do |byte|
+            string << sprintf("%02X", byte)
+          end
+          Logger.error string
         end
-        Logger.error string
-      end
 
-      target = System.targets[packet.target_name]
-      target.tlm_cnt += 1 if target
-      packet.received_count += 1
-      @identified_packet_callback.call(packet) if @identified_packet_callback
+        target = System.targets[packet.target_name]
+        target.tlm_cnt += 1 if target
+        packet.received_count += 1
+        @identified_packet_callback.call(packet) if @identified_packet_callback
 
+        # So we can release the mutex
+        packet = packet.clone
+      end
+      
       # Write to routers
       @interface.routers.each do |router|
         begin

data/lib/cosmos/tools/cmd_tlm_server/limits_groups_background_task.rb

@@ -86,7 +86,7 @@ module Cosmos
       return if @sleeper.sleep(@initial_delay)
       loop do
         start = Time.now
-        check_methods.each {|method| self.send(method.intern) }
+        check_methods.each {|method| self.public_send(method.intern) }
         now = Time.now
         @status = "#{now.formatted}: Checking groups took #{now - start}s"
         sleep_time = @task_delay - (now - start)

data/lib/cosmos/tools/cmd_tlm_server/router_thread.rb

@@ -19,6 +19,11 @@ module Cosmos
     protected
 
     def handle_packet(packet)
+      unless System.allow_router_commanding
+        Logger.error "Router received command with router commanding disabled"
+        return
+      end
+
       # Start out assuming we will route to all associated interfaces
       interfaces = @interface.interfaces
 

data/lib/cosmos/tools/config_editor/config_editor.rb

@@ -653,7 +653,7 @@ module Cosmos
       end
       File.open(File.join(target_folder, 'procedures', "#{target.downcase}_noop.rb"), 'w') do |file|
         file.puts "require 'cosmos'"
-        file.puts "require '#{File.basename(lib_filename)}'"
+        file.puts "load_utility '#{File.basename(lib_filename)}'"
         file.puts "\n"
         file.puts "#{target.downcase} = #{lib_filename.filename_to_class_name}.new"
         file.puts "#{target.downcase}.noop"

data/lib/cosmos/tools/handbook_creator/handbook_creator.rb

@@ -156,7 +156,7 @@ module Cosmos
             msg << "PDF Handbooks created successfully"
             progress_dialog.append_text(msg)
           else
-            progress_dialog.append_text("\nPDF Handbooks could not be created.\n\nIs wkhtmltopdf in your PATH and are all existing pdfs closed?\n\nUsing version 0.11.0_rc1 of wkhtmltox is recommended which can be found at: http://download.gna.org/wkhtmltopdf/obsolete/\n\nVersion 0.12.x has shown issues with Handbook Creator's default templates.")
+            progress_dialog.append_text("\nPDF Handbooks could not be created.\n\nIs wkhtmltopdf in your PATH and are all existing pdfs closed?\n\nwkhtmltopdf can be found at: https://wkhtmltopdf.org/downloads.html.")
           end
         rescue => error
           progress_dialog.append_text("\n\nError processing:\n#{error.formatted}")

data/lib/cosmos/tools/handbook_creator/handbook_creator_config.rb

@@ -115,7 +115,7 @@ module Cosmos
         cover, cover_file = make_pdf_detail('cover', @pdf_cover_filename, @pdf_cover_title, target_name)
         header, header_file = make_pdf_detail('--header-spacing 3 --header-html', @pdf_header_filename, @pdf_header_title, target_name)
         footer, footer_file = make_pdf_detail('--footer-spacing 3 --footer-html', @pdf_footer_filename, @pdf_footer_title, target_name)
-        system_call = "wkhtmltopdf -L #{@pdf_side_margin} -R #{@pdf_side_margin} -T #{@pdf_top_margin} -B #{@pdf_bottom_margin} -s Letter #{header} #{footer} #{cover} #{@pdf_toc} \"#{tmp_html_file.path}\" \"#{File.dirname(filename)}/#{File.basename(filename, '.*')}.pdf\""
+        system_call = "wkhtmltopdf --enable-local-file-access -L #{@pdf_side_margin} -R #{@pdf_side_margin} -T #{@pdf_top_margin} -B #{@pdf_bottom_margin} -s Letter #{header} #{footer} #{cover} #{@pdf_toc} \"#{tmp_html_file.path}\" \"#{File.dirname(filename)}/#{File.basename(filename, '.*')}.pdf\""
         status = nil
         begin
           Cosmos.set_working_dir(System.paths['HANDBOOKS']) do

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -973,8 +973,10 @@ module Cosmos
                 if debug_text =~ /^@\S+$/ || @script_binding.local_variables.include?(debug_text.to_sym)
                   debug_text = "puts #{debug_text}" # Automatically add puts to print it
                 end
+                # Fortify: Dynamic Code Evaluation: Code Injection
                 eval(debug_text, @script_binding, 'debug', 1)
               else
+                # Fortify: Dynamic Code Evaluation: Code Injection
                 Object.class_eval(debug_text, 'debug', 1)
               end
               handle_output_io()
@@ -1489,7 +1491,7 @@ module Cosmos
               @@output_thread = nil
             end
 
-            @script.setReadOnly(false)
+            @script.setReadOnly(false) unless @script.read_only
             @script.stop_highlight unless uncaught_exception
             select_tab_and_destroy_tabs_after_index(0)
             remove_tabs()
@@ -1722,7 +1724,8 @@ module Cosmos
         @active_script.setPlainText(data)
       end
       mark_breakpoints(filename)
-
+      @active_script.read_only = !File.writable?(filename)
+      @active_script.setReadOnly(@active_script.read_only)
       @active_script.stop_highlight
     end
 

data/lib/cosmos/tools/test_runner/test.rb

@@ -176,7 +176,7 @@ module Cosmos
             end
           end
 
-          object.send(method_name)
+          object.public_send(method_name)
           result.result = :PASS
 
           if defined? ScriptRunnerFrame

data/lib/cosmos/tools/test_runner/test_runner.rb

@@ -865,13 +865,13 @@ module Cosmos
             suite = CustomTestSuite.new
             begin
               # Remove any previously defined suite setup methods
-              CustomTestSuite.send(:remove_method, :setup)
+              CustomTestSuite.public_send(:remove_method, :setup)
             rescue NameError
               # NameError is raised if no setup method was defined
             end
             begin
               # Remove any previously defined suite teardown methods
-              CustomTestSuite.send(:remove_method, :teardown)
+              CustomTestSuite.public_send(:remove_method, :teardown)
             rescue NameError
               # NameError is raised if no teardown method was defined
             end
@@ -884,7 +884,7 @@ module Cosmos
                   inst = @@test_suites.detect {|my_suite| my_suite.class.to_s == suite_node.text}
                   # Create a lambda which will call that one setup method
                   body = lambda { inst.setup }
-                  CustomTestSuite.send(:define_method, :setup, &body)
+                  CustomTestSuite.public_send(:define_method, :setup, &body)
                 end
                 if test_node.text == 'teardown'
                   cur_suite.teardown = true
@@ -892,7 +892,7 @@ module Cosmos
                   inst = @@test_suites.detect {|my_suite| my_suite.class.to_s == suite_node.text}
                   # Create a lambda which will call that one teardown method
                   body = lambda { inst.teardown}
-                  CustomTestSuite.send(:define_method, :teardown, &body)
+                  CustomTestSuite.public_send(:define_method, :teardown, &body)
                 end
               end
 

data/lib/cosmos/tools/tlm_extractor/tlm_extractor.rb

@@ -455,7 +455,7 @@ module Cosmos
     def self.post_options_parsed_hook(options)
       if options.input_files or options.dart
         normalize_config_options(options)
-        
+
         # Process config file
         raise "Configuration File must be specified for command line processing" unless options.config_file
 
@@ -675,7 +675,7 @@ module Cosmos
                 process_args = [batch_name, @input_filenames, @log_dir, output_extension, @batch_filenames, @packet_log_frame.time_start, @packet_log_frame.time_end]
               end
 
-              @tlm_extractor_processor.send(process_method, *process_args) do |input_file_index, packet_count, file_progress|
+              @tlm_extractor_processor.public_send(process_method, *process_args) do |input_file_index, packet_count, file_progress|
                 # Handle Cancel
                 break if @cancel
 
@@ -760,7 +760,7 @@ module Cosmos
                 process_args = [batch_name, @log_dir, output_extension, @batch_filenames, @packet_log_frame.time_start, @packet_log_frame.time_end, @dart_meta_frame.meta_filters]
               end
 
-              @tlm_extractor_processor.send(process_method, *process_args) do |percentage, message|
+              @tlm_extractor_processor.public_send(process_method, *process_args) do |percentage, message|
                 # Handle Cancel
                 break if @cancel
                 progress_dialog.append_text(message)

data/lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb

@@ -385,10 +385,7 @@ module Cosmos
 
       # Print column headings to output file
       @output_file.print "%" if @matlab_header
-      column_names().each do |column_name|
-        @output_file.print column_name
-        @output_file.print @delimiter
-      end
+      @output_file.print column_names.join(@delimiter)
       @output_file.puts ""
       @row_index += 1
     end

data/lib/cosmos/tools/tlm_extractor/tlm_extractor_processor.rb

@@ -72,13 +72,13 @@ module Cosmos
         items = []
         configs.each { |config| config.mode = :dart; items.concat(config.normal_items); config.open_output_file }
         items.uniq!
- 
+
         time_start = Time.utc(1970, 1, 1) unless time_start
         time_end = Time.now unless time_end
 
         results = {}
         begin
-          server = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'])
+          server = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'], 1.0, Cosmos::System.x_csrf_token)
 
           index = 0
           items.each do |item_type, target_name, packet_name, item_name, value_type, dart_reduction, dart_reduced_type|
@@ -116,7 +116,7 @@ module Cosmos
             rescue Exception => error
               yield(index.to_f / items.length, "Error querying #{query_string} : #{error.class}:#{error.message}\n#{error.backtrace.join("\n")}\n") if block_given?
               return # Bail out because something bad happened
-            end          
+            end
           end
 
           configs.each { |config| config.process_dart(results) }

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_dart_thread.rb

@@ -45,7 +45,7 @@ module Cosmos
 
           # Execute each query
           results = {}
-          server = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'])
+          server = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'], 1.0, Cosmos::System.x_csrf_token)
           time_start = Time.utc(1970, 1, 1) unless time_start
           time_end = Time.now unless time_end
           progress_dialog.set_step_progress(0) if progress_dialog

data/lib/cosmos/tools/tlm_viewer/tlm_viewer.rb

@@ -146,7 +146,7 @@ module Cosmos
             'clear_all']
           @json_drb.method_whitelist = whitelist
           begin
-            @json_drb.start_service System.listen_hosts['TLMVIEWER_API'], port, self
+            @json_drb.start_service System.listen_hosts['TLMVIEWER_API'], port, self, 1000, System
           rescue Exception
             raise FatalError.new("Error starting JsonDRb on port #{port}.\nPerhaps a Telemetry Viewer is already running?")
           end
@@ -171,7 +171,7 @@ module Cosmos
 
         ConfigParser.splash = nil
       end
-      
+
       hide() unless options.show_main
     end
 

data/lib/cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb

@@ -61,6 +61,8 @@ module Cosmos
     end
 
     def eval_str(string_to_eval)
+      # Fortify: Dynamic Code Evaluation: Code Injection
+      # TODO: Not sure how to sanitize this string
       @screen.instance_eval(string_to_eval)
     end
 

data/lib/cosmos/top_level.rb

@@ -397,7 +397,7 @@ module Cosmos
   # @param hashing_algorithm [String] Hashing algorithm to use
   # @return [Digest::<algorithm>] The hashing sum object
   def self.hash_files(filenames, additional_data = nil, hashing_algorithm = 'MD5')
-    digest = Digest.const_get(hashing_algorithm).send('new')
+    digest = Digest.const_get(hashing_algorithm).public_send('new')
 
     Cosmos.set_working_dir do
       filenames.each do |filename|

data/lib/cosmos/utilities/simulated_target.rb

@@ -37,7 +37,7 @@ module Cosmos
       @tlm_packets.each do |name, packet|
         ids = packet.id_items
         ids.each do |id|
-          packet.send((id.name + '=').to_sym, id.id_value)
+          packet.public_send((id.name + '=').to_sym, id.id_value)
         end
       end