You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spot.apache.org by ev...@apache.org on 2017/03/29 16:51:59 UTC
[35/50] [abbrv] incubator-spot git commit: Fixed issue with iana
codes resolution
Fixed issue with iana codes resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/7693ad10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/7693ad10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/7693ad10
Branch: refs/heads/SPOT-35_graphql_api
Commit: 7693ad10ca23ad3c561139aaf1e1ee9ad2cb92a5
Parents: 4734f4f
Author: LedaLima <le...@apache.org>
Authored: Tue Mar 7 12:05:03 2017 -0600
Committer: Diego Ortiz Huerta <di...@intel.com>
Committed: Wed Mar 15 11:49:48 2017 -0700
----------------------------------------------------------------------
spot-oa/oa/components/iana/iana_transform.py | 8 ++++----
spot-oa/oa/components/reputation/fb/fb.py | 2 +-
spot-oa/oa/dns/dns_oa.py | 9 +++++----
spot-oa/oa/proxy/proxy_oa.py | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/7693ad10/spot-oa/oa/components/iana/iana_transform.py
----------------------------------------------------------------------
diff --git a/spot-oa/oa/components/iana/iana_transform.py b/spot-oa/oa/components/iana/iana_transform.py
index 97a1c28..34730bd 100644
--- a/spot-oa/oa/components/iana/iana_transform.py
+++ b/spot-oa/oa/components/iana/iana_transform.py
@@ -82,20 +82,20 @@ class IanaTransform(object):
if key in self._qclass_dict:
return self._qclass_dict[key]
else:
- return key
+ return ""
if column == COL_QTYPE:
if key in self._qtype_dict:
return self._qtype_dict[key]
else:
- return key
+ return ""
if column == COL_RCODE:
if key in self._rcode_dict:
return self._rcode_dict[key]
else:
- return key
+ return ""
if column == COL_PRESP:
if key in self._http_rcode_dict:
return self._http_rcode_dict[key]
else:
- return key
+ return ""
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/7693ad10/spot-oa/oa/components/reputation/fb/fb.py
----------------------------------------------------------------------
diff --git a/spot-oa/oa/components/reputation/fb/fb.py b/spot-oa/oa/components/reputation/fb/fb.py
index e9d997c..b33ec7d 100644
--- a/spot-oa/oa/components/reputation/fb/fb.py
+++ b/spot-oa/oa/components/reputation/fb/fb.py
@@ -92,7 +92,7 @@ class Reputation(object):
str_response = urllib2.urlopen(request).read()
response = json.loads(str_response)
except urllib2.HTTPError as e:
- self._logger.error("Error calling ThreatExchange in module fb: " + e.message)
+ self._logger.info("Error calling ThreatExchange in module fb: " + e.message)
reputation_dict[name] = self._get_reputation_label('UNKNOWN')
return reputation_dict
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/7693ad10/spot-oa/oa/dns/dns_oa.py
----------------------------------------------------------------------
diff --git a/spot-oa/oa/dns/dns_oa.py b/spot-oa/oa/dns/dns_oa.py
index 1117583..a154c35 100644
--- a/spot-oa/oa/dns/dns_oa.py
+++ b/spot-oa/oa/dns/dns_oa.py
@@ -180,6 +180,7 @@ class OA(object):
dns_scores_final = self._move_time_stamp(self._dns_scores)
self._dns_scores = dns_scores_final
+
for row in dns_scores_final:
value_string += str(tuple(Util.cast_val(item) for item in row)) + ","
@@ -243,16 +244,15 @@ class OA(object):
def _add_iana(self):
-
iana_conf_file = "{0}/components/iana/iana_config.json".format(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
- if os.path.isfile(iana_conf_file):
+ if os.path.isfile(iana_conf_file):
iana_config = json.loads(open(iana_conf_file).read())
dns_iana = IanaTransform(iana_config["IANA"])
dns_qry_class_index = self._conf["dns_results_fields"]["dns_qry_class"]
dns_qry_type_index = self._conf["dns_results_fields"]["dns_qry_type"]
dns_qry_rcode_index = self._conf["dns_results_fields"]["dns_qry_rcode"]
- self._dns_scores = [ conn + [ str(dns_iana.get_name(conn[dns_qry_class_index],"dns_qry_class"))] + [str(dns_iana.get_name(conn[dns_qry_type_index],"dns_qry_type"))] + [str(dns_iana.get_name(conn[dns_qry_rcode_index],"dns_qry_rcode"))] for conn in self._dns_scores ]
+ self._dns_scores = [ conn + [ dns_iana.get_name(conn[dns_qry_class_index],"dns_qry_class")] + [dns_iana.get_name(conn[dns_qry_type_index],"dns_qry_type")] + [dns_iana.get_name(conn[dns_qry_rcode_index],"dns_qry_rcode")] for conn in self._dns_scores ]
else:
self._dns_scores = [ conn + ["","",""] for conn in self._dns_scores ]
@@ -307,6 +307,7 @@ class OA(object):
dns_qry_name = conn[self._conf["dns_score_fields"]["dns_qry_name"]]
self._get_dns_details(dns_qry_name,yr,mn,dy,hh,dns_iana)
+
def _get_dns_details(self,dns_qry_name,year,month,day,hh,dns_iana):
value_string = ""
query_to_load =("""
@@ -317,7 +318,7 @@ class OA(object):
try:
dns_details = impala.execute_query(query_to_load)
except:
- self._logger.error("ERROR. Details couldn't be retreived for {0}, skipping this step".format(dns_qry_name))
+ self._logger.info("WARNING. Details couldn't be retreived for {0}, skipping this step".format(dns_qry_name))
else:
# add IANA to results.
update_rows = []
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/7693ad10/spot-oa/oa/proxy/proxy_oa.py
----------------------------------------------------------------------
diff --git a/spot-oa/oa/proxy/proxy_oa.py b/spot-oa/oa/proxy/proxy_oa.py
index ea46114..07313eb 100644
--- a/spot-oa/oa/proxy/proxy_oa.py
+++ b/spot-oa/oa/proxy/proxy_oa.py
@@ -231,7 +231,7 @@ class OA(object):
iana_config = json.loads(open(iana_conf_file).read())
proxy_iana = IanaTransform(iana_config["IANA"])
proxy_rcode_index = self._conf["proxy_score_fields"]["respcode"]
- self._proxy_scores = [ conn + [str(proxy_iana.get_name(conn[proxy_rcode_index],"proxy_http_rcode"))] for conn in self._proxy_scores ]
+ self._proxy_scores = [ conn + [proxy_iana.get_name(conn[proxy_rcode_index],"proxy_http_rcode")] for conn in self._proxy_scores ]
else:
self._proxy_scores = [ conn + [""] for conn in self._proxy_scores ]