op public repos

Blame

Date:: Fri Apr 14 20:54:38 2023 UTC
Message:: significantly reduce the amount of code linked into gitwrapper By moving got_serve_parse_command() from lib/serve.c into lib/dial.c as got_dial_parse_command(), we can significantly reduce the amount of symbols gitwrapper depends on indirectly. As a downside, gotsh now needs to link to dial.c. But it only uses the same parsing routine, and any other routines in dial.c would likely cause pledge violations in gotsh if used. No functional change.
Actions:: History | Blob | Raw File
  1 13b2bc37 2022-10-23 stsp /*
  2 13b2bc37 2022-10-23 stsp  * Copyright (c) 2022 Stefan Sperling <stsp@openbsd.org>
  3 13b2bc37 2022-10-23 stsp  *
  4 13b2bc37 2022-10-23 stsp  * Permission to use, copy, modify, and distribute this software for any
  5 13b2bc37 2022-10-23 stsp  * purpose with or without fee is hereby granted, provided that the above
  6 13b2bc37 2022-10-23 stsp  * copyright notice and this permission notice appear in all copies.
  7 13b2bc37 2022-10-23 stsp  *
  8 13b2bc37 2022-10-23 stsp  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  9 13b2bc37 2022-10-23 stsp  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 10 13b2bc37 2022-10-23 stsp  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 11 13b2bc37 2022-10-23 stsp  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 12 13b2bc37 2022-10-23 stsp  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 13 13b2bc37 2022-10-23 stsp  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 14 13b2bc37 2022-10-23 stsp  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 15 13b2bc37 2022-10-23 stsp  */
 16 13b2bc37 2022-10-23 stsp 
 17 13b2bc37 2022-10-23 stsp #include <sys/queue.h>
 18 13b2bc37 2022-10-23 stsp #include <sys/socket.h>
 19 13b2bc37 2022-10-23 stsp #include <sys/un.h>
 20 13b2bc37 2022-10-23 stsp 
 21 13b2bc37 2022-10-23 stsp #include <err.h>
 22 13b2bc37 2022-10-23 stsp #include <event.h>
 23 13b2bc37 2022-10-23 stsp #include <imsg.h>
 24 13b2bc37 2022-10-23 stsp #include <limits.h>
 25 13b2bc37 2022-10-23 stsp #include <sha1.h>
 26 5822e79e 2023-02-23 op #include <sha2.h>
 27 13b2bc37 2022-10-23 stsp #include <stdio.h>
 28 13b2bc37 2022-10-23 stsp #include <stdlib.h>
 29 13b2bc37 2022-10-23 stsp #include <string.h>
 30 13b2bc37 2022-10-23 stsp #include <unistd.h>
 31 13b2bc37 2022-10-23 stsp 
 32 13b2bc37 2022-10-23 stsp #include "got_error.h"
 33 13b2bc37 2022-10-23 stsp #include "got_serve.h"
 34 9afa3de2 2023-04-04 stsp #include "got_path.h"
 35 13b2bc37 2022-10-23 stsp 
 36 1eb38992 2023-04-14 stsp #include "got_lib_dial.h"
 37 1eb38992 2023-04-14 stsp 
 38 13b2bc37 2022-10-23 stsp #include "gotd.h"
 39 13b2bc37 2022-10-23 stsp 
 40 13b2bc37 2022-10-23 stsp static int chattygot;
 41 13b2bc37 2022-10-23 stsp 
 42 13b2bc37 2022-10-23 stsp __dead static void
 43 575dc3f9 2023-02-09 op usage(void)
 44 13b2bc37 2022-10-23 stsp {
 45 13b2bc37 2022-10-23 stsp 	fprintf(stderr, "usage: %s -c '%s|%s repository-path'\n",
 46 1eb38992 2023-04-14 stsp 	    getprogname(), GOT_DIAL_CMD_SEND, GOT_DIAL_CMD_FETCH);
 47 13b2bc37 2022-10-23 stsp 	exit(1);
 48 13b2bc37 2022-10-23 stsp }
 49 13b2bc37 2022-10-23 stsp 
 50 13b2bc37 2022-10-23 stsp static const struct got_error *
 51 13b2bc37 2022-10-23 stsp apply_unveil(const char *unix_socket_path)
 52 13b2bc37 2022-10-23 stsp {
 53 13b2bc37 2022-10-23 stsp #ifdef PROFILE
 54 13b2bc37 2022-10-23 stsp 	if (unveil("gmon.out", "rwc") != 0)
 55 13b2bc37 2022-10-23 stsp 		return got_error_from_errno2("unveil", "gmon.out");
 56 13b2bc37 2022-10-23 stsp #endif
 57 13b2bc37 2022-10-23 stsp 	if (unveil(unix_socket_path, "w") != 0)
 58 13b2bc37 2022-10-23 stsp 		return got_error_from_errno2("unveil", unix_socket_path);
 59 13b2bc37 2022-10-23 stsp 
 60 13b2bc37 2022-10-23 stsp 	if (unveil(NULL, NULL) != 0)
 61 13b2bc37 2022-10-23 stsp 		return got_error_from_errno("unveil");
 62 13b2bc37 2022-10-23 stsp 
 63 13b2bc37 2022-10-23 stsp 	return NULL;
 64 13b2bc37 2022-10-23 stsp }
 65 13b2bc37 2022-10-23 stsp 
 66 13b2bc37 2022-10-23 stsp int
 67 13b2bc37 2022-10-23 stsp main(int argc, char *argv[])
 68 13b2bc37 2022-10-23 stsp {
 69 13b2bc37 2022-10-23 stsp 	const struct got_error *error;
 70 8edf8796 2023-01-22 op 	const char *unix_socket_path;
 71 13b2bc37 2022-10-23 stsp 	int gotd_sock = -1;
 72 13b2bc37 2022-10-23 stsp 	struct sockaddr_un	 sun;
 73 9aeaf23a 2023-01-22 op 	char *gitcmd = NULL, *command = NULL, *repo_path = NULL;
 74 13b2bc37 2022-10-23 stsp 
 75 13b2bc37 2022-10-23 stsp #ifndef PROFILE
 76 13b2bc37 2022-10-23 stsp 	if (pledge("stdio recvfd unix unveil", NULL) == -1)
 77 13b2bc37 2022-10-23 stsp 		err(1, "pledge");
 78 13b2bc37 2022-10-23 stsp #endif
 79 16e4df9d 2023-01-22 op 
 80 16e4df9d 2023-01-22 op 	unix_socket_path = getenv("GOTD_UNIX_SOCKET");
 81 16e4df9d 2023-01-22 op 	if (unix_socket_path == NULL)
 82 16e4df9d 2023-01-22 op 		unix_socket_path = GOTD_UNIX_SOCKET;
 83 16e4df9d 2023-01-22 op 
 84 16e4df9d 2023-01-22 op 	error = apply_unveil(unix_socket_path);
 85 16e4df9d 2023-01-22 op 	if (error)
 86 16e4df9d 2023-01-22 op 		goto done;
 87 16e4df9d 2023-01-22 op 
 88 1eb38992 2023-04-14 stsp 	if (strcmp(argv[0], GOT_DIAL_CMD_SEND) == 0 ||
 89 1eb38992 2023-04-14 stsp 	    strcmp(argv[0], GOT_DIAL_CMD_FETCH) == 0) {
 90 bc854c7b 2022-10-23 stsp 		if (argc != 2)
 91 bc854c7b 2022-10-23 stsp 			usage();
 92 bc854c7b 2022-10-23 stsp 		if (asprintf(&gitcmd, "%s %s", argv[0], argv[1]) == -1)
 93 bc854c7b 2022-10-23 stsp 			err(1, "asprintf");
 94 1eb38992 2023-04-14 stsp 		error = got_dial_parse_command(&command, &repo_path, gitcmd);
 95 bc854c7b 2022-10-23 stsp 	} else {
 96 9aeaf23a 2023-01-22 op 		if (argc != 3 || strcmp(argv[1], "-c") != 0)
 97 bc854c7b 2022-10-23 stsp 			usage();
 98 1eb38992 2023-04-14 stsp 		error = got_dial_parse_command(&command, &repo_path, argv[2]);
 99 bc854c7b 2022-10-23 stsp 	}
100 9aeaf23a 2023-01-22 op 	if (error && error->code == GOT_ERR_BAD_PACKET)
101 9aeaf23a 2023-01-22 op 		usage();
102 9aeaf23a 2023-01-22 op 	if (error)
103 9aeaf23a 2023-01-22 op 		goto done;
104 13b2bc37 2022-10-23 stsp 
105 13b2bc37 2022-10-23 stsp 	if ((gotd_sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
106 13b2bc37 2022-10-23 stsp 		err(1, "socket");
107 13b2bc37 2022-10-23 stsp 
108 13b2bc37 2022-10-23 stsp 	memset(&sun, 0, sizeof(sun));
109 13b2bc37 2022-10-23 stsp 	sun.sun_family = AF_UNIX;
110 13b2bc37 2022-10-23 stsp 	if (strlcpy(sun.sun_path, unix_socket_path,
111 13b2bc37 2022-10-23 stsp 	    sizeof(sun.sun_path)) >= sizeof(sun.sun_path))
112 13b2bc37 2022-10-23 stsp 		errx(1, "gotd socket path too long");
113 13b2bc37 2022-10-23 stsp 	if (connect(gotd_sock, (struct sockaddr *)&sun, sizeof(sun)) == -1)
114 13b2bc37 2022-10-23 stsp 		err(1, "connect: %s", unix_socket_path);
115 13b2bc37 2022-10-23 stsp 
116 13b2bc37 2022-10-23 stsp #ifndef PROFILE
117 13b2bc37 2022-10-23 stsp 	if (pledge("stdio recvfd", NULL) == -1)
118 13b2bc37 2022-10-23 stsp 		err(1, "pledge");
119 13b2bc37 2022-10-23 stsp #endif
120 9aeaf23a 2023-01-22 op 	error = got_serve(STDIN_FILENO, STDOUT_FILENO, command, repo_path,
121 9aeaf23a 2023-01-22 op 	    gotd_sock, chattygot);
122 13b2bc37 2022-10-23 stsp done:
123 bc854c7b 2022-10-23 stsp 	free(gitcmd);
124 9aeaf23a 2023-01-22 op 	free(command);
125 9aeaf23a 2023-01-22 op 	free(repo_path);
126 13b2bc37 2022-10-23 stsp 	if (gotd_sock != -1)
127 13b2bc37 2022-10-23 stsp 		close(gotd_sock);
128 13b2bc37 2022-10-23 stsp 	if (error) {
129 13b2bc37 2022-10-23 stsp 		fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
130 13b2bc37 2022-10-23 stsp 		return 1;
131 13b2bc37 2022-10-23 stsp 	}
132 13b2bc37 2022-10-23 stsp 
133 13b2bc37 2022-10-23 stsp 	return 0;
134 13b2bc37 2022-10-23 stsp }