cosmos 4.4.1-java → 4.5.2-java

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/dart/spec/dart/dart_database_cleaner_spec.rb

@@ -189,7 +189,7 @@ describe DartDatabaseCleaner do
       end
       model.reset_column_information
       model_name = table_name.upcase
-      Cosmos.send(:remove_const, model_name) if Cosmos.const_defined?(model_name)
+      Cosmos.public_send(:remove_const, model_name) if Cosmos.const_defined?(model_name)
       Cosmos.const_set(model_name, model)
 
       expect(model.column_names).to include("delete_me")
@@ -205,7 +205,7 @@ describe DartDatabaseCleaner do
         end
         model.reset_column_information
         model_name = table_name.upcase
-        Cosmos.send(:remove_const, model_name) if Cosmos.const_defined?(model_name)
+        Cosmos.public_send(:remove_const, model_name) if Cosmos.const_defined?(model_name)
         Cosmos.const_set(model_name, model)
 
         expect(model.column_names).to include("delete_me")

data/lib/cosmos/gui/qt.rb

@@ -101,22 +101,22 @@ module Cosmos
     return color_r if (color_r.is_a? Qt::Color) || (color_r.is_a? Qt::Pen) || (color_r.is_a? Qt::LinearGradient)
 
     color = nil
-    key = color_r
-    key = key.to_i if key.is_a? Qt::Enum
+    color_key = color_r
+    color_key = color_key.to_i if color_key.is_a? Qt::Enum
 
     if color_r && color_g && color_b
-      key = (color_r.to_i << 24) + (color_g.to_i << 16) + (color_b.to_i << 8)
+      color_key = (color_r.to_i << 24) + (color_g.to_i << 16) + (color_b.to_i << 8)
     end
 
-    if Cosmos::COLORS[key]
-      color = Cosmos::COLORS[key]
+    if Cosmos::COLORS[color_key]
+      color = Cosmos::COLORS[color_key]
     else
       if color_r && color_g && color_b
         color = Qt::Color.new(color_r.to_i, color_g.to_i, color_b.to_i)
       else
         color = Qt::Color.new(color_r)
       end
-      Cosmos::COLORS[key] = color
+      Cosmos::COLORS[color_key] = color
     end
     color
   end
@@ -214,12 +214,12 @@ module Cosmos
   end
 
   def self.getCursor(shape)
-    key = shape
-    key = shape.to_i if shape.is_a? Qt::Enum
-    cursor = CURSORS[key]
+    shape_key = shape
+    shape_key = shape.to_i if shape.is_a? Qt::Enum
+    cursor = CURSORS[shape_key]
     unless cursor
       cursor = Qt::Cursor.new(shape)
-      CURSORS[key] = cursor
+      CURSORS[shape_key] = cursor
     end
     cursor
   end

data/lib/cosmos/gui/qt_tool.rb

@@ -61,6 +61,7 @@ module Cosmos
       @stylesheet = File.read(app_style) if File.exist? app_style
 
       self.class.normalize_config_options(@options)
+      setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint) if @options.stay_on_top
 
       # Add a banner based on system configuration
       add_classification_banner
@@ -82,7 +83,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 +210,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
 
@@ -352,6 +351,7 @@ module Cosmos
       options.remember_geometry = true
       options.restore_position = true
       options.restore_size = true
+      options.stay_on_top = false
       options.redirect_io = true
       options.title = "COSMOS Tool"
       options.config_file = nil
@@ -403,6 +403,11 @@ module Cosmos
           options.startup_state = :DEFAULT
         end
 
+        # Create the defaultsize option
+        option_parser.on("--stay-on-top", "Force the tool to stay on top of all other windows") do |arg|
+          options.stay_on_top = true
+        end
+
         # Create the x and y position options
         option_parser.separator("")
         option_parser.separator("Window X & Y Position Options:")

data/lib/cosmos/gui/text/completion_text_edit.rb

@@ -17,6 +17,7 @@ module Cosmos
   # This calss also includes many helper methods to access various
   # lines, indent selections, highlight lines and center the view.
   class CompletionTextEdit < Qt::PlainTextEdit
+    attr_accessor :read_only
     # Create a signal so users of CompletionTextEdit don't have to
     # subclass in order to listen to keyPressEvents
     signals 'key_pressed(QKeyEvent*)'
@@ -47,6 +48,7 @@ module Cosmos
 
       @last_hightlighted_line = 1
       @code_completion = nil
+      @read_only = false
       begin
         @code_completion = Completion.new(self)
       rescue

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/linc_interface.rb

@@ -256,7 +256,7 @@ module Cosmos
       # Handle handshake warnings and errors
       if status == "OK" and code != 0
         unless @ignored_error_codes[handshake_cmd.handshake.handshake.target_name].include? code
-          Logger.warn "Warning sending command (#{code}): #{source}"
+          Logger.warn "#{@name}: Warning sending command (#{code}): #{source}"
         end
       elsif status == "ERROR"
         unless @ignored_error_codes[handshake_cmd.handshake.handshake.target_name].include? code
@@ -295,7 +295,7 @@ module Cosmos
       command.received_count += 1
 
       # Put a log of the command onto the server for the user to see
-      Logger.info("External Command: " + System.commands.format(linc_handshake.identified_command, System.targets[linc_handshake.identified_command.target_name].ignored_parameters))
+      Logger.info("#{@name}: External Command: " + System.commands.format(linc_handshake.identified_command, System.targets[linc_handshake.identified_command.target_name].ignored_parameters))
 
       # Log the command to the command log(s)
       @packet_log_writer_pairs.each do |packet_log_writer_pair|
@@ -361,7 +361,7 @@ module Cosmos
       if @handshake
         timed_out = false
       else
-        Logger.warn "No handshake - must be timeout."
+        Logger.warn "#{@name}: No handshake - must be timeout."
         timed_out = true
       end
 

data/lib/cosmos/interfaces/protocols/burst_protocol.rb

@@ -156,7 +156,7 @@ module Cosmos
     end
 
     def log_discard(length, found)
-      Logger.error("Sync #{'not ' unless found}found. Discarding #{length} bytes of data.")
+      Logger.error("#{@interface ? @interface.name : ""}: Sync #{'not ' unless found}found. Discarding #{length} bytes of data.")
       if @data.length >= 0
         Logger.error(sprintf("Starting: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
           @data.length >= 1 ? @data.getbyte(0) : 0,

data/lib/cosmos/interfaces/protocols/crc_protocol.rb

@@ -140,7 +140,7 @@ module Cosmos
       crc = BinaryAccessor.read(@bit_offset, @bit_size, :UINT, data, @endianness)
       calculated_crc = @crc.calc(data[0...(@bit_offset / 8)])
       if calculated_crc != crc
-        Logger.error "Invalid CRC detected! Calculated 0x#{calculated_crc.to_s(16).upcase} vs found 0x#{crc.to_s(16).upcase}."
+        Logger.error "#{@interface ? @interface.name : ""}: Invalid CRC detected! Calculated 0x#{calculated_crc.to_s(16).upcase} vs found 0x#{crc.to_s(16).upcase}."
         if @bad_strategy == DISCONNECT
           return :DISCONNECT
         end

data/lib/cosmos/interfaces/protocols/template_protocol.rb

@@ -146,13 +146,13 @@ module Cosmos
         # Write the packet value with each of the values received
         response_values = response_string.scan(response_regexp)[0]
         if !response_values || (response_values.length != response_item_names.length)
-          handle_error("#{@interface.name}: Unexpected response: #{response_string}")
+          handle_error("#{@interface ? @interface.name : ""}: Unexpected response: #{response_string}")
         else
           response_values.each_with_index do |value, i|
             begin
               result_packet.write(response_item_names[i], value)
             rescue => error
-              handle_error("#{@interface.name}: Could not write value #{value} due to #{error.message}")
+              handle_error("#{@interface ? @interface.name : ""}: Could not write value #{value} due to #{error.message}")
               break
             end
           end
@@ -234,7 +234,7 @@ module Cosmos
           sleep(@response_polling_period)
           retry if !response_timeout_time
           retry if response_timeout_time and Time.now < response_timeout_time
-          handle_error("#{@interface.name}: Timeout waiting for response")
+          handle_error("#{@interface ? @interface.name : ""}: Timeout waiting for response")
         end
 
         @response_template = nil

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/interfaces/stream_interface.rb

@@ -49,7 +49,7 @@ module Cosmos
       begin
         data = @stream.read
       rescue Timeout::Error
-        Logger.instance.error "Timeout waiting for data to be read"
+        Logger.instance.error "#{@name}: Timeout waiting for data to be read"
         data = nil
       end
       return nil if data.nil? or data.length <= 0

data/lib/cosmos/interfaces/tcpip_server_interface.rb

@@ -132,7 +132,7 @@ module Cosmos
             end
           rescue Exception => err
             shutdown_interfaces(@write_interface_infos)
-            Logger.instance.error("Tcpip server write thread unexpectedly died")
+            Logger.instance.error("#{@name}: Tcpip server write thread unexpectedly died")
             Logger.instance.error(err.formatted)
           end
         end
@@ -144,7 +144,7 @@ module Cosmos
             end
           rescue Exception => err
             shutdown_interfaces(@write_interface_infos)
-            Logger.instance.error("Tcpip server write raw thread unexpectedly died")
+            Logger.instance.error("#{@name}: Tcpip server write raw thread unexpectedly died")
             Logger.instance.error(err.formatted)
           end
         end
@@ -298,10 +298,10 @@ module Cosmos
     def change_raw_logging(method)
       if @raw_logger_pair
         @write_interface_infos.each do |interface_info|
-          interface_info.interface.raw_logger_pair.send(method) if interface_info.interface.raw_logger_pair
+          interface_info.interface.raw_logger_pair.public_send(method) if interface_info.interface.raw_logger_pair
         end
         @read_interface_infos.each do |interface_info|
-          interface_info.interface.raw_logger_pair.send(method) if interface_info.interface.raw_logger_pair
+          interface_info.interface.raw_logger_pair.public_send(method) if interface_info.interface.raw_logger_pair
         end
       end
     end
@@ -346,7 +346,7 @@ module Cosmos
             break if @cancel_threads
           end
         rescue => err
-          Logger.instance.error("Tcpip server listen thread unexpectedly died")
+          Logger.instance.error("#{@name}: Tcpip server listen thread unexpectedly died")
           Logger.instance.error(err.formatted)
         end
       end
@@ -372,7 +372,7 @@ module Cosmos
         if not System.instance.acl.allow_addr?(addr)
           # Reject connection
           Cosmos.close_socket(socket)
-          Logger.instance.info "Tcpip server rejected connection from #{hostname}(#{host_ip}):#{port}"
+          Logger.instance.info "#{@name}: Tcpip server rejected connection from #{hostname}(#{host_ip}):#{port}"
           return
         end
       end
@@ -417,7 +417,7 @@ module Cosmos
         end
         start_read_thread(@read_interface_infos[-1])
       end
-      Logger.instance.info "Tcpip server accepted connection from #{hostname}(#{host_ip}):#{port}"
+      Logger.instance.info "#{@name}: Tcpip server accepted connection from #{hostname}(#{host_ip}):#{port}"
     end
 
     def start_read_thread(interface_info)
@@ -427,10 +427,10 @@ module Cosmos
           begin
             read_thread_body(interface_info.interface)
           rescue Exception => err
-            Logger.instance.error "Tcpip server read thread unexpectedly died"
+            Logger.instance.error "#{@name}: Tcpip server read thread unexpectedly died"
             Logger.instance.error err.formatted
           end
-          Logger.instance.info "Tcpip server lost read connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
+          Logger.instance.info "#{@name}: Tcpip server lost read connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
           @read_threads.delete(Thread.current)
 
           index_to_delete = nil
@@ -453,7 +453,7 @@ module Cosmos
             end
           end
         rescue Exception => err
-          Logger.instance.error "Tcpip server read thread unexpectedly died"
+          Logger.instance.error "#{@name}: Tcpip server read thread unexpectedly died"
           Logger.instance.error err.formatted
         end
       end
@@ -500,7 +500,7 @@ module Cosmos
     end
 
     def interface_disconnect(interface_info)
-      Logger.instance.info "Tcpip server lost write connection to "\
+      Logger.instance.info "#{@name}: Tcpip server lost write connection to "\
         "#{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
       interface_info.interface.disconnect
       interface_info.interface.raw_logger_pair.stop if interface_info.interface.raw_logger_pair
@@ -552,13 +552,13 @@ module Cosmos
               next
             end
             # Client has disconnected (or is invalidly sending data on the socket)
-            Logger.instance.info "Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
+            Logger.instance.info "#{@name}: Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
             interface_info.interface.disconnect
             interface_info.interface.raw_logger_pair.stop if interface_info.interface.raw_logger_pair
             indexes_to_delete.unshift(index) # Put later indexes at front of array
           rescue Errno::ECONNRESET, Errno::ECONNABORTED, IOError
             # Client has disconnected
-            Logger.instance.info "Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
+            Logger.instance.info "#{@name}: Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
             interface_info.interface.disconnect
             interface_info.interface.raw_logger_pair.stop if interface_info.interface.raw_logger_pair
             indexes_to_delete.unshift(index) # Put later indexes at front of array
@@ -590,7 +590,7 @@ module Cosmos
           need_disconnect = false
           begin
             interface_bytes_written = interface_info.interface.bytes_written
-            interface_info.interface.send(method, packet_or_data)
+            interface_info.interface.public_send(method, packet_or_data)
             diff = interface_info.interface.bytes_written - interface_bytes_written
             @written_raw_data_time = interface_info.interface.written_raw_data_time
             @written_raw_data = interface_info.interface.written_raw_data
@@ -600,13 +600,13 @@ module Cosmos
             need_disconnect = true
           rescue Exception => err
             if err.message != "Stream not connected for write_raw"
-              Logger.instance.error "Error sending to client: #{err.class} #{err.message}"
+              Logger.instance.error "#{@name}: Error sending to client: #{err.class} #{err.message}"
             end
             need_disconnect = true
           end
 
           if need_disconnect
-            Logger.instance.info "Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
+            Logger.instance.info "#{@name}: Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
             interface_info.interface.disconnect
             interface_info.interface.raw_logger_pair.stop if interface_info.interface.raw_logger_pair
             indexes_to_delete.unshift(index) # Put later indexes at front of array

data/lib/cosmos/io/io_multiplexer.rb

@@ -40,11 +40,15 @@ module Cosmos
       result = nil
       @streams.each do |stream|
         if first
-          result = stream.send(method_name, *args)
+          # Fortify Access Specifier Manipulation
+          # We're forwarding only public methods to the stream
+          result = stream.public_send(method_name, *args)
           result = self if result == stream
           first = false
         else
-          stream.send(method_name, *args)
+          # Fortify Access Specifier Manipulation
+          # We're forwarding only public methods to the stream
+          stream.public_send(method_name, *args)
         end
       end
       result

data/lib/cosmos/io/json_drb.rb

@@ -17,14 +17,6 @@ require 'set'
 require 'cosmos/io/json_rpc'
 require 'cosmos/io/json_drb_rack'
 require 'rack/handler/puma'
-if RUBY_ENGINE == 'ruby' and %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
-  begin
-    require 'stopgap_13632'
-  rescue Exception => err
-    msg = "Error loading stopgap. Make sure gem install stopgap_13632 succeeds: #{err.message}"
-    raise $!, msg, $!.backtrace
-  end
-end
 
 # Add methods to the Puma::Launcher and Puma::Single class so we can tell
 # if the server has been started.
@@ -123,7 +115,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 +139,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
@@ -262,7 +254,7 @@ module Cosmos
         if (@method_whitelist and @method_whitelist.include?(request.method.downcase())) or
            (!@method_whitelist and !JsonRpcRequest::DANGEROUS_METHODS.include?(request.method.downcase()))
           begin
-            result = @object.send(request.method.downcase().intern, *request.params)
+            result = @object.public_send(request.method.downcase().intern, *request.params)
             if request.id
               response = JsonRpcSuccessResponse.new(result, request.id)
             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