lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

firewall/aliases, cleanup for https://github.com/opnsense/core/issues/1971

Browse Source
This commit is contained in:
Ad Schellevis 2017-12-11 13:28:50 +01:00
parent 87f450bc62
commit aafa261e52
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/opnsense/scripts/filter/lib/alias.py
View File

@ -220,13 +220,7 @@ class Alias(object):
if self.expired() or self.changed():
with open(self._filename_alias_content, 'w') as f_out:
for item in self.items():
address_parser = None
if self._type in ['host', 'network']:
address_parser = self._parse_address
elif self._type in ['url', 'urltable']:
address_parser = self._fetch_url
elif self._type == 'geoip':
address_parser = self._fetch_geo
address_parser = self.get_parser()
if address_parser:
for address in address_parser(item):
if address not in self._resolve_content:
@ -243,6 +237,19 @@ class Alias(object):
# return the addresses and networks of this alias
return self._resolve_content
def get_parser(self):
""" fetch address parser to use, None if alias type is not handled here
:return: function or None
"""
if self._type in ['host', 'network']:
return self._parse_address
elif self._type in ['url', 'urltable']:
return self._fetch_url
elif self._type == 'geoip':
return self._fetch_geo
else:
return None
def get_type(self):
""" get type of alias
:return: string