MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: reverse matching condition

pull/61/head
Sami Mokaddem 2018-05-09 13:31:49 +02:00
parent 069a6d13b3
commit c4c2555739
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helpers/geo_helper.py
View File

@ -101,7 +101,7 @@ class Geo_helper:
ordDic['categ'] = categ ordDic['categ'] = categ
ordDic['value'] = supposed_ip ordDic['value'] = supposed_ip
coord_list = [coord['lat'], coord['lon']] coord_list = [coord['lat'], coord['lon']]
if self.coordinate_list_valid(coord_list): if not self.coordinate_list_valid(coord_list):
raise InvalidCoordinate("Coordinate do not match EPSG:900913 / EPSG:3785 / OSGEO:41001") raise InvalidCoordinate("Coordinate do not match EPSG:900913 / EPSG:3785 / OSGEO:41001")
self.push_to_redis_zset(self.keyCategCoord, json.dumps(ordDic)) self.push_to_redis_zset(self.keyCategCoord, json.dumps(ordDic))
self.push_to_redis_zset(self.keyCategCountry, rep['full_rep'].country.iso_code) self.push_to_redis_zset(self.keyCategCountry, rep['full_rep'].country.iso_code)
@ -146,7 +146,7 @@ class Geo_helper:
ordDic['lat'] = coord_dic['lat'] ordDic['lat'] = coord_dic['lat']
ordDic['lon'] = coord_dic['lon'] ordDic['lon'] = coord_dic['lon']
coord_list = [coord['lat'], coord['long']] coord_list = [coord['lat'], coord['long']]
if self.coordinate_list_valid(coord_list): if not self.coordinate_list_valid(coord_list):
raise InvalidCoordinate("Coordinate do not match EPSG:900913 / EPSG:3785 / OSGEO:41001") raise InvalidCoordinate("Coordinate do not match EPSG:900913 / EPSG:3785 / OSGEO:41001")
self.push_to_redis_zset(self.keyCategCoord, json.dumps(ordDic)) self.push_to_redis_zset(self.keyCategCoord, json.dumps(ordDic))
self.push_to_redis_zset(self.keyCategCountry, country_code) self.push_to_redis_zset(self.keyCategCountry, country_code)
@ -167,6 +167,8 @@ class Geo_helper:
self.logger.info('Published: {}'.format(json.dumps(to_send))) self.logger.info('Published: {}'.format(json.dumps(to_send)))
except phonenumbers.NumberParseException: except phonenumbers.NumberParseException:
self.logger.warning("Can't resolve phone number country") self.logger.warning("Can't resolve phone number country")
except InvalidCoordinate:
self.logger.warning("Coordinate do not follow redis specification")
''' UTIL ''' ''' UTIL '''
def push_to_redis_geo(self, keyCateg, lon, lat, content): def push_to_redis_geo(self, keyCateg, lon, lat, content):