RepoMirrors/setools
1
0
Fork 0
mirror of https://github.com/SELinuxProject/setools synced 2025-02-22 15:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

InfoFlowAnalysis: convert output to namedtuples

Browse Source
This commit is contained in:
Chris PeBenito 2015-04-26 10:41:03 -04:00
parent d23bdd4895
commit da8b151d5c
3 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
seinfoflow
View File

@ -90,10 +90,10 @@ try:
flownum = 0 flownum = 0
for flownum, path in enumerate(paths, start=1): for flownum, path in enumerate(paths, start=1):
print("Flow {0}:".format(flownum)) print("Flow {0}:".format(flownum))
for stepnum, (src, tgt, rules) in enumerate(path, start=1): for stepnum, step in enumerate(path, start=1):
print(" Step {0}: {1} -> {2}".format(stepnum, src, tgt)) print(" Step {0}: {1} -> {2}".format(stepnum, step.source, step.target))
for rule in sorted(rules): for rule in sorted(step.rules):
print(" ", rule) print(" ", rule)
print() print()
@ -105,9 +105,9 @@ try:
else: # single direct info flow else: # single direct info flow
flownum = 0 flownum = 0
for flownum, (src, tgt, rules) in enumerate(g.infoflows(args.source), start=1): for flownum, flow in enumerate(g.infoflows(args.source), start=1):
print("Flow {0}: {1} -> {2}".format(flownum, src, tgt)) print("Flow {0}: {1} -> {2}".format(flownum, flow.source, flow.target))
for rule in sorted(rules): for rule in sorted(flow.rules):
print(" ", rule) print(" ", rule)
print() print()

12
setools/infoflow.py
View File

@ -18,13 +18,19 @@
# #
import itertools import itertools
import logging import logging
from collections import namedtuple
import networkx as nx import networkx as nx
from networkx.exception import NetworkXError, NetworkXNoPath from networkx.exception import NetworkXError, NetworkXNoPath
__all__ = ['InfoFlowAnalysis'] __all__ = ['InfoFlowAnalysis']
# Return values for the analysis
# are in the following tuple format:
step_output = namedtuple("step", ["source",
"target",
"rules"])
class InfoFlowAnalysis(object): class InfoFlowAnalysis(object):
@ -246,7 +252,7 @@ class InfoFlowAnalysis(object):
try: try:
for source, target in flows: for source, target in flows:
edge = Edge(self.subG, source, target) edge = Edge(self.subG, source, target)
yield source, target, edge.rules yield step_output(source, target, edge.rules)
except NetworkXError: except NetworkXError:
# NetworkXError: the type is valid but not in graph, e.g. # NetworkXError: the type is valid but not in graph, e.g.
# excluded or disconnected due to min weight # excluded or disconnected due to min weight
@ -284,7 +290,7 @@ class InfoFlowAnalysis(object):
""" """
for s in range(1, len(path)): for s in range(1, len(path)):
edge = Edge(self.subG, path[s - 1], path[s]) edge = Edge(self.subG, path[s - 1], path[s])
yield edge.source, edge.target, edge.rules yield step_output(edge.source, edge.target, edge.rules)
# #
# #

92
tests/infoflow.py
View File

@ -208,20 +208,20 @@ class InfoFlowAnalysisTest(mixins.ValidateRule, unittest.TestCase):
steps = list(paths[0]) steps = list(paths[0])
self.assertEqual(2, len(steps)) self.assertEqual(2, len(steps))
s, t, rules = steps[0] step = steps[0]
self.assertIsInstance(s, Type) self.assertIsInstance(step.source, Type)
self.assertIsInstance(t, Type) self.assertIsInstance(step.target, Type)
self.assertEqual(s, "node1") self.assertEqual(step.source, "node1")
self.assertEqual(t, "node2") self.assertEqual(step.target, "node2")
for r in rules: for r in steps[0].rules:
self.assertEqual("allow", r.ruletype) self.assertEqual("allow", r.ruletype)
s, t, rules = steps[1] step = steps[1]
self.assertIsInstance(s, Type) self.assertIsInstance(step.source, Type)
self.assertIsInstance(t, Type) self.assertIsInstance(step.target, Type)
self.assertEqual(s, "node2") self.assertEqual(step.source, "node2")
self.assertEqual(t, "node4") self.assertEqual(step.target, "node4")
for r in rules: for r in step.rules:
self.assertEqual("allow", r.ruletype) self.assertEqual("allow", r.ruletype)
def test_301_all_shortest_paths(self): def test_301_all_shortest_paths(self):
@ -235,20 +235,20 @@ class InfoFlowAnalysisTest(mixins.ValidateRule, unittest.TestCase):
steps = list(paths[0]) steps = list(paths[0])
self.assertEqual(2, len(steps)) self.assertEqual(2, len(steps))
s, t, rules = steps[0] step = steps[0]
self.assertIsInstance(s, Type) self.assertIsInstance(step.source, Type)
self.assertIsInstance(t, Type) self.assertIsInstance(step.target, Type)
self.assertEqual(s, "node1") self.assertEqual(step.source, "node1")
self.assertEqual(t, "node2") self.assertEqual(step.target, "node2")
for r in rules: for r in steps[0].rules:
self.assertEqual("allow", r.ruletype) self.assertEqual("allow", r.ruletype)
s, t, rules = steps[1] step = steps[1]
self.assertIsInstance(s, Type) self.assertIsInstance(step.source, Type)
self.assertIsInstance(t, Type) self.assertIsInstance(step.target, Type)
self.assertEqual(s, "node2") self.assertEqual(step.source, "node2")
self.assertEqual(t, "node4") self.assertEqual(step.target, "node4")
for r in rules: for r in step.rules:
self.assertEqual("allow", r.ruletype) self.assertEqual("allow", r.ruletype)
def test_302_shortest_path(self): def test_302_shortest_path(self):
@ -262,20 +262,20 @@ class InfoFlowAnalysisTest(mixins.ValidateRule, unittest.TestCase):
steps = list(paths[0]) steps = list(paths[0])
self.assertEqual(2, len(steps)) self.assertEqual(2, len(steps))
s, t, rules = steps[0] step = steps[0]
self.assertIsInstance(s, Type) self.assertIsInstance(step.source, Type)
self.assertIsInstance(t, Type) self.assertIsInstance(step.target, Type)
self.assertEqual(s, "node1") self.assertEqual(step.source, "node1")
self.assertEqual(t, "node2") self.assertEqual(step.target, "node2")
for r in rules: for r in steps[0].rules:
self.assertEqual("allow", r.ruletype) self.assertEqual("allow", r.ruletype)
s, t, rules = steps[1] step = steps[1]
self.assertIsInstance(s, Type) self.assertIsInstance(step.source, Type)
self.assertIsInstance(t, Type) self.assertIsInstance(step.target, Type)
self.assertEqual(s, "node2") self.assertEqual(step.source, "node2")
self.assertEqual(t, "node4") self.assertEqual(step.target, "node4")
for r in rules: for r in step.rules:
self.assertEqual("allow", r.ruletype) self.assertEqual("allow", r.ruletype)
def test_303_infoflows_out(self): def test_303_infoflows_out(self):
@ -283,11 +283,11 @@ class InfoFlowAnalysisTest(mixins.ValidateRule, unittest.TestCase):
self.a.set_exclude(None) self.a.set_exclude(None)
self.a.set_min_weight(1) self.a.set_min_weight(1)
for s, t, rules in self.a.infoflows("node6"): for flow in self.a.infoflows("node6"):
self.assertIsInstance(s, Type) self.assertIsInstance(flow.source, Type)
self.assertIsInstance(t, Type) self.assertIsInstance(flow.target, Type)
self.assertEqual(s, "node6") self.assertEqual(flow.source, "node6")
for r in rules: for r in flow.rules:
self.assertEqual("allow", r.ruletype) self.assertEqual("allow", r.ruletype)
def test_304_infoflows_in(self): def test_304_infoflows_in(self):
@ -295,11 +295,11 @@ class InfoFlowAnalysisTest(mixins.ValidateRule, unittest.TestCase):
self.a.set_exclude(None) self.a.set_exclude(None)
self.a.set_min_weight(1) self.a.set_min_weight(1)
for s, t, rules in self.a.infoflows("node8", out=False): for flow in self.a.infoflows("node8", out=False):
self.assertIsInstance(s, Type) self.assertIsInstance(flow.source, Type)
self.assertIsInstance(t, Type) self.assertIsInstance(flow.target, Type)
self.assertEqual(t, "node8") self.assertEqual(flow.target, "node8")
for r in rules: for r in flow.rules:
self.assertEqual("allow", r.ruletype) self.assertEqual("allow", r.ruletype)
def test_900_set_exclude_invalid_type(self): def test_900_set_exclude_invalid_type(self):