pnx/dns-updater
1
0
Fork 0
mirror of https://gitlab.com/pnx-tools/dns-updater.git synced 2026-06-16 05:54:56 +02:00
Code Releases Activity

Refactor

Browse source
This commit is contained in:
Henrik Hautakoski 2023-12-07 19:18:03 +01:00
parent bd3aa5e948
commit 0f21902ffd
11 changed files with 96 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/app.go
View file

@ -33,7 +33,7 @@ func NewApp(config *Config) (*App, error) {
return &App{
ProviderManager: providerMgr,
iplookup: ip.NewCache(resolver.LookupWrapper(l)).Get,
iplookup: ip.NewCache(ip.LookupWrapper(l)).Get,
}, nil
}

15
ip/helpers.go → ip/interface.go
View file

@ -5,9 +5,6 @@ import (
"net"
)
// Resolver is a function that gets the ip from a interface name
type NetInterfaceIPResolver func(iface string) (net.IP, error)
func GetInterfaceIP(iface_name string) (net.IP, error) {
ip := net.IP{}
iface, err := net.InterfaceByName(iface_name)
@ -47,15 +44,3 @@ func AddrToIP(addr net.Addr) (net.IP, error) {
}
return nil, errors.New("could not find ip")
}
func ParseIP(s string) (net.IP, error) {
var err error = nil
ip := net.ParseIP(s)
if ip == nil {
err = &net.ParseError{
Type: "IP address",
Text: s,
}
}
return ip, err
}

28
ip/helpers_test.go → ip/interface_test.go
View file

@ -67,31 +67,3 @@ func TestAddrToIP(t *testing.T) {
})
}
}
func TestParseIP(t *testing.T) {
tests := []struct {
name string
input string
want net.IP
wantErr bool
}{
{"localhost", "127.0.0.1", net.IPv4(127, 0, 0, 1), false},
{"Private#1", "10.4.0.11", net.IPv4(10, 4, 0, 11), false},
{"Private#2", "192.168.1.12", net.IPv4(192, 168, 1, 12), false},
{"Public#1", "82.249.10.254", net.IPv4(82, 249, 10, 254), false},
{"Public#2", "57.167.50.222", net.IPv4(57, 167, 50, 222), false},
{"Invalid", "xx", nil, true},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := ParseIP(tt.input)
if (err != nil) != tt.wantErr {
t.Errorf("ParseIP() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("ParseIP() = %v, want %v", got, tt.want)
}
})
}
}

15
ip/internal/ip.go Normal file
View file

@ -0,0 +1,15 @@
package internal
import "net"
func ParseIP(s string) (net.IP, error) {
var err error = nil
ip := net.ParseIP(s)
if ip == nil {
err = &net.ParseError{
Type: "IP address",
Text: s,
}
}
return ip, err
}

35
ip/internal/ip_test.go Normal file
View file

@ -0,0 +1,35 @@
package internal
import (
"net"
"reflect"
"testing"
)
func TestParseIP(t *testing.T) {
tests := []struct {
name string
input string
want net.IP
wantErr bool
}{
{"localhost", "127.0.0.1", net.IPv4(127, 0, 0, 1), false},
{"Private#1", "10.4.0.11", net.IPv4(10, 4, 0, 11), false},
{"Private#2", "192.168.1.12", net.IPv4(192, 168, 1, 12), false},
{"Public#1", "82.249.10.254", net.IPv4(82, 249, 10, 254), false},
{"Public#2", "57.167.50.222", net.IPv4(57, 167, 50, 222), false},
{"Invalid", "xx", nil, true},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := ParseIP(tt.input)
if (err != nil) != tt.wantErr {
t.Errorf("ParseIP() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("ParseIP() = %v, want %v", got, tt.want)
}
})
}
}

23
ip/lookup.go Normal file
View file

@ -0,0 +1,23 @@
package ip
import (
"context"
"net"
"time"
"dnsupdater/ip/resolver"
)
// Resolver is a function that gets the ip from a interface name
type NetInterfaceIPResolver func(iface string) (net.IP, error)
func LookupWrapper(service resolver.Service) NetInterfaceIPResolver {
return func(iface_name string) (net.IP, error) {
if iface_name == resolver.WAN_IFACE {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()
return service.Lookup(ctx)
}
return GetInterfaceIP(iface_name)
}
}

4
ip/resolver/basic_http/service.go
View file

@ -8,7 +8,7 @@ import (
"strings"
httputils "dnsupdater/http"
"dnsupdater/ip"
"dnsupdater/ip/internal"
)
type Service struct {
@ -35,5 +35,5 @@ func (s Service) Lookup(ctx context.Context) (net.IP, error) {
// Trim spaces and stuff.
ip_str := strings.TrimSpace(string(body))
return ip.ParseIP(ip_str)
return internal.ParseIP(ip_str)
}

4
ip/resolver/jsonip/service.go
View file

@ -6,7 +6,7 @@ import (
"net"
"dnsupdater/http"
"dnsupdater/ip"
"dnsupdater/ip/internal"
)
type Service struct {
@ -38,5 +38,5 @@ func (s Service) Lookup(ctx context.Context) (net.IP, error) {
return nil, err
}
return ip.ParseIP(v.Ip)
return internal.ParseIP(v.Ip)
}

18
ip/resolver/resolver.go Normal file
View file

@ -0,0 +1,18 @@
package resolver
import (
"context"
"net"
)
// Interface that IP Lookup Services must implement.
type Service interface {
// Get the name of the serivce
Name() string
// Lookup the public ip.
Lookup(ctx context.Context) (net.IP, error)
}
// Constant name for the virtual WAN interface
const WAN_IFACE = "wan"

32
ip/resolver/service.go
View file

@ -1,32 +0,0 @@
package resolver
import (
"context"
"net"
"time"
"dnsupdater/ip"
)
// Interface that IP Lookup Services must implement.
type Service interface {
// Get the name of the serivce
Name() string
// Lookup the public ip.
Lookup(ctx context.Context) (net.IP, error)
}
// Constant name for the virtual WAN interface
const WAN_IFACE = "wan"
func LookupWrapper(service Service) ip.NetInterfaceIPResolver {
return func(iface_name string) (net.IP, error) {
if iface_name == WAN_IFACE {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()
return service.Lookup(ctx)
}
return ip.GetInterfaceIP(iface_name)
}
}

BIN
main Executable file
View file

Binary file not shown.