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

apol: more logging for the status bar

Browse Source
This commit is contained in:
Chris PeBenito 2016-03-07 13:21:36 -05:00
parent 3f4630c6f9
commit d268e7e7f7
6 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
setoolsgui/apol/dta.py
View File

@ -146,7 +146,8 @@ class DomainTransitionAnalysisTab(SEToolsWidget, QScrollArea):
# Source criteria
#
def set_source_error(self, error_text):
self.source.setToolTip(error_text)
self.log.error("Source domain error: {0}".format(error_text))
self.source.setToolTip("Error: {0}".format(error_text))
self.source.setPalette(self.error_palette)
def clear_source_error(self):
@ -162,13 +163,14 @@ class DomainTransitionAnalysisTab(SEToolsWidget, QScrollArea):
else:
self.query.source = None
except Exception as ex:
self.set_source_error("Error: " + str(ex))
self.set_source_error(ex)
#
# Target criteria
#
def set_target_error(self, error_text):
self.target.setToolTip(error_text)
self.log.error("Target domain error: {0}".format(error_text))
self.target.setToolTip("Error: {0}".format(error_text))
self.target.setPalette(self.error_palette)
def clear_target_error(self):
@ -184,7 +186,7 @@ class DomainTransitionAnalysisTab(SEToolsWidget, QScrollArea):
else:
self.query.target = None
except Exception as ex:
self.set_target_error("Error: " + str(ex))
self.set_target_error(ex)
#
# Options
@ -204,11 +206,11 @@ class DomainTransitionAnalysisTab(SEToolsWidget, QScrollArea):
# right now there is only one button.
fail = False
if self.source.isEnabled() and not self.query.source:
self.set_source_error("Error: a source domain is required")
self.set_source_error("A source domain is required")
fail = True
if self.target.isEnabled() and not self.query.target:
self.set_target_error("Error: a target domain is required.")
self.set_target_error("A target domain is required.")
fail = True
if fail:

14
setoolsgui/apol/infoflow.py
View File

@ -132,7 +132,8 @@ class InfoFlowAnalysisTab(SEToolsWidget, QScrollArea):
# Source criteria
#
def set_source_error(self, error_text):
self.source.setToolTip(error_text)
self.log.error("Source type error: {0}".format(error_text))
self.source.setToolTip("Error: {0}".format(error_text))
self.source.setPalette(self.error_palette)
def clear_source_error(self):
@ -148,13 +149,14 @@ class InfoFlowAnalysisTab(SEToolsWidget, QScrollArea):
else:
self.query.source = None
except Exception as ex:
self.set_source_error("Error: " + str(ex))
self.set_source_error(ex)
#
# Target criteria
#
def set_target_error(self, error_text):
self.target.setToolTip(error_text)
self.log.error("Target type error: {0}".format(error_text))
self.target.setToolTip("Error: {0}".format(error_text))
self.target.setPalette(self.error_palette)
def clear_target_error(self):
@ -170,7 +172,7 @@ class InfoFlowAnalysisTab(SEToolsWidget, QScrollArea):
else:
self.query.target = None
except Exception as ex:
self.set_target_error("Error: " + str(ex))
self.set_target_error(ex)
#
# Options
@ -190,11 +192,11 @@ class InfoFlowAnalysisTab(SEToolsWidget, QScrollArea):
# right now there is only one button.
fail = False
if self.source.isEnabled() and not self.query.source:
self.set_source_error("Error: a source type is required")
self.set_source_error("A source type is required")
fail = True
if self.target.isEnabled() and not self.query.target:
self.set_target_error("Error: a target type is required.")
self.set_target_error("A target type is required.")
fail = True
if fail:

9
setoolsgui/apol/mlsrulequery.py
View File

@ -148,7 +148,8 @@ class MLSRuleQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.source = self.source.text()
except Exception as ex:
self.source.setToolTip("Error: " + str(ex))
self.log.error("Source type/attribute error: {0}".format(ex))
self.source.setToolTip("Error: {0}".format(ex))
self.source.setPalette(self.error_palette)
def set_source_regex(self, state):
@ -169,7 +170,8 @@ class MLSRuleQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.target = self.target.text()
except Exception as ex:
self.target.setToolTip("Error: " + str(ex))
self.log.error("Target type/attribute error: {0}".format(ex))
self.target.setToolTip("Error: {0}".format(ex))
self.target.setPalette(self.error_palette)
def set_target_regex(self, state):
@ -204,7 +206,8 @@ class MLSRuleQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.default = self.default_range.text()
except Exception as ex:
self.default_range.setToolTip("Error: " + str(ex))
self.log.error("Default range error: {0}".format(ex))
self.default_range.setToolTip("Error: {0}".format(ex))
self.default_range.setPalette(self.error_palette)
#

3
setoolsgui/apol/rbacrulequery.py
View File

@ -161,6 +161,7 @@ class RBACRuleQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.source = self.source.text()
except Exception as ex:
self.log.error("Source role error: {0}".format(ex))
self.source.setToolTip("Error: " + str(ex))
self.source.setPalette(self.error_palette)
@ -182,6 +183,7 @@ class RBACRuleQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.target = self.target.text()
except Exception as ex:
self.log.error("Target type/role error: {0}".format(ex))
self.target.setToolTip("Error: " + str(ex))
self.target.setPalette(self.error_palette)
@ -219,6 +221,7 @@ class RBACRuleQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.default = self.default_role.text()
except Exception as ex:
self.log.error("Default role error: {0}".format(ex))
self.default_role.setToolTip("Error: " + str(ex))
self.default_role.setPalette(self.error_palette)

3
setoolsgui/apol/terulequery.py
View File

@ -176,6 +176,7 @@ class TERuleQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.source = self.source.text()
except Exception as ex:
self.log.error("Source type/attribute error: {0}".format(ex))
self.source.setToolTip("Error: " + str(ex))
self.source.setPalette(self.error_palette)
@ -197,6 +198,7 @@ class TERuleQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.target = self.target.text()
except Exception as ex:
self.log.error("Target type/attribute error: {0}".format(ex))
self.target.setToolTip("Error: " + str(ex))
self.target.setPalette(self.error_palette)
@ -249,6 +251,7 @@ class TERuleQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.default = self.default_type.text()
except Exception as ex:
self.log.error("Default type error: {0}".format(ex))
self.default_type.setToolTip("Error: " + str(ex))
self.default_type.setPalette(self.error_palette)

1
setoolsgui/apol/userquery.py
View File

@ -142,6 +142,7 @@ class UserQueryTab(SEToolsWidget, QScrollArea):
try:
self.query.name = self.name.text()
except Exception as ex:
self.log.error("User name error: {0}".format(ex))
self.name.setToolTip("Error: " + str(ex))
self.name.setPalette(self.error_palette)