From c57138f255e5e67a0ecc59ad1791ffbf930c80a3 Mon Sep 17 00:00:00 2001 From: Mark Grassi Date: Sun, 7 Aug 2022 20:32:07 -0400 Subject: [PATCH] Order imports and module-level dunder name assignments. --- .../libapparmor/swig/python/test/buildpath.py | 1 + .../swig/python/test/test_python.py.in | 1 + parser/tst/caching.py | 3 +- parser/tst/errors.py | 6 +-- parser/tst/mk_features_file.py | 5 ++- parser/tst/valgrind_simple.py | 5 ++- utils/aa-audit | 9 ++-- utils/aa-autodep | 9 ++-- utils/aa-cleanprof | 9 ++-- utils/aa-complain | 9 ++-- utils/aa-disable | 9 ++-- utils/aa-easyprof | 8 ++-- utils/aa-enforce | 9 ++-- utils/aa-genprof | 9 ++-- utils/aa-logprof | 10 ++--- utils/aa-mergeprof | 13 ++---- utils/aa-notify | 8 ++-- utils/aa-sandbox | 8 ++-- utils/aa-unconfined | 9 ++-- utils/apparmor/aa.py | 43 +++++++------------ utils/apparmor/logparser.py | 6 +-- utils/apparmor/profile_list.py | 5 +-- utils/apparmor/profile_storage.py | 10 ++--- utils/apparmor/regex.py | 4 +- utils/apparmor/rule/__init__.py | 3 +- utils/apparmor/rule/abi.py | 5 +-- utils/apparmor/rule/alias.py | 5 +-- utils/apparmor/rule/boolean.py | 5 +-- utils/apparmor/rule/capability.py | 5 +-- utils/apparmor/rule/change_profile.py | 8 ++-- utils/apparmor/rule/dbus.py | 10 ++--- utils/apparmor/rule/file.py | 10 ++--- utils/apparmor/rule/include.py | 9 ++-- utils/apparmor/rule/network.py | 6 +-- utils/apparmor/rule/ptrace.py | 10 ++--- utils/apparmor/rule/rlimit.py | 5 +-- utils/apparmor/rule/signal.py | 6 +-- utils/apparmor/rule/variable.py | 9 ++-- utils/apparmor/sandbox.py | 5 ++- utils/apparmor/severity.py | 3 +- utils/apparmor/tools.py | 3 +- utils/apparmor/translations.py | 4 +- utils/apparmor/ui.py | 9 ++-- utils/python-tools-setup.py | 5 ++- utils/test/common_test.py | 2 +- utils/test/test-aa-cli-bootstrap.py | 9 ++-- utils/test/test-aa-notify.py | 2 +- utils/test/test-aa.py | 14 +++--- utils/test/test-aare.py | 10 ++--- utils/test/test-abi.py | 7 +-- utils/test/test-alias.py | 9 ++-- utils/test/test-baserule.py | 7 ++- utils/test/test-boolean.py | 9 ++-- utils/test/test-capability.py | 13 +++--- utils/test/test-change_profile.py | 11 ++--- utils/test/test-common.py | 5 +-- utils/test/test-dbus.py | 11 ++--- utils/test/test-example.py | 3 +- utils/test/test-file.py | 13 +++--- utils/test/test-include.py | 14 +++--- utils/test/test-libapparmor-test_multi.py | 7 ++- utils/test/test-logparser.py | 5 +-- utils/test/test-minitools.py | 3 +- utils/test/test-mount_parse.py | 5 ++- utils/test/test-network.py | 11 ++--- utils/test/test-notify.py | 2 +- utils/test/test-parser-simple-tests.py | 10 ++--- utils/test/test-pivot_root_parse.py | 5 ++- utils/test/test-profile-list.py | 7 ++- utils/test/test-profile-storage.py | 2 +- utils/test/test-profiles.py | 3 +- utils/test/test-ptrace.py | 11 ++--- utils/test/test-regex_matches.py | 12 +++--- utils/test/test-rlimit.py | 11 ++--- utils/test/test-severity.py | 2 +- utils/test/test-signal.py | 11 ++--- utils/test/test-translations.py | 5 +-- utils/test/test-unix_parse.py | 3 +- utils/test/test-variable.py | 5 ++- 79 files changed, 269 insertions(+), 323 deletions(-) diff --git a/libraries/libapparmor/swig/python/test/buildpath.py b/libraries/libapparmor/swig/python/test/buildpath.py index 94b63c2e4..cfa05c01f 100644 --- a/libraries/libapparmor/swig/python/test/buildpath.py +++ b/libraries/libapparmor/swig/python/test/buildpath.py @@ -3,6 +3,7 @@ # https://github.com/pypa/setuptools/commit/1c23f5e1e4b18b50081cbabb2dea22bf345f5894 import sys import sysconfig + import setuptools diff --git a/libraries/libapparmor/swig/python/test/test_python.py.in b/libraries/libapparmor/swig/python/test/test_python.py.in index 01877b90a..29fd05116 100644 --- a/libraries/libapparmor/swig/python/test/test_python.py.in +++ b/libraries/libapparmor/swig/python/test/test_python.py.in @@ -13,6 +13,7 @@ import ctypes import os import unittest + import LibAppArmor as libapparmor TESTDIR = "../../../testsuite/test_multi" diff --git a/parser/tst/caching.py b/parser/tst/caching.py index 9d0fc1f8b..60c97c69c 100755 --- a/parser/tst/caching.py +++ b/parser/tst/caching.py @@ -15,12 +15,11 @@ # - check cache not used if parser in $PATH is newer # - check cache used for force-complain, disable symlink, etc. -from argparse import ArgumentParser import os import shutil -import time import tempfile import unittest +from argparse import ArgumentParser import testlib diff --git a/parser/tst/errors.py b/parser/tst/errors.py index 389a32a0d..3be714925 100755 --- a/parser/tst/errors.py +++ b/parser/tst/errors.py @@ -13,10 +13,10 @@ # # ------------------------------------------------------------------ -from argparse import ArgumentParser -import os -import unittest import subprocess +import unittest +from argparse import ArgumentParser + import testlib config = None diff --git a/parser/tst/mk_features_file.py b/parser/tst/mk_features_file.py index 39ba31261..bf80d0bc8 100755 --- a/parser/tst/mk_features_file.py +++ b/parser/tst/mk_features_file.py @@ -10,11 +10,12 @@ # # ------------------------------------------------------------------ -from testlib import read_features_dir -from argparse import ArgumentParser import os +from argparse import ArgumentParser from sys import stderr, exit +from testlib import read_features_dir + DEFAULT_FEATURES_DIR = '/sys/kernel/security/apparmor/features' diff --git a/parser/tst/valgrind_simple.py b/parser/tst/valgrind_simple.py index c30884a7e..92865a896 100755 --- a/parser/tst/valgrind_simple.py +++ b/parser/tst/valgrind_simple.py @@ -13,13 +13,14 @@ # TODO # - finish adding suppressions for valgrind false positives -from argparse import ArgumentParser import os import sys import unittest -import testlib +from argparse import ArgumentParser from tempfile import NamedTemporaryFile +import testlib + DEFAULT_TESTDIR = "./simple_tests/vars" VALGRIND_ERROR_CODE = 151 VALGRIND_ARGS = ['--leak-check=full', '--error-exitcode=%d' % (VALGRIND_ERROR_CODE)] diff --git a/utils/aa-audit b/utils/aa-audit index d3741a046..f76cdef85 100755 --- a/utils/aa-audit +++ b/utils/aa-audit @@ -15,14 +15,11 @@ import argparse import apparmor.tools - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations parser = argparse.ArgumentParser(description=_('Switch the given programs to audit mode')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) diff --git a/utils/aa-autodep b/utils/aa-autodep index 6b5305fc9..fa76094fd 100755 --- a/utils/aa-autodep +++ b/utils/aa-autodep @@ -15,14 +15,11 @@ import argparse import apparmor.tools - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations parser = argparse.ArgumentParser(description=_('Generate a basic AppArmor profile by guessing requirements')) parser.add_argument('--force', action='store_true', default=False, help=_('overwrite existing profile')) diff --git a/utils/aa-cleanprof b/utils/aa-cleanprof index 46a3e9371..09ae2c1c4 100755 --- a/utils/aa-cleanprof +++ b/utils/aa-cleanprof @@ -15,14 +15,11 @@ import argparse import apparmor.tools - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations parser = argparse.ArgumentParser(description=_('Cleanup the profiles for the given programs')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) diff --git a/utils/aa-complain b/utils/aa-complain index 7dbcf93fc..d4631b1c4 100755 --- a/utils/aa-complain +++ b/utils/aa-complain @@ -15,14 +15,11 @@ import argparse import apparmor.tools - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations parser = argparse.ArgumentParser(description=_('Switch the given program to complain mode')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) diff --git a/utils/aa-disable b/utils/aa-disable index 3023ed4fe..8da8c58c9 100755 --- a/utils/aa-disable +++ b/utils/aa-disable @@ -15,14 +15,11 @@ import argparse import apparmor.tools - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations parser = argparse.ArgumentParser(description=_('Disable the profile for the given programs')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) diff --git a/utils/aa-easyprof b/utils/aa-easyprof index 20e6b43dd..3fa1df72b 100755 --- a/utils/aa-easyprof +++ b/utils/aa-easyprof @@ -9,14 +9,14 @@ # # ------------------------------------------------------------------ -import apparmor.easyprof -from apparmor.easyprof import error import os import sys -# setup exception handling +import apparmor.easyprof +from apparmor.easyprof import error from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() + +enable_aa_exception_handler() # setup exception handling if __name__ == "__main__": def usage(): diff --git a/utils/aa-enforce b/utils/aa-enforce index 5df484bf4..a2e62649e 100755 --- a/utils/aa-enforce +++ b/utils/aa-enforce @@ -15,14 +15,11 @@ import argparse import apparmor.tools - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations parser = argparse.ArgumentParser(description=_('Switch the given program to enforce mode')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) diff --git a/utils/aa-genprof b/utils/aa-genprof index 7f7a3a9ec..2805c6e7e 100755 --- a/utils/aa-genprof +++ b/utils/aa-genprof @@ -23,14 +23,11 @@ import time import apparmor.aa as apparmor import apparmor.ui as aaui from apparmor.common import AppArmorException, warn - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations def sysctl_read(path): diff --git a/utils/aa-logprof b/utils/aa-logprof index f6059cc36..4513e35fd 100755 --- a/utils/aa-logprof +++ b/utils/aa-logprof @@ -16,16 +16,12 @@ import argparse import apparmor.aa as apparmor import apparmor.ui as aaui - from apparmor.common import AppArmorException - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations parser = argparse.ArgumentParser(description=_('Process log entries to generate profiles')) parser.add_argument('-d', '--dir', type=str, help=_('path to profiles')) diff --git a/utils/aa-mergeprof b/utils/aa-mergeprof index 8c614f2b7..2091bff93 100755 --- a/utils/aa-mergeprof +++ b/utils/aa-mergeprof @@ -16,19 +16,14 @@ import argparse import apparmor.aa - -import apparmor.severity import apparmor.cleanprofile as cleanprofile +import apparmor.severity import apparmor.ui as aaui - - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations parser = argparse.ArgumentParser(description=_('Merge the given profiles into /etc/apparmor.d/ (or the directory specified with -d)')) parser.add_argument('files', nargs='+', type=str, help=_('Profile(s) to merge')) diff --git a/utils/aa-notify b/utils/aa-notify index 3ce7f79e0..e51820f7c 100755 --- a/utils/aa-notify +++ b/utils/aa-notify @@ -30,25 +30,25 @@ import argparse import atexit +import grp import os +import pwd import re import sys import time + import notify2 import psutil -import pwd -import grp import apparmor.aa as aa import apparmor.ui as aaui import apparmor.config as aaconfig +import LibAppArmor # C-library to parse one log line from apparmor.common import DebugLogger, open_file_read from apparmor.fail import enable_aa_exception_handler from apparmor.notify import get_last_login_timestamp from apparmor.translations import init_translation -import LibAppArmor # C-library to parse one log line - def get_user_login(): """Portable function to get username. Should not trigger any diff --git a/utils/aa-sandbox b/utils/aa-sandbox index 8a7e0e82b..e8aec1054 100755 --- a/utils/aa-sandbox +++ b/utils/aa-sandbox @@ -9,14 +9,14 @@ # # ------------------------------------------------------------------ -import apparmor.sandbox -from apparmor.common import error import optparse import sys -# setup exception handling +import apparmor.sandbox +from apparmor.common import error from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() + +enable_aa_exception_handler() # setup exception handling if __name__ == "__main__": argv = sys.argv diff --git a/utils/aa-unconfined b/utils/aa-unconfined index cf13c0abf..e75397a95 100755 --- a/utils/aa-unconfined +++ b/utils/aa-unconfined @@ -22,14 +22,11 @@ import sys import apparmor.aa as aa import apparmor.ui as ui from apparmor.common import AppArmorException, open_file_read - -# setup exception handling from apparmor.fail import enable_aa_exception_handler -enable_aa_exception_handler() - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() + +enable_aa_exception_handler() # setup exception handling +_ = init_translation() # setup module translations parser = argparse.ArgumentParser(description=_("Lists unconfined processes having tcp or udp ports")) parser.add_argument("--paranoid", action="store_true", help=_("scan all processes from /proc")) diff --git a/utils/apparmor/aa.py b/utils/apparmor/aa.py index 7c2a93531..ba363ca12 100644 --- a/utils/apparmor/aa.py +++ b/utils/apparmor/aa.py @@ -13,6 +13,7 @@ # # ---------------------------------------------------------------------- # No old version logs, only 2.6 + supported +import atexit import os import re import shutil @@ -20,37 +21,26 @@ import subprocess # nosec import sys import time import traceback -import atexit +from copy import deepcopy from shutil import which from tempfile import NamedTemporaryFile import apparmor.config import apparmor.logparser -import apparmor.severity - -from copy import deepcopy - -from apparmor.aare import AARE - -from apparmor.common import ( - AppArmorException, AppArmorBug, cmd, is_skippable_file, open_file_read, valid_path, hasher, - combine_profname, split_name, open_file_write, DebugLogger) - -import apparmor.ui as aaui - -from apparmor.regex import ( - RE_PROFILE_START, RE_PROFILE_END, RE_PROFILE_CONDITIONAL, - RE_PROFILE_CONDITIONAL_VARIABLE, RE_PROFILE_CONDITIONAL_BOOLEAN, - RE_PROFILE_CHANGE_HAT, RE_PROFILE_HAT_DEF, RE_PROFILE_MOUNT, - RE_PROFILE_PIVOT_ROOT, RE_PROFILE_UNIX, RE_RULE_HAS_COMMA, RE_HAS_COMMENT_SPLIT, - parse_profile_start_line, re_match_include) - -from apparmor.profile_list import ProfileList, preamble_ruletypes - -from apparmor.profile_storage import ProfileStorage, add_or_remove_flag, ruletypes - import apparmor.rules as aarules - +import apparmor.severity +import apparmor.ui as aaui +from apparmor.aare import AARE +from apparmor.common import ( + AppArmorBug, AppArmorException, DebugLogger, cmd, combine_profname, hasher, + is_skippable_file, open_file_read, open_file_write, split_name, valid_path) +from apparmor.profile_list import ProfileList, preamble_ruletypes +from apparmor.profile_storage import ProfileStorage, add_or_remove_flag, ruletypes +from apparmor.regex import ( + RE_HAS_COMMENT_SPLIT, RE_PROFILE_CHANGE_HAT, RE_PROFILE_CONDITIONAL, + RE_PROFILE_CONDITIONAL_BOOLEAN, RE_PROFILE_CONDITIONAL_VARIABLE, RE_PROFILE_END, + RE_PROFILE_HAT_DEF, RE_PROFILE_MOUNT, RE_PROFILE_PIVOT_ROOT, RE_PROFILE_START, + RE_PROFILE_UNIX, RE_RULE_HAS_COMMA, parse_profile_start_line, re_match_include) from apparmor.rule.abi import AbiRule from apparmor.rule.capability import CapabilityRule from apparmor.rule.change_profile import ChangeProfileRule @@ -60,9 +50,8 @@ from apparmor.rule.include import IncludeRule from apparmor.rule.network import NetworkRule from apparmor.rule.ptrace import PtraceRule from apparmor.rule.signal import SignalRule - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() # Setup logging in case debugging is enabled diff --git a/utils/apparmor/logparser.py b/utils/apparmor/logparser.py index 053a7f12b..ba2ef45d3 100644 --- a/utils/apparmor/logparser.py +++ b/utils/apparmor/logparser.py @@ -16,11 +16,11 @@ import ctypes import re import sys import time -import LibAppArmor -from apparmor.common import AppArmorException, AppArmorBug, hasher, open_file_read, split_name, DebugLogger -# setup module translations +import LibAppArmor +from apparmor.common import AppArmorBug, AppArmorException, DebugLogger, hasher, open_file_read, split_name from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/profile_list.py b/utils/apparmor/profile_list.py index b6c473bfa..08768e98a 100644 --- a/utils/apparmor/profile_list.py +++ b/utils/apparmor/profile_list.py @@ -15,14 +15,13 @@ from apparmor.aare import AARE from apparmor.common import AppArmorBug, AppArmorException from apparmor.profile_storage import ProfileStorage -from apparmor.rule.alias import AliasRule, AliasRuleset from apparmor.rule.abi import AbiRule, AbiRuleset +from apparmor.rule.alias import AliasRule, AliasRuleset from apparmor.rule.boolean import BooleanRule, BooleanRuleset from apparmor.rule.include import IncludeRule, IncludeRuleset from apparmor.rule.variable import VariableRule, VariableRuleset - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() preamble_ruletypes = { diff --git a/utils/apparmor/profile_storage.py b/utils/apparmor/profile_storage.py index d831a2c9c..bd8040dfe 100644 --- a/utils/apparmor/profile_storage.py +++ b/utils/apparmor/profile_storage.py @@ -15,7 +15,8 @@ from apparmor.common import AppArmorBug, AppArmorException - +from apparmor.regex import parse_profile_start_line +from apparmor.rule import quote_if_needed from apparmor.rule.abi import AbiRule, AbiRuleset from apparmor.rule.capability import CapabilityRule, CapabilityRuleset from apparmor.rule.change_profile import ChangeProfileRule, ChangeProfileRuleset @@ -26,13 +27,8 @@ from apparmor.rule.network import NetworkRule, NetworkRuleset from apparmor.rule.ptrace import PtraceRule, PtraceRuleset from apparmor.rule.rlimit import RlimitRule, RlimitRuleset from apparmor.rule.signal import SignalRule, SignalRuleset - -from apparmor.rule import quote_if_needed - -from apparmor.regex import parse_profile_start_line - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() ruletypes = { diff --git a/utils/apparmor/regex.py b/utils/apparmor/regex.py index dafdd0470..876fe572c 100644 --- a/utils/apparmor/regex.py +++ b/utils/apparmor/regex.py @@ -14,10 +14,10 @@ # ---------------------------------------------------------------------- import re -from apparmor.common import AppArmorBug, AppArmorException -# setup module translations +from apparmor.common import AppArmorBug, AppArmorException from apparmor.translations import init_translation + _ = init_translation() # Profile parsing Regex diff --git a/utils/apparmor/rule/__init__.py b/utils/apparmor/rule/__init__.py index db68cfce0..26f72965b 100644 --- a/utils/apparmor/rule/__init__.py +++ b/utils/apparmor/rule/__init__.py @@ -17,9 +17,8 @@ from abc import abstractmethod from apparmor.aare import AARE from apparmor.common import AppArmorBug - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/rule/abi.py b/utils/apparmor/rule/abi.py index 9a5926be0..f985b78f4 100644 --- a/utils/apparmor/rule/abi.py +++ b/utils/apparmor/rule/abi.py @@ -12,12 +12,11 @@ # # ---------------------------------------------------------------------- -from apparmor.regex import RE_ABI from apparmor.common import AppArmorBug +from apparmor.regex import RE_ABI from apparmor.rule.include import IncludeRule, IncludeRuleset - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/rule/alias.py b/utils/apparmor/rule/alias.py index da9e0bae1..6cfc7796a 100644 --- a/utils/apparmor/rule/alias.py +++ b/utils/apparmor/rule/alias.py @@ -12,12 +12,11 @@ # # ---------------------------------------------------------------------- -from apparmor.regex import RE_PROFILE_ALIAS, strip_quotes from apparmor.common import AppArmorBug, AppArmorException +from apparmor.regex import RE_PROFILE_ALIAS, strip_quotes from apparmor.rule import BaseRule, BaseRuleset, parse_comment, quote_if_needed - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/rule/boolean.py b/utils/apparmor/rule/boolean.py index e4b226557..c59fa7628 100644 --- a/utils/apparmor/rule/boolean.py +++ b/utils/apparmor/rule/boolean.py @@ -13,12 +13,11 @@ # # ---------------------------------------------------------------------- -from apparmor.regex import RE_PROFILE_BOOLEAN from apparmor.common import AppArmorBug, AppArmorException +from apparmor.regex import RE_PROFILE_BOOLEAN from apparmor.rule import BaseRule, BaseRuleset, parse_comment - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/rule/capability.py b/utils/apparmor/rule/capability.py index dc83b4767..c1ece20ef 100644 --- a/utils/apparmor/rule/capability.py +++ b/utils/apparmor/rule/capability.py @@ -15,12 +15,11 @@ import re -from apparmor.regex import RE_PROFILE_CAP from apparmor.common import AppArmorBug, AppArmorException +from apparmor.regex import RE_PROFILE_CAP from apparmor.rule import BaseRule, BaseRuleset, logprof_value_or_all, parse_modifiers - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/rule/change_profile.py b/utils/apparmor/rule/change_profile.py index a87a2bb88..321fe392f 100644 --- a/utils/apparmor/rule/change_profile.py +++ b/utils/apparmor/rule/change_profile.py @@ -13,12 +13,12 @@ # # ---------------------------------------------------------------------- -from apparmor.regex import RE_PROFILE_CHANGE_PROFILE, strip_quotes from apparmor.common import AppArmorBug, AppArmorException -from apparmor.rule import BaseRule, BaseRuleset, parse_modifiers, logprof_value_or_all, quote_if_needed - -# setup module translations +from apparmor.regex import RE_PROFILE_CHANGE_PROFILE, strip_quotes +from apparmor.rule import ( + BaseRule, BaseRuleset, logprof_value_or_all, parse_modifiers, quote_if_needed) from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/rule/dbus.py b/utils/apparmor/rule/dbus.py index 5e49f110b..f3f75b758 100644 --- a/utils/apparmor/rule/dbus.py +++ b/utils/apparmor/rule/dbus.py @@ -14,14 +14,14 @@ import re -from apparmor.regex import RE_PROFILE_DBUS, RE_PROFILE_NAME, strip_parenthesis, strip_quotes from apparmor.common import AppArmorBug, AppArmorException -from apparmor.rule import BaseRule, BaseRuleset, check_and_split_list, logprof_value_or_all, parse_modifiers, quote_if_needed - -# setup module translations +from apparmor.regex import RE_PROFILE_DBUS, RE_PROFILE_NAME, strip_parenthesis, strip_quotes +from apparmor.rule import ( + BaseRule, BaseRuleset, check_and_split_list, logprof_value_or_all, + parse_modifiers, quote_if_needed) from apparmor.translations import init_translation -_ = init_translation() +_ = init_translation() message_keywords = ['send', 'receive', 'r', 'read', 'w', 'write', 'rw'] access_keywords = ['bind', 'eavesdrop'] + message_keywords diff --git a/utils/apparmor/rule/file.py b/utils/apparmor/rule/file.py index dd90264ba..3a3739e94 100644 --- a/utils/apparmor/rule/file.py +++ b/utils/apparmor/rule/file.py @@ -13,14 +13,14 @@ # ---------------------------------------------------------------------- from apparmor.aare import AARE -from apparmor.regex import RE_PROFILE_FILE_ENTRY, strip_quotes from apparmor.common import AppArmorBug, AppArmorException -from apparmor.rule import BaseRule, BaseRuleset, check_and_split_list, logprof_value_or_all, parse_modifiers, quote_if_needed - -# setup module translations +from apparmor.regex import RE_PROFILE_FILE_ENTRY, strip_quotes +from apparmor.rule import ( + BaseRule, BaseRuleset, check_and_split_list, logprof_value_or_all, + parse_modifiers, quote_if_needed) from apparmor.translations import init_translation -_ = init_translation() +_ = init_translation() allow_exec_transitions = ('ix', 'ux', 'Ux', 'px', 'Px', 'cx', 'Cx') # 2 chars - len relevant for split_perms() allow_exec_fallback_transitions = ('pix', 'Pix', 'cix', 'Cix', 'pux', 'PUx', 'cux', 'CUx') # 3 chars - len relevant for split_perms() diff --git a/utils/apparmor/rule/include.py b/utils/apparmor/rule/include.py index 6de851d4b..e1eea7e35 100644 --- a/utils/apparmor/rule/include.py +++ b/utils/apparmor/rule/include.py @@ -11,14 +11,13 @@ # GNU General Public License for more details. # # ---------------------------------------------------------------------- - -from apparmor.regex import RE_INCLUDE, re_match_include_parse -from apparmor.common import AppArmorBug, AppArmorException, is_skippable_file -from apparmor.rule import BaseRule, BaseRuleset, parse_comment import os -# setup module translations +from apparmor.common import AppArmorBug, AppArmorException, is_skippable_file +from apparmor.regex import RE_INCLUDE, re_match_include_parse +from apparmor.rule import BaseRule, BaseRuleset, parse_comment from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/rule/network.py b/utils/apparmor/rule/network.py index 63c472a4a..5e6600443 100644 --- a/utils/apparmor/rule/network.py +++ b/utils/apparmor/rule/network.py @@ -15,14 +15,12 @@ import re -from apparmor.regex import RE_PROFILE_NETWORK from apparmor.common import AppArmorBug, AppArmorException +from apparmor.regex import RE_PROFILE_NETWORK from apparmor.rule import BaseRule, BaseRuleset, logprof_value_or_all, parse_modifiers - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() +_ = init_translation() network_domain_keywords = [ 'unspec', 'unix', 'inet', 'ax25', 'ipx', 'appletalk', 'netrom', 'bridge', 'atmpvc', 'x25', 'inet6', diff --git a/utils/apparmor/rule/ptrace.py b/utils/apparmor/rule/ptrace.py index e02854cef..381cd550f 100644 --- a/utils/apparmor/rule/ptrace.py +++ b/utils/apparmor/rule/ptrace.py @@ -14,14 +14,14 @@ import re -from apparmor.regex import RE_PROFILE_PTRACE, RE_PROFILE_NAME, strip_quotes from apparmor.common import AppArmorBug, AppArmorException -from apparmor.rule import BaseRule, BaseRuleset, check_and_split_list, logprof_value_or_all, parse_modifiers, quote_if_needed - -# setup module translations +from apparmor.regex import RE_PROFILE_PTRACE, RE_PROFILE_NAME, strip_quotes +from apparmor.rule import ( + BaseRule, BaseRuleset, check_and_split_list, logprof_value_or_all, + parse_modifiers, quote_if_needed) from apparmor.translations import init_translation -_ = init_translation() +_ = init_translation() access_keywords = ['r', 'w', 'rw', 'wr', 'read', 'write', 'readby', 'trace', 'tracedby'] # XXX 'wr' and 'write' accepted by the parser, but not documented in apparmor.d.pod diff --git a/utils/apparmor/rule/rlimit.py b/utils/apparmor/rule/rlimit.py index a2ab64426..2d5ad482c 100644 --- a/utils/apparmor/rule/rlimit.py +++ b/utils/apparmor/rule/rlimit.py @@ -15,12 +15,11 @@ import re -from apparmor.regex import RE_PROFILE_RLIMIT, strip_quotes from apparmor.common import AppArmorBug, AppArmorException +from apparmor.regex import RE_PROFILE_RLIMIT, strip_quotes from apparmor.rule import BaseRule, BaseRuleset, parse_comment, quote_if_needed - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() rlimit_size = ['fsize', 'data', 'stack', 'core', 'rss', 'as', 'memlock', 'msgqueue'] # NUMBER ( 'K' | 'M' | 'G' ) diff --git a/utils/apparmor/rule/signal.py b/utils/apparmor/rule/signal.py index 348868920..b2f567906 100644 --- a/utils/apparmor/rule/signal.py +++ b/utils/apparmor/rule/signal.py @@ -14,16 +14,14 @@ import re -from apparmor.regex import RE_PROFILE_SIGNAL, RE_PROFILE_NAME from apparmor.common import AppArmorBug, AppArmorException +from apparmor.regex import RE_PROFILE_SIGNAL, RE_PROFILE_NAME from apparmor.rule import ( BaseRule, BaseRuleset, check_and_split_list, logprof_value_or_all, parse_modifiers, quote_if_needed) - -# setup module translations from apparmor.translations import init_translation -_ = init_translation() +_ = init_translation() access_keywords_read = ['receive', 'r', 'read'] access_keywords_write = ['send', 'w', 'write'] diff --git a/utils/apparmor/rule/variable.py b/utils/apparmor/rule/variable.py index b04355b6a..e6d8e0841 100644 --- a/utils/apparmor/rule/variable.py +++ b/utils/apparmor/rule/variable.py @@ -13,14 +13,13 @@ # # ---------------------------------------------------------------------- -from apparmor.regex import RE_PROFILE_VARIABLE, strip_quotes -from apparmor.common import AppArmorBug, AppArmorException -from apparmor.rule import BaseRule, BaseRuleset, parse_comment, quote_if_needed - import re -# setup module translations +from apparmor.common import AppArmorBug, AppArmorException +from apparmor.regex import RE_PROFILE_VARIABLE, strip_quotes +from apparmor.rule import BaseRule, BaseRuleset, parse_comment, quote_if_needed from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/sandbox.py b/utils/apparmor/sandbox.py index 32623d7fe..151e1687b 100644 --- a/utils/apparmor/sandbox.py +++ b/utils/apparmor/sandbox.py @@ -8,8 +8,6 @@ # # ------------------------------------------------------------------ -from apparmor.common import AppArmorException, debug, error, msg, cmd -import apparmor.easyprof import optparse import os import pwd @@ -21,6 +19,9 @@ import time from shutil import which from tempfile import NamedTemporaryFile +import apparmor.easyprof +from apparmor.common import AppArmorException, cmd, debug, error, msg + def check_requirements(binary): """Verify necessary software is installed""" diff --git a/utils/apparmor/severity.py b/utils/apparmor/severity.py index dd09e98ed..a0116acf9 100644 --- a/utils/apparmor/severity.py +++ b/utils/apparmor/severity.py @@ -12,7 +12,8 @@ # # ---------------------------------------------------------------------- import re -from apparmor.common import AppArmorException, open_file_read, warn, convert_regexp # , msg, error, debug + +from apparmor.common import AppArmorException, convert_regexp, open_file_read, warn # , debug, error, msg class Severity: diff --git a/utils/apparmor/tools.py b/utils/apparmor/tools.py index 0750b4e0e..af6a16106 100644 --- a/utils/apparmor/tools.py +++ b/utils/apparmor/tools.py @@ -19,9 +19,8 @@ from shutil import which import apparmor.aa as apparmor import apparmor.ui as aaui from apparmor.common import AppArmorException, cmd, is_skippable_file, user_perm - -# setup module translations from apparmor.translations import init_translation + _ = init_translation() diff --git a/utils/apparmor/translations.py b/utils/apparmor/translations.py index 949c6c1b3..1e29b7d7c 100644 --- a/utils/apparmor/translations.py +++ b/utils/apparmor/translations.py @@ -7,12 +7,12 @@ # License published by the Free Software Foundation. # # ------------------------------------------------------------------ +__apparmor_gettext__ = None + import gettext TRANSLATION_DOMAIN = 'apparmor-utils' -__apparmor_gettext__ = None - def init_translation(): global __apparmor_gettext__ diff --git a/utils/apparmor/ui.py b/utils/apparmor/ui.py index 0132804b7..7395f78ce 100644 --- a/utils/apparmor/ui.py +++ b/utils/apparmor/ui.py @@ -15,17 +15,16 @@ # ---------------------------------------------------------------------- import json -import sys +import os import re import readline -import os import subprocess +import sys from tempfile import NamedTemporaryFile -from apparmor.common import readkey, AppArmorException, DebugLogger - -# setup module translations +from apparmor.common import AppArmorException, DebugLogger, readkey from apparmor.translations import init_translation + _ = init_translation() # Set up UI logger for separate messages from UI module diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py index 341aca291..8efe6ce9a 100644 --- a/utils/python-tools-setup.py +++ b/utils/python-tools-setup.py @@ -20,12 +20,13 @@ # Note: --version=... must be the last argument to this script # -from setuptools.command.install import install as _install -from setuptools import setup import os import shutil import sys +from setuptools import setup +from setuptools.command.install import install as _install + class Install(_install): """Override setuptools to install the files where we want them.""" diff --git a/utils/test/common_test.py b/utils/test/common_test.py index 1979f5db4..958cbdc13 100755 --- a/utils/test/common_test.py +++ b/utils/test/common_test.py @@ -12,12 +12,12 @@ # GNU General Public License for more details. # # ---------------------------------------------------------------------- -import unittest import inspect import os import shutil import sys import tempfile +import unittest # def test_readkey(self): diff --git a/utils/test/test-aa-cli-bootstrap.py b/utils/test/test-aa-cli-bootstrap.py index b789d16ba..206445260 100644 --- a/utils/test/test-aa-cli-bootstrap.py +++ b/utils/test/test-aa-cli-bootstrap.py @@ -9,21 +9,18 @@ # # ------------------------------------------------------------------ -import unittest -from common_test import AATest, setup_all_loops, setup_aa - -# Imports for test code +import atexit import io import os import sys +import unittest -# Imports for AppArmor -import atexit import apparmor.aa as aa import apparmor.ui as aaui from apparmor.common import DebugLogger from apparmor.fail import enable_aa_exception_handler from apparmor.translations import init_translation +from common_test import AATest, setup_aa, setup_all_loops class AACliBootstrapTest(AATest): diff --git a/utils/test/test-aa-notify.py b/utils/test/test-aa-notify.py index d6fb59400..d87e56193 100644 --- a/utils/test/test-aa-notify.py +++ b/utils/test/test-aa-notify.py @@ -17,8 +17,8 @@ import time import unittest from tempfile import NamedTemporaryFile -from common_test import AATest, setup_all_loops, setup_aa import apparmor.aa as aa +from common_test import AATest, setup_aa, setup_all_loops # The location of the aa-notify utility can be overridden by setting # the APPARMOR_NOTIFY environment variable; this is useful for running diff --git a/utils/test/test-aa.py b/utils/test/test-aa.py index fd56595a4..13f203bd1 100644 --- a/utils/test/test-aa.py +++ b/utils/test/test-aa.py @@ -9,23 +9,19 @@ # # ------------------------------------------------------------------ -import unittest -from common_test import AATest, setup_all_loops, setup_aa -from common_test import read_file, write_file - import os import shutil +import unittest import apparmor.aa # needed to set global vars in some tests from apparmor.aa import ( - check_for_apparmor, get_output, get_reqs, get_interpreter_and_abstraction, create_new_profile, - get_profile_flags, change_profile_flags, set_options_audit_mode, set_options_owner_mode, - parse_profile_data, - get_file_perms, propose_file_rules, merged_to_split, split_to_merged) + change_profile_flags, check_for_apparmor, create_new_profile, get_file_perms, get_interpreter_and_abstraction, get_output, get_profile_flags, get_reqs, + merged_to_split, parse_profile_data, propose_file_rules, set_options_audit_mode, set_options_owner_mode, split_to_merged) from apparmor.aare import AARE -from apparmor.common import AppArmorException, AppArmorBug, is_skippable_file +from apparmor.common import AppArmorBug, AppArmorException, is_skippable_file from apparmor.rule.file import FileRule from apparmor.rule.include import IncludeRule +from common_test import AATest, read_file, setup_aa, setup_all_loops, write_file class AaTestWithTempdir(AATest): diff --git a/utils/test/test-aare.py b/utils/test/test-aare.py index 11af0e2ab..d37e6dfba 100644 --- a/utils/test/test-aare.py +++ b/utils/test/test-aare.py @@ -10,13 +10,13 @@ # # ------------------------------------------------------------------ -import unittest -from common_test import AATest, setup_all_loops - -from copy import deepcopy import re -from apparmor.common import convert_regexp, AppArmorBug, AppArmorException +import unittest +from copy import deepcopy + +from apparmor.common import AppArmorBug, AppArmorException, convert_regexp from apparmor.aare import AARE, convert_expression_to_aare +from common_test import AATest, setup_all_loops class TestConvert_regexp(AATest): diff --git a/utils/test/test-abi.py b/utils/test/test-abi.py index 2b6ccfb44..5fad6d72b 100644 --- a/utils/test/test-abi.py +++ b/utils/test/test-abi.py @@ -17,11 +17,12 @@ import unittest from collections import namedtuple from common_test import AATest, setup_all_loops -from apparmor.rule.abi import AbiRule, AbiRuleset -# from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug +from apparmor.common import AppArmorBug, AppArmorException # from apparmor.logparser import ReadLog +# from apparmor.rule import BaseRule +from apparmor.rule.abi import AbiRule, AbiRuleset from apparmor.translations import init_translation + _ = init_translation() exp = namedtuple( diff --git a/utils/test/test-alias.py b/utils/test/test-alias.py index 89b731b20..6448ab2e2 100644 --- a/utils/test/test-alias.py +++ b/utils/test/test-alias.py @@ -15,12 +15,13 @@ import unittest from collections import namedtuple + +from apparmor.common import AppArmorBug, AppArmorException +from apparmor.rule import BaseRule +from apparmor.rule.alias import AliasRule, AliasRuleset +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.alias import AliasRule, AliasRuleset -from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug -from apparmor.translations import init_translation _ = init_translation() exp = namedtuple('exp', ('comment', 'orig_path', 'target')) diff --git a/utils/test/test-baserule.py b/utils/test/test-baserule.py index 58b8770cc..b95aa4473 100644 --- a/utils/test/test-baserule.py +++ b/utils/test/test-baserule.py @@ -9,14 +9,13 @@ # # ------------------------------------------------------------------ +import re import unittest -from common_test import AATest, setup_all_loops +import apparmor.severity as severity from apparmor.common import AppArmorBug from apparmor.rule import BaseRule, parse_modifiers -import apparmor.severity as severity - -import re +from common_test import AATest, setup_all_loops class TestBaserule(AATest): diff --git a/utils/test/test-boolean.py b/utils/test/test-boolean.py index 03016cf5a..a6f35ba65 100644 --- a/utils/test/test-boolean.py +++ b/utils/test/test-boolean.py @@ -15,12 +15,13 @@ import unittest from collections import namedtuple + +from apparmor.common import AppArmorBug, AppArmorException +from apparmor.rule import BaseRule +from apparmor.rule.boolean import BooleanRule, BooleanRuleset +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.boolean import BooleanRule, BooleanRuleset -from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug -from apparmor.translations import init_translation _ = init_translation() exp = namedtuple('exp', ('comment', 'varname', 'value')) diff --git a/utils/test/test-capability.py b/utils/test/test-capability.py index f7d885865..d39e5fa25 100644 --- a/utils/test/test-capability.py +++ b/utils/test/test-capability.py @@ -14,14 +14,15 @@ # ---------------------------------------------------------------------- import unittest + +import apparmor.severity as severity +from apparmor.common import AppArmorBug, AppArmorException, hasher +from apparmor.logparser import ReadLog +from apparmor.rule import BaseRule +from apparmor.rule.capability import CapabilityRule, CapabilityRuleset +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.capability import CapabilityRule, CapabilityRuleset -from apparmor.rule import BaseRule -import apparmor.severity as severity -from apparmor.common import AppArmorException, AppArmorBug, hasher -from apparmor.logparser import ReadLog -from apparmor.translations import init_translation _ = init_translation() diff --git a/utils/test/test-change_profile.py b/utils/test/test-change_profile.py index b0789e848..38375fc3d 100644 --- a/utils/test/test-change_profile.py +++ b/utils/test/test-change_profile.py @@ -15,13 +15,14 @@ import unittest from collections import namedtuple + +from apparmor.common import AppArmorBug, AppArmorException +from apparmor.logparser import ReadLog +from apparmor.rule import BaseRule +from apparmor.rule.change_profile import ChangeProfileRule, ChangeProfileRuleset +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.change_profile import ChangeProfileRule, ChangeProfileRuleset -from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug -from apparmor.logparser import ReadLog -from apparmor.translations import init_translation _ = init_translation() exp = namedtuple( diff --git a/utils/test/test-common.py b/utils/test/test-common.py index 88d18687a..7f885da18 100644 --- a/utils/test/test-common.py +++ b/utils/test/test-common.py @@ -10,10 +10,9 @@ # ------------------------------------------------------------------ import unittest -from common_test import AATest, setup_all_loops -from apparmor.common import AppArmorBug -from apparmor.common import split_name, combine_profname +from apparmor.common import AppArmorBug, combine_profname, split_name +from common_test import AATest, setup_all_loops class AaTest_split_name(AATest): diff --git a/utils/test/test-dbus.py b/utils/test/test-dbus.py index 4716676fb..e3f69ae0c 100644 --- a/utils/test/test-dbus.py +++ b/utils/test/test-dbus.py @@ -15,13 +15,14 @@ import unittest from collections import namedtuple + +from apparmor.common import AppArmorBug, AppArmorException +from apparmor.logparser import ReadLog +from apparmor.rule import BaseRule +from apparmor.rule.dbus import DbusRule, DbusRuleset +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.dbus import DbusRule, DbusRuleset -from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug -from apparmor.logparser import ReadLog -from apparmor.translations import init_translation _ = init_translation() exp = namedtuple( diff --git a/utils/test/test-example.py b/utils/test/test-example.py index cf415fece..793fe32d1 100644 --- a/utils/test/test-example.py +++ b/utils/test/test-example.py @@ -10,8 +10,9 @@ # ------------------------------------------------------------------ import unittest -from common_test import AATest, setup_all_loops # , setup_aa + # import apparmor.aa as aa # see the setup_aa() call for details +from common_test import AATest, setup_all_loops # , setup_aa class TestFoo(AATest): diff --git a/utils/test/test-file.py b/utils/test/test-file.py index dfe17be1b..ade409f3e 100644 --- a/utils/test/test-file.py +++ b/utils/test/test-file.py @@ -15,14 +15,15 @@ import unittest from collections import namedtuple + +import apparmor.severity as severity +from apparmor.common import AppArmorBug, AppArmorException +from apparmor.logparser import ReadLog +from apparmor.rule import BaseRule +from apparmor.rule.file import FileRule, FileRuleset +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.file import FileRule, FileRuleset -from apparmor.rule import BaseRule -import apparmor.severity as severity -from apparmor.common import AppArmorException, AppArmorBug -from apparmor.logparser import ReadLog -from apparmor.translations import init_translation _ = init_translation() exp = namedtuple( diff --git a/utils/test/test-include.py b/utils/test/test-include.py index 82217c0e4..6b5d57b25 100644 --- a/utils/test/test-include.py +++ b/utils/test/test-include.py @@ -13,18 +13,18 @@ # # ---------------------------------------------------------------------- -import unittest -from collections import namedtuple -from common_test import AATest, setup_all_loops, write_file - import os import shutil +import unittest +from collections import namedtuple -from apparmor.rule.include import IncludeRule, IncludeRuleset -from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug +from apparmor.common import AppArmorBug, AppArmorException # from apparmor.logparser import ReadLog +from apparmor.rule import BaseRule +from apparmor.rule.include import IncludeRule, IncludeRuleset from apparmor.translations import init_translation +from common_test import AATest, setup_all_loops, write_file + _ = init_translation() exp = namedtuple( diff --git a/utils/test/test-libapparmor-test_multi.py b/utils/test/test-libapparmor-test_multi.py index 7aadee6ee..715af66a3 100644 --- a/utils/test/test-libapparmor-test_multi.py +++ b/utils/test/test-libapparmor-test_multi.py @@ -9,16 +9,15 @@ # # ------------------------------------------------------------------ -import unittest -from common_test import AATest, setup_all_loops, setup_aa, read_file - import os import sys -from apparmor.common import hasher, open_file_read, split_name +import unittest import apparmor.aa +from apparmor.common import hasher, open_file_read, split_name from apparmor.logparser import ReadLog from apparmor.profile_list import ProfileList +from common_test import AATest, read_file, setup_aa, setup_all_loops class TestLibapparmorTestMulti(AATest): diff --git a/utils/test/test-logparser.py b/utils/test/test-logparser.py index e8e3dea30..c38759d7c 100644 --- a/utils/test/test-logparser.py +++ b/utils/test/test-logparser.py @@ -14,10 +14,9 @@ # ---------------------------------------------------------------------- import unittest -from apparmor.logparser import ReadLog - -from common_test import AATest, setup_all_loops # , setup_aa from apparmor.common import AppArmorException +from apparmor.logparser import ReadLog +from common_test import AATest, setup_all_loops # , setup_aa class TestParseEvent(AATest): diff --git a/utils/test/test-minitools.py b/utils/test/test-minitools.py index 62729547f..f99fc4de7 100755 --- a/utils/test/test-minitools.py +++ b/utils/test/test-minitools.py @@ -15,10 +15,9 @@ import os import shutil import subprocess import unittest -from common_test import AATest, setup_all_loops, setup_aa import apparmor.aa as apparmor -from common_test import read_file +from common_test import AATest, read_file, setup_aa, setup_all_loops python_interpreter = 'python3' diff --git a/utils/test/test-mount_parse.py b/utils/test/test-mount_parse.py index 775a8bea3..81c364092 100644 --- a/utils/test/test-mount_parse.py +++ b/utils/test/test-mount_parse.py @@ -9,9 +9,10 @@ # # ------------------------------------------------------------------ -import apparmor.aa as aa import unittest -from common_test import AAParseTest, setup_regex_tests, setup_aa + +import apparmor.aa as aa +from common_test import AAParseTest, setup_aa, setup_regex_tests class BaseAAParseMountTest(AAParseTest): diff --git a/utils/test/test-network.py b/utils/test/test-network.py index 4c144b43c..ed2d80c6a 100644 --- a/utils/test/test-network.py +++ b/utils/test/test-network.py @@ -15,13 +15,14 @@ import unittest from collections import namedtuple + +from apparmor.common import AppArmorBug, AppArmorException, cmd +from apparmor.logparser import ReadLog +from apparmor.rule import BaseRule +from apparmor.rule.network import NetworkRule, NetworkRuleset, network_domain_keywords +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.network import NetworkRule, NetworkRuleset, network_domain_keywords -from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug, cmd -from apparmor.logparser import ReadLog -from apparmor.translations import init_translation _ = init_translation() exp = namedtuple( diff --git a/utils/test/test-notify.py b/utils/test/test-notify.py index 69f7ed322..bb2b123d2 100644 --- a/utils/test/test-notify.py +++ b/utils/test/test-notify.py @@ -10,10 +10,10 @@ # ------------------------------------------------------------------ import unittest -from common_test import AATest, setup_all_loops from apparmor.common import AppArmorBug from apparmor.notify import get_last_login_timestamp, sane_timestamp +from common_test import AATest, setup_all_loops class TestSane_timestamp(AATest): diff --git a/utils/test/test-parser-simple-tests.py b/utils/test/test-parser-simple-tests.py index e0eb66eae..58c5b43a6 100644 --- a/utils/test/test-parser-simple-tests.py +++ b/utils/test/test-parser-simple-tests.py @@ -9,12 +9,12 @@ # # ------------------------------------------------------------------ -import unittest -from common_test import AATest, setup_all_loops, setup_aa -import apparmor.aa as apparmor - import os -from apparmor.common import open_file_read, AppArmorException, is_skippable_file +import unittest + +import apparmor.aa as apparmor +from apparmor.common import AppArmorException, is_skippable_file, open_file_read +from common_test import AATest, setup_aa, setup_all_loops # This testcase will parse all parser/tst/simple_tests with parse_profile_data(), # except the files listed in one of the arrays below. diff --git a/utils/test/test-pivot_root_parse.py b/utils/test/test-pivot_root_parse.py index f9d2dcf20..d33532595 100644 --- a/utils/test/test-pivot_root_parse.py +++ b/utils/test/test-pivot_root_parse.py @@ -9,9 +9,10 @@ # # ------------------------------------------------------------------ -import apparmor.aa as aa import unittest -from common_test import AAParseTest, setup_regex_tests, setup_aa + +import apparmor.aa as aa +from common_test import AAParseTest, setup_aa, setup_regex_tests class AAParsePivotRootTest(AAParseTest): diff --git a/utils/test/test-profile-list.py b/utils/test/test-profile-list.py index 80c32495f..ac4831b61 100644 --- a/utils/test/test-profile-list.py +++ b/utils/test/test-profile-list.py @@ -9,13 +9,11 @@ # # ------------------------------------------------------------------ -import unittest -from common_test import AATest, setup_aa, setup_all_loops, write_file - -import apparmor.aa import os import shutil +import unittest +import apparmor.aa from apparmor.common import AppArmorBug, AppArmorException from apparmor.profile_list import ProfileList from apparmor.profile_storage import ProfileStorage @@ -24,6 +22,7 @@ from apparmor.rule.alias import AliasRule from apparmor.rule.boolean import BooleanRule from apparmor.rule.include import IncludeRule from apparmor.rule.variable import VariableRule +from common_test import AATest, setup_aa, setup_all_loops, write_file class TestAdd_profile(AATest): diff --git a/utils/test/test-profile-storage.py b/utils/test/test-profile-storage.py index 357f3d378..a970a1457 100644 --- a/utils/test/test-profile-storage.py +++ b/utils/test/test-profile-storage.py @@ -10,10 +10,10 @@ # ------------------------------------------------------------------ import unittest -from common_test import AATest, setup_all_loops from apparmor.common import AppArmorBug, AppArmorException from apparmor.profile_storage import ProfileStorage, add_or_remove_flag, split_flags, var_transform +from common_test import AATest, setup_all_loops class TestUnknownKey(AATest): diff --git a/utils/test/test-profiles.py b/utils/test/test-profiles.py index 0606157ea..b8300a0c5 100644 --- a/utils/test/test-profiles.py +++ b/utils/test/test-profiles.py @@ -10,8 +10,9 @@ # ------------------------------------------------------------------ import unittest -from common_test import AATest, setup_all_loops, setup_aa + import apparmor.aa as aa +from common_test import AATest, setup_aa, setup_all_loops # If a profile can't be parsed by the tools, add it to skip_active_profiles or skip_extra_profiles. # Add only the filename (without path), for example 'usr.bin.foo'. diff --git a/utils/test/test-ptrace.py b/utils/test/test-ptrace.py index 9a0fbcf86..1d6a60289 100644 --- a/utils/test/test-ptrace.py +++ b/utils/test/test-ptrace.py @@ -15,13 +15,14 @@ import unittest from collections import namedtuple + +from apparmor.common import AppArmorBug, AppArmorException +from apparmor.logparser import ReadLog +from apparmor.rule import BaseRule +from apparmor.rule.ptrace import PtraceRule, PtraceRuleset +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.ptrace import PtraceRule, PtraceRuleset -from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug -from apparmor.logparser import ReadLog -from apparmor.translations import init_translation _ = init_translation() exp = namedtuple( diff --git a/utils/test/test-regex_matches.py b/utils/test/test-regex_matches.py index 287ee3b4a..f084dad3c 100644 --- a/utils/test/test-regex_matches.py +++ b/utils/test/test-regex_matches.py @@ -9,15 +9,15 @@ # # ------------------------------------------------------------------ -import apparmor.aa as aa import unittest -from common_test import AATest, setup_all_loops, setup_aa -from apparmor.common import AppArmorBug, AppArmorException +import apparmor.aa as aa +from apparmor.common import AppArmorBug, AppArmorException from apparmor.regex import ( - strip_parenthesis, strip_quotes, parse_profile_start_line, re_match_include, - re_match_include_parse, - RE_PROFILE_START, RE_PROFILE_DBUS, RE_PROFILE_CAP, RE_PROFILE_PTRACE, RE_PROFILE_SIGNAL) + RE_PROFILE_CAP, RE_PROFILE_DBUS, RE_PROFILE_PTRACE, RE_PROFILE_SIGNAL, + RE_PROFILE_START, parse_profile_start_line, re_match_include, + re_match_include_parse, strip_parenthesis, strip_quotes) +from common_test import AATest, setup_aa, setup_all_loops class AARegexTest(AATest): diff --git a/utils/test/test-rlimit.py b/utils/test/test-rlimit.py index b6f624567..be3ddebd5 100644 --- a/utils/test/test-rlimit.py +++ b/utils/test/test-rlimit.py @@ -15,13 +15,14 @@ import unittest from collections import namedtuple + +from apparmor.common import AppArmorBug, AppArmorException +# from apparmor.logparser import ReadLog +from apparmor.rule import BaseRule +from apparmor.rule.rlimit import RlimitRule, RlimitRuleset, split_unit +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.rlimit import RlimitRule, RlimitRuleset, split_unit -from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug -# from apparmor.logparser import ReadLog -from apparmor.translations import init_translation _ = init_translation() exp = namedtuple( diff --git a/utils/test/test-severity.py b/utils/test/test-severity.py index 997fd0acc..959148a67 100755 --- a/utils/test/test-severity.py +++ b/utils/test/test-severity.py @@ -15,10 +15,10 @@ # # ---------------------------------------------------------------------- import unittest -from common_test import AATest, setup_all_loops import apparmor.severity as severity from apparmor.common import AppArmorException +from common_test import AATest, setup_all_loops class SeverityBaseTest(AATest): diff --git a/utils/test/test-signal.py b/utils/test/test-signal.py index d9584b79c..ac68b12e5 100644 --- a/utils/test/test-signal.py +++ b/utils/test/test-signal.py @@ -15,13 +15,14 @@ import unittest from collections import namedtuple + +from apparmor.common import AppArmorBug, AppArmorException +from apparmor.logparser import ReadLog +from apparmor.rule import BaseRule +from apparmor.rule.signal import SignalRule, SignalRuleset +from apparmor.translations import init_translation from common_test import AATest, setup_all_loops -from apparmor.rule.signal import SignalRule, SignalRuleset -from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug -from apparmor.logparser import ReadLog -from apparmor.translations import init_translation _ = init_translation() exp = namedtuple( diff --git a/utils/test/test-translations.py b/utils/test/test-translations.py index 4591dd292..9e7493586 100644 --- a/utils/test/test-translations.py +++ b/utils/test/test-translations.py @@ -9,14 +9,13 @@ # # ------------------------------------------------------------------ -import unittest -from common_test import AATest, setup_all_loops - import gettext import os import subprocess +import unittest from apparmor.ui import CMDS, get_translated_hotkey +from common_test import AATest, setup_all_loops class TestHotkeyConflicts(AATest): diff --git a/utils/test/test-unix_parse.py b/utils/test/test-unix_parse.py index 3e5274a4c..5faadc874 100644 --- a/utils/test/test-unix_parse.py +++ b/utils/test/test-unix_parse.py @@ -11,7 +11,8 @@ import apparmor.aa as aa import unittest -from common_test import AAParseTest, setup_regex_tests, setup_aa + +from common_test import AAParseTest, setup_aa, setup_regex_tests class AAParseUnixTest(AAParseTest): diff --git a/utils/test/test-variable.py b/utils/test/test-variable.py index fcca1f629..8e1c4b4ba 100644 --- a/utils/test/test-variable.py +++ b/utils/test/test-variable.py @@ -17,10 +17,11 @@ import unittest from collections import namedtuple from common_test import AATest, setup_all_loops -from apparmor.rule.variable import VariableRule, VariableRuleset, separate_vars +from apparmor.common import AppArmorBug, AppArmorException from apparmor.rule import BaseRule -from apparmor.common import AppArmorException, AppArmorBug +from apparmor.rule.variable import VariableRule, VariableRuleset, separate_vars from apparmor.translations import init_translation + _ = init_translation() exp = namedtuple('exp', ('comment', 'varname', 'mode', 'values'))