usr.bin/fetch: Add options for HTTP upload data

Add a -D/--data option to specify a file from which to read HTTP request
body contents, with the special case that "-" will read from stdin.

This option deviates from curl, taking a much more barebones approach
for simplicity.

Add a -C/--chunked option to specify that the HTTP request body contents
are to use chunked transfer-encoding.  Otherwise, it is automatically
used by libfetch when the size of the file cannot be predetermined.

Signed-off-by: Ryan Moeller <[email protected]>

Author: ryan-moeller

usr.bin/fetch/fetch.1

@@ -28,21 +28,22 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 27, 2025
+.Dd September 30, 2025
 .Dt FETCH 1
 .Os
 .Sh NAME
 .Nm fetch
 .Nd retrieve a file by Uniform Resource Locator
 .Sh SYNOPSIS
 .Nm
-.Op Fl 146AadFlMmnPpqRrsUv
+.Op Fl 146AaCdFlMmnPpqRrsUv
 .Op Fl B Ar bytes
 .Op Fl -bind-address= Ns Ar host
 .Op Fl -ca-cert= Ns Ar file
 .Op Fl -ca-path= Ns Ar dir
 .Op Fl -cert= Ns Ar file
 .Op Fl -crl= Ns Ar file
+.Op Fl D Ar file
 .Op Fl H Ar header
 .Op Fl i Ar file
 .Op Fl -key= Ns Ar file
@@ -62,13 +63,14 @@
 .Op Fl X Ar method
 .Ar URL ...
 .Nm
-.Op Fl 146AadFlMmnPpqRrsUv
+.Op Fl 146AaCdFlMmnPpqRrsUv
 .Op Fl B Ar bytes
 .Op Fl -bind-address= Ns Ar host
 .Op Fl -ca-cert= Ns Ar file
 .Op Fl -ca-path= Ns Ar dir
 .Op Fl -cert= Ns Ar file
 .Op Fl -crl= Ns Ar file
+.Op Fl D Ar file
 .Op Fl H Ar header
 .Op Fl i Ar file
 .Op Fl -key= Ns Ar file
@@ -126,6 +128,10 @@ flag).
 .It Fl -bind-address= Ns Ar host
 Specifies a hostname or IP address to which sockets used for outgoing
 connections will be bound.
+.It Fl C , -chunked
+Force chunked transfer of HTTP request body contents.
+By default, the transfer is automatically chunk-encoded when the body size
+cannot be predetermined.
 .It Fl c Ar dir
 The file to retrieve is in directory
 .Ar dir
@@ -153,6 +159,16 @@ Points to certificate revocation list
 .Ar file ,
 which has to be in PEM format and may contain peer certificates that have
 been revoked.
+.It Fl D Ar file , Fl -data= Ns Ar file
+Send the contents of
+.Ar file
+as the body of HTTP requests.
+If
+.Ar file
+is a single dash
+.Pq Sq Fl ,
+.Nm
+reads the body from the standard input.
 .It Fl d , -direct
 Use a direct connection even if a proxy is configured.
 .It Fl F , -force-restart

usr.bin/fetch/fetch.c

@@ -57,8 +57,9 @@
 static int	 A_flag;	/*    -A: do not follow 302 redirects */
 static int	 a_flag;	/*    -a: auto retry */
 static off_t	 B_size;	/*    -B: buffer size */
-static int	 b_flag;	/*!   -b: workaround TCP bug */
-static char    *c_dirname;	/*    -c: remote directory */
+static int	 C_flag;	/*    -C: force HTTP request chunk-encoding */
+static char	*c_dirname;	/*    -c: remote directory */
+static char	*D_filename;	/*    -D: HTTP request body content file */
 static int	 d_flag;	/*    -d: direct connection */
 static int	 F_flag;	/*    -F: restart without checking mtime  */
 static char	*f_filename;	/*    -f: file to fetch */
@@ -128,7 +129,9 @@ static struct option longopts[] =
 	{ "no-redirect", no_argument, NULL, 'A' },
 	{ "retry", no_argument, NULL, 'a' },
 	{ "buffer-size", required_argument, NULL, 'B' },
+	{ "chunked", no_argument, NULL, 'C' },
 	/* -c not mapped, since it's deprecated */
+	{ "data", required_argument, NULL, 'D' },
 	{ "direct", no_argument, NULL, 'd' },
 	{ "force-restart", no_argument, NULL, 'F' },
 	/* -f not mapped, since it's deprecated */
@@ -431,9 +434,36 @@ query_auth(struct url *URL)
 static FILE *
 invoke(struct url *url, struct url_stat *us, const char *flags, bool is_http)
 {
-	if (is_http)
-		return (fetchXReqHTTP(url, us, method ? method : "GET", flags,
-		    &headers, NULL, NULL));
+	static bool rewind_stdin = false;
+	FILE *body, *f;
+
+	if (is_http) {
+		if (D_filename == NULL)
+			body = NULL;
+		else if (strcmp(D_filename, "-") == 0) {
+			if (rewind_stdin) {
+				if (fseek(stdin, 0, SEEK_SET) == 0)
+					clearerr(stdin);
+				else {
+					snprintf(fetchLastErrString,
+					    MAXERRSTRING, "cannot rewind: "
+					    "stdin is not seekable");
+					return (NULL);
+				}
+			}
+			rewind_stdin = true;
+			body = stdin;
+		} else if ((body = fopen(D_filename, "r")) == NULL) {
+			snprintf(fetchLastErrString, MAXERRSTRING, "%s: %s",
+			    D_filename, strerror(errno));
+			return (NULL);
+		}
+		f = fetchXReqHTTP(url, us, method ? method : "GET", flags,
+		    &headers, NULL, body);
+		if (body != NULL && body != stdin)
+			fclose(body);
+		return (f);
+	}
 	return (fetchXGet(url, us, flags));
 }
 
@@ -522,6 +552,8 @@ fetch(char *URL, const char *path, bool *is_http)
 			strcat(flags, "d");
 		if (A_flag)
 			strcat(flags, "A");
+		if (C_flag)
+			strcat(flags, "C");
 		timeout = T_secs ? T_secs : http_timeout;
 		if (i_flag) {
 			if (stat(i_filename, &sb)) {
@@ -923,15 +955,15 @@ static void
 usage(void)
 {
 	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
-"usage: fetch [-146AadFlMmnPpqRrsUv] [-B bytes] [--bind-address=host]",
+"usage: fetch [-146AaCdFlMmnPpqRrsUv] [-B bytes] [--bind-address=host]",
 "       [--ca-cert=file] [--ca-path=dir] [--cert=file] [--crl=file]",
-"       [-H header] [-i file] [--key=file] [-N file] [--no-passive]",
+"       [-D file] [-H header] [-i file] [--key=file] [-N file] [--no-passive]",
 "       [--no-proxy=list] [--no-sslv3] [--no-tlsv1] [--no-verify-hostname]",
 "       [--no-verify-peer] [-o file] [--referer=URL] [-S bytes] [-T seconds]",
 "       [--user-agent=agent-string] [-w seconds] [-X method] URL ...",
-"       fetch [-146AadFlMmnPpqRrsUv] [-B bytes] [--bind-address=host]",
+"       fetch [-146AaCdFlMmnPpqRrsUv] [-B bytes] [--bind-address=host]",
 "       [--ca-cert=file] [--ca-path=dir] [--cert=file] [--crl=file]",
-"       [-H header] [-i file] [--key=file] [-N file] [--no-passive]",
+"       [-D file] [-H header] [-i file] [--key=file] [-N file] [--no-passive]",
 "       [--no-proxy=list] [--no-sslv3] [--no-tlsv1] [--no-verify-hostname]",
 "       [--no-verify-peer] [-o file] [--referer=URL] [-S bytes] [-T seconds]",
 "       [--user-agent=agent-string] [-w seconds] [-X method] -h host -f file",
@@ -954,7 +986,7 @@ main(int argc, char *argv[])
 
 
 	while ((c = getopt_long(argc, argv,
-	    "146AaB:bc:dFf:H:h:i:lMmN:nPpo:qRrS:sT:tUvw:X:",
+	    "146AaB:bCc:D:dFf:H:h:i:lMmN:nPpo:qRrS:sT:tUvw:X:",
 	    longopts, NULL)) != -1)
 		switch (c) {
 		case '1':
@@ -979,11 +1011,16 @@ main(int argc, char *argv[])
 			break;
 		case 'b':
 			warnx("warning: the -b option is deprecated");
-			b_flag = 1;
+			break;
+		case 'C':
+			C_flag = 1;
 			break;
 		case 'c':
 			c_dirname = optarg;
 			break;
+		case 'D':
+			D_filename = optarg;
+			break;
 		case 'd':
 			d_flag = 1;
 			break;