Re: [9front] [PATCH] Update hpost to use -r header like hget

[Julien Blanchard <julien@typed-hole.org>]

On 15/12/2020 19:42, ori@eigenstate.org wrote:
> 
> unrelated to your change, but while we're here:
> if you could also set action=()/method=(), that
> would prevent them from leaking in through the
> environment.
> 

Done

> 
> This only supports one header. hget allows repeated
> -r flags to add multiple headers:
> 
> 	hget -r foo -r bar
> 
> The change for multiple headers should be as simple
> as one change here:
> 
> 	headers=($headers $1)
> 
>> +	if not
>> +		hget=(hget -r $header $l)
> 
> 
> And one here here:
> 
> 	-r^$headers
> 
> which will distribute -r across all of the
> entries in the headers list.
> 
> As a reminder: in rc,
> 
> 	foo_^(x y z)
> 
> expands to:
> 
> 	foo_x foo_y foo_z
> 

I had issues with just expanding the headers using -r^headers. It 
generates an hget command like (just an echo before line 98):

hget -rX-Foo: Lol -rAuthorization: Bearer Token -r Content-Type: 
multipart/form-data; boundary=HJBOUNDARY -b https://httpbin.org -P /post

where a valid hget command would be:
hget -r 'X-Foo: Lol' -r 'Authorization: Bearer Token' -r 'Content-Type: 
multipart/form-data; boundary=HJBOUNDARY' -b https://httpbin.org -P /post

so I updated with a for loop but maybe there is a better way?

Thanks for the feedback and the tips!


diff -r ac35c963f8e2 rc/bin/hpost
--- a/rc/bin/hpost	Sun Dec 13 20:23:03 2020 +0100
+++ b/rc/bin/hpost	Wed Dec 16 17:57:47 2020 +0000
@@ -1,12 +1,15 @@
  #!/bin/rc
  rfork e
  url=()
+headers=()
+action=()
+method=()
  at=()	# text fields
  af=()	# file fields
  l=()

  fn usage {
-	echo 'usage: hpost [ -l ] [ -[gpm] action ] [ -u ] url [ field:value | 
field@file ... ]' >[1=2]
+	echo 'usage: hpost [ -l ] [ -[gpm] action ] [ -r ] headers [ -u ] url 
[ field:value | field@file ... ]' >[1=2]
  	exit usage
  }

@@ -14,6 +17,7 @@
  	switch($1){
  	case -l;	l=($l $1)
  	case -u;	shift; url=$1
+	case -r;	shift; headers=($headers $1)
  	case -g;	shift; action=$1; method=mget
  	case -p;	shift; action=$1; method=mpost
  	case -m;	shift; action=$1; method=multi
@@ -95,7 +99,14 @@
  }

  if(! ~ $action ''){
-	hget=(hget $l)
+	if(~ $headers '')
+		hget=(hget $l)
+	if not
+		h=()
+		for(i in $headers)
+			h=($h -r $i)
+		hget=(hget $h $l)
+
  	$method
  	exit
  }
diff -r ac35c963f8e2 sys/man/1/hget
--- a/sys/man/1/hget	Sun Dec 13 20:23:03 2020 +0100
+++ b/sys/man/1/hget	Wed Dec 16 17:57:47 2020 +0000
@@ -38,6 +38,9 @@
  .B -m
  .I action
  ] [
+.B -r
+.I header
+] [
  .B -u
  ]
  .I url