Skip to content

fix(source): block reserved stream IP ranges #44

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

Open
rissrice2105-agent wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −3
Open

fix(source): block reserved stream IP ranges #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 29 additions & 3 deletions internal/source/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"fmt"
"io"
"net"
"net/netip"
"net/url"
"os"
"os/exec"
Expand Down Expand Up @@ -61,6 +62,19 @@ var youtubeHosts = map[string]bool{
"youtu.be": true,
}

var blockedIPPrefixes = []netip.Prefix{
netip.MustParsePrefix("100.64.0.0/10"), // carrier-grade NAT / shared address space
netip.MustParsePrefix("192.0.0.0/24"), // IETF protocol assignments
netip.MustParsePrefix("192.0.2.0/24"), // TEST-NET-1
netip.MustParsePrefix("198.18.0.0/15"), // benchmarking
netip.MustParsePrefix("198.51.100.0/24"), // TEST-NET-2
netip.MustParsePrefix("203.0.113.0/24"), // TEST-NET-3
netip.MustParsePrefix("2001:db8::/32"), // documentation
netip.MustParsePrefix("2002::/16"), // 6to4
netip.MustParsePrefix("64:ff9b::/96"), // IPv4/IPv6 translation
netip.MustParsePrefix("64:ff9b:1::/48"), // locally scoped IPv4/IPv6 translation
}

// Classify decides how a raw URL is handled, and rejects anything that is not
// http(s). It does not touch the network.
func Classify(raw string) (Kind, error) {
Expand All @@ -87,16 +101,28 @@ func Classify(raw string) (Kind, error) {

// isBlockedIP reports whether an address must not be dialed: loopback,
// link-local (incl. the 169.254.169.254 cloud-metadata endpoint), private
// (RFC1918 / fc00::/7), multicast, or unspecified.
// (RFC1918 / fc00::/7), shared/reserved, multicast, or unspecified.
func isBlockedIP(ip net.IP) bool {
return ip == nil ||
if ip == nil ||
ip.IsLoopback() ||
ip.IsLinkLocalUnicast() ||
ip.IsLinkLocalMulticast() ||
ip.IsInterfaceLocalMulticast() ||
ip.IsMulticast() ||
ip.IsUnspecified() ||
ip.IsPrivate()
ip.IsPrivate() {
return true
}
addr, ok := netip.AddrFromSlice(ip)
if !ok {
return true
}
for _, p := range blockedIPPrefixes {
if p.Contains(addr.Unmap()) {
return true
}
}
return false
}

// guardURL validates scheme and resolves the host, rejecting any URL that
Expand Down
7 changes: 7 additions & 0 deletions internal/source/source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,15 @@ func TestIsBlockedIP(t *testing.T) {
"172.16.3.4", // private
"192.168.1.1", // private
"169.254.169.254", // link-local / cloud metadata
"100.100.100.200", // shared space, commonly used by cloud metadata services
"198.18.0.1", // benchmarking range
"192.0.2.10", // TEST-NET-1
"198.51.100.10", // TEST-NET-2
"203.0.113.10", // TEST-NET-3
"fe80::1", // link-local v6
"fc00::1", // unique-local v6 (private)
"2001:db8::1", // documentation v6
"2002::1", // 6to4
"0.0.0.0", // unspecified
"224.0.0.1", // multicast
}
Expand Down