sepolicy: fix some typos and port definitions #230
PATCH 1/1 sepolicy: fix some typos and port definitions #230
The range of unreserved ports starts from 1024 and ends to 65535 (inclusive). (Secure) RPC ports can be between 512 and 1023 (inclusive).
--- python/sepolicy/sepolicy/generate.py | 4 ++-- python/sepolicy/sepolicy/interface.py | 2 +- python/sepolicy/sepolicy/network.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
python/sepolicy/sepolicy/generate.py +2 -2
@@ -340,7 +340,7 @@ class policy: (self.generate_root_user_types, self.generate_root_user_rules), (self.generate_new_types, self.generate_new_rules)) if not re.match(r"^[a-zA-Z0-9-_]+$", name): - raise ValueError(_("Name must be alpha numeric with no spaces. Consider using option \"-n MODULENAME\"")) + raise ValueError(_("Name must be alphanumeric with no spaces. Consider using option \"-n MODULENAME\"")) if type == CGI: self.name = "httpd_%s_script" % name
@@ -438,7 +438,7 @@ class policy: def set_init_script(self, initscript): if self.type != DAEMON: - raise ValueError(_("Only Daemon apps can use an init script..")) + raise ValueError(_("Only Daemon apps can use an init script.")) self.initscript = initscript
python/sepolicy/sepolicy/interface.py +1 -1
@@ -198,7 +198,7 @@ def get_xml_file(if_file): filename = os.path.basename(if_file).split(".")[0] rc, output = getstatusoutput("/usr/bin/python3 /usr/share/selinux/devel/include/support/segenxml.py -w -m %s" % (basedir + filename)) if rc != 0: - sys.stderr.write("\n Could not proceed selected interface file.\n") + sys.stderr.write("\n Could not process selected interface file.\n") sys.stderr.write("\n%s" % output) sys.exit(1) else:
python/sepolicy/sepolicy/network.py +3 -3
@@ -49,15 +49,15 @@ def get_network_connect(src, protocol, perm, check_bools=False): if "port_t" in tlist: continue if i == "port_t": - d[(src, protocol, perm)].append((i, ["all ports with out defined types"])) + d[(src, protocol, perm)].append((i, ["all ports without defined types"])) if i == "port_type": d[(src, protocol, perm)].append((i, ["all ports"])) elif i == "unreserved_port_type": - d[(src, protocol, perm)].append((i, ["all ports > 1024"])) + d[(src, protocol, perm)].append((i, ["all ports > 1023"])) elif i == "reserved_port_type": d[(src, protocol, perm)].append((i, ["all ports < 1024"])) elif i == "rpc_port_type": - d[(src, protocol, perm)].append((i, ["all ports > 500 and < 1024"])) + d[(src, protocol, perm)].append((i, ["all ports > 511 and < 1024"])) else: try: d[(src, protocol, perm)].append((i, portrecs[(i, protocol)]))
Signature · 1 line
2.26.2
Quoted 51 lines · Topi Miettinen
The range of unreserved ports starts from 1024 and ends to 65535 (inclusive). (Secure) RPC ports can be between 512 and 1023 (inclusive).
Signed-off-by Topi Miettinen <[email protected]>--- python/sepolicy/sepolicy/generate.py | 4 ++-- python/sepolicy/sepolicy/interface.py | 2 +- python/sepolicy/sepolicy/network.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)python/sepolicy/sepolicy/generate.py +2
-2@@ -340,7 +340,7 @@ class policy: (self.generate_root_user_types, self.generate_root_user_rules), (self.generate_new_types, self.generate_new_rules)) if not re.match(r"^[a-zA-Z0-9-_]+$", name): - raise ValueError(_("Name must be alpha numeric with no spaces. Consider using option \"-n MODULENAME\"")) + raise ValueError(_("Name must be alphanumeric with no spaces. Consider using option \"-n MODULENAME\"")) if type == CGI: self.name = "httpd_%s_script" % name@@ -438,7 +438,7 @@ class policy: def set_init_script(self, initscript): if self.type != DAEMON: - raise ValueError(_("Only Daemon apps can use an init script..")) + raise ValueError(_("Only Daemon apps can use an init script.")) self.initscript = initscriptpython/sepolicy/sepolicy/interface.py +1
-1@@ -198,7 +198,7 @@ def get_xml_file(if_file): filename = os.path.basename(if_file).split(".")[0] rc, output = getstatusoutput("/usr/bin/python3 /usr/share/selinux/devel/include/support/segenxml.py -w -m %s" % (basedir + filename)) if rc != 0: - sys.stderr.write("\n Could not proceed selected interface file.\n") + sys.stderr.write("\n Could not process selected interface file.\n") sys.stderr.write("\n%s" % output) sys.exit(1) else:python/sepolicy/sepolicy/network.py +0
-0
python/sepolicy/sepolicy/network.py def get_network_connect(src, protocol, perm, check_bools=False): · line 56
Quoted 10 lines
python/sepolicy/sepolicy/network.py +2
-2@@ -49,15 +49,15 @@ def get_network_connect(src, protocol, perm, check_bools=False): if "port_t" in tlist: continue if i == "port_t": - d[(src, protocol, perm)].append((i, ["all ports with out defined types"])) + d[(src, protocol, perm)].append((i, ["all ports without defined types"])) if i == "port_type": d[(src, protocol, perm)].append((i, ["all ports"])) elif i == "unreserved_port_type": - d[(src, protocol, perm)].append((i, ["all ports > 1024"])) + d[(src, protocol, perm)].append((i, ["all ports > 1023"]))
I'd prefer to use "all ports >= 1024" as "1024" is used in the refpolicy definition:
policy/modules/kernel/corenetwork.te.m4:ifelse(eval(range_start($2) < 1024),1,typeattribute $1 reserved_port_type;',typeattribute $1 unreserved_port_type;')
python/sepolicy/sepolicy/network.py def get_network_connect(src, protocol, perm, check_bools=False): · line 60
Quoted 5 lines
python/sepolicy/sepolicy/network.py +1
-1elif i == "reserved_port_type": d[(src, protocol, perm)].append((i, ["all ports < 1024"])) elif i == "rpc_port_type": - d[(src, protocol, perm)].append((i, ["all ports > 500 and < 1024"])) + d[(src, protocol, perm)].append((i, ["all ports > 511 and < 1024"]))
"all ports >= 512 and < 1024"
policy/modules/kernel/corenetwork.te.m4:ifelse(eval(range_start($3) >= 512 && range_start($3) < 1024),1,`typeattribute $1 rpc_port_type;
Quoted 6 lines
python/sepolicy/sepolicy/network.py +0
-0else: try: d[(src, protocol, perm)].append((i, portrecs[(i, protocol)]))Signature · 1 line
2.26.2