Skip to content

Support multiple host names, comma separated #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wollomatic merged 2 commits into from
May 5, 2024
Merged

Support multiple host names, comma separated #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6370f42
Merge pull request #13 from wollomatic/develop
Apr 23, 2024
1c4b2a6
support multiple hostnames, comma separated
ildyria May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions cmd/socket-proxy/handlehttprequest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"log/slog"
"net"
"net/http"
"strings"
)

// handleHttpRequest checks if the request is allowed and sends it to the proxy.
Expand Down Expand Up @@ -61,14 +62,18 @@ func isAllowedClient(remoteAddr string) (bool, error) {
return allowedIPNet.Contains(clientIP), nil
} else {
// AllowFrom is not a valid CIDR, so try to resolve it via DNS
ips, err := net.LookupIP(cfg.AllowFrom)
if err != nil {
return false, errors.New("error looking up allowed client hostname: " + err.Error())
}
for _, ip := range ips {
// Check if IP address is one of the resolved IPs
if ip.Equal(clientIP) {
return true, nil
// split over comma to support multiple hostnames
allowFroms := strings.Split(cfg.AllowFrom, ",")
for _, allowFrom := range allowFroms {
ips, err := net.LookupIP(allowFrom)
if err != nil {
return false, errors.New("error looking up allowed client hostname: " + err.Error())
}
for _, ip := range ips {
// Check if IP address is one of the resolved IPs
if ip.Equal(clientIP) {
return true, nil
}
}
}
return false, nil
Expand Down