hardsploit_gui 2.2 → 2.3

data/lib/class/Command_editor.rb

@@ -5,8 +5,6 @@
 #  License URI: http://www.gnu.org/licenses/gpl.txt
 #===================================================
 
-require_relative '../HardsploitAPI/HardsploitAPI'
-require_relative '../class/Command_table'
 require_relative '../gui/gui_command_editor'
 class Command_editor < Qt::Widget
   slots 'add_cmd()'
@@ -16,70 +14,134 @@ class Command_editor < Qt::Widget
   slots 'remove_row()'
   slots 'check_cell_content(QTableWidgetItem*)'
 
-  def initialize(action, cmd_name, chip, bus_id, parent, api, bus_param={})
+  def initialize(action, cmd_name, chip, bus_id, parent, bus_param={})
     super()
-    @cmd_editor_gui = Ui_Command_editor.new
+    @view = Ui_Command_editor.new
     centerWindow(self)
-    @cmd_editor_gui.setupUi(self)
-    @bus = Bus.find_by(bus_id: bus_id)
-    @chip_id = chip.chip_id
+    @view.setupUi(self)
+    @bus = Bus.find(bus_id)
+    @chip_id = chip.id
     @cmd_name = cmd_name
     @bus_id = bus_id
     @parent = parent
-    @api = api
-    @cmd_table = Command_table.new(@api, @cmd_editor_gui.tbl_bytes, @bus.bus_name)
-
-    inputRestrict(@cmd_editor_gui.lie_name, 2)
-    inputRestrict(@cmd_editor_gui.lie_description, 2)
-    @cmd_editor_gui.lbl_chip_val.setText(chip.chip_reference)
+    @cmd_table = Command_table.new(@view.tbl_bytes, @bus.name)
 
+    inputRestrict(@view.lie_name, 2)
+    inputRestrict(@view.lie_description, 2)
+    @view.lbl_chip_val.setText(chip.reference)
     @cmd_table.resize_to_content
-    case @bus.bus_name
-    when 'SPI'
-      @cmd_table.build_spi
-    end
-    @cmd_editor_gui.lie_text_2_bytes.hide if @bus.bus_name != 'SPI'
+    @cmd_table.build_spi if @bus.name == 'SPI'
+    @view.lie_text_2_bytes.hide unless @bus.name == 'SPI'
 
     case action
     when 0
       # Add
-      @cmd_editor_gui.lbl_cmd_val.text = '-'
-      Qt::Object.connect(@cmd_editor_gui.btn_validate, SIGNAL('clicked()'), self, SLOT('add_cmd()'))
+      @view.lbl_cmd_val.setText('-')
+      Qt::Object.connect(@view.btn_validate, SIGNAL('clicked()'), self, SLOT('add_cmd()'))
     when 1
-      # Temp
-      @cmd_editor_gui.lbl_cmd_val.text = cmd_name
+      # Template
+      @view.lbl_cmd_val.setText(cmd_name)
       feed_editor_form
-      @cmd_editor_gui.lie_name.setText('')
-      Qt::Object.connect(@cmd_editor_gui.btn_validate, SIGNAL('clicked()'), self, SLOT('add_cmd()'))
+      @view.lie_name.setText('')
+      Qt::Object.connect(@view.btn_validate, SIGNAL('clicked()'), self, SLOT('add_cmd()'))
     else
       # Edit
-      @cmd_editor_gui.lbl_cmd_val.text = "#{cmd_name}"
+      @view.lbl_cmd_val.setText(cmd_name)
       feed_editor_form
-      @cmd_editor_gui.btn_validate.setText('Edit')
-      Qt::Object.connect(@cmd_editor_gui.btn_validate, SIGNAL('clicked()'), self, SLOT('edit_cmd()'))
+      @view.btn_validate.setText('Edit')
+      Qt::Object.connect(@view.btn_validate, SIGNAL('clicked()'), self, SLOT('edit_cmd()'))
     end
     unless bus_param.empty?
       feed_i2c_cmd_array(bus_param)
     end
   rescue Exception => msg
-    Qt::MessageBox.new(Qt::MessageBox::Critical, 'Critical error', 'Error occured while loading the GUI. Consult the logs for more details').exec
-    logger = Logger.new($logFilePath)
-    logger.error msg
+    ErrorMsg.new.unknown(msg)
+  end
+
+  def feed_i2c_cmd_array(bus_param)
+    if bus_param[:mode] == 'w'
+      @cmd_table.i2c_write_cmd(bus_param[:addr], bus_param[:size].to_i)
+    else
+      @cmd_table.i2c_read_cmd(bus_param[:addr], bus_param[:size].to_i)
+    end
+  end
+
+  def add_cmd
+    return false if @cmd_table.empty_data_exist? || is_cmd_size_valid? == false
+    @cmd = Command.create(
+      name:        @view.lie_name.text,
+      description: @view.lie_description.text,
+      bus_id:      @bus_id,
+      chip_id:     @chip_id
+    )
+    unless check_for_errors(@cmd)
+      add_bytes
+      @parent.feed_cmd_array
+      close
+    end
+  rescue Exception => msg
+    ErrorMsg.new.unknown(msg)
+  end
+
+  def edit_cmd
+    return false if @cmd_table.empty_data_exist? && !is_cmd_size_valid?
+    @cmd = Command.find_by(name: @cmd_name, chip_id: @chip_id)
+    @cmd.update(
+      name: @view.lie_name.text,
+      description: @view.lie_description.text
+    )
+    @view.tbl_bytes.sortItems(0, Qt::AscendingOrder)
+    unless check_for_errors(@cmd)
+      Byte.where(command_id: @cmd.id).destroy_all
+      add_bytes
+      @parent.feed_cmd_array
+      close
+    end
+  rescue Exception => msg
+    ErrorMsg.new.unknown(msg)
+  end
+
+  def add_bytes
+    @view.tbl_bytes.sortItems(0, Qt::AscendingOrder)
+    @view.tbl_bytes.rowCount.times do |i|
+      if @bus.name == 'SPI'
+        iteration = @view.tbl_bytes.item(i, 2).text
+        description = @view.tbl_bytes.item(i, 3).text
+      else
+        iteration = nil
+        description = @view.tbl_bytes.item(i, 2).text
+      end
+      byte = Byte.create(
+        index:       i.next,
+        value:       @view.tbl_bytes.item(i, 1).text,
+        iteration:   iteration,
+        description: description,
+        command_id:  @cmd.id
+      )
+      return false if check_for_errors(byte)
+    end
+    Qt::MessageBox.new(
+      Qt::MessageBox::Information,
+      'Command status',
+      'Command saved'
+    ).exec
+  rescue Exception => msg
+    ErrorMsg.new.unknown(msg)
   end
 
   def check_cell_content(item)
-    case @cmd_editor_gui.tbl_bytes.horizontalHeaderItem(item.column).text
+    case @view.tbl_bytes.horizontalHeaderItem(item.column).text
     when 'Order', 'Repetition'
       if item.text.to_i < 0
         item.setData(0, Qt::Variant.new(0))
-        Qt::MessageBox.new(Qt::MessageBox::Warning, 'Wrong data', 'Only positive values are accepted in this cell').exec
+        ErrorMsg.new.positive_cell_value
       end
     when 'Byte (Hexa)'
       reg = Qt::RegExp.new("^[A-Fa-f0-9]{2}")
       reg_val = Qt::RegExpValidator.new(reg, self)
       if reg_val.validate(item.text, item.text.length) == 0
         item.setText('')
-        Qt::MessageBox.new(Qt::MessageBox::Warning, 'Wrong data', 'Only hexadecimal values are accepted in this cell').exec
+        ErrorMsg.new.hexa_cell_value
       end
     when 'Description'
       unless item.text.nil?
@@ -87,174 +149,60 @@ class Command_editor < Qt::Widget
         reg_val = Qt::RegExpValidator.new(reg, self)
         if reg_val.validate(item.text, item.text.length) == 0
           item.setText('')
-          Qt::MessageBox.new(Qt::MessageBox::Warning, 'Wrong data', 'Wrong characters in this cell').exec
+          ErrorMsg.new.char_cell_value
         end
       end
     end
   rescue Exception => msg
-    Qt::MessageBox.new(Qt::MessageBox::Critical, 'Critical error', 'Error occured while verifying the command byte column. Consult the logs for more details').exec
-    logger = Logger.new($logFilePath)
-    logger.error msg
+    ErrorMsg.new.unknown(msg)
   end
 
   def is_cmd_size_valid?
-    # SPI
-    if @bus.bus_name == 'SPI'
-      if (@cmd_editor_gui.tbl_bytes.rowCount + @cmd_table.count_total_repetition) > 4000
-			  Qt::MessageBox.new(Qt::MessageBox::Warning, 'SPI command invalid', 'SPI command size is to big (> 4000)').exec
-        return false
-      else
-        return true
-      end
-    # I2C
-    elsif @bus.bus_name == 'I2C'
-      count = 0
-      i = 0
-      while i <= (@cmd_editor_gui.tbl_bytes.rowCount) - 1 do
-        if @cmd_editor_gui.tbl_bytes.item(i, 1).nil?
-          Qt::MessageBox.new(Qt::MessageBox::Critical, 'Command error', 'Payload size invalid or payload size (low) missing').exec
-          return false
-        else
-          lowByte = @cmd_editor_gui.tbl_bytes.item(i, 1).text
-        end
-        if @cmd_editor_gui.tbl_bytes.item(i + 1, 1).nil?
-          Qt::MessageBox.new(Qt::MessageBox::Critical, 'Command error', 'Payload size invalid or payload size (high) missing').exec
-          return false
-        else
-          highByte = @cmd_editor_gui.tbl_bytes.item(i + 1, 1).text
-        end
-        if @cmd_editor_gui.tbl_bytes.item(i + 2, 1).nil?
-          Qt::MessageBox.new(Qt::MessageBox::Critical, 'Command error', 'Payload size invalid or Read / Write address missing').exec
-          return false
-        else
-          commandType = @cmd_editor_gui.tbl_bytes.item(i + 2, 1).text
-        end
-        count = count + (HardsploitAPI.BytesToInt(lowByte.to_i(16), highByte.to_i(16)))
-        if commandType.to_i(16) % 2 == 0 #WRITE
-          i = (i + ((HardsploitAPI.BytesToInt(lowByte.to_i(16), highByte.to_i(16))) + 3))
-        else #READ
-          i = (i + 3)
-        end
-      end
-      if i != @cmd_editor_gui.tbl_bytes.rowCount
-        Qt::MessageBox.new(Qt::MessageBox::Critical, 'Command error', 'I2C command incorrectly formated: The payload size does not match with the row number').exec
-        return false
-      end
-      if count > 2000
-        Qt::MessageBox.new(Qt::MessageBox::Critical, 'I2C command invalid', 'Your payload is too big (> 2000)').exec
-        return false
-      else
-        return true
-      end
-    else
-      return false
-    end
-  rescue Exception => msg
-    Qt::MessageBox.new(Qt::MessageBox::Critical, 'Critical error', 'Error occured while verifying the command size. Consult the logs for more details').exec
-    logger = Logger.new($logFilePath)
-    logger.error msg
-  end
-
-  def feed_i2c_cmd_array(bus_param)
-    if bus_param[:mode] == 'w'
-      @cmd_table.i2c_write_cmd(bus_param[:addr], bus_param[:size].to_i)
-    else
-      @cmd_table.i2c_read_cmd(bus_param[:addr], bus_param[:size].to_i)
-    end
-  end
-
-  def add_cmd
-    if @cmd_table.empty_data_exist? || is_cmd_size_valid? == false
-			return false
-    end
-    if @cmd_editor_gui.lie_name.text.empty? || @cmd_editor_gui.lie_description.text.empty?
-      Qt::MessageBox.new(Qt::MessageBox::Warning, 'Information missing', 'Name or description empty').exec
-      return false
-    end
-    cmd = Cmd.new
-    cmd.cmd_name = @cmd_editor_gui.lie_name.text
-    cmd.cmd_desc = @cmd_editor_gui.lie_description.text
-    cmd.cmd_bus = @bus_id
-    cmd.cmd_chip = @chip_id
-    cmd.save
-    @cmd_editor_gui.tbl_bytes.sortItems(0, Qt::AscendingOrder)
-    @cmd_editor_gui.tbl_bytes.rowCount.times do |i|
-      byte = Byte.new
-      byte.byte_index = i + 1
-      byte.byte_value = @cmd_editor_gui.tbl_bytes.item(i, 1).text
-      if @bus.bus_name == 'SPI'
-        byte.byte_iteration = @cmd_editor_gui.tbl_bytes.item(i, 2).text
-        byte.byte_description = @cmd_editor_gui.tbl_bytes.item(i, 3).text
-      else
-        byte.byte_description = @cmd_editor_gui.tbl_bytes.item(i, 2).text
-      end
-      byte.byte_cmd = Cmd.ids.last
-      byte.save
-    end
-    @parent.feed_cmd_array
-    close
-  rescue Exception => msg
-    Qt::MessageBox.new(Qt::MessageBox::Critical, 'Critical error', 'Error occured while adding the command. Consult the logs for more details').exec
-    logger = Logger.new($logFilePath)
-    logger.error msg
-  end
-
-  def edit_cmd
-    if @cmd_table.empty_data_exist? && !is_cmd_size_valid?
-			return false
-    end
-    if @cmd_editor_gui.lie_name.text.empty? || @cmd_editor_gui.lie_description.text.empty?
-      Qt::MessageBox.new(Qt::MessageBox::Warning, 'Information missing', 'Name or description empty').exec
-      return false
-    end
-    cmd = Cmd.find_by(cmd_name: @cmd_name, cmd_chip: @chip_id)
-    if cmd.cmd_name != @cmd_editor_gui.lie_name.text
-      cmd.update(cmd_name: @cmd_editor_gui.lie_name.text)
-    end
-    if cmd.cmd_desc != @cmd_editor_gui.lie_description.text
-      cmd.update(cmd_desc: @cmd_editor_gui.lie_description.text)
-    end
-    @cmd_editor_gui.tbl_bytes.sortItems(0, Qt::AscendingOrder)
-    bytes = Byte.where(byte_cmd: cmd.cmd_id)
-    bytes.destroy_all
-    @cmd_editor_gui.tbl_bytes.rowCount.times do |i|
-      byte = Byte.new
-      byte.byte_index = i + 1
-      byte.byte_value = @cmd_editor_gui.tbl_bytes.item(i, 1).text
-      if @bus.bus_name == 'SPI'
-        byte.byte_iteration = @cmd_editor_gui.tbl_bytes.item(i, 2).text
-        byte.byte_description = @cmd_editor_gui.tbl_bytes.item(i, 3).text
-      else
-        byte.byte_description = @cmd_editor_gui.tbl_bytes.item(i, 2).text
+    byte_table_size = @view.tbl_bytes.rowCount
+    case @bus_name
+    when 'SPI'
+      cmd_size =  byte_table_size + @cmd_table.count_total_repetition
+      return true if cmd_size < 4000
+      return ErrorMsg.new.spi_cmd_too_long
+    when 'I2C'
+      count = i = 0
+      while i <= byte_table_size - 1 do
+        low_byte     = @view.tbl_bytes.item(i, 1)
+        high_byte    = @view.tbl_bytes.item(i + 1, 1)
+        command_byte = @view.tbl_bytes.item(i + 2, 1)
+        return ErrorMsg.new.lowbyte_missing  if low_byte.nil?
+        return ErrorMsg.new.highbyte_missing if high_byte.nil?
+        return ErrorMsg.new.mode_missing     if command_byte.nil?
+        current_count = HardsploitAPI.BytesToInt(
+          lByte: low_byte.text.to_i(16),
+          hByte: high_byte.text.to_i(16)
+        )
+        count += current_count
+        (command_type.to_i(16) % 2).zero? ? i += current_count + 3 : i += 3
       end
-      byte.byte_cmd = cmd.cmd_id
-      byte.save
+      return ErrorMsg.new.size_neq_row_number unless i == byte_table_size
+      return ErrorMsg.new.i2c_cmd_too_long    if count > 2000
+      return true
     end
-    @parent.feed_cmd_array
-    close
   rescue Exception => msg
-    Qt::MessageBox.new(Qt::MessageBox::Critical, 'Critical error', 'Error occured while editing the command. Consult the logs for more details').exec
-    logger = Logger.new($logFilePath)
-    logger.error msg
+    ErrorMsg.new.unknown(msg)
   end
 
   def feed_editor_form
-    cmd = Cmd.find_by(cmd_name: @cmd_name)
-    @cmd_editor_gui.lie_name.setText(@cmd_name)
-    @cmd_editor_gui.lie_description.setText(cmd.cmd_desc)
-    @cmd_table.fill_byte_table(cmd.byte)
+    cmd = Command.find_by(name: @cmd_name)
+    @view.lie_name.setText(@cmd_name)
+    @view.lie_description.setText(cmd.description)
+    @cmd_table.fill_byte_table(cmd.bytes)
   rescue Exception => msg
-    Qt::MessageBox.new(Qt::MessageBox::Critical, 'Critical error', 'Error occured when loading the command. Consult the logs for more details').exec
-    logger = Logger.new($logFilePath)
-    logger.error msg
+    ErrorMsg.new.unknown(msg)
   end
 
   def add_row
-    if @cmd_editor_gui.lie_text_2_bytes.text.empty?
+    if @view.lie_text_2_bytes.text.empty?
       @cmd_table.add_row
     else
-      @cmd_table.add_text_rows(@cmd_editor_gui.lie_text_2_bytes.text)
-      @cmd_editor_gui.lie_text_2_bytes.setText('')
+      @cmd_table.add_text_rows(@view.lie_text_2_bytes.text)
+      @view.lie_text_2_bytes.setText('')
     end
   end
 

data/lib/class/Command_table.rb

@@ -5,15 +5,12 @@
 #  License URI: http://www.gnu.org/licenses/gpl.txt
 #===================================================
 
-require_relative '../HardsploitAPI/HardsploitAPI'
-
 class Command_table < Qt::Widget
 
-  def initialize(api, cmd_table, bus)
+  def initialize(cmd_table, bus)
     super()
     @cmd_table = cmd_table
     @bus = bus
-    @api = api
     cmd_table.insertColumn(0)
     cmd_table.setHorizontalHeaderItem(0, Qt::TableWidgetItem.new('Order'))
     cmd_table.insertColumn(1)
@@ -30,17 +27,17 @@ class Command_table < Qt::Widget
   def fill_byte_table(byte_list)
     byte_list.to_enum.with_index(0).each do |b, i|
       @cmd_table.insertRow(@cmd_table.rowCount)
-      @cmd_table.setItem(i, 1, Qt::TableWidgetItem.new(b.byte_value))
+      @cmd_table.setItem(i, 1, Qt::TableWidgetItem.new(b.value))
       if @bus == 'SPI'
         item =  Qt::TableWidgetItem.new
-        item.setData(0, Qt::Variant.new(b.byte_iteration))
+        item.setData(0, Qt::Variant.new(b.iteration))
         @cmd_table.setItem(i, 2, item)
-        @cmd_table.setItem(i, 3, Qt::TableWidgetItem.new(b.byte_description))
+        @cmd_table.setItem(i, 3, Qt::TableWidgetItem.new(b.description))
       else
-        @cmd_table.setItem(i, 2, Qt::TableWidgetItem.new(b.byte_description))
+        @cmd_table.setItem(i, 2, Qt::TableWidgetItem.new(b.description))
       end
       item =  Qt::TableWidgetItem.new
-      item.setData(0, Qt::Variant.new(b.byte_index))
+      item.setData(0, Qt::Variant.new(b.index))
       @cmd_table.setItem(i, 0, item)
     end
   end
@@ -62,7 +59,7 @@ class Command_table < Qt::Widget
   end
 
   def add_text_rows(txt)
-    if txt.ascii_only?
+      return ErrorMsg.new.ascii_only unless txt.ascii_only?
       txt.each_byte do |x|
         @cmd_table.insertRow(@cmd_table.rowCount)
         @cmd_table.setItem(@cmd_table.rowCount - 1, 1, Qt::TableWidgetItem.new(x.to_s(16)))
@@ -74,9 +71,6 @@ class Command_table < Qt::Widget
         item.setData(0, Qt::Variant.new(@cmd_table.rowCount))
         @cmd_table.setItem(@cmd_table.rowCount - 1, 0, item)
       end
-    else
-      Qt::MessageBox.new(Qt::MessageBox::Warning, 'String error', 'Only ASCII characters can be specified').exec
-    end
   end
 
   def clone_rows
@@ -102,7 +96,7 @@ class Command_table < Qt::Widget
         end
       else
         unless @cmd_table.item(row, 2).nil?
-          @cmd_table.setItem(@cmd_table.rowCount - 1, 2, Qt::TableWidgetItem.new(@cmd_table.item(row, 3).text))
+          @cmd_table.setItem(@cmd_table.rowCount - 1, 2, Qt::TableWidgetItem.new(@cmd_table.item(row, 2).text))
         end
       end
       unless @cmd_table.item(row, 0).nil?
@@ -129,14 +123,14 @@ class Command_table < Qt::Widget
     # Byte array size
     @cmd_table.setRowCount(3)
     # Size 1
-    @cmd_table.setItem(0, 1, Qt::TableWidgetItem.new(HardsploitAPI.lowByte(cmd_size).to_s(16).upcase))
+    @cmd_table.setItem(0, 1, Qt::TableWidgetItem.new(HardsploitAPI.lowByte(word: cmd_size).to_s(16).upcase))
     @cmd_table.setItem(0, 2, Qt::TableWidgetItem.new('Payload size - low'))
     # Index
     item =  Qt::TableWidgetItem.new
     item.setData(0, Qt::Variant.new(1))
     @cmd_table.setItem(0, 0, item)
     # Size 2
-    @cmd_table.setItem(1, 1, Qt::TableWidgetItem.new(HardsploitAPI.highByte(cmd_size).to_s(16).upcase))
+    @cmd_table.setItem(1, 1, Qt::TableWidgetItem.new(HardsploitAPI.highByte(word: cmd_size).to_s(16).upcase))
     @cmd_table.setItem(1, 2, Qt::TableWidgetItem.new('Payload size - high'))
     # Index
     item =  Qt::TableWidgetItem.new
@@ -156,7 +150,7 @@ class Command_table < Qt::Widget
     @cmd_table.setRowCount(3 + cmd_size)
     # Payload size low
     # -byte
-    itemLB1 = Qt::TableWidgetItem.new(HardsploitAPI.lowByte(cmd_size).to_s(16).upcase)
+    itemLB1 = Qt::TableWidgetItem.new(HardsploitAPI.lowByte(word: cmd_size).to_s(16).upcase)
     @cmd_table.setItem(0, 1, itemLB1)
     # -description
     itemLB3 = Qt::TableWidgetItem.new('Payload size - low')
@@ -167,7 +161,7 @@ class Command_table < Qt::Widget
     @cmd_table.setItem(0, 0, itemLB0)
     # Payload size high
     # -byte
-    itemHB1 = Qt::TableWidgetItem.new(HardsploitAPI.highByte(cmd_size).to_s(16).upcase)
+    itemHB1 = Qt::TableWidgetItem.new(HardsploitAPI.highByte(word: cmd_size).to_s(16).upcase)
     @cmd_table.setItem(1, 1, itemHB1)
     # -description
     itemHB3 = Qt::TableWidgetItem.new('Payload size - high')
@@ -193,7 +187,7 @@ class Command_table < Qt::Widget
       @cmd_table.setItem(i, 2, Qt::TableWidgetItem.new('Payload byte'))
       # Index
       item =  Qt::TableWidgetItem.new
-      item.setData(0, Qt::Variant.new((i + 1)))
+      item.setData(0, Qt::Variant.new(i.next))
       @cmd_table.setItem(i, 0, item)
     end
   end
@@ -205,11 +199,11 @@ class Command_table < Qt::Widget
   end
 
   def count_total_repetition
-	  repetitionValue = 0
+	  repetition_value = 0
 	  @cmd_table.rowCount.times do |i|
-			repetitionValue += @cmd_table.item(i, 2).text.to_i
+			repetition_value += @cmd_table.item(i, 2).text.to_i
 		end
-		return repetitionValue
+		return repetition_value
 	end
 
   def empty_data_exist?