Send the VTs by chunk as response for get_vts #215
Conversation
Since the VTs are not in the ospd cache anymore, the are get from a a generator. The generator must be implemented in the wrapper and should return a single vt dictionary to be converted in xml format and to be sent to the client. Therefore, get_vt_xml() does not receive a vt id anymore, but the vt dictionary.
There was a problem hiding this comment.
Looks good!
Currently - because I just had such an issue in gvm-libs - i am thinking about escaping our xml element in the xmlhelper class. I know we didn't do that in master too and currently we are only passing correct element names but maybe it is a good idea to already support this to always create valid xml.
ospd/ospd.py
Outdated
|
|
||
| responses.append(vts_xml) | ||
| for vt in self.get_vt_generator(): |
There was a problem hiding this comment.
Personally I would call this iterator because a generator is a special (the most common type) iterator.
| for vt in self.get_vt_generator(): | |
| for vt in self.get_vt_iterator(): |
There was a problem hiding this comment.
Done. Also, I implemented the iterator in the class, in case it was not implemented in the wrapper, and it still can get the VTs in case there is a vts dictionary already loaded.
Codecov Report
@@ Coverage Diff @@
## ospd-2.0 #215 +/- ##
============================================
- Coverage 68.22% 68.07% -0.16%
============================================
Files 12 12
Lines 1835 1873 +38
============================================
+ Hits 1252 1275 +23
- Misses 583 598 +15
Continue to review full report at Codecov.
|
Rename the generator to get_vt_iterator() The iterator get the vts from the dictionary, if no get_vt_iterator() was implemented in the wrapper.
I agree with that, but I would like to do it with a different PR. |
Of course! |
ospd/ospd.py
Outdated
|
|
||
| responses.append(vts_xml) | ||
| for vt in self.get_vt_iterator(): | ||
| if list(vt.keys())[0] not in filtered_vts: |
There was a problem hiding this comment.
This doesn't look got to me. I am really nor sure what this is supposed to do.
If I understand the code correctly it returns the first key of a dict as the vt_id which wont work for Python 3.5 if the dict contains several keys.
It would be better to expect a specific shape of a dict always having a vt_id key like {'vt_id': ..., }
ospd/ospd.py
Outdated
| return Element('vt') | ||
|
|
||
| vt = self.vts.get(vt_id) | ||
|
|
||
| vt_id = list(single_vt.keys())[0] |
There was a problem hiding this comment.
Same as above this isn't readable and confused me.
| @@ -1466,16 +1476,19 @@ def get_severities_vt_as_xml_str( | |||
| """ | |||
| return '' | |||
|
|
|||
| def get_vt_xml(self, vt_id): | |||
| def get_vt_iterator(self): | |||
| for vt_id, val in self.vts.items(): | |||
There was a problem hiding this comment.
Technically it would also be possible to just use
return self.vts.items()or
return iter(self.vts.items())here
Send the VTs by chunk as response for get_vts
Since the VTs are not in the ospd cache anymore, they are get from a a generator to be sent to the client.
The generator must be implemented in the wrapper and should return a single vt dictionary to be converted in xml format and to be sent to the client.
Therefore, get_vt_xml() does not receive a vt id anymore, but the vt dictionary.