Merge pull request #130 from guggero/lsat-header-rfc

Roasbeef · web-flow · commit 68ebd142354e · 2020-01-07T16:21:31.000-08:00
lsat: change WWW-Authenticate header format
diff --git a/lsat/interceptor.go b/lsat/interceptor.go
@@ -52,7 +52,7 @@ var (
 	// authHeaderRegex is the regular expression the payment challenge must
 	// match for us to be able to parse the macaroon and invoice.
 	authHeaderRegex = regexp.MustCompile(
-		"LSAT macaroon='(.*?)' invoice='(.*?)'",
+		"LSAT macaroon=\"(.*?)\", invoice=\"(.*?)\"",
 	)
 )
 
diff --git a/lsat/interceptor_test.go b/lsat/interceptor_test.go
@@ -324,6 +324,6 @@ func makeAuthHeader(macBytes []byte) string {
 		"3l2ahrqsfpp3x9et2e20v6pu37c5d9vax37wxq72un98k6vcx9fz94w0qf23" +
 		"7cm2rqv9pmn5lnexfvf5579slr4zq3u8kmczecytdx0xg9rwzngp7e6guwqp" +
 		"qlhssu04sucpnz4axcv2dstmknqq6jsk2l"
-	return fmt.Sprintf("LSAT macaroon='%s' invoice='%s'",
+	return fmt.Sprintf("LSAT macaroon=\"%s\", invoice=\"%s\"",
 		base64.StdEncoding.EncodeToString(macBytes), invoice)
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ var (`
`52`	`52`	`// authHeaderRegex is the regular expression the payment challenge must`
`53`	`53`	`// match for us to be able to parse the macaroon and invoice.`
`54`	`54`	`authHeaderRegex = regexp.MustCompile(`
`55`		`- "LSAT macaroon='(.?)' invoice='(.?)'",`
	`55`	`+ "LSAT macaroon=\"(.?)\", invoice=\"(.?)\"",`
`56`	`56`	`)`
`57`	`57`	`)`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,6 @@ func makeAuthHeader(macBytes []byte) string {`
`324`	`324`	`"3l2ahrqsfpp3x9et2e20v6pu37c5d9vax37wxq72un98k6vcx9fz94w0qf23" +`
`325`	`325`	`"7cm2rqv9pmn5lnexfvf5579slr4zq3u8kmczecytdx0xg9rwzngp7e6guwqp" +`
`326`	`326`	`"qlhssu04sucpnz4axcv2dstmknqq6jsk2l"`
`327`		`- return fmt.Sprintf("LSAT macaroon='%s' invoice='%s'",`
	`327`	`+ return fmt.Sprintf("LSAT macaroon=\"%s\", invoice=\"%s\"",`
`328`	`328`	`base64.StdEncoding.EncodeToString(macBytes), invoice)`
`329`	`329`	`}`