tlsrp

commit 1d8f24ab2967f525ba60139f829b496415b58212
parent d2023ebddb50e3b5063c656c07621cd2193f908d
Author: Nihal Jere <nihal@nihaljere.xyz>
Date:   Thu, 30 Jul 2020 14:00:37 -0500

adds serving to a unix socket

Diffstat:
M
Makefile
 | 
2
+-
M
config.mk
 | 
10
+++++-----
M
tlsrp.c
 | 
49
++++++++++++++++++++++++++++++++++++++-----------

3 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/Makefile b/Makefile
@@ -18,4 +18,4 @@ clean:
 	rm -f $(OBJ) tlsrp
 
 test: tlsrp certs
-	LD_LIBRARY_PATH=$(LIB_PATH) ./tlsrp -U "/tmp/conn.socket" -P 8000 -ca "CA/root.crt" -cert "CA/tlsrp.crt" -key "CA/tlsrp.key"
+	LD_LIBRARY_PATH=$(LIB_PATH) ./tlsrp -u "/tmp/conn.socket" -P 8000 -ca "CA/root.crt" -cert "CA/tlsrp.crt" -key "CA/tlsrp.key"
diff --git a/config.mk b/config.mk
@@ -2,16 +2,16 @@ CC = cc
 CFLAGS = -std=c99 -Wall -Wextra
 
 # Arch Linux Testing
-# LIB_PATH=/lib/libressl
-# LIBTLS_PKGCONF_PATH = /usr/lib/libressl/pkgconfig/
-# CFLAGS := $(CFLAGS) `PKG_CONFIG_PATH=$(LIBTLS_PKGCONF_PATH) pkg-config --cflags libtls`
-# FLAGS = `PKG_CONFIG_PATH=$(LIBTLS_PKGCONF_PATH) pkg-config --libs libtls`
+LIB_PATH=/lib/libressl
+LIBTLS_PKGCONF_PATH = /usr/lib/libressl/pkgconfig/
+CFLAGS := $(CFLAGS) `PKG_CONFIG_PATH=$(LIBTLS_PKGCONF_PATH) pkg-config --cflags libtls`
+FLAGS = `PKG_CONFIG_PATH=$(LIBTLS_PKGCONF_PATH) pkg-config --libs libtls`
 
 # glibc
 CFLAGS := $(CFLAGS) -D_XOPEN_SOURCE=700
 
 # Any system that is using LibreSSL as the default SSL provider
-FLAGS := $(FLAGS) -ltls
+# FLAGS := $(FLAGS) -ltls
 
 SRC = tlsrp.c util.c
 OBJ = $(SRC:.c=.o)
diff --git a/tlsrp.c b/tlsrp.c
@@ -24,13 +24,12 @@ char *argv0;
 static void
 usage(void)
 {
-    fprintf(stderr, "usage: %s [-h backhost] [-H fronthost] -p backport -P frontport -ca ca_path -cert cert_path -key key_path\n", argv0);
-    fprintf(stderr, "       %s -U unixsocket [-H fronthost] -P frontport -ca ca_path -cert cert_path -key key_path\n", argv0);
+    fprintf(stderr, "usage: %s [-u backpath | -p backport [-h backhost]] [-U frontpath | -P frontport [-H fronthost]] -ca ca_path -cert cert_path -key key_path\n", argv0);
 	exit(1);
 }
 
 static int
-dobind(const char *host, const char *port)
+donetworkbind(const char *host, const char *port)
 {
     int sfd = -1;
     struct addrinfo *results = NULL, *rp = NULL;
@@ -61,6 +60,24 @@ dobind(const char *host, const char *port)
 }
 
 static int
+dounixbind(const char *path)
+{
+    struct sockaddr_un saddr = { .sun_family = AF_UNIX };
+    int sfd;
+
+    if (!memccpy(saddr.sun_path, path, '\0', sizeof(saddr.sun_path)))
+        die("unix socket path too long:");
+
+    if ((sfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+        die("failed to create unix-domain socket at %s:", path);
+
+    if (bind(sfd, (struct sockaddr*)&saddr, sizeof(struct sockaddr_un)) == -1)
+        die("failed to bind to socket at %s:", path);
+
+    return sfd;
+}
+
+static int
 dounixconnect(const char *sockname)
 {
     int sfd;
@@ -195,7 +212,8 @@ main(int argc, char* argv[])
     struct tls_config *config;
     struct tls *toclient, *conn;
     socklen_t client_sa_len = 0;
-    char *usock = NULL,
+    char *backpath = NULL,
+         *frontpath = NULL,
          *backhost  = NULL,
          *fronthost  = NULL,
          *backport = NULL,
@@ -211,8 +229,10 @@ main(int argc, char* argv[])
 
     // TODO make parameter format enforcement stricter
     for (int i = 1; i < argc; ++i) {
-        if (strcmp(argv[i], "-U") == 0)
-            usock = argv[++i];
+        if (strcmp(argv[i], "-u") == 0)
+             backpath = argv[++i];
+        else if (strcmp(argv[i], "-U") == 0)
+            frontpath = argv[++i];
         else if (strcmp(argv[i], "-h") == 0)
             backhost = argv[++i];
         else if (strcmp(argv[i], "-H") == 0)
@@ -231,8 +251,11 @@ main(int argc, char* argv[])
             usage();
     }
 
-    if (usock && (backhost || backport))
-        die("cannot use both unix and network socket");
+    if (backpath && (backhost || backport))
+        die("cannot receive from both unix and network socket");
+
+    if (frontpath && (fronthost || frontport))
+        die("cannot serve to both unix and network socket");
 
     if (!ca_path || !cert_path || !key_path)
         usage();
@@ -269,7 +292,11 @@ main(int argc, char* argv[])
     
     tls_config_free(config);
 
-    bindfd = dobind(fronthost, frontport);
+    if (frontpath)
+        bindfd = dounixbind(frontpath);
+    else
+        bindfd = donetworkbind(fronthost, frontport);
+
 
     if (listen(bindfd, BACKLOG) == -1) {
         close(bindfd);
@@ -288,8 +315,8 @@ main(int argc, char* argv[])
             case -1:
                 warn("fork:");
             case 0:
-                if (usock)
-                    serverfd = dounixconnect(usock);
+                if (backpath)
+                    serverfd = dounixconnect(backpath);
                 else
                     serverfd = donetworkconnect(backhost, backport);