diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-01-23 08:44:51 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-01-23 08:45:08 +0000 |
| commit | 60ef06ac51c8e5fab1c4d19f14d95f3f004a4333 (patch) | |
| tree | 91b176a8d7d7730f9fd95413ea881095f9da9e23 /src/server.c | |
| parent | Releasing debian version 1.7.2-1. (diff) | |
| download | ttyd-60ef06ac51c8e5fab1c4d19f14d95f3f004a4333.tar.xz ttyd-60ef06ac51c8e5fab1c4d19f14d95f3f004a4333.zip | |
Merging upstream version 1.7.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/server.c')
| -rw-r--r-- | src/server.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/server.c b/src/server.c index 91e3a90..1d7c72a 100644 --- a/src/server.c +++ b/src/server.c @@ -53,6 +53,7 @@ static lws_retry_bo_t retry = { // command line options static const struct option options[] = {{"port", required_argument, NULL, 'p'}, {"interface", required_argument, NULL, 'i'}, + {"socket-owner", required_argument, NULL, 'U'}, {"credential", required_argument, NULL, 'c'}, {"auth-header", required_argument, NULL, 'H'}, {"uid", required_argument, NULL, 'u'}, @@ -93,6 +94,7 @@ static void print_help() { "OPTIONS:\n" " -p, --port Port to listen (default: 7681, use `0` for random port)\n" " -i, --interface Network interface to bind (eg: eth0), or UNIX domain socket path (eg: /var/run/ttyd.sock)\n" + " -U, --socket-owner User owner of the UNIX domain socket file, when enabled (eg: user:group)\n" " -c, --credential Credential for basic authentication (format: username:password)\n" " -H, --auth-header HTTP Header name for auth proxy, this will configure ttyd to let a HTTP reverse proxy handle authentication\n" " -u, --uid User id to run with\n" @@ -323,6 +325,7 @@ int main(int argc, char **argv) { int debug_level = LLL_ERR | LLL_WARN | LLL_NOTICE; char iface[128] = ""; + char socket_owner[128] = ""; bool browser = false; bool ssl = false; char cert_path[1024] = ""; @@ -373,6 +376,10 @@ int main(int argc, char **argv) { strncpy(iface, optarg, sizeof(iface) - 1); iface[sizeof(iface) - 1] = '\0'; break; + case 'U': + strncpy(socket_owner, optarg, sizeof(socket_owner) - 1); + socket_owner[sizeof(socket_owner) - 1] = '\0'; + break; case 'c': if (strchr(optarg, ':') == NULL) { fprintf(stderr, "ttyd: invalid credential, format: username:password\n"); @@ -521,6 +528,9 @@ int main(int argc, char **argv) { info.options |= LWS_SERVER_OPTION_UNIX_SOCK; info.port = 0; // warmcat/libwebsockets#1985 strncpy(server->socket_path, info.iface, sizeof(server->socket_path) - 1); + if (strlen(socket_owner) > 0) { + info.unix_socket_perms = socket_owner; + } #else fprintf(stderr, "libwebsockets is not compiled with UNIX domain socket support"); return -1; |