Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Linux и macOS.
username: env:REGRU_USERNAME_OTHER
password: env:REGRU_PASSWORD_OTHER
env_file: ~/.config/regru/secrets.env
interface: en0
defaults:
max_deletes: 10
timeout: 5m
Expand All @@ -66,6 +67,10 @@ Linux и macOS.
переменные окружения `REGRU_USERNAME` и `REGRU_PASSWORD`. Явно указанный через `--config` или `REGRU_CONFIG`
несуществующий файл считается ошибкой.

`interface` привязывает запросы аккаунта к сетевому интерфейсу (macOS и linux), например чтобы ходить в API
мимо VPN с адреса из белого списка. В режиме без конфига то же задаёт `REGRU_INTERFACE`. На linux привязка
требует `CAP_NET_RAW`.

Аккаунт выбирается через `--account NAME` или `REGRU_ACCOUNT`, иначе берётся `default_account`.
`--account auto` находит аккаунт, которому принадлежит домен из командной строки, перебирая домены
всех настроенных аккаунтов. Результат кэшируется на час в `~/.cache/regru/domains.json`
Expand Down Expand Up @@ -188,6 +193,9 @@ NS-записи апекса никогда не меняются и в этот
- Ошибки по домену (`CONFLICT_CNAME`, `TEXT_CONTAINS_INVALID_CHARACTERS`) приходят внутри ответа
с общим `result: success`.
- Повторное добавление существующей A-записи ничего не меняет.
- Зона, у которой на reg.ru только DNS-хостинг (`srv_dns_both`), а домен у другого регистратора, по имени
отвечает `DOMAIN_NOT_FOUND` и адресуется по `service_id`. Клиент находит такую услугу сам и повторяет
запрос; в `domain list` и `--account auto` она не попадает.
- Лимит 1200 запросов в час; API принимает запросы только с IP из белого списка в кабинете.

## Лицензия
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/deps.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func openFileJournal(stateDir, userID, zoneName, runID string) (apply.Journal, e

func defaultNewClient(a config.Account, lim *regruapi.Limiter, requestTimeout time.Duration) *regruapi.Client {
return regruapi.New(regruapi.Credentials{Username: a.Username, Password: a.Password}, lim,
regruapi.WithRequestTimeout(requestTimeout))
regruapi.WithRequestTimeout(requestTimeout), regruapi.WithInterface(a.Interface))
}

type Target struct {
Expand Down
18 changes: 10 additions & 8 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ type Defaults struct {
}

type AccountSpec struct {
Name, Username, Password, EnvFile string
Name, Username, Password, EnvFile, Interface string
}

type Account struct {
Name, Username, Password string
Name, Username, Password, Interface string
}

type Config struct {
Expand All @@ -43,9 +43,10 @@ type Config struct {
}

type rawAccount struct {
Username string `yaml:"username"`
Password string `yaml:"password"`
EnvFile string `yaml:"env_file"`
Username string `yaml:"username"`
Password string `yaml:"password"`
EnvFile string `yaml:"env_file"`
Interface string `yaml:"interface"`
}

type rawDefaults struct {
Expand Down Expand Up @@ -105,7 +106,7 @@ func Load(path string, explicit bool, readFile func(string) ([]byte, error)) (*C
if err := checkPasswordRef(name, a.Password); err != nil {
return nil, err
}
c.Accounts[name] = AccountSpec{Name: name, Username: a.Username, Password: a.Password, EnvFile: a.EnvFile}
c.Accounts[name] = AccountSpec{Name: name, Username: a.Username, Password: a.Password, EnvFile: a.EnvFile, Interface: a.Interface}
}
c.Defaults.MaxDeletes = raw.Defaults.MaxDeletes
if c.Defaults.Timeout, err = parseDuration("timeout", raw.Defaults.Timeout); err != nil {
Expand Down Expand Up @@ -203,7 +204,7 @@ func (c *Config) Resolve(name string, lookup Lookup, readFile func(string) ([]by
}
return Account{}, errf("missing_env", "account %q: variable %s is not set", name, varName)
}
return Account{Name: name, Username: username, Password: v}, nil
return Account{Name: name, Username: username, Password: v, Interface: spec.Interface}, nil
}

func isRefPrefix(s string) bool {
Expand All @@ -228,7 +229,8 @@ func ResolveEnvMode(lookup Lookup) (Account, error) {
if p == "" {
return Account{}, errf("missing_env", "REGRU_PASSWORD is not set or empty")
}
return Account{Name: "env", Username: u, Password: p}, nil
iface, _ := lookup("REGRU_INTERFACE")
return Account{Name: "env", Username: u, Password: p, Interface: iface}, nil
}

type Selection struct {
Expand Down
15 changes: 15 additions & 0 deletions internal/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,18 @@ func TestMaxDeletesZeroIsExplicit(t *testing.T) {
t.Fatal("expected nil")
}
}

func TestAccountInterface(t *testing.T) {
c := load(t, "version: 1\naccounts:\n alpha:\n username: a\n password: env:P\n interface: en0\n")
a, err := c.Resolve("alpha", lk(map[string]string{"P": "1"}), fakeFS(nil))
if err != nil || a.Interface != "en0" {
t.Fatalf("%v %+v", err, a)
}
}

func TestEnvModeInterface(t *testing.T) {
a, err := ResolveEnvMode(lk(map[string]string{"REGRU_USERNAME": "u", "REGRU_PASSWORD": "p", "REGRU_INTERFACE": "en0"}))
if err != nil || a.Interface != "en0" {
t.Fatalf("%v %+v", err, a)
}
}
29 changes: 29 additions & 0 deletions internal/regruapi/bind.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package regruapi

import (
"context"
"net"
"net/http"
"syscall"
"time"
)

func boundTransport(iface string) *http.Transport {
d := &net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
Control: func(network, _ string, rc syscall.RawConn) error {
var bindErr error
if err := rc.Control(func(fd uintptr) { bindErr = bindToInterface(fd, network, iface) }); err != nil {
return err
}
return bindErr
},
}
t := http.DefaultTransport.(*http.Transport).Clone()
t.Proxy = nil
t.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
return d.DialContext(ctx, network, addr)
}
return t
}
18 changes: 18 additions & 0 deletions internal/regruapi/bind_darwin.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package regruapi

import (
"fmt"
"net"
"syscall"
)

func bindToInterface(fd uintptr, network, iface string) error {
ifi, err := net.InterfaceByName(iface)
if err != nil {
return fmt.Errorf("interface %s: %w", iface, err)
}
if network == "tcp6" || network == "udp6" {
return syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifi.Index)
}
return syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifi.Index)
}
13 changes: 13 additions & 0 deletions internal/regruapi/bind_linux.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package regruapi

import (
"fmt"
"syscall"
)

func bindToInterface(fd uintptr, _, iface string) error {
if err := syscall.BindToDevice(int(fd), iface); err != nil {
return fmt.Errorf("interface %s: %w", iface, err)
}
return nil
}
12 changes: 12 additions & 0 deletions internal/regruapi/bind_other.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//go:build !darwin && !linux

package regruapi

import (
"fmt"
"runtime"
)

func bindToInterface(uintptr, string, string) error {
return fmt.Errorf("binding to an interface is not supported on %s", runtime.GOOS)
}
52 changes: 52 additions & 0 deletions internal/regruapi/bind_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
//go:build darwin || linux

package regruapi

import (
"context"
"net"
"runtime"
"strings"
"testing"
)

func loopbackName(t *testing.T) string {
t.Helper()
ifs, err := net.Interfaces()
if err != nil {
t.Fatal(err)
}
for _, i := range ifs {
if i.Flags&net.FlagLoopback != 0 {
return i.Name
}
}
t.Skip("no loopback interface")
return ""
}

func TestInterfaceBound(t *testing.T) {
if runtime.GOOS == "linux" {
t.Skip("SO_BINDTODEVICE needs CAP_NET_RAW")
}
srv, n := newServer(t, body(`{"result":"success","answer":{}}`))
c := testClient(srv.URL, &fakeClock{}, WithInterface(loopbackName(t)))
if _, err := c.Call(context.Background(), Read, "nop", nil); err != nil {
t.Fatal(err)
}
if n.Load() != 1 {
t.Fatalf("calls = %d", n.Load())
}
}

func TestInterfaceUnknown(t *testing.T) {
srv, n := newServer(t, body(`{"result":"success","answer":{}}`))
c := testClient(srv.URL, &fakeClock{}, WithInterface("nosuchif0"), WithMaxAttempts(1))
_, err := c.Call(context.Background(), Read, "nop", nil)
if err == nil || !strings.Contains(err.Error(), "nosuchif0") {
t.Fatalf("err = %v", err)
}
if n.Load() != 0 {
t.Fatalf("calls = %d", n.Load())
}
}
9 changes: 9 additions & 0 deletions internal/regruapi/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"net/http"
"net/url"
"strings"
"sync"
"time"
)

Expand All @@ -31,9 +32,12 @@ type Client struct {
lim *Limiter
baseURL string
httpClient *http.Client
iface string
timeout time.Duration
maxAttempts int
clock Clock
hostingMu sync.Mutex
hostingIDs map[string]string
}

type Option func(*Client)
Expand All @@ -42,6 +46,8 @@ func WithBaseURL(u string) Option { return func(c *Client) { c.baseURL = u } }

func WithHTTPClient(h *http.Client) Option { return func(c *Client) { c.httpClient = h } }

func WithInterface(name string) Option { return func(c *Client) { c.iface = name } }

func WithRequestTimeout(d time.Duration) Option { return func(c *Client) { c.timeout = d } }

func WithMaxAttempts(n int) Option { return func(c *Client) { c.maxAttempts = n } }
Expand All @@ -67,6 +73,9 @@ func New(cr Credentials, lim *Limiter, opts ...Option) *Client {
if c.httpClient != nil {
hc = *c.httpClient
}
if c.iface != "" && hc.Transport == nil {
hc.Transport = boundTransport(c.iface)
}
hc.CheckRedirect = func(*http.Request, []*http.Request) error { return errRedirectRefused }
c.httpClient = &hc
return c
Expand Down
Loading
Loading