Skip to content

Commit a065bd4

Browse files
dependabot[bot]ldemailly
dependabot[bot]
and
ldemailly
authored
Bump fortio.org/fortio from 1.72.0 to 1.73.0 (#339)
* Bump fortio.org/fortio from 1.72.0 to 1.73.0 Bumps [fortio.org/fortio](https://github.com/fortio/fortio) from 1.72.0 to 1.73.0. - [Release notes](https://github.com/fortio/fortio/releases) - [Commits](fortio/fortio@v1.72.0...v1.73.0) --- updated-dependencies: - dependency-name: fortio.org/fortio dependency-version: 1.73.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix lints * fix tests (kinda) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Laurent Demailly <ldemailly@gmail.com>
1 parent 902a29d commit a065bd4

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

‎config/route_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ func TestMatch(t *testing.T) {
2626
{`{"host": "www.google.com", "destination": "https://www.google.com:443/"}`, true}, // 9
2727
{`{"host": "www.google.com", "destination": "http://www.google.com:443/"}`, true}, // 10
2828
{`{"host": "www.google.com", "destination": "https://google.com/"}`, false}, // 11
29-
{`{"host": "[:1:2", "destination": "http://[:1:2:443]/"}`, false}, // 12
30-
{`{"host": "[:1:2:443]", "destination": "https://[:1:2:443]/"}`, true}, // 13
31-
{`{"host": "[:1:2:443]", "destination": "http://[:1:2:443]/"}`, true}, // 14
32-
{`{"host": "[:1:2:443]", "destination": "https://[:1:2:443]/"}`, true}, // 15
33-
{`{"host": "[:1:2:443]", "destination": "https://[:1:2:443]:673/"}`, true}, // 16
34-
{`{"host": "[:1:2:443]", "prefix": "/x", "destination": "https://[:1:2:443]:673/y"}`, false}, // 17
35-
{`{"host": "[:1:2:443]", "prefix": "/x", "destination": "https://[:1:2:443]:673/x"}`, true}, // 18
29+
{`{"host": "[::1:2:3]", "destination": "http://[::1:2:4]/"}`, false}, // 12
30+
{`{"host": "[::1:2:3]", "destination": "https://[::1:2:3]:443/"}`, true}, // 13
31+
{`{"host": "[::1:2:3]", "destination": "http://[::1:2:3]:443/"}`, true}, // 14
32+
{`{"host": "[::1:2:3]", "destination": "https://[::1:2:3]:443/"}`, true}, // 15
33+
{`{"host": "[::1:2:3]", "destination": "https://[::1:2:3]:673/"}`, true}, // 16
34+
{`{"host": "[::1:2:3]", "prefix": "/x", "destination": "https://[::1:2:3]:673/y"}`, false}, // 17
35+
{`{"host": "[::1:2:3]", "prefix": "/x", "destination": "https://[::1:2:3]:673/x"}`, true}, // 18
3636
{`{"host": "www.google.com", "destination": "http://www.GOOGLE.com:443/"}`, true}, // 19
3737
}
3838
for i, tst := range tests {

‎config/tailscale.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
const HasTailscale = true
1717

18-
// Suffix for server names which will use the tailscale client instead of the autocert client.
18+
// TailscaleSuffix is the suffix for server names which will use the tailscale client instead of the autocert client.
1919
// Not expected to be changed but just in case.
2020
var TailscaleSuffix = ".ts.net"
2121

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ module fortio.org/proxy
44
go 1.24.7
55

66
require (
7-
fortio.org/cli v1.11.0
7+
fortio.org/cli v1.12.2
88
fortio.org/dflag v1.9.2
9-
fortio.org/fortio v1.72.0
10-
fortio.org/log v1.17.2
11-
fortio.org/scli v1.17.1
12-
golang.org/x/crypto v0.42.0
13-
golang.org/x/net v0.44.0
9+
fortio.org/fortio v1.73.0
10+
fortio.org/log v1.18.1
11+
fortio.org/scli v1.18.1
12+
golang.org/x/crypto v0.43.0
13+
golang.org/x/net v0.46.0
1414
tailscale.com v1.86.5
1515
)
1616

@@ -34,7 +34,7 @@ require (
3434
github.com/google/uuid v1.6.0 // indirect
3535
github.com/hdevalence/ed25519consensus v0.2.0 // indirect
3636
github.com/jsimonetti/rtnetlink v1.4.0 // indirect
37-
github.com/kortschak/goroutine v1.1.2 // indirect
37+
github.com/kortschak/goroutine v1.1.3 // indirect
3838
github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 // indirect
3939
github.com/mdlayher/socket v0.5.0 // indirect
4040
github.com/mitchellh/go-ps v1.0.0 // indirect
@@ -45,7 +45,7 @@ require (
4545
golang.org/x/crypto/x509roots/fallback v0.0.0-20250406160420-959f8f3db0fb // indirect
4646
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
4747
golang.org/x/sync v0.17.0 // indirect
48-
golang.org/x/sys v0.36.0 // indirect
49-
golang.org/x/text v0.29.0 // indirect
48+
golang.org/x/sys v0.37.0 // indirect
49+
golang.org/x/text v0.30.0 // indirect
5050
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
5151
)

‎go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
22
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
33
fortio.org/assert v1.2.1 h1:48I39urpeDj65RP1KguF7akCjILNeu6vICiYMEysR7Q=
44
fortio.org/assert v1.2.1/go.mod h1:039mG+/iYDPO8Ibx8TrNuJCm2T2SuhwRI3uL9nHTTls=
5-
fortio.org/cli v1.11.0 h1:cQTPqKoUII5A7gaP8PRLOGLIq1nfeYj2sStvIngaPF4=
6-
fortio.org/cli v1.11.0/go.mod h1:QTPufwEbBsIo2iWdgIjMFyuRSg8aNiDaXWFYYLL6aUI=
5+
fortio.org/cli v1.12.2 h1:D0n52GvG+iCECGmUGiw7WBy+qQSLAWseejpa6L/9Ibo=
6+
fortio.org/cli v1.12.2/go.mod h1:b2fRQzWjdgYAqIsaEhGslsCH0P3u/037BviWbclO2x8=
77
fortio.org/dflag v1.9.2 h1:yaHJrcHd1LtUApdX5I6PbM/522C9rBPcD/8XxWgRBfE=
88
fortio.org/dflag v1.9.2/go.mod h1:KJ7QvqLiXRnXFzhQNVSPPKsHLFM8SHxiVBCNlSHcCNI=
99
fortio.org/duration v1.0.4 h1:TB07ng4UsMZPDRujJRkTJIcNqMTLM283zob10nb9K24=
1010
fortio.org/duration v1.0.4/go.mod h1:RuBVqdcCKRwMmI8WIdVq8kd7ngQPCIe6G7AU0NC0XDw=
11-
fortio.org/fortio v1.72.0 h1:oLJFFRFbWxTS6P2wcMuNISPaOT+rEukQbmdZ676WpuA=
12-
fortio.org/fortio v1.72.0/go.mod h1:a9A/7OiaOQyfzgw43j7BqFVF7LMN40Uynl2QDjwnosI=
13-
fortio.org/log v1.17.2 h1:JPX/ApDXDoGzsNtXw0AJI4ai6tl9wHp4Ch6bVs1OK0Y=
14-
fortio.org/log v1.17.2/go.mod h1:1V7bPfFI7ZVTdtN9DnUCAN0ilEMs5VgKjHIDRO7Mjzk=
11+
fortio.org/fortio v1.73.0 h1:ZQU9uuzn7bF5Fvk3G/qyTQoRUUYdMLOWPsUr0RRhQ3k=
12+
fortio.org/fortio v1.73.0/go.mod h1:GM5lxkq25ukAxcgwTPjzT8L9QBddzBvvCW0NvI9Xlj8=
13+
fortio.org/log v1.18.1 h1:rqzz/57dGhDg3GAn5yQxVgh5JPQE1OAnNGS58S6dQOI=
14+
fortio.org/log v1.18.1/go.mod h1:vqpyEZd/TP4xO5eAHQaa4buDZDCn1AxCAV+wl3eaTec=
1515
fortio.org/safecast v1.2.0 h1:ckQJNenMJHycqPsi/QrzA4EUX5WQkyd+hGO4mxt/a8w=
1616
fortio.org/safecast v1.2.0/go.mod h1:xZmcPk3vi4kuUFf+tq4SvnlVdwViqf6ZSZl91Jr9Jdg=
17-
fortio.org/scli v1.17.1 h1:HzoNzBNPhK9fJb+wX7bUwG4Srv38TKGxOz4M70vCIvk=
18-
fortio.org/scli v1.17.1/go.mod h1:7bVuqdHgvWFDLWBLuCCvXb1bFHRCJt7eCpRM8Ju72Js=
17+
fortio.org/scli v1.18.1 h1:ynReyGc2PFJ4T277y9AmfD8IvHN27E6MCquCZiiVQaQ=
18+
fortio.org/scli v1.18.1/go.mod h1:7uYVMb38siW0xxTYIg2lDoNBcqQQmGUxwIeVM9stPwY=
1919
fortio.org/sets v1.3.0 h1:UiEtck/ndNM3Tg53mJu3I7Zz1ED8+YSQLtPKSjd8LTE=
2020
fortio.org/sets v1.3.0/go.mod h1:y8fFzm4bPTk3Qfr/tF3Xz7oWwgzpy++QdkwURKhNbP4=
2121
fortio.org/struct2env v0.4.2 h1:Xh7HlS9vf2ZdRvRfmoGIasNDO8t6z36M713utVODRCo=
@@ -66,8 +66,8 @@ github.com/illarion/gonotify/v3 v3.0.2 h1:O7S6vcopHexutmpObkeWsnzMJt/r1hONIEogeV
6666
github.com/illarion/gonotify/v3 v3.0.2/go.mod h1:HWGPdPe817GfvY3w7cx6zkbzNZfi3QjcBm/wgVvEL1U=
6767
github.com/jsimonetti/rtnetlink v1.4.0 h1:Z1BF0fRgcETPEa0Kt0MRk3yV5+kF1FWTni6KUFKrq2I=
6868
github.com/jsimonetti/rtnetlink v1.4.0/go.mod h1:5W1jDvWdnthFJ7fxYX1GMK07BUpI4oskfOqvPteYS6E=
69-
github.com/kortschak/goroutine v1.1.2 h1:lhllcCuERxMIK5cYr8yohZZScL1na+JM5JYPRclWjck=
70-
github.com/kortschak/goroutine v1.1.2/go.mod h1:zKpXs1FWN/6mXasDQzfl7g0LrGFIOiA6cLs9eXKyaMY=
69+
github.com/kortschak/goroutine v1.1.3 h1:kELvAfi7jpVD7a+MPWjmIxuQVJVYo/RELaOeGJZBb88=
70+
github.com/kortschak/goroutine v1.1.3/go.mod h1:zKpXs1FWN/6mXasDQzfl7g0LrGFIOiA6cLs9eXKyaMY=
7171
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
7272
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
7373
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -96,22 +96,22 @@ go4.org/mem v0.0.0-20240501181205-ae6ca9944745 h1:Tl++JLUCe4sxGu8cTpDzRLd3tN7US4
9696
go4.org/mem v0.0.0-20240501181205-ae6ca9944745/go.mod h1:reUoABIJ9ikfM5sgtSF3Wushcza7+WeD01VB9Lirh3g=
9797
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
9898
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
99-
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
100-
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
99+
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
100+
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
101101
golang.org/x/crypto/x509roots/fallback v0.0.0-20250406160420-959f8f3db0fb h1:Iu0p/klM0SM7atONioa/bPhLS7cjhnip99x1OIGibwg=
102102
golang.org/x/crypto/x509roots/fallback v0.0.0-20250406160420-959f8f3db0fb/go.mod h1:lxN5T34bK4Z/i6cMaU7frUU57VkDXFD4Kamfl/cp9oU=
103103
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs=
104104
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo=
105-
golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
106-
golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
107-
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
108-
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
105+
golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
106+
golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
107+
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
108+
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
109109
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
110110
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
111-
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
112-
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
113-
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
114-
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
111+
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
112+
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
113+
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
114+
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
115115
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
116116
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
117117
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=

‎rp/reverse_proxy.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var (
2727
h2Target = flag.Bool("h2", false, "Whether destinations support h2c prior knowledge")
2828
HostID = dflag.DynString(flag.CommandLine, "hostid", "", "host id to show in debug-host output")
2929
startTime = time.Now()
30-
// optional fortio debug virtual host.
30+
// DebugHost is theoptional fortio debug virtual host.
3131
DebugHost = dflag.DynString(flag.CommandLine, "debug-host", "",
3232
"`hostname` to serve echo debug info on if non-empty (ex: debug.fortio.org)")
3333
defaultRoute = dflag.DynString(flag.CommandLine, "default-route", "",
@@ -120,7 +120,7 @@ func ReverseProxy() *httputil.ReverseProxy {
120120
// GzipDebugHandler is a handler wrapping SafeDebugHandler with optional gzip compression.
121121
var GzipDebugHandler = fhttp.Gzip(http.HandlerFunc(SafeDebugHandler))
122122

123-
// DebugHandler is similar to Fortio's DebugHandler,
123+
// SafeDebugHandler is similar to Fortio's DebugHandler,
124124
// it returns debug/useful info to http client.
125125
// but doesn't have some of the extra sensitive info like env dump
126126
// and host name or echo delay or header setting options.

0 commit comments

Comments
 (0)