semanage: use socket.getprotobyname for protocol
PATCH 1/2 semanage: use socket.getprotobyname for protocol
This patch removes proto_to_audit dictionary and uses standard socket.getprotobyname(protocol) to resolve protocol number from given protocol name.
--- policycoreutils/semanage/seobject.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
policycoreutils/semanage/seobject.py +8 -12
@@ -28,6 +28,7 @@ import os import re import sys import stat +import socket from semanage import * PROGNAME = "policycoreutils" import sepolicy
@@ -88,11 +89,6 @@ file_type_str_to_option = {"all files": "a", "symbolic link": "l", "named pipe": "p"} -proto_to_audit = {"tcp": 6, - "udp": 17, - "ipv4": 4, - "ipv6": 41} - ftype_to_audit = {"": "any", "b": "block", "c": "char",
@@ -1134,7 +1130,7 @@ class portRecords(semanageRecords): semanage_port_key_free(k) semanage_port_free(p) - self.mylog.log_change("resrc=port op=add lport=%s proto=%s tcontext=%s:%s:%s:%s" % (port, proto_to_audit[proto], "system_u", "object_r", type, serange)) + self.mylog.log_change("resrc=port op=add lport=%s proto=%s tcontext=%s:%s:%s:%s" % (port, socket.getprotobyname(proto), "system_u", "object_r", type, serange)) def add(self, port, proto, serange, type): self.begin()
@@ -1177,7 +1173,7 @@ class portRecords(semanageRecords): semanage_port_key_free(k) semanage_port_free(p) - self.mylog.log_change("resrc=port op=modify lport=%s proto=%s tcontext=%s:%s:%s:%s" % (port, proto_to_audit[proto], "system_u", "object_r", setype, serange)) + self.mylog.log_change("resrc=port op=modify lport=%s proto=%s tcontext=%s:%s:%s:%s" % (port, socket.getprotobyname(proto), "system_u", "object_r", setype, serange)) def modify(self, port, proto, serange, setype): self.begin()
@@ -1210,7 +1206,7 @@ class portRecords(semanageRecords): if low == high: port_str = low - self.mylog.log_change("resrc=port op=delete lport=%s proto=%s" % (port_str, proto_to_audit[proto_str])) + self.mylog.log_change("resrc=port op=delete lport=%s proto=%s" % (port_str, socket.getprotobyname(proto_str))) self.commit()
@@ -1234,7 +1230,7 @@ class portRecords(semanageRecords): semanage_port_key_free(k) - self.mylog.log_change("resrc=port op=delete lport=%s proto=%s" % (port, proto_to_audit[proto])) + self.mylog.log_change("resrc=port op=delete lport=%s proto=%s" % (port, socket.getprotobyname(proto))) def delete(self, port, proto): self.begin()
@@ -1414,7 +1410,7 @@ class nodeRecords(semanageRecords): semanage_node_key_free(k) semanage_node_free(node) - self.mylog.log_change("resrc=node op=add laddr=%s netmask=%s proto=%s tcontext=%s:%s:%s:%s" % (addr, mask, proto_to_audit[self.protocol[proto]], "system_u", "object_r", ctype, serange)) + self.mylog.log_change("resrc=node op=add laddr=%s netmask=%s proto=%s tcontext=%s:%s:%s:%s" % (addr, mask, socket.getprotobyname(self.protocol[proto]), "system_u", "object_r", ctype, serange)) def add(self, addr, mask, proto, serange, ctype): self.begin()
@@ -1457,7 +1453,7 @@ class nodeRecords(semanageRecords): semanage_node_key_free(k) semanage_node_free(node) - self.mylog.log_change("resrc=node op=modify laddr=%s netmask=%s proto=%s tcontext=%s:%s:%s:%s" % (addr, mask, proto_to_audit[self.protocol[proto]], "system_u", "object_r", setype, serange)) + self.mylog.log_change("resrc=node op=modify laddr=%s netmask=%s proto=%s tcontext=%s:%s:%s:%s" % (addr, mask, socket.getprotobyname(self.protocol[proto]), "system_u", "object_r", setype, serange)) def modify(self, addr, mask, proto, serange, setype): self.begin()
@@ -1490,7 +1486,7 @@ class nodeRecords(semanageRecords): semanage_node_key_free(k) - self.mylog.log_change("resrc=node op=delete laddr=%s netmask=%s proto=%s" % (addr, mask, proto_to_audit[self.protocol[proto]])) + self.mylog.log_change("resrc=node op=delete laddr=%s netmask=%s proto=%s" % (addr, mask, socket.getprotobyname(self.protocol[proto]))) def delete(self, addr, mask, proto): self.begin()
Signature · 1 line
1.8.3.1
PATCH 2/2 semanage: default to "s0" if serange empty for port modify
In case serange is empty, but the record is beeing modified (setype was supplied), use default "s0" range. With the original code the audit event would be printed with no range (i.e. "system_u:object_r:ssh_port_t:")
Note that default "s0" is currently used in other places of seobject.py.
--- policycoreutils/semanage/seobject.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
policycoreutils/semanage/seobject.py +5 -2
@@ -1161,8 +1161,11 @@ class portRecords(semanageRecords): con = semanage_port_get_con(p) - if (is_mls_enabled == 1) and (serange != ""): - semanage_context_set_mls(self.sh, con, untranslate(serange)) + if is_mls_enabled == 1: + if serange == "": + serange = "s0" + else: + semanage_context_set_mls(self.sh, con, untranslate(serange)) if setype != "": semanage_context_set_type(self.sh, con, setype)
Signature · 1 line
1.8.3.1
Re: [PATCH 2/2] semanage: default to "s0" if serange empty for port modify
Quoted 8 lines · Miroslav Vadkerti
In case serange is empty, but the record is beeing modified (setype was supplied), use default "s0" range. With the original code the audit event would be printed with no range (i.e. "system_u:object_r:ssh_port_t:")
Note that default "s0" is currently used in other places of
seobject.py.
Note-to-self: when we deal with refpolicy specific identifiers like system_u remember to also deal with these. Since these are essentially also refpolicy specific identifiers.
Quoted 24 lines
Signed-off-by Miroslav Vadkerti <[email protected]>--- policycoreutils/semanage/seobject.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)policycoreutils/semanage/seobject.py +5
-2@@ -1161,8 +1161,11 @@ class portRecords(semanageRecords): con = semanage_port_get_con(p) - if (is_mls_enabled == 1) and (serange != ""): - semanage_context_set_mls(self.sh, con, untranslate(serange)) + if is_mls_enabled == 1: + if serange == "": + serange = "s0" + else: + semanage_context_set_mls(self.sh, con, untranslate(serange)) if setype != "": semanage_context_set_type(self.sh, con, setype)
Signature · 3 lines
Key fingerprint = 5F4D 3CDB D3F8 3652 FBD8 02D5 3B6C 5F1D 2C7B 6B02 https://sks-keyservers.net/pks/lookup?op=get&search=0x3B6C5F1D2C7B6B02 Dominick Grift
Quoted 5 lines · Miroslav Vadkerti
This patch removes
proto_to_auditdictionary and uses standardsocket.getprotobyname(protocol)to resolve protocol number from given protocol name.Signed-off-by Miroslav Vadkerti <[email protected]>
Applied both patches.
Thanks,
Jim
Quoted 92 lines
--- policycoreutils/semanage/seobject.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)policycoreutils/semanage/seobject.py +8
-12@@ -28,6 +28,7 @@ import os import re import sys import stat +import socket from semanage import * PROGNAME = "policycoreutils" import sepolicy@@ -88,11 +89,6 @@ file_type_str_to_option = {"all files": "a", "symbolic link": "l", "named pipe": "p"} -proto_to_audit = {"tcp": 6, - "udp": 17, - "ipv4": 4, - "ipv6": 41} - ftype_to_audit = {"": "any", "b": "block", "c": "char",@@ -1134,7 +1130,7 @@ class portRecords(semanageRecords): semanage_port_key_free(k) semanage_port_free(p) - self.mylog.log_change("resrc=port op=add lport=%s proto=%s tcontext=%s:%s:%s:%s" % (port, proto_to_audit[proto], "system_u", "object_r", type, serange)) + self.mylog.log_change("resrc=port op=add lport=%s proto=%s tcontext=%s:%s:%s:%s" % (port, socket.getprotobyname(proto), "system_u", "object_r", type, serange)) def add(self, port, proto, serange, type): self.begin()@@ -1177,7 +1173,7 @@ class portRecords(semanageRecords): semanage_port_key_free(k) semanage_port_free(p) - self.mylog.log_change("resrc=port op=modify lport=%s proto=%s tcontext=%s:%s:%s:%s" % (port, proto_to_audit[proto], "system_u", "object_r", setype, serange)) + self.mylog.log_change("resrc=port op=modify lport=%s proto=%s tcontext=%s:%s:%s:%s" % (port, socket.getprotobyname(proto), "system_u", "object_r", setype, serange)) def modify(self, port, proto, serange, setype): self.begin()@@ -1210,7 +1206,7 @@ class portRecords(semanageRecords): if low == high: port_str = low - self.mylog.log_change("resrc=port op=delete lport=%s proto=%s" % (port_str, proto_to_audit[proto_str])) + self.mylog.log_change("resrc=port op=delete lport=%s proto=%s" % (port_str, socket.getprotobyname(proto_str))) self.commit()@@ -1234,7 +1230,7 @@ class portRecords(semanageRecords): semanage_port_key_free(k) - self.mylog.log_change("resrc=port op=delete lport=%s proto=%s" % (port, proto_to_audit[proto])) + self.mylog.log_change("resrc=port op=delete lport=%s proto=%s" % (port, socket.getprotobyname(proto))) def delete(self, port, proto): self.begin()@@ -1414,7 +1410,7 @@ class nodeRecords(semanageRecords): semanage_node_key_free(k) semanage_node_free(node) - self.mylog.log_change("resrc=node op=add laddr=%s netmask=%s proto=%s tcontext=%s:%s:%s:%s" % (addr, mask, proto_to_audit[self.protocol[proto]], "system_u", "object_r", ctype, serange)) + self.mylog.log_change("resrc=node op=add laddr=%s netmask=%s proto=%s tcontext=%s:%s:%s:%s" % (addr, mask, socket.getprotobyname(self.protocol[proto]), "system_u", "object_r", ctype, serange)) def add(self, addr, mask, proto, serange, ctype): self.begin()@@ -1457,7 +1453,7 @@ class nodeRecords(semanageRecords): semanage_node_key_free(k) semanage_node_free(node) - self.mylog.log_change("resrc=node op=modify laddr=%s netmask=%s proto=%s tcontext=%s:%s:%s:%s" % (addr, mask, proto_to_audit[self.protocol[proto]], "system_u", "object_r", setype, serange)) + self.mylog.log_change("resrc=node op=modify laddr=%s netmask=%s proto=%s tcontext=%s:%s:%s:%s" % (addr, mask, socket.getprotobyname(self.protocol[proto]), "system_u", "object_r", setype, serange)) def modify(self, addr, mask, proto, serange, setype): self.begin()@@ -1490,7 +1486,7 @@ class nodeRecords(semanageRecords): semanage_node_key_free(k) - self.mylog.log_change("resrc=node op=delete laddr=%s netmask=%s proto=%s" % (addr, mask, proto_to_audit[self.protocol[proto]])) + self.mylog.log_change("resrc=node op=delete laddr=%s netmask=%s proto=%s" % (addr, mask, socket.getprotobyname(self.protocol[proto]))) def delete(self, addr, mask, proto): self.begin()
Signature · 2 lines
James Carter <[email protected]> National Security Agency