Skip to content

Commit 5f352a5

Browse files
committed
update host resolution
1 parent 27d6d12 commit 5f352a5

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

image.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,13 @@ func ImageHandler(c echo.Context) error {
201201
return c.String(400, err.Error())
202202
}
203203

204-
targetIPs, err := net.LookupIP(parsedUrl.Host)
204+
targetHost := parsedUrl.Host
205+
splitHost, _, err := net.SplitHostPort(parsedUrl.Host)
206+
if err == nil {
207+
targetHost = splitHost
208+
}
209+
210+
targetIPs, err := net.LookupIP(targetHost)
205211
if err != nil {
206212
err := errors.Wrap(err, "Failed to lookup IP")
207213
span.SetAttributes(attribute.String("host", parsedUrl.Host))

summary.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,13 @@ func SummaryHandler(c echo.Context) error {
7676
return invalidURL(c, "Invalid URL", cacheKey)
7777
}
7878

79-
targetIPs, err := net.LookupIP(parsedUrl.Host)
79+
targetHost := parsedUrl.Host
80+
splitHost, _, err := net.SplitHostPort(parsedUrl.Host)
81+
if err == nil {
82+
targetHost = splitHost
83+
}
84+
85+
targetIPs, err := net.LookupIP(targetHost)
8086
if err != nil {
8187
fmt.Println("Error looking up IP: ", err)
8288
return invalidURL(c, parsedUrl.Host, cacheKey)
@@ -92,7 +98,7 @@ func SummaryHandler(c echo.Context) error {
9298
for _, targetIP := range targetIPs {
9399
if ipnet.Contains(targetIP) {
94100
fmt.Println("IP is in deny list: ", targetIP)
95-
return invalidURL(c, parsedUrl.Host, cacheKey)
101+
return invalidURL(c, targetHost, cacheKey)
96102
}
97103
}
98104
}
@@ -105,7 +111,7 @@ func SummaryHandler(c echo.Context) error {
105111
resp, err := client.Do(req)
106112
if err != nil {
107113
fmt.Println("Error fetching URL: ", err)
108-
return invalidURL(c, parsedUrl.Host, cacheKey)
114+
return invalidURL(c, targetHost, cacheKey)
109115
}
110116

111117
charset := ""

0 commit comments

Comments
 (0)