tkcert / pffocus Goto Github PK

$ ./format.py -i ~/Desktop/config.xml -f md -o ~/Desktop/config.md
\u268b Parsing "C:/Users/x/Desktop/config.xml" ...
Traceback (most recent call last):
  File "./format.py", line 73, in <module>
    main()
  File "./format.py", line 66, in main
    step_parse(args, doc)
  File "./format.py", line 39, in step_parse
    parse_pfsense(args.input_path, doc)
  File "C:\Users\x\Projects\pfFocus\parse.py", line 75, in parse_pfsense
    parse(input_file, handler)
  File "C:\Users\x\AppData\Local\Programs\Python\Python36-32\lib\site-packages\defusedxml\sax.py", line 26, in parse
    parser.parse(source)
  File "C:\Users\x\AppData\Local\Programs\Python\Python36-32\lib\xml\sax\expatreader.py", line 111, in parse
    xmlreader.IncrementalParser.parse(self, source)
  File "C:\Users\x\AppData\Local\Programs\Python\Python36-32\lib\xml\sax\xmlreader.py", line 125, in parse
    self.feed(buffer)
  File "C:\Users\x\AppData\Local\Programs\Python\Python36-32\lib\xml\sax\expatreader.py", line 217, in feed
    self._parser.Parse(data, isFinal)
  File "..\Modules\pyexpat.c", line 282, in CharacterData
  File "C:\Users\x\Projects\pfFocus\parse.py", line 50, in characters
    cur(stack_chars.getvalue())
  File "C:\Users\x\Projects\pfFocus\pfsense.py", line 51, in __call__
    self.integer = int(content)
ValueError: invalid literal for int() with base 10: 'Photon_External'

		<rule>
			<source>
				<any></any>
			</source>
			<destination>
				<network>wanip</network>
				<port>Photon_External</port>

  File "./format.py", line 73, in <module>
    main()
  File "./format.py", line 68, in main
    step_stdout(args, doc, output_func)
  File "./format.py", line 48, in step_stdout
    output_func(doc, output_file)
  File "/home/rrauenza/src/pfFocus/markdown.py", line 148, in output_markdown
    output_markdown_table(stream, ('Disabled', 'Interface', 'Source', 'Destination', 'Protocol', 'Target', 'Local port', 'Description'), rules)
  File "/home/rrauenza/src/pfFocus/markdown.py", line 73, in output_markdown_table
    stream.write(" | ".join(map(format_markdown_cell, row)))
  File "/home/rrauenza/src/pfFocus/markdown.py", line 36, in format_markdown_cell
    if cell is None or (isinstance(cell, PfSenseNode) and cell.data is None):
  File "/home/rrauenza/src/pfFocus/pfsense.py", line 16, in __getattr__
    return super().__getattribute__(name)
  File "/home/rrauenza/src/pfFocus/util.py", line 13, in data
    data[key] = value.data
  File "/home/rrauenza/src/pfFocus/pfsense.py", line 16, in __getattr__
    return super().__getattribute__(name)
  File "/home/rrauenza/src/pfFocus/pfsense.py", line 86, in data
    for alias in self.rootdoc.pfsense.aliases.alias:
  File "/home/rrauenza/src/pfFocus/pfsense.py", line 16, in __getattr__
    return super().__getattribute__(name)
AttributeError: 'PfSenseAliases' object has no attribute 'alias'

--- a/pfsense.py
+++ b/pfsense.py
@@ -11,8 +11,12 @@ class PfSenseNode(DataNode):
         self._parent = parent
 
     def __getattr__(self, name):
         # This trick hides PyLint error messages...
-        return super().__getattribute__(name)
+         This trick hides PyLint error messages...
+        try:
+            return super().__getattribute__(name)
+        except AttributeError:
+            if name == 'alias':
+                return None

@@ -79,9 +83,12 @@ class PfSenseAliasString(PfSenseString):
     @property
     def data(self):
         data = super().data
-        for alias in self.rootdoc.pfsense.aliases.alias:
-            if alias.name.string == data:
-                return {'alias': alias.data}
+        try:
+            for alias in self.rootdoc.pfsense.aliases.alias:
+                if alias.name.string == data:
+                    return {'alias': alias.data}
+        except AttributeError:
+            pass
         return data
 
 class PfSensePortString(PfSenseAliasString):
@@ -136,9 +143,12 @@ class PfSenseRuleAlias(PfSenseString):
             if interface_name == alias_name:
                 interface_data['name'] = data
                 return {'interface': interface_data}
-        for alias in self.rootdoc.pfsense.aliases.alias:
-            if alias.name.string == data:
-                return {'alias': alias.data}
+        try:
+            for alias in self.rootdoc.pfsense.aliases.alias:
+                if alias.name.string == data:
+                    return {'alias': alias.data}
+        except AttributeError:
+            pass
         return data