Skip to content
This repository was archived by the owner on Sep 17, 2021. It is now read-only.

Fixing two policy diff cases. #453

Merged
scriptsrc merged 1 commit into from
Nov 21, 2016
Merged

Fixing two policy diff cases. #453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions security_monkey/common/PolicyDiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def diff_dict(dicta, dictb, indentation):
for keya in dicta.keys():
if not keya in dictb:
brackets = get_brackets(dicta[keya])
if type(dicta[keya]) in [str, unicode, int, float, bool, None]:
if type(dicta[keya]) in [str, unicode, int, float, bool, type(None)]:
retstr += added("{4}\"{0}\": {2}{1}{3},".format(keya, print_item(dicta[keya], 'added', indentation + 1), brackets['open'], brackets['close'], i(indentation)))
if type(dicta[keya]) in [list, dict]:
retstr += added("{4}\"{0}\": {2}<br/>\n{1}{4}{3},".format(keya, print_item(dicta[keya], 'added', indentation + 1), brackets['open'], brackets['close'], i(indentation)))
Expand All @@ -170,7 +170,7 @@ def diff_dict(dicta, dictb, indentation):
for keyb in dictb.keys():
if not keyb in dicta:
brackets = get_brackets(dictb[keyb])
if type(dictb[keyb]) in [str, unicode, int, float, bool, None]:
if type(dictb[keyb]) in [str, unicode, int, float, bool, type(None)]:
retstr += deleted("{4}\"{0}\": {2}{1}{3},".format(keyb, print_item(dictb[keyb], 'deleted', indentation + 1), brackets['open'], brackets['close'], i(indentation)))
if type(dictb[keyb]) in [list, dict]:
retstr += deleted("{4}\"{0}\": {2}<br/>\n{1}{4}{3},".format(keyb, print_item(dictb[keyb], 'deleted', indentation + 1), brackets['open'], brackets['close'], i(indentation)))
Expand Down Expand Up @@ -380,23 +380,17 @@ def __init__(self, new_policy, old_policy):
except:
print "Could not read policy in as json. Type: {} Policy: {}".format(type(new_policy), new_policy)
self._new_policy = new_policy
else:
self._new_policy = json.loads(json.dumps(new_policy))

if isinstance(old_policy, basestring):
try:
self._old_policy = json.loads(old_policy)
except:
print "Could not read policy in as json. Type: {} Policy: {}".format(type(old_policy), old_policy)
self._old_policy = old_policy

if type(new_policy) is list or isinstance(new_policy, dict):
self._new_policy = new_policy
if type(self._new_policy) is collections.defaultdict:
self._new_policy = dict(self._new_policy)

if type(old_policy) is list or isinstance(old_policy, dict):
self._old_policy = old_policy
if type(self._old_policy) is collections.defaultdict:
self._old_policy = dict(self._old_policy)
else:
self._old_policy = json.loads(json.dumps(old_policy))

if self._old_policy is None or self._new_policy is None:
raise ValueError("PolicyDiff could not process old policy or new policy or both.")
Expand All @@ -422,7 +416,7 @@ def produceDiffHTML(self):

brackets = get_brackets(self._new_policy)

if type(self._new_policy) is dict or type(self._new_policy) is collections.OrderedDict:
if type(self._new_policy) is dict:
inner_html = diff_dict(self._new_policy, self._old_policy, 1)
elif type(self._new_policy) is list:
inner_html = diff_list(self._new_policy, self._old_policy, 1)
Expand Down