Make OptInteger handle value 0 and hex value. (#613)

routersploit/core/exploit/option.py

@@ -20,7 +20,7 @@ class Option(object):
         except ValueError:
             raise OptionValidationError("Invalid value. Cannot cast '{}' to boolean.".format(advanced))
 
-        if default:
+        if default or default == 0:
             self.__set__("", default)
         else:
             self.display_value = ""
@@ -93,6 +93,9 @@ class OptInteger(Option):
             self.display_value = str(value)
             self.value = int(value)
         except ValueError:
+            try:
+                self.value = int(value, 16)
+            except ValueError:
                 raise OptionValidationError("Invalid option. Cannot cast '{}' to integer.".format(value))
 
 

tests/core/test_option.py

@@ -118,6 +118,18 @@ def test_opt_integer():
     assert opt_integer.value == 9999999
     assert opt_integer.__get__(None, None) == 9999999
 
+    # Test OptInteger setting to 0
+    opt_integer = OptInteger(0, "Test Integer with 0")
+    assert opt_integer.display_value == "0"
+    assert opt_integer.value == 0
+    assert opt_integer.__get__(None, None) == 0
+
+    # Test OptInteger setting to 0x100
+    opt_integer.__set__(None, "0x100")
+    assert opt_integer.display_value == "0x100"
+    assert opt_integer.value == 0x100
+    assert opt_integer.__get__(None, None) == 0x100
+
     # Test OptInteget setting to invalid value
     try:
         opt_integer.__set__(None, "Invalid Value")