]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
libxt_owner
authorJan Engelhardt <jengelh@medozas.de>
Sun, 20 Jan 2008 13:21:38 +0000 (13:21 +0000)
committerPatrick McHardy <kaber@trash.net>
Sun, 20 Jan 2008 13:21:38 +0000 (13:21 +0000)
libxt_owner merges libipt_owner and libip6t_owner, and adds support
for the xt_owner match revision 1.

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
extensions/libip6t_owner.c [deleted file]
extensions/libip6t_owner.man [deleted file]
extensions/libipt_owner.c [deleted file]
extensions/libipt_owner.man [deleted file]
extensions/libxt_owner.c [new file with mode: 0644]
extensions/libxt_owner.man [new file with mode: 0644]
include/linux/netfilter/xt_owner.h [new file with mode: 0644]

diff --git a/extensions/libip6t_owner.c b/extensions/libip6t_owner.c
deleted file mode 100644 (file)
index bf9c27e..0000000
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Shared library add-on to iptables to add OWNER matching support. */
-#include <stdio.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <pwd.h>
-#include <grp.h>
-
-#include <ip6tables.h>
-#include <linux/netfilter_ipv6/ip6t_owner.h>
-
-/* Function which prints out usage message. */
-static void owner_help(void)
-{
-#ifdef IP6T_OWNER_COMM
-       printf(
-"OWNER match v%s options:\n"
-"[!] --uid-owner userid     Match local uid\n"
-"[!] --gid-owner groupid    Match local gid\n"
-"[!] --pid-owner processid  Match local pid\n"
-"[!] --sid-owner sessionid  Match local sid\n"
-"[!] --cmd-owner name       Match local command name\n"
-"\n",
-IPTABLES_VERSION);
-#else
-       printf(
-"OWNER match v%s options:\n"
-"[!] --uid-owner userid     Match local uid\n"
-"[!] --gid-owner groupid    Match local gid\n"
-"[!] --pid-owner processid  Match local pid\n"
-"[!] --sid-owner sessionid  Match local sid\n"
-"\n",
-IPTABLES_VERSION);
-#endif /* IP6T_OWNER_COMM */
-}
-
-static const struct option owner_opts[] = {
-       { "uid-owner", 1, NULL, '1' },
-       { "gid-owner", 1, NULL, '2' },
-       { "pid-owner", 1, NULL, '3' },
-       { "sid-owner", 1, NULL, '4' },
-#ifdef IP6T_OWNER_COMM
-       { "cmd-owner", 1, NULL, '5' },
-#endif
-       { }
-};
-
-/* Function which parses command options; returns true if it
-   ate an option */
-static int owner_parse(int c, char **argv, int invert, unsigned int *flags,
-                       const void *entry, struct xt_entry_match **match)
-{
-       struct ip6t_owner_info *ownerinfo = (struct ip6t_owner_info *)(*match)->data;
-
-       switch (c) {
-               char *end;
-               struct passwd *pwd;
-               struct group *grp;
-       case '1':
-               check_inverse(optarg, &invert, &optind, 0);
-
-               if ((pwd = getpwnam(optarg)))
-                       ownerinfo->uid = pwd->pw_uid;
-               else {
-                       ownerinfo->uid = strtoul(optarg, &end, 0);
-                       if (*end != '\0' || end == optarg)
-                               exit_error(PARAMETER_PROBLEM, "Bad OWNER UID value `%s'", optarg);
-               }
-               if (invert)
-                       ownerinfo->invert |= IP6T_OWNER_UID;
-               ownerinfo->match |= IP6T_OWNER_UID;
-               *flags = 1;
-               break;
-
-       case '2':
-               check_inverse(optarg, &invert, &optind, 0);
-               if ((grp = getgrnam(optarg)))
-                       ownerinfo->gid = grp->gr_gid;
-               else {
-                       ownerinfo->gid = strtoul(optarg, &end, 0);
-                       if (*end != '\0' || end == optarg)
-                               exit_error(PARAMETER_PROBLEM, "Bad OWNER GID value `%s'", optarg);
-               }
-               if (invert)
-                       ownerinfo->invert |= IP6T_OWNER_GID;
-               ownerinfo->match |= IP6T_OWNER_GID;
-               *flags = 1;
-               break;
-
-       case '3':
-               check_inverse(optarg, &invert, &optind, 0);
-               ownerinfo->pid = strtoul(optarg, &end, 0);
-               if (*end != '\0' || end == optarg)
-                       exit_error(PARAMETER_PROBLEM, "Bad OWNER PID value `%s'", optarg);
-               if (invert)
-                       ownerinfo->invert |= IP6T_OWNER_PID;
-               ownerinfo->match |= IP6T_OWNER_PID;
-               *flags = 1;
-               break;
-
-       case '4':
-               check_inverse(optarg, &invert, &optind, 0);
-               ownerinfo->sid = strtoul(optarg, &end, 0);
-               if (*end != '\0' || end == optarg)
-                       exit_error(PARAMETER_PROBLEM, "Bad OWNER SID value `%s'", optarg);
-               if (invert)
-                       ownerinfo->invert |= IP6T_OWNER_SID;
-               ownerinfo->match |= IP6T_OWNER_SID;
-               *flags = 1;
-               break;
-
-#ifdef IP6T_OWNER_COMM
-       case '5':
-               check_inverse(optarg, &invert, &optind, 0);
-               if(strlen(optarg) > sizeof(ownerinfo->comm))
-                       exit_error(PARAMETER_PROBLEM, "OWNER CMD `%s' too long, max %d characters", optarg, sizeof(ownerinfo->comm));
-               
-               strncpy(ownerinfo->comm, optarg, sizeof(ownerinfo->comm));
-               ownerinfo->comm[sizeof(ownerinfo->comm)-1] = '\0';
-
-               if (invert)
-                       ownerinfo->invert |= IP6T_OWNER_COMM;
-               ownerinfo->match |= IP6T_OWNER_COMM;
-               *flags = 1;
-               break;
-#endif
-               
-       default:
-               return 0;
-       }
-       return 1;
-}
-
-static void
-print_item(struct ip6t_owner_info *info, u_int8_t flag, int numeric, char *label)
-{
-       if(info->match & flag) {
-
-               if (info->invert & flag)
-                       printf("! ");
-
-               printf(label);
-
-               switch(info->match & flag) {
-               case IP6T_OWNER_UID:
-                       if(!numeric) {
-                               struct passwd *pwd = getpwuid(info->uid);
-
-                               if(pwd && pwd->pw_name) {
-                                       printf("%s ", pwd->pw_name);
-                                       break;
-                               }
-                               /* FALLTHROUGH */
-                       }
-                       printf("%u ", info->uid);
-                       break;
-               case IP6T_OWNER_GID:
-                       if(!numeric) {
-                               struct group *grp = getgrgid(info->gid);
-
-                               if(grp && grp->gr_name) {
-                                       printf("%s ", grp->gr_name);
-                                       break;
-                               }
-                               /* FALLTHROUGH */
-                       }
-                       printf("%u ", info->gid);
-                       break;
-               case IP6T_OWNER_PID:
-                       printf("%u ", info->pid);
-                       break;
-               case IP6T_OWNER_SID:
-                       printf("%u ", info->sid);
-                       break;
-#ifdef IP6T_OWNER_COMM
-               case IP6T_OWNER_COMM:
-                       printf("%.*s ", (int)sizeof(info->comm), info->comm);
-                       break;
-#endif
-               default:
-                       break;
-               }
-       }
-}
-
-/* Final check; must have specified --own. */
-static void owner_check(unsigned int flags)
-{
-       if (!flags)
-               exit_error(PARAMETER_PROBLEM,
-                          "OWNER match: You must specify one or more options");
-}
-
-/* Prints out the matchinfo. */
-static void owner_print(const void *ip, const struct xt_entry_match *match,
-                        int numeric)
-{
-       struct ip6t_owner_info *info = (struct ip6t_owner_info *)match->data;
-
-       print_item(info, IP6T_OWNER_UID, numeric, "OWNER UID match ");
-       print_item(info, IP6T_OWNER_GID, numeric, "OWNER GID match ");
-       print_item(info, IP6T_OWNER_PID, numeric, "OWNER PID match ");
-       print_item(info, IP6T_OWNER_SID, numeric, "OWNER SID match ");
-#ifdef IP6T_OWNER_COMM
-       print_item(info, IP6T_OWNER_COMM, numeric, "OWNER CMD match ");
-#endif
-}
-
-/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void owner_save(const void *ip, const struct xt_entry_match *match)
-{
-       struct ip6t_owner_info *info = (struct ip6t_owner_info *)match->data;
-
-       print_item(info, IP6T_OWNER_UID, 0, "--uid-owner ");
-       print_item(info, IP6T_OWNER_GID, 0, "--gid-owner ");
-       print_item(info, IP6T_OWNER_PID, 0, "--pid-owner ");
-       print_item(info, IP6T_OWNER_SID, 0, "--sid-owner ");
-#ifdef IP6T_OWNER_COMM
-       print_item(info, IP6T_OWNER_COMM, 0, "--cmd-owner ");
-#endif
-}
-
-static struct ip6tables_match owner_match6 = {
-       .name           = "owner",
-       .version        = IPTABLES_VERSION,
-       .size           = IP6T_ALIGN(sizeof(struct ip6t_owner_info)),
-       .userspacesize  = IP6T_ALIGN(sizeof(struct ip6t_owner_info)),
-       .help           = owner_help,
-       .parse          = owner_parse,
-       .final_check    = owner_check,
-       .print          = owner_print,
-       .save           = owner_save,
-       .extra_opts     = owner_opts,
-};
-
-void _init(void)
-{
-       register_match6(&owner_match6);
-}
diff --git a/extensions/libip6t_owner.man b/extensions/libip6t_owner.man
deleted file mode 100644 (file)
index edd72b1..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-This module attempts to match various characteristics of the packet
-creator, for locally-generated packets.  It is only valid in the
-.B OUTPUT
-chain, and even this some packets (such as ICMPv6 ping responses) may
-have no owner, and hence never match.  This is regarded as experimental.
-.TP
-.BI "--uid-owner " "userid"
-Matches if the packet was created by a process with the given
-effective user id.
-.TP
-.BI "--gid-owner " "groupid"
-Matches if the packet was created by a process with the given
-effective group id.
-.TP
-.BI "--pid-owner " "processid"
-Matches if the packet was created by a process with the given
-process id.
-.TP
-.BI "--sid-owner " "sessionid"
-Matches if the packet was created by a process in the given session
-group.
-.TP
-.B NOTE: pid, sid and command matching are broken on SMP
diff --git a/extensions/libipt_owner.c b/extensions/libipt_owner.c
deleted file mode 100644 (file)
index 910e011..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Shared library add-on to iptables to add OWNER matching support. */
-#include <stdio.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <pwd.h>
-#include <grp.h>
-
-#include <iptables.h>
-#include <linux/netfilter_ipv4/ipt_owner.h>
-
-/* Function which prints out usage message. */
-static void owner_help(void)
-{
-#ifdef IPT_OWNER_COMM
-       printf(
-"OWNER match v%s options:\n"
-"[!] --uid-owner userid     Match local uid\n"
-"[!] --gid-owner groupid    Match local gid\n"
-"[!] --pid-owner processid  Match local pid\n"
-"[!] --sid-owner sessionid  Match local sid\n"
-"[!] --cmd-owner name       Match local command name\n"
-"NOTE: pid, sid and command matching are broken on SMP\n"
-"\n",
-IPTABLES_VERSION);
-#else
-       printf(
-"OWNER match v%s options:\n"
-"[!] --uid-owner userid     Match local uid\n"
-"[!] --gid-owner groupid    Match local gid\n"
-"[!] --pid-owner processid  Match local pid\n"
-"[!] --sid-owner sessionid  Match local sid\n"
-"NOTE: pid and sid matching are broken on SMP\n"
-"\n",
-IPTABLES_VERSION);
-#endif /* IPT_OWNER_COMM */
-}
-
-static const struct option owner_opts[] = {
-       { "uid-owner", 1, NULL, '1' },
-       { "gid-owner", 1, NULL, '2' },
-       { "pid-owner", 1, NULL, '3' },
-       { "sid-owner", 1, NULL, '4' },
-#ifdef IPT_OWNER_COMM
-       { "cmd-owner", 1, NULL, '5' },
-#endif
-       { }
-};
-
-/* Function which parses command options; returns true if it
-   ate an option */
-static int owner_parse(int c, char **argv, int invert, unsigned int *flags,
-                       const void *entry, struct xt_entry_match **match)
-{
-       struct ipt_owner_info *ownerinfo = (struct ipt_owner_info *)(*match)->data;
-
-       switch (c) {
-               char *end;
-               struct passwd *pwd;
-               struct group *grp;
-       case '1':
-               check_inverse(optarg, &invert, &optind, 0);
-               if ((pwd = getpwnam(optarg)))
-                       ownerinfo->uid = pwd->pw_uid;
-               else {
-                       ownerinfo->uid = strtoul(optarg, &end, 0);
-                       if (*end != '\0' || end == optarg)
-                               exit_error(PARAMETER_PROBLEM, "Bad OWNER UID value `%s'", optarg);
-               }
-               if (invert)
-                       ownerinfo->invert |= IPT_OWNER_UID;
-               ownerinfo->match |= IPT_OWNER_UID;
-               *flags = 1;
-               break;
-
-       case '2':
-               check_inverse(optarg, &invert, &optind, 0);
-               if ((grp = getgrnam(optarg)))
-                       ownerinfo->gid = grp->gr_gid;
-               else {
-                       ownerinfo->gid = strtoul(optarg, &end, 0);
-                       if (*end != '\0' || end == optarg)
-                               exit_error(PARAMETER_PROBLEM, "Bad OWNER GID value `%s'", optarg);
-               }
-               if (invert)
-                       ownerinfo->invert |= IPT_OWNER_GID;
-               ownerinfo->match |= IPT_OWNER_GID;
-               *flags = 1;
-               break;
-
-       case '3':
-               check_inverse(optarg, &invert, &optind, 0);
-               ownerinfo->pid = strtoul(optarg, &end, 0);
-               if (*end != '\0' || end == optarg)
-                       exit_error(PARAMETER_PROBLEM, "Bad OWNER PID value `%s'", optarg);
-               if (invert)
-                       ownerinfo->invert |= IPT_OWNER_PID;
-               ownerinfo->match |= IPT_OWNER_PID;
-               *flags = 1;
-               break;
-
-       case '4':
-               check_inverse(optarg, &invert, &optind, 0);
-               ownerinfo->sid = strtoul(optarg, &end, 0);
-               if (*end != '\0' || end == optarg)
-                       exit_error(PARAMETER_PROBLEM, "Bad OWNER SID value `%s'", optarg);
-               if (invert)
-                       ownerinfo->invert |= IPT_OWNER_SID;
-               ownerinfo->match |= IPT_OWNER_SID;
-               *flags = 1;
-               break;
-
-#ifdef IPT_OWNER_COMM
-       case '5':
-               check_inverse(optarg, &invert, &optind, 0);
-               if(strlen(optarg) > sizeof(ownerinfo->comm))
-                       exit_error(PARAMETER_PROBLEM, "OWNER CMD `%s' too long, max %u characters", optarg, (unsigned int)sizeof(ownerinfo->comm));
-
-               strncpy(ownerinfo->comm, optarg, sizeof(ownerinfo->comm));
-               ownerinfo->comm[sizeof(ownerinfo->comm)-1] = '\0';
-
-               if (invert)
-                       ownerinfo->invert |= IPT_OWNER_COMM;
-               ownerinfo->match |= IPT_OWNER_COMM;
-               *flags = 1;
-               break;
-#endif
-
-       default:
-               return 0;
-       }
-       return 1;
-}
-
-static void
-print_item(struct ipt_owner_info *info, u_int8_t flag, int numeric, char *label)
-{
-       if(info->match & flag) {
-
-               if (info->invert & flag)
-                       printf("! ");
-
-               printf(label);
-
-               switch(info->match & flag) {
-               case IPT_OWNER_UID:
-                       if(!numeric) {
-                               struct passwd *pwd = getpwuid(info->uid);
-
-                               if(pwd && pwd->pw_name) {
-                                       printf("%s ", pwd->pw_name);
-                                       break;
-                               }
-                               /* FALLTHROUGH */
-                       }
-                       printf("%u ", info->uid);
-                       break;
-               case IPT_OWNER_GID:
-                       if(!numeric) {
-                               struct group *grp = getgrgid(info->gid);
-
-                               if(grp && grp->gr_name) {
-                                       printf("%s ", grp->gr_name);
-                                       break;
-                               }
-                               /* FALLTHROUGH */
-                       }
-                       printf("%u ", info->gid);
-                       break;
-               case IPT_OWNER_PID:
-                       printf("%u ", info->pid);
-                       break;
-               case IPT_OWNER_SID:
-                       printf("%u ", info->sid);
-                       break;
-#ifdef IPT_OWNER_COMM
-               case IPT_OWNER_COMM:
-                       printf("%.*s ", (int)sizeof(info->comm), info->comm);
-                       break;
-#endif
-               default:
-                       break;
-               }
-       }
-}
-
-/* Final check; must have specified --own. */
-static void owner_check(unsigned int flags)
-{
-       if (!flags)
-               exit_error(PARAMETER_PROBLEM,
-                          "OWNER match: You must specify one or more options");
-}
-
-/* Prints out the matchinfo. */
-static void owner_print(const void *ip, const struct xt_entry_match *match,
-                        int numeric)
-{
-       struct ipt_owner_info *info = (struct ipt_owner_info *)match->data;
-
-       print_item(info, IPT_OWNER_UID, numeric, "OWNER UID match ");
-       print_item(info, IPT_OWNER_GID, numeric, "OWNER GID match ");
-       print_item(info, IPT_OWNER_PID, numeric, "OWNER PID match ");
-       print_item(info, IPT_OWNER_SID, numeric, "OWNER SID match ");
-#ifdef IPT_OWNER_COMM
-       print_item(info, IPT_OWNER_COMM, numeric, "OWNER CMD match ");
-#endif
-}
-
-/* Saves the union ipt_matchinfo in parsable form to stdout. */
-static void owner_save(const void *ip, const struct xt_entry_match *match)
-{
-       struct ipt_owner_info *info = (struct ipt_owner_info *)match->data;
-
-       print_item(info, IPT_OWNER_UID, 0, "--uid-owner ");
-       print_item(info, IPT_OWNER_GID, 0, "--gid-owner ");
-       print_item(info, IPT_OWNER_PID, 0, "--pid-owner ");
-       print_item(info, IPT_OWNER_SID, 0, "--sid-owner ");
-#ifdef IPT_OWNER_COMM
-       print_item(info, IPT_OWNER_COMM, 0, "--cmd-owner ");
-#endif
-}
-
-static struct iptables_match owner_match = {
-       .name           = "owner",
-       .version        = IPTABLES_VERSION,
-       .size           = IPT_ALIGN(sizeof(struct ipt_owner_info)),
-       .userspacesize  = IPT_ALIGN(sizeof(struct ipt_owner_info)),
-       .help           = owner_help,
-       .parse          = owner_parse,
-       .final_check    = owner_check,
-       .print          = owner_print,
-       .save           = owner_save,
-       .extra_opts     = owner_opts,
-};
-
-void _init(void)
-{
-       register_match(&owner_match);
-}
diff --git a/extensions/libipt_owner.man b/extensions/libipt_owner.man
deleted file mode 100644 (file)
index b635e7d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-This module attempts to match various characteristics of the packet
-creator, for locally-generated packets.  It is only valid in the
-.B OUTPUT
-chain, and even this some packets (such as ICMP ping responses) may
-have no owner, and hence never match.
-.TP
-.BI "--uid-owner " "userid"
-Matches if the packet was created by a process with the given
-effective user id.
-.TP
-.BI "--gid-owner " "groupid"
-Matches if the packet was created by a process with the given
-effective group id.
-.TP
-.BI "--pid-owner " "processid"
-Matches if the packet was created by a process with the given
-process id.
-.TP
-.BI "--sid-owner " "sessionid"
-Matches if the packet was created by a process in the given session
-group.
-.TP
-.BI "--cmd-owner " "name"
-Matches if the packet was created by a process with the given command name.
-(this option is present only if iptables was compiled under a kernel
-supporting this feature)
-.TP
-.B NOTE: pid, sid and command matching are broken on SMP
diff --git a/extensions/libxt_owner.c b/extensions/libxt_owner.c
new file mode 100644 (file)
index 0000000..28e2db4
--- /dev/null
@@ -0,0 +1,574 @@
+/*
+ *     libxt_owner - iptables addon for xt_owner
+ *
+ *     Copyright Â© CC Computer Consultants GmbH, 2007 - 2008
+ *     Jan Engelhardt <jengelh@computergmbh.de>
+ */
+#include <getopt.h>
+#include <grp.h>
+#include <netdb.h>
+#include <pwd.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <xtables.h>
+#include <linux/netfilter/xt_owner.h>
+#include <linux/netfilter_ipv4/ipt_owner.h>
+#include <linux/netfilter_ipv6/ip6t_owner.h>
+
+enum {
+       FLAG_UID_OWNER     = 1 << 0,
+       FLAG_GID_OWNER     = 1 << 1,
+       FLAG_SOCKET_EXISTS = 1 << 2,
+       FLAG_PID_OWNER     = 1 << 3,
+       FLAG_SID_OWNER     = 1 << 4,
+       FLAG_COMM          = 1 << 5,
+};
+
+static void owner_mt_help_v0(void)
+{
+#ifdef IPT_OWNER_COMM
+       printf(
+"owner match options:\n"
+"[!] --uid-owner userid       Match local UID\n"
+"[!] --gid-owner groupid      Match local GID\n"
+"[!] --pid-owner processid    Match local PID\n"
+"[!] --sid-owner sessionid    Match local SID\n"
+"[!] --cmd-owner name         Match local command name\n"
+"NOTE: PID, SID and command matching are broken on SMP\n"
+"\n");
+#else
+       printf(
+"owner match options:\n"
+"[!] --uid-owner userid       Match local UID\n"
+"[!] --gid-owner groupid      Match local GID\n"
+"[!] --pid-owner processid    Match local PID\n"
+"[!] --sid-owner sessionid    Match local SID\n"
+"NOTE: PID and SID matching are broken on SMP\n"
+"\n");
+#endif /* IPT_OWNER_COMM */
+}
+
+static void owner_mt6_help_v0(void)
+{
+       printf(
+"owner match options:\n"
+"[!] --uid-owner userid       Match local UID\n"
+"[!] --gid-owner groupid      Match local GID\n"
+"[!] --pid-owner processid    Match local PID\n"
+"[!] --sid-owner sessionid    Match local SID\n"
+"NOTE: PID and SID matching are broken on SMP\n"
+"\n");
+}
+
+static void owner_mt_help(void)
+{
+       printf(
+"owner match options:\n"
+"[!] --uid-owner userid     Match local UID\n"
+"[!] --gid-owner groupid    Match local GID\n"
+"[!] --socket-exists        Match if socket exists\n"
+"\n");
+}
+
+static const struct option owner_mt_opts_v0[] = {
+       {.name = "uid-owner", .has_arg = true, .val = 'u'},
+       {.name = "gid-owner", .has_arg = true, .val = 'g'},
+       {.name = "pid-owner", .has_arg = true, .val = 'p'},
+       {.name = "sid-owner", .has_arg = true, .val = 's'},
+#ifdef IPT_OWNER_COMM
+       {.name = "cmd-owner", .has_arg = true, .val = 'c'},
+#endif
+       {},
+};
+
+static const struct option owner_mt6_opts_v0[] = {
+       {.name = "uid-owner", .has_arg = true, .val = 'u'},
+       {.name = "gid-owner", .has_arg = true, .val = 'g'},
+       {.name = "pid-owner", .has_arg = true, .val = 'p'},
+       {.name = "sid-owner", .has_arg = true, .val = 's'},
+       {},
+};
+
+static const struct option owner_mt_opts[] = {
+       {.name = "uid-owner",     .has_arg = true,  .val = 'u'},
+       {.name = "gid-owner",     .has_arg = true,  .val = 'g'},
+       {.name = "socket-exists", .has_arg = false, .val = 'k'},
+       {},
+};
+
+static int
+owner_mt_parse_v0(int c, char **argv, int invert, unsigned int *flags,
+                  const void *entry, struct xt_entry_match **match)
+{
+       struct ipt_owner_info *info = (void *)(*match)->data;
+       struct passwd *pwd;
+       struct group *grp;
+       unsigned int id;
+
+       switch (c) {
+       case 'u':
+               param_act(P_ONLY_ONCE, "owner", "--uid-owner", *flags & FLAG_UID_OWNER);
+               if ((pwd = getpwnam(optarg)) != NULL)
+                       id = pwd->pw_uid;
+               else if (!strtonum(optarg, NULL, &id, 0, ~(uid_t)0))
+                       param_act(P_BAD_VALUE, "owner", "--uid-owner", optarg);
+               if (invert)
+                       info->invert |= IPT_OWNER_UID;
+               info->match |= IPT_OWNER_UID;
+               info->uid    = id;
+               *flags      |= FLAG_UID_OWNER;
+               return true;
+
+       case 'g':
+               param_act(P_ONLY_ONCE, "owner", "--gid-owner", *flags & FLAG_GID_OWNER);
+               if ((grp = getgrnam(optarg)) != NULL)
+                       id = grp->gr_gid;
+               else if (!strtonum(optarg, NULL, &id, 0, ~(gid_t)0))
+                       param_act(P_BAD_VALUE, "owner", "--gid-owner", optarg);
+               if (invert)
+                       info->invert |= IPT_OWNER_GID;
+               info->match |= IPT_OWNER_GID;
+               info->gid    = id;
+               *flags      |= FLAG_GID_OWNER;
+               return true;
+
+       case 'p':
+               param_act(P_ONLY_ONCE, "owner", "--pid-owner", *flags & FLAG_PID_OWNER);
+               if (!strtonum(optarg, NULL, &id, 0, INT_MAX))
+                       param_act(P_BAD_VALUE, "owner", "--pid-owner", optarg);
+               if (invert)
+                       info->invert |= IPT_OWNER_PID;
+               info->match |= IPT_OWNER_PID;
+               info->pid    = id;
+               *flags      |= FLAG_PID_OWNER;
+               return true;
+
+       case 's':
+               param_act(P_ONLY_ONCE, "owner", "--sid-owner", *flags & FLAG_SID_OWNER);
+               if (!strtonum(optarg, NULL, &id, 0, INT_MAX))
+                       param_act(P_BAD_VALUE, "owner", "--sid-value", optarg);
+               if (invert)
+                       info->invert |= IPT_OWNER_SID;
+               info->match |= IPT_OWNER_SID;
+               info->sid    = id;
+               *flags      |= FLAG_SID_OWNER;
+               return true;
+
+#ifdef IPT_OWNER_COMM
+       case 'c':
+               param_act(P_ONLY_ONCE, "owner", "--cmd-owner", *flags & FLAG_COMM);
+               if (strlen(optarg) > sizeof(info->comm))
+                       exit_error(PARAMETER_PROBLEM, "owner match: command "
+                                  "\"%s\" too long, max. %zu characters",
+                                  optarg, sizeof(info->comm));
+
+               info->comm[sizeof(info->comm)-1] = '\0';
+               strncpy(info->comm, optarg, sizeof(info->comm));
+
+               if (invert)
+                       info->invert |= IPT_OWNER_COMM;
+               info->match |= IPT_OWNER_COMM;
+               *flags      |= FLAG_COMM;
+               return true;
+#endif
+       }
+       return false;
+}
+
+static int
+owner_mt6_parse_v0(int c, char **argv, int invert, unsigned int *flags,
+                   const void *entry, struct xt_entry_match **match)
+{
+       struct ip6t_owner_info *info = (void *)(*match)->data;
+       struct passwd *pwd;
+       struct group *grp;
+       unsigned int id;
+
+       switch (c) {
+       case 'u':
+               param_act(P_ONLY_ONCE, "owner", "--uid-owner",
+                         *flags & FLAG_UID_OWNER);
+               if ((pwd = getpwnam(optarg)) != NULL)
+                       id = pwd->pw_uid;
+               else if (!strtonum(optarg, NULL, &id, 0, ~(uid_t)0))
+                       param_act(P_BAD_VALUE, "owner", "--uid-owner", optarg);
+               if (invert)
+                       info->invert |= IP6T_OWNER_UID;
+               info->match |= IP6T_OWNER_UID;
+               info->uid    = id;
+               *flags      |= FLAG_UID_OWNER;
+               return true;
+
+       case 'g':
+               param_act(P_ONLY_ONCE, "owner", "--gid-owner",
+                         *flags & FLAG_GID_OWNER);
+               if ((grp = getgrnam(optarg)) != NULL)
+                       id = grp->gr_gid;
+               else if (!strtonum(optarg, NULL, &id, 0, ~(gid_t)0))
+                       param_act(P_BAD_VALUE, "owner", "--gid-owner", optarg);
+               if (invert)
+                       info->invert |= IP6T_OWNER_GID;
+               info->match |= IP6T_OWNER_GID;
+               info->gid    = id;
+               *flags      |= FLAG_GID_OWNER;
+               return true;
+
+       case 'p':
+               param_act(P_ONLY_ONCE, "owner", "--pid-owner",
+                         *flags & FLAG_PID_OWNER);
+               if (!strtonum(optarg, NULL, &id, 0, INT_MAX))
+                       param_act(P_BAD_VALUE, "owner", "--pid-owner", optarg);
+               if (invert)
+                       info->invert |= IP6T_OWNER_PID;
+               info->match |= IP6T_OWNER_PID;
+               info->pid    = id;
+               *flags      |= FLAG_PID_OWNER;
+               return true;
+
+       case 's':
+               param_act(P_ONLY_ONCE, "owner", "--sid-owner",
+                         *flags & FLAG_SID_OWNER);
+               if (!strtonum(optarg, NULL, &id, 0, INT_MAX))
+                       param_act(P_BAD_VALUE, "owner", "--sid-owner", optarg);
+               if (invert)
+                       info->invert |= IP6T_OWNER_SID;
+               info->match |= IP6T_OWNER_SID;
+               info->sid    = id;
+               *flags      |= FLAG_SID_OWNER;
+               return true;
+       }
+       return false;
+}
+
+static int owner_mt_parse(int c, char **argv, int invert, unsigned int *flags,
+                          const void *entry, struct xt_entry_match **match)
+{
+       struct xt_owner_match_info *info = (void *)(*match)->data;
+       struct passwd *pwd;
+       struct group *grp;
+       unsigned int id;
+
+       switch (c) {
+       case 'u':
+               param_act(P_ONLY_ONCE, "owner", "--uid-owner",
+                         *flags & FLAG_UID_OWNER);
+               if ((pwd = getpwnam(optarg)) != NULL)
+                       id = pwd->pw_uid;
+               else if (!strtonum(optarg, NULL, &id, 0, ~(uid_t)0))
+                       param_act(P_BAD_VALUE, "owner", "--uid-owner", optarg);
+               if (invert)
+                       info->invert |= XT_OWNER_UID;
+               info->match |= XT_OWNER_UID;
+               info->uid    = id;
+               *flags      |= FLAG_UID_OWNER;
+               return true;
+
+       case 'g':
+               param_act(P_ONLY_ONCE, "owner", "--gid-owner",
+                         *flags & FLAG_GID_OWNER);
+               if ((grp = getgrnam(optarg)) != NULL)
+                       id = grp->gr_gid;
+               else if (!strtonum(optarg, NULL, &id, 0, ~(gid_t)0))
+                       param_act(P_BAD_VALUE, "owner", "--gid-owner", optarg);
+               if (invert)
+                       info->invert |= XT_OWNER_GID;
+               info->match |= XT_OWNER_GID;
+               info->gid    = id;
+               *flags      |= FLAG_GID_OWNER;
+               return true;
+
+       case 'k':
+               param_act(P_ONLY_ONCE, "owner", "--socket-exists",
+                         *flags & FLAG_SOCKET_EXISTS);
+               if (invert)
+                       info->invert |= XT_OWNER_SOCKET;
+               info->match |= XT_OWNER_SOCKET;
+               *flags |= FLAG_SOCKET_EXISTS;
+               return true;
+
+       }
+       return false;
+}
+
+static void owner_mt_check(unsigned int flags)
+{
+       if (flags == 0)
+               exit_error(PARAMETER_PROBLEM, "owner: At least one of "
+                          "--uid-owner, --gid-owner or --socket-exists "
+                          "is required");
+}
+
+static void
+owner_mt_print_item_v0(const struct ipt_owner_info *info, const char *label,
+                       u_int8_t flag, bool numeric)
+{
+       if (!(info->match & flag))
+               return;
+       if (info->invert & flag)
+               printf("! ");
+       printf(label);
+
+       switch (info->match & flag) {
+       case IPT_OWNER_UID:
+               if (!numeric) {
+                       struct passwd *pwd = getpwuid(info->uid);
+
+                       if (pwd != NULL && pwd->pw_name != NULL) {
+                               printf("%s ", pwd->pw_name);
+                               break;
+                       }
+               }
+               printf("%u ", (unsigned int)info->uid);
+               break;
+
+       case IPT_OWNER_GID:
+               if (!numeric) {
+                       struct group *grp = getgrgid(info->gid);
+
+                       if (grp != NULL && grp->gr_name != NULL) {
+                               printf("%s ", grp->gr_name);
+                               break;
+                       }
+               }
+               printf("%u ", (unsigned int)info->gid);
+               break;
+
+       case IPT_OWNER_PID:
+               printf("%u ", (unsigned int)info->pid);
+               break;
+
+       case IPT_OWNER_SID:
+               printf("%u ", (unsigned int)info->sid);
+               break;
+
+#ifdef IPT_OWNER_COMM
+       case IPT_OWNER_COMM:
+               printf("%.*s ", (int)sizeof(info->comm), info->comm);
+               break;
+#endif
+       }
+}
+
+static void
+owner_mt6_print_item_v0(const struct ip6t_owner_info *info, const char *label,
+                        u_int8_t flag, bool numeric)
+{
+       if (!(info->match & flag))
+               return;
+       if (info->invert & flag)
+               printf("! ");
+       printf(label);
+
+       switch (info->match & flag) {
+       case IP6T_OWNER_UID:
+               if (!numeric) {
+                       struct passwd *pwd = getpwuid(info->uid);
+
+                       if (pwd != NULL && pwd->pw_name != NULL) {
+                               printf("%s ", pwd->pw_name);
+                               break;
+                       }
+               }
+               printf("%u ", (unsigned int)info->uid);
+               break;
+
+       case IP6T_OWNER_GID:
+               if (!numeric) {
+                       struct group *grp = getgrgid(info->gid);
+
+                       if (grp != NULL && grp->gr_name != NULL) {
+                               printf("%s ", grp->gr_name);
+                               break;
+                       }
+               }
+               printf("%u ", (unsigned int)info->gid);
+               break;
+
+       case IP6T_OWNER_PID:
+               printf("%u ", (unsigned int)info->pid);
+               break;
+
+       case IP6T_OWNER_SID:
+               printf("%u ", (unsigned int)info->sid);
+               break;
+       }
+}
+
+static void
+owner_mt_print_item(const struct xt_owner_match_info *info, const char *label,
+                    u_int8_t flag, bool numeric)
+{
+       if (!(info->match & flag))
+               return;
+       if (info->invert & flag)
+               printf("! ");
+       printf(label);
+
+       switch (info->match & flag) {
+       case XT_OWNER_UID:
+               if (!numeric) {
+                       const struct passwd *pwd = getpwuid(info->uid);
+
+                       if (pwd != NULL && pwd->pw_name != NULL) {
+                               printf("%s ", pwd->pw_name);
+                               break;
+                       }
+               }
+               printf("%u ", (unsigned int)info->uid);
+               break;
+
+       case XT_OWNER_GID:
+               if (!numeric) {
+                       const struct group *grp = getgrgid(info->gid);
+
+                       if (grp != NULL && grp->gr_name != NULL) {
+                               printf("%s ", grp->gr_name);
+                               break;
+                       }
+               }
+               printf("%u ", (unsigned int)info->gid);
+               break;
+       }
+}
+
+static void
+owner_mt_print_v0(const void *ip, const struct xt_entry_match *match,
+                  int numeric)
+{
+       const struct ipt_owner_info *info = (void *)match->data;
+
+       owner_mt_print_item_v0(info, "owner UID match ", IPT_OWNER_UID, numeric);
+       owner_mt_print_item_v0(info, "owner GID match ", IPT_OWNER_GID, numeric);
+       owner_mt_print_item_v0(info, "owner PID match ", IPT_OWNER_PID, numeric);
+       owner_mt_print_item_v0(info, "owner SID match ", IPT_OWNER_SID, numeric);
+#ifdef IPT_OWNER_COMM
+       owner_mt_print_item_v0(info, "owner CMD match ", IPT_OWNER_COMM, numeric);
+#endif
+}
+
+static void
+owner_mt6_print_v0(const void *ip, const struct xt_entry_match *match,
+                   int numeric)
+{
+       const struct ip6t_owner_info *info = (void *)match->data;
+
+       owner_mt6_print_item_v0(info, "owner UID match ", IPT_OWNER_UID, numeric);
+       owner_mt6_print_item_v0(info, "owner GID match ", IPT_OWNER_GID, numeric);
+       owner_mt6_print_item_v0(info, "owner PID match ", IPT_OWNER_PID, numeric);
+       owner_mt6_print_item_v0(info, "owner SID match ", IPT_OWNER_SID, numeric);
+}
+
+static void owner_mt_print(const void *ip, const struct xt_entry_match *match,
+                           int numeric)
+{
+       const struct xt_owner_match_info *info = (void *)match->data;
+
+       owner_mt_print_item(info, "owner socket exists ", XT_OWNER_SOCKET, numeric);
+       owner_mt_print_item(info, "owner UID match ",     XT_OWNER_UID,    numeric);
+       owner_mt_print_item(info, "owner GID match ",     XT_OWNER_GID,    numeric);
+}
+
+static void
+owner_mt_save_v0(const void *ip, const struct xt_entry_match *match)
+{
+       const struct ipt_owner_info *info = (void *)match->data;
+
+       owner_mt_print_item_v0(info, "owner UID match ", IPT_OWNER_UID, true);
+       owner_mt_print_item_v0(info, "owner GID match ", IPT_OWNER_GID, true);
+       owner_mt_print_item_v0(info, "owner PID match ", IPT_OWNER_PID, true);
+       owner_mt_print_item_v0(info, "owner SID match ", IPT_OWNER_SID, true);
+#ifdef IPT_OWNER_COMM
+       owner_mt_print_item_v0(info, "owner CMD match ", IPT_OWNER_COMM, true);
+#endif
+}
+
+static void
+owner_mt6_save_v0(const void *ip, const struct xt_entry_match *match)
+{
+       const struct ip6t_owner_info *info = (void *)match->data;
+
+       owner_mt6_print_item_v0(info, "owner UID match ", IPT_OWNER_UID, true);
+       owner_mt6_print_item_v0(info, "owner GID match ", IPT_OWNER_GID, true);
+       owner_mt6_print_item_v0(info, "owner PID match ", IPT_OWNER_PID, true);
+       owner_mt6_print_item_v0(info, "owner SID match ", IPT_OWNER_SID, true);
+}
+
+static void owner_mt_save(const void *ip, const struct xt_entry_match *match)
+{
+       const struct xt_owner_match_info *info = (void *)match->data;
+
+       owner_mt_print_item(info, "--socket-exists ", XT_OWNER_SOCKET, false);
+       owner_mt_print_item(info, "--uid-owner",      XT_OWNER_UID,    false);
+       owner_mt_print_item(info, "--gid-owner",      XT_OWNER_GID,    false);
+}
+
+static struct xtables_match owner_mt_reg_v0 = {
+       .version       = IPTABLES_VERSION,
+       .name          = "owner",
+       .revision      = 0,
+       .family        = AF_INET,
+       .size          = XT_ALIGN(sizeof(struct ipt_owner_info)),
+       .userspacesize = XT_ALIGN(sizeof(struct ipt_owner_info)),
+       .help          = owner_mt_help_v0,
+       .parse         = owner_mt_parse_v0,
+       .final_check   = owner_mt_check,
+       .print         = owner_mt_print_v0,
+       .save          = owner_mt_save_v0,
+       .extra_opts    = owner_mt_opts_v0,
+};
+
+static struct xtables_match owner_mt6_reg_v0 = {
+       .version       = IPTABLES_VERSION,
+       .name          = "owner",
+       .revision      = 0,
+       .family        = AF_INET6,
+       .size          = XT_ALIGN(sizeof(struct ip6t_owner_info)),
+       .userspacesize = XT_ALIGN(sizeof(struct ip6t_owner_info)),
+       .help          = owner_mt6_help_v0,
+       .parse         = owner_mt6_parse_v0,
+       .final_check   = owner_mt_check,
+       .print         = owner_mt6_print_v0,
+       .save          = owner_mt6_save_v0,
+       .extra_opts    = owner_mt6_opts_v0,
+};
+
+static struct xtables_match owner_mt_reg = {
+       .version       = IPTABLES_VERSION,
+       .name          = "owner",
+       .revision      = 1,
+       .family        = AF_INET,
+       .size          = XT_ALIGN(sizeof(struct xt_owner_match_info)),
+       .userspacesize = XT_ALIGN(sizeof(struct xt_owner_match_info)),
+       .help          = owner_mt_help,
+       .parse         = owner_mt_parse,
+       .final_check   = owner_mt_check,
+       .print         = owner_mt_print,
+       .save          = owner_mt_save,
+       .extra_opts    = owner_mt_opts,
+};
+
+static struct xtables_match owner_mt6_reg = {
+       .version       = IPTABLES_VERSION,
+       .name          = "owner",
+       .revision      = 1,
+       .family        = AF_INET6,
+       .size          = XT_ALIGN(sizeof(struct xt_owner_match_info)),
+       .userspacesize = XT_ALIGN(sizeof(struct xt_owner_match_info)),
+       .help          = owner_mt_help,
+       .parse         = owner_mt_parse,
+       .final_check   = owner_mt_check,
+       .print         = owner_mt_print,
+       .save          = owner_mt_save,
+       .extra_opts    = owner_mt_opts,
+};
+
+void _init(void)
+{
+       xtables_register_match(&owner_mt_reg_v0);
+       xtables_register_match(&owner_mt6_reg_v0);
+       xtables_register_match(&owner_mt_reg);
+       xtables_register_match(&owner_mt6_reg);
+}
diff --git a/extensions/libxt_owner.man b/extensions/libxt_owner.man
new file mode 100644 (file)
index 0000000..add2369
--- /dev/null
@@ -0,0 +1,16 @@
+This module attempts to match various characteristics of the packet creator,
+for locally generated packets. This match is only valid in the OUTPUT and
+POSTROUTING chains. Forwarded packets do not have any socket associated with
+them. Packets from kernel threads do have a socket, but usually no owner.
+.TP
+\fB--uid-owner\fR \fIuserid\fR
+Matches if the packet socket's file structure (if it has one) is owned by the
+given user ID. A user name may be specified in place of \fIuserid\fR, in which
+case iptables will try to look it up.
+.TP
+\fB--gid-owner\fR \fIgroupid\fR
+Matches if the packet socket's file structure is owned by the given group ID.
+A group name may be specified in place of \fIgroupid\fR.
+.TP
+\fB--socket-exists\fR
+Matches if the packet is associated with a socket.
diff --git a/include/linux/netfilter/xt_owner.h b/include/linux/netfilter/xt_owner.h
new file mode 100644 (file)
index 0000000..eacd34e
--- /dev/null
@@ -0,0 +1,16 @@
+#ifndef _XT_OWNER_MATCH_H
+#define _XT_OWNER_MATCH_H
+
+enum {
+       XT_OWNER_UID    = 1 << 0,
+       XT_OWNER_GID    = 1 << 1,
+       XT_OWNER_SOCKET = 1 << 2,
+};
+
+struct xt_owner_match_info {
+       u_int32_t uid;
+       u_int32_t gid;
+       u_int8_t match, invert;
+};
+
+#endif /* _XT_OWNER_MATCH_H */