(ids) refactor source url processing

src/opnsense/scripts/suricata/lib/metadata.py

@@ -61,6 +61,12 @@ class Metadata(object):
                         metadata_record = dict()
                         metadata_record['source'] = src_location.attrib
                         metadata_record['filename'] = rule_filename.text.strip()
+                        if 'url' in rule_filename.attrib:
+                            metadata_record['url'] = (rule_filename.attrib['url'])
+                        else:
+                            metadata_record['url'] = ('%s/%s' % (metadata_record['source']['url'],
+                                                                 metadata_record['filename']))
+
                         if 'prefix' in src_location.attrib:
                             description_prefix = "%s/" % src_location.attrib['prefix']
                         else:

src/opnsense/scripts/suricata/rule-updater.py

@@ -78,5 +78,4 @@ if __name__ == '__main__':
                         pass
                 else:
                     input_filter = enabled_rulefiles[rule['filename']]['filter']
-                    url = ('%s/%s' % (rule['source']['url'], rule['filename']))
-                    dl.download(proto=download_proto, url=url, input_filter=input_filter)
+                    dl.download(proto=download_proto, url=rule['url'], input_filter=input_filter)