diff options
Diffstat (limited to 'kms')
| -rw-r--r-- | kms/client/kms_client.c | 35 | ||||
| -rw-r--r-- | kms/server/kms_server.c | 3 |
2 files changed, 36 insertions, 2 deletions
diff --git a/kms/client/kms_client.c b/kms/client/kms_client.c index 018b25e..d7ddc78 100644 --- a/kms/client/kms_client.c +++ b/kms/client/kms_client.c @@ -13,7 +13,12 @@ #include <sys/wait.h> #include <poll.h> #include <sys/stat.h> +#ifdef __linux__ #include <sys/capability.h> +#endif +#ifdef __FreeBSD__ +#include <sys/sysctl.h> +#endif #define GSR_SOCKET_PAIR_LOCAL 0 #define GSR_SOCKET_PAIR_REMOTE 1 @@ -119,8 +124,11 @@ static int recv_msg_from_server(int server_pid, int server_fd, gsr_kms_response /* We have to use $HOME because in flatpak there is no simple path that is accessible, read and write, that multiple flatpak instances can access */ static bool create_socket_path(char *output_path, size_t output_path_size) { + const bool inside_flatpak = getenv("FLATPAK_ID") != NULL; const char *home = getenv("HOME"); - if(!home) + // Portable home with AppImage can cause the socket path to be longer than 108 characters (unix domain socket path max length). + // Using gsr-kms-socket in $HOME is only needed in flatpak, so use /tmp everywhere else instead. + if(!home || !inside_flatpak) home = "/tmp"; char random_characters[11]; @@ -132,6 +140,7 @@ static bool create_socket_path(char *output_path, size_t output_path_size) { return true; } +#ifdef __linux__ static bool readlink_realpath(const char *filepath, char *buffer) { char symlinked_path[PATH_MAX]; ssize_t bytes_written = readlink(filepath, symlinked_path, sizeof(symlinked_path) - 1); @@ -149,6 +158,7 @@ static bool readlink_realpath(const char *filepath, char *buffer) { return true; } +#endif static bool strcat_safe(char *str, int size, const char *str_to_add) { const int str_len = strlen(str); @@ -220,10 +230,24 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) { } char server_filepath[PATH_MAX]; +#ifdef __linux__ if(!readlink_realpath("/proc/self/exe", server_filepath)) { fprintf(stderr, "gsr error: gsr_kms_client_init: failed to resolve /proc/self/exe\n"); return -1; } + +#elif defined(__FreeBSD__) + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, getpid() }; + size_t size = PATH_MAX; + + if (sysctl(mib, 4, server_filepath, &size, NULL, 0) != 0) { + fprintf(stderr, "gsr error: gsr_kms_client_init: failed to resolve pathname using sysctl\n"); + return -1; + } + +#else +#error "Implement it by yourself" +#endif file_get_directory(server_filepath); if(!strcat_safe(server_filepath, sizeof(server_filepath), "/gsr-kms-server")) { @@ -250,6 +274,7 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) { if(geteuid() == 0) { has_perm = true; } else { +#ifdef __linux__ cap_t kms_server_cap = cap_get_file(server_filepath); if(kms_server_cap) { cap_flag_value_t res = CAP_CLEAR; @@ -267,6 +292,9 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) { else fprintf(stderr, "gsr info: gsr_kms_client_init: failed to get cap\n"); } +#else + fprintf(stderr, "gsr info: gsr_kms_client_init: platform doesn't support cap\n"); +#endif } if(socketpair(AF_UNIX, SOCK_STREAM, 0, self->socket_pair) == -1) { @@ -312,12 +340,14 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) { const char *args[] = { "pkexec", server_filepath, self->initial_socket_path, card_path, NULL }; execvp(args[0], (char *const*)args); } - fprintf(stderr, "gsr error: gsr_kms_client_init: execvp failed, error: %s\n", strerror(errno)); + fprintf(stderr, "gsr error: gsr_kms_client_init: failed to launch \"gsr-kms-server\", error: %s\n", strerror(errno)); _exit(127); } else { /* parent */ self->kms_server_pid = pid; } + // We need this dumb-shit retardation with unix domain socket and then replace it with socketpair because + // pkexec doesn't work with socketpair................ fprintf(stderr, "gsr info: gsr_kms_client_init: waiting for server to connect\n"); struct pollfd poll_fd = { .fd = self->initial_socket_fd, @@ -387,6 +417,7 @@ void cleanup_socket(gsr_kms_client *self, bool kill_server) { if(kill_server && self->kms_server_pid > 0) { kill(self->kms_server_pid, SIGKILL); + // TODO: //int status; //waitpid(self->kms_server_pid, &status, 0); self->kms_server_pid = -1; diff --git a/kms/server/kms_server.c b/kms/server/kms_server.c index c585f24..070875b 100644 --- a/kms/server/kms_server.c +++ b/kms/server/kms_server.c @@ -8,6 +8,7 @@ #include <string.h> #include <errno.h> #include <stdlib.h> +#include <locale.h> #include <unistd.h> #include <limits.h> @@ -434,6 +435,8 @@ static double clock_get_monotonic_seconds(void) { } int main(int argc, char **argv) { + setlocale(LC_ALL, "C"); // Sigh... stupid C + int res = 0; int socket_fd = 0; gsr_drm drm; |