baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

separate out isLocalIP

Browse source
This commit is contained in:
Jeffrey Morgan 2024-03-09 00:22:08 -08:00
parent bfec2c6e10
commit 5b3fad9636
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
server/routes.go
View file

@ -905,8 +905,29 @@ var defaultAllowOrigins = []string{
"0.0.0.0",
}
func isLocalIP(ip netip.Addr) bool {
if interfaces, err := net.Interfaces(); err == nil {
for _, iface := range interfaces {
addrs, err := iface.Addrs()
if err != nil {
continue
}
for _, a := range addrs {
if parsed, _, err := net.ParseCIDR(a.String()); err == nil {
if parsed.String() == ip.String() {
return true
}
}
}
}
}
return false
}
func allowedHost(host string) bool {
if host == "" || host == "localhost" || host == "0.0.0.0" {
if host == "" || host == "localhost" {
return true
}
@ -927,24 +948,6 @@ func allowedHost(host string) bool {
}
}
// check if the host is a local IP address
if interfaces, err := net.Interfaces(); err == nil {
for _, iface := range interfaces {
addrs, err := iface.Addrs()
if err != nil {
continue
}
for _, a := range addrs {
if ip, _, err := net.ParseCIDR(a.String()); err == nil {
if host == ip.String() {
return true
}
}
}
}
}
return false
}
@ -955,8 +958,7 @@ func allowedHostsMiddleware(addr net.Addr) gin.HandlerFunc {
return
}
addr, err := netip.ParseAddrPort(addr.String())
if err == nil && !addr.Addr().IsLoopback() {
if addr, err := netip.ParseAddrPort(addr.String()); err == nil && !addr.Addr().IsLoopback() {
c.Next()
return
}
@ -967,7 +969,7 @@ func allowedHostsMiddleware(addr net.Addr) gin.HandlerFunc {
}
if addr, err := netip.ParseAddr(host); err == nil {
if addr.IsLoopback() || addr.IsPrivate() {
if addr.IsLoopback() || addr.IsPrivate() || addr.IsUnspecified() || isLocalIP(addr) {
c.Next()
return
}