[PATCH 1/2] libsemanage: Add support for DCCP and SCTP protocols

[PATCH 1/2] libsemanage: Add support for DCCP and SCTP protocols

[Vit Mojzis]

This is necessary for "semanage port" to be able to handle DCCP and SCTP
protocols.

Fixes:
    "port_parse" only handles TCP and UDP protocols

Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
---
 libsemanage/include/semanage/port_record.h | 2 ++
 libsemanage/src/ports_file.c               | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/libsemanage/include/semanage/port_record.h b/libsemanage/include/semanage/port_record.h
index 20ae4bd9..71074800 100644
--- a/libsemanage/include/semanage/port_record.h
+++ b/libsemanage/include/semanage/port_record.h
@@ -16,6 +16,8 @@ typedef struct semanage_port_key semanage_port_key_t;
 
 #define SEMANAGE_PROTO_UDP 0
 #define SEMANAGE_PROTO_TCP 1
+#define SEMANAGE_PROTO_DCCP 2
+#define SEMANAGE_PROTO_SCTP 3
 
 /* Key */
 extern int semanage_port_compare(const semanage_port_t * port,
diff --git a/libsemanage/src/ports_file.c b/libsemanage/src/ports_file.c
index 46ee2f00..4738d467 100644
--- a/libsemanage/src/ports_file.c
+++ b/libsemanage/src/ports_file.c
@@ -84,6 +84,10 @@ static int port_parse(semanage_handle_t * handle,
 		semanage_port_set_proto(port, SEMANAGE_PROTO_TCP);
 	else if (!strcasecmp(str, "udp"))
 		semanage_port_set_proto(port, SEMANAGE_PROTO_UDP);
+	else if (!strcasecmp(str, "dccp"))
+		semanage_port_set_proto(port, SEMANAGE_PROTO_DCCP);
+	else if (!strcasecmp(str, "sctp"))
+		semanage_port_set_proto(port, SEMANAGE_PROTO_SCTP);
 	else {
 		ERR(handle, "invalid protocol \"%s\" (%s: %u):\n%s", str,
 		    info->filename, info->lineno, info->orig_line);
-- 
2.21.0

[PATCH 2/2] python/semanage: Add support for DCCP and SCTP protocols

[Vit Mojzis]

Fixes:
   # semanage port -a -p sctp -t port_t 1234
   ValueError: Protocol udp or tcp is required
   # semanage port -d -p sctp -t port_t 1234
   ValueError: Protocol udp or tcp is required

Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
---
 python/semanage/seobject.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
index f4c29854..dc413ca5 100644
--- a/python/semanage/seobject.py
+++ b/python/semanage/seobject.py
@@ -1058,13 +1058,15 @@ class portRecords(semanageRecords):
             pass
 
     def __genkey(self, port, proto):
-        if proto == "tcp":
-            proto_d = SEMANAGE_PROTO_TCP
+        protocols = {"tcp": SEMANAGE_PROTO_TCP,
+                     "udp": SEMANAGE_PROTO_UDP,
+                     "sctp": SEMANAGE_PROTO_SCTP,
+                     "dccp": SEMANAGE_PROTO_DCCP}
+
+        if proto in protocols.keys():
+            proto_d = protocols[proto]
         else:
-            if proto == "udp":
-                proto_d = SEMANAGE_PROTO_UDP
-            else:
-                raise ValueError(_("Protocol udp or tcp is required"))
+            raise ValueError(_("Protocol has to be one of udp, tcp, dccp or sctp"))
         if port == "":
             raise ValueError(_("Port is required"))
 
-- 
2.21.0

Re: [PATCH 2/2] python/semanage: Add support for DCCP and SCTP protocols

[Stephen Smalley]

On 10/8/19 8:22 AM, Vit Mojzis wrote:
> Fixes:
>     # semanage port -a -p sctp -t port_t 1234
>     ValueError: Protocol udp or tcp is required
>     # semanage port -d -p sctp -t port_t 1234
>     ValueError: Protocol udp or tcp is required
> 
> Signed-off-by: Vit Mojzis <vmojzis@redhat.com>

For both patches,

Acked-by: Stephen Smalley <sds@tycho.nsa.gov>

> ---
>   python/semanage/seobject.py | 14 ++++++++------
>   1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
> index f4c29854..dc413ca5 100644
> --- a/python/semanage/seobject.py
> +++ b/python/semanage/seobject.py
> @@ -1058,13 +1058,15 @@ class portRecords(semanageRecords):
>               pass
>   
>       def __genkey(self, port, proto):
> -        if proto == "tcp":
> -            proto_d = SEMANAGE_PROTO_TCP
> +        protocols = {"tcp": SEMANAGE_PROTO_TCP,
> +                     "udp": SEMANAGE_PROTO_UDP,
> +                     "sctp": SEMANAGE_PROTO_SCTP,
> +                     "dccp": SEMANAGE_PROTO_DCCP}
> +
> +        if proto in protocols.keys():
> +            proto_d = protocols[proto]
>           else:
> -            if proto == "udp":
> -                proto_d = SEMANAGE_PROTO_UDP
> -            else:
> -                raise ValueError(_("Protocol udp or tcp is required"))
> +            raise ValueError(_("Protocol has to be one of udp, tcp, dccp or sctp"))
>           if port == "":
>               raise ValueError(_("Port is required"))
>   
> 

Re: [PATCH 2/2] python/semanage: Add support for DCCP and SCTP protocols

[Stephen Smalley]

On 10/9/19 10:39 AM, Stephen Smalley wrote:
> On 10/8/19 8:22 AM, Vit Mojzis wrote:
>> Fixes:
>>     # semanage port -a -p sctp -t port_t 1234
>>     ValueError: Protocol udp or tcp is required
>>     # semanage port -d -p sctp -t port_t 1234
>>     ValueError: Protocol udp or tcp is required
>>
>> Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
> 
> For both patches,
> 
> Acked-by: Stephen Smalley <sds@tycho.nsa.gov>

Thanks, applied.

> 
>> ---
>>   python/semanage/seobject.py | 14 ++++++++------
>>   1 file changed, 8 insertions(+), 6 deletions(-)
>>
>> diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
>> index f4c29854..dc413ca5 100644
>> --- a/python/semanage/seobject.py
>> +++ b/python/semanage/seobject.py
>> @@ -1058,13 +1058,15 @@ class portRecords(semanageRecords):
>>               pass
>>       def __genkey(self, port, proto):
>> -        if proto == "tcp":
>> -            proto_d = SEMANAGE_PROTO_TCP
>> +        protocols = {"tcp": SEMANAGE_PROTO_TCP,
>> +                     "udp": SEMANAGE_PROTO_UDP,
>> +                     "sctp": SEMANAGE_PROTO_SCTP,
>> +                     "dccp": SEMANAGE_PROTO_DCCP}
>> +
>> +        if proto in protocols.keys():
>> +            proto_d = protocols[proto]
>>           else:
>> -            if proto == "udp":
>> -                proto_d = SEMANAGE_PROTO_UDP
>> -            else:
>> -                raise ValueError(_("Protocol udp or tcp is required"))
>> +            raise ValueError(_("Protocol has to be one of udp, tcp, 
>> dccp or sctp"))
>>           if port == "":
>>               raise ValueError(_("Port is required"))
>>
>