cosmos 4.4.2 → 4.5.0

data/install/config/system/system.txt

@@ -5,16 +5,17 @@ AUTO_DECLARE_TARGETS
 # DECLARE_TARGET SYSTEM
 
 # Listen Hosts - Ip addresses or hostnames to listen on when running the tools
+# Set these to 0.0.0.0 if you need external connections from other computers
 LISTEN_HOST CTS_API 127.0.0.1
 LISTEN_HOST TLMVIEWER_API 127.0.0.1
-LISTEN_HOST CTS_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
-LISTEN_HOST CTS_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST CTS_PREIDENTIFIED 127.0.0.1
+LISTEN_HOST CTS_CMD_ROUTER 127.0.0.1
 LISTEN_HOST REPLAY_API 127.0.0.1
-LISTEN_HOST REPLAY_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
-LISTEN_HOST REPLAY_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
-LISTEN_HOST DART_STREAM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
-LISTEN_HOST DART_DECOM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
-LISTEN_HOST DART_MASTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST REPLAY_PREIDENTIFIED 127.0.0.1
+LISTEN_HOST REPLAY_CMD_ROUTER 127.0.0.1
+LISTEN_HOST DART_STREAM 127.0.0.1
+LISTEN_HOST DART_DECOM 127.0.0.1
+LISTEN_HOST DART_MASTER 127.0.0.1
 
 # Connect Hosts - Ip addresses or hostnames to connect to when running the tools
 CONNECT_HOST CTS_API 127.0.0.1
@@ -65,3 +66,10 @@ ALLOW_ACCESS ALL
 # META_INIT config/data/meta_init.txt
 
 # ADD_HASH_FILE lib/user_version.rb
+
+# ALLOW_ROUTER_COMMANDING # Enable this to chain servers with commanding
+# ALLOW_HOST localhost:7777 # This is provided by default.  Add with HostIP:7777 for chaining
+# ALLOW_ORIGIN 1.2.3.4:8080 # Add this if you have a webserver that should be able to access the COSMOS API
+
+# *** IMPORTANT *** Change this value to a unique value for each project
+X_CSRF_TOKEN SuperSecret # Secret used to secure requests - Change for each project

data/lib/cosmos/core_ext/time.rb

@@ -389,7 +389,9 @@ class Time
   # @return [Float] The number of seconds from the given epoch to the given
   #   CCSDS day, milliseconds, and microseconds.
   def self.ccsds2sec(day, ms, us, sec_epoch_jd = JULIAN_DATE_OF_CCSDS_EPOCH)
-    (self.ccsds2julian(day, ms, us) - sec_epoch_jd) * SEC_PER_DAY_FLOAT
+    # NOTE: We don't call ccsds2julian to avoid loss of precision
+    (day + JULIAN_DATE_OF_CCSDS_EPOCH - sec_epoch_jd +
+    ((ms.to_f + (us / 1000.0)) / MSEC_PER_DAY_FLOAT)) * SEC_PER_DAY_FLOAT
   end
 
   # @param sec [Float] Number of seconds to convert

data/lib/cosmos/dart/examples/dart_decom_client.rb

@@ -31,7 +31,7 @@ request['value_type'] = 'RAW_AVG'
 request['meta_filters'] = ["OPERATOR_NAME == 'Unspecified'"]
 
 puts "Connecting to Dart Decom Server..."
-server = Cosmos::JsonDRbObject.new(Cosmos::System.connect_hosts['DART_DECOM'], Cosmos::System.ports['DART_DECOM'])
+server = Cosmos::JsonDRbObject.new(Cosmos::System.connect_hosts['DART_DECOM'], Cosmos::System.ports['DART_DECOM'], 1.0, Cosmos::System.x_csrf_token)
 puts "Getting SYSTEM META fields"
 result = server.item_names("SYSTEM", "META")
 puts result.inspect(10000)

data/lib/cosmos/dart/lib/dart_decommutator.rb

@@ -36,16 +36,16 @@ class DartDecommutator
 
   # Wait 60s before giving up on the PacketConfig becoming ready
   PACKET_CONFIG_READY_TIMEOUT = 60
-  
+
   # Delay between updating the DART status packet.   Simply throttles this rarely viewed status
   STATUS_UPDATE_PERIOD_SECONDS = 60.seconds
-  
+
   def initialize(worker_id = 0, num_workers = 1)
     sync_targets_and_packets()
     @worker_id = worker_id
     @num_workers = num_workers
     @status = DartDecommutatorStatus.new
-    @master = Cosmos::JsonDRbObject.new(Cosmos::System.connect_hosts['DART_MASTER'], Cosmos::System.ports['DART_MASTER'])
+    @master = Cosmos::JsonDRbObject.new(Cosmos::System.connect_hosts['DART_MASTER'], Cosmos::System.ports['DART_MASTER'], 1.0, Cosmos::System.x_csrf_token)
   end
 
   def timeit(message, &block)
@@ -84,7 +84,7 @@ class DartDecommutator
             # If we timeout this code will simply exit the application
             wait_for_ready_packet_config(packet_config)
             decom_packet(ple, packet, packet_config)
-            
+
             # Update status
             if Time.now > status_time
               status_time = Time.now + 60.seconds

data/lib/cosmos/dart/processes/dart_decom_server.rb

@@ -25,7 +25,7 @@ Cosmos.catch_fatal_exception do
     json_drb.method_whitelist = ['query', 'item_names', 'dart_status', 'clear_errors']
     begin
       json_drb.start_service(Cosmos::System.listen_hosts['DART_DECOM'],
-        Cosmos::System.ports['DART_DECOM'], DartDecomQuery.new)
+        Cosmos::System.ports['DART_DECOM'], DartDecomQuery.new, 1000, Cosmos::System)
     rescue Exception => error
       raise Cosmos::FatalError.new("Error starting JsonDRb on port #{Cosmos::System.ports['DART_DECOM']}.\nPerhaps another DART Decom Server is already running?\n#{error.formatted}")
     end

data/lib/cosmos/dart/processes/dart_master.rb

@@ -29,7 +29,7 @@ Cosmos.catch_fatal_exception do
     json_drb.method_whitelist = ['get_decom_ple_ids']
     begin
       json_drb.start_service(Cosmos::System.listen_hosts['DART_MASTER'],
-        Cosmos::System.ports['DART_MASTER'], DartMasterQuery.new(ples_per_request))
+        Cosmos::System.ports['DART_MASTER'], DartMasterQuery.new(ples_per_request), 1000, Cosmos::System)
     rescue Exception => error
       raise Cosmos::FatalError.new("Error starting JsonDRb on port #{Cosmos::System.ports['DART_MASTER']}.\nPerhaps another DART Master is already running?\n#{error.formatted}")
     end

data/lib/cosmos/gui/qt_tool.rb

@@ -82,7 +82,7 @@ module Cosmos
       else
         options.config_file = nil
         options.stylesheet = nil
-      end      
+      end
     end
 
     # Creates a path to a configuration file. If the file is given it is
@@ -209,28 +209,26 @@ module Cosmos
 
       # Handle manually positioning the window
       unless @options.auto_position
-        # Get the desktop's geometry
-        desktop = Qt::Application.desktop
-
-        # Handle position relative to right edge
-        @options.x = desktop.width - frameGeometry().width + @options.x + 1 if @options.x < 0
-
-        # Handle position relative to bottom edge
-        @options.y = desktop.height - frameGeometry().height + @options.y + 1 if @options.y < 0
-
         # Move to the desired position
         move(@options.x, @options.y)
       end
 
       if @options.remember_geometry and !@options.command_line_geometry
+        # Get the desktop's geometry
+        desktop = Qt::Application.desktop
+        screen = desktop.screen
         settings = Qt::Settings.new('Ball Aerospace', self.class.to_s)
         if settings.contains('size') and @options.restore_size and @options.startup_state != :DEFAULT
           size = settings.value('size').toSize
-          resize(size)
+          if size.height > 0 and size.height < screen.height and size.width > 0 and size.width < screen.width
+            resize(size)
+          end
         end
         if settings.contains('position') and @options.restore_position
           position = settings.value('position').toPoint
-          move(position)
+          if position.x > 0 and position.y > 0 and position.x < screen.width and position.y < screen.height
+            move(position)
+          end
         end
       end
 

data/lib/cosmos/gui/widgets/dart_meta_frame.rb

@@ -114,7 +114,7 @@ module Cosmos
       if !@got_meta_item_names and !@update_thread
         @update_thread = Thread.new do
           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)
             item_names = server.item_names("SYSTEM", "META")
             Qt.execute_in_main_thread do
               unless self.disposed?

data/lib/cosmos/interfaces/dart_status_interface.rb

@@ -36,7 +36,7 @@ module Cosmos
       @status_packet.write('PACKET_ID', 1)
       @clear_errors_command = System.commands.packet('DART', 'CLEAR_ERRORS')
       @sleeper = Sleeper.new
-      @dart = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'])
+      @dart = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'], 1.0, Cosmos::System.x_csrf_token)
     end
 
     # Indicates if the interface is connected to its target(s) or not. Must be

data/lib/cosmos/interfaces/serial_interface.rb

@@ -52,6 +52,7 @@ module Cosmos
       @read_allowed = false unless @read_port_name
       @flow_control = :NONE
       @data_bits = 8
+      @struct = []
     end
 
     # Creates a new {SerialStream} using the parameters passed in the constructor
@@ -65,13 +66,16 @@ module Cosmos
         @write_timeout,
         @read_timeout,
         @flow_control,
-        @data_bits
+        @data_bits,
+        @struct
       )
       super()
     end
 
     # Supported Options
     # FLOW_CONTROL - Flow control method NONE or RTSCTS. Defaults to NONE
+    # DATA_BITS - How many data bits to use
+    # STRUCT - Directly set fields in the Win32 DCB or POSIX termios structure
     def set_option(option_name, option_values)
       super(option_name, option_values)
       case option_name.upcase
@@ -79,6 +83,8 @@ module Cosmos
         @flow_control = option_values[0]
       when 'DATA_BITS'
         @data_bits = option_values[0].to_i
+      when 'STRUCT'
+        @struct << option_values
       end
     end
   end

data/lib/cosmos/io/json_drb.rb

@@ -123,7 +123,7 @@ module Cosmos
     # @param object [Object] The object to send the DRb requests to. This
     #   object must either include the Cosmos::Script module or be the
     #   CmdTlmServer.
-    def start_service(hostname = nil, port = nil, object = nil, max_threads = 1000)
+    def start_service(hostname = nil, port = nil, object = nil, max_threads = 1000, system = nil)
       server_started = false
       @server_mutex.synchronize do
         server_started = true if @server
@@ -147,7 +147,7 @@ module Cosmos
             }
 
             # The run call will block until the server is stopped.
-            Rack::Handler::Puma.run(JsonDrbRack.new(self), server_config) do |server|
+            Rack::Handler::Puma.run(JsonDrbRack.new(self, system), server_config) do |server|
               @server_mutex.synchronize do
                 @server = server
               end

data/lib/cosmos/io/json_drb_object.rb

@@ -38,7 +38,7 @@ module Cosmos
     # @param hostname [String] The name of the machine which has started
     #   the JSON service
     # @param port [Integer] The port number of the JSON service
-    def initialize(hostname, port, connect_timeout = 1.0)
+    def initialize(hostname, port, connect_timeout = 1.0, x_csrf_token = nil)
       hostname = '127.0.0.1' if (hostname.to_s.upcase == 'LOCALHOST')
       begin
         Socket.pack_sockaddr_in(port, hostname)
@@ -61,6 +61,7 @@ module Cosmos
       @connect_timeout = connect_timeout
       @connect_timeout = @connect_timeout.to_f if @connect_timeout
       @shutdown = false
+      @x_csrf_token = x_csrf_token
     end
 
     # Disconnects from http server
@@ -127,7 +128,11 @@ module Cosmos
         STDOUT.puts "\nRequest:\n" if JsonDRb.debug?
         STDOUT.puts @request_data if JsonDRb.debug?
         @request_in_progress = true
-        headers = {'Content-Type' => 'application/json-rpc'}
+        if @x_csrf_token
+          headers = {'Content-Type' => 'application/json-rpc', 'X-Csrf-Token' => @x_csrf_token}
+        else
+          headers = {'Content-Type' => 'application/json-rpc'}
+        end
         res = @http.post(@uri,
                          :body   => @request_data,
                          :header => headers)

data/lib/cosmos/io/json_drb_rack.rb

@@ -17,8 +17,9 @@ module Cosmos
   class JsonDrbRack
     # @param drb [JsonDRb] - An instance of the JsonDRb class that'll be used
     #   to process the JSON request and generate a response
-    def initialize(drb)
+    def initialize(drb, system = nil)
       @drb = drb
+      @system = system
     end
 
     # Handles a request.
@@ -32,22 +33,41 @@ module Cosmos
       # ACL allow_addr? function takes address in the form returned by
       # IPSocket.peeraddr.
       req_addr = ["AF_INET", request.port, request.host.to_s, request.ip.to_s]
+      status = nil
 
       if @drb.acl and !@drb.acl.allow_addr?(req_addr)
         status       = 403
         content_type = "text/plain"
         body         = "Forbidden"
       elsif request.post?
-        status, content_type, body = handle_post(request)
+        if @system
+          if @system.x_csrf_token and (request.env['HTTP_X_CSRF_TOKEN'] != @system.x_csrf_token)
+            status       = 403
+            content_type = "text/plain"
+            body         = "Forbidden: Bad X-Csrf-Token: #{request.env['HTTP_X_CSRF_TOKEN']}"
+          end
+          if !@system.allowed_hosts.include?(request.env['HTTP_HOST'])
+            status       = 403
+            content_type = "text/plain"
+            body         = "Forbidden: #{request.env['HTTP_HOST']} not in allowed hosts"
+          end
+          if request.env['HTTP_ORIGIN'] and !@system.allowed_origins.include?(request.env['HTTP_ORIGIN'])
+            status       = 403
+            content_type = "text/plain"
+            body         = "Forbidden: #{request.env['HTTP_ORIGIN']} not in allowed origins"
+          end
+        end
+
+        status, content_type, body = handle_post(request) unless status
       else
         status       = 405
         content_type = "text/plain"
         body         = "Request not allowed"
       end
-  
+
       return status, {'Content-Type' => content_type}, [body]
     end
-    
+
     # Handles an http post.
     #
     # @param request [Rack::Request] - A rack post request
@@ -57,7 +77,7 @@ module Cosmos
       request_data = request.body.read
       start_time = Time.now.sys
       response_data, error_code = @drb.process_request(request_data, start_time)
-  
+
       # Convert json error code into html status code
       # see http://www.jsonrpc.org/historical/json-rpc-over-http.html#errors
       if error_code

data/lib/cosmos/io/json_rpc.rb

@@ -269,7 +269,7 @@ module Cosmos
     # @param response_data [String] JSON encoded string representing the response
     # @return [JsonRpcResponse]
     def self.from_json(response_data)
-      msg = "Invalid JSON-RPC 2.0 Response"
+      msg = "Invalid JSON-RPC 2.0 Response: #{response_data.inspect}"
       begin
         hash = JSON.parse(response_data, :allow_nan => true, :create_additions => true)
       rescue

data/lib/cosmos/io/posix_serial_driver.rb

@@ -25,19 +25,20 @@ module Cosmos
                    write_timeout = 10.0,
                    read_timeout = nil,
                    flow_control = :NONE,
-                   data_bits = 8)
+                   data_bits = 8,
+                   struct = [])
 
       # Convert Baud Rate into Termios constant
       begin
         baud_rate = Object.const_get("Termios::B#{baud_rate}")
       rescue NameError
-        raise(ArgumentError, "Invalid Baud Rate, Not Defined by Termios: #{baud_rate}")
+        raise(ArgumentError, "Invalid baud rate: #{baud_rate}")
       end
 
       # Verify Parameters
-      raise(ArgumentError, "Invalid Data Bits: #{data_bits}") unless [5,6,7,8].include?(data_bits)
+      raise(ArgumentError, "Invalid data bits: #{data_bits}") unless [5,6,7,8].include?(data_bits)
       raise(ArgumentError, "Invalid parity: #{parity}") if parity and !SerialDriver::VALID_PARITY.include?(parity)
-      raise(ArgumentError, "Invalid Stop Bits: #{stop_bits}") unless [1,2].include?(stop_bits)
+      raise(ArgumentError, "Invalid stop bits: #{stop_bits}") unless [1,2].include?(stop_bits)
       @write_timeout = write_timeout
       @read_timeout = read_timeout
 
@@ -51,22 +52,61 @@ module Cosmos
 
       # Configure the serial Port
       tio = Termios::new_termios()
-      iflags = 0
-      iflags |= Termios::IGNPAR unless parity
-      cflags = 0
-      cflags |= Termios::CREAD # Enable receiver
-      cflags |= Termios.const_get("CS#{data_bits}") # data bits
-      cflags |= Termios::CLOCAL # Ignore Modem Control Lines
-      cflags |= Termios::CSTOPB if stop_bits == 2
-      cflags |= Termios::PARENB if parity
-      cflags |= Termios::PARODD if parity == :ODD
-      cflags |= Termios::CRTSCTS if flow_control == :RTSCTS
-      tio.iflag = iflags
-      tio.oflag = 0
-      tio.cflag = cflags
-      tio.lflag = 0
+      iflag = 0
+      iflag |= Termios::IGNPAR unless parity
+      oflag = 0
+      cflag = 0
+      cflag |= Termios::CREAD # Enable receiver
+      cflag |= Termios.const_get("CS#{data_bits}") # data bits
+      cflag |= Termios::CLOCAL # Ignore Modem Control Lines
+      cflag |= Termios::CSTOPB if stop_bits == 2
+      cflag |= Termios::PARENB if parity
+      cflag |= Termios::PARODD if parity == :ODD
+      cflag |= Termios::CRTSCTS if flow_control == :RTSCTS
+      lflag = 0
       tio.cc[Termios::VTIME] = 0
       tio.cc[Termios::VMIN] = 1
+      unless struct.empty?
+        struct.each do |field, key, value|
+          case field
+          when 'iflag'
+            if value == "0"
+              iflag &= ~Termios.const_get(key)
+            else
+              iflag |= Termios.const_get(key)
+            end
+          when 'oflag'
+            if value == "0"
+              oflag &= ~Termios.const_get(key)
+            else
+              oflag |= Termios.const_get(key)
+            end
+          when 'cflag'
+            if value == "0"
+              cflag &= ~Termios.const_get(key)
+            else
+              cflag |= Termios.const_get(key)
+            end
+          when 'lflag'
+            if value == "0"
+              lflag &= ~Termios.const_get(key)
+            else
+              lflag |= Termios.const_get(key)
+            end
+          when 'cc'
+            begin
+              value = Integer(value) # Try to convert to int
+            rescue ArgumentError
+              # Ignore this error and use the string
+            end
+            tio.cc[Termios.const_get(key)] = value
+          end
+        end
+      end
+      tio.iflag = iflag
+      tio.oflag = oflag
+      tio.cflag = cflag
+      tio.lflag = lflag
       tio.ispeed = baud_rate
       tio.ospeed = baud_rate
       @handle.tcflush(Termios::TCIOFLUSH)
@@ -143,7 +183,5 @@ module Cosmos
 
       data
     end
-
-  end # class PosixSerialDriver
-
-end # module Cosmos
+  end
+end

data/lib/cosmos/io/serial_driver.rb

@@ -32,8 +32,10 @@ module Cosmos
     #   complete or nil to block
     # @param read_timeout [Float|nil] Number of seconds to wait for the read to
     #   complete or nil to block
-    # @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(port_name,
                    baud_rate,
                    parity = :NONE,
@@ -41,7 +43,8 @@ module Cosmos
                    write_timeout = 10.0,
                    read_timeout = nil,
                    flow_control = :NONE,
-                   data_bits = 8)
+                   data_bits = 8,
+                   struct = [])
       raise(ArgumentError, "Invalid parity: #{parity}") unless VALID_PARITY.include? parity
       if Kernel.is_windows?
         @driver = Win32SerialDriver.new(port_name,
@@ -53,7 +56,8 @@ module Cosmos
                                         0.01,
                                         1000,
                                         flow_control,
-                                        data_bits)
+                                        data_bits,
+                                        struct)
       elsif RUBY_ENGINE == 'ruby'
         @driver = PosixSerialDriver.new(port_name,
                                         baud_rate,
@@ -62,7 +66,8 @@ module Cosmos
                                         write_timeout,
                                         read_timeout,
                                         flow_control,
-                                        data_bits)
+                                        data_bits,
+                                        struct)
       else
         @driver = nil # JRuby Serial on Linux not currently supported
       end
@@ -92,7 +97,5 @@ module Cosmos
     def read_nonblock
       @driver.read_nonblock
     end
-
-  end # class SerialDriver
-
-end # module Cosmos
+  end
+end