* Refactor core * Re-added tests * Small fixes * Add tests for acmetxt cidrslice and util funcs * Remove the last dangling reference to old logging package * Refactoring (#327) * chore: enable more linters and fix linter issues * ci: enable linter checks on all branches and disable recurring checks recurring linter checks don't make that much sense. The code & linter checks should not change on their own over night ;) * chore: update packages * Revert "chore: update packages" This reverts commit 30250bf28c4b39e9e5b3af012a4e28ab036bf9af. * chore: manually upgrade some packages * Updated dependencies, wrote changelog entry and fixed namespace for release * Refactoring - improving coverage (#371) * Increase code coverage in acmedns * More testing of ReadConfig() and its fallback mechanism * Found that if someone put a '"' double quote into the filename that we configure zap to log to, it would cause the the JSON created to be invalid. I have replaced the JSON string with proper config * Better handling of config options for api.TLS - we now error on an invalid value instead of silently failing. added a basic test for api.setupTLS() (to increase test coverage) * testing nameserver isOwnChallenge and isAuthoritative methods * add a unit test for nameserver answerOwnChallenge * fix linting errors * bump go and golangci-lint versions in github actions * Update golangci-lint.yml Bumping github-actions workflow versions to accommodate some changes in upstream golanci-lint * Bump Golang version to 1.23 (currently the oldest supported version) Bump golanglint-ci to 2.0.2 and migrate the config file. This should resolve the math/rand/v2 issue * bump golanglint-ci action version * Fixing up new golanglint-ci warnings and errors --------- Co-authored-by: Joona Hoikkala <5235109+joohoi@users.noreply.github.com> * Minor refactoring, error returns and e2e testing suite * Add a few tests * Fix linter and umask setting * Update github actions * Refine concurrency configuration for GitHub actions * HTTP timeouts to API, and self-validation mutex to nameserver ops --------- Co-authored-by: Florian Ritterhoff <32478819+fritterhoff@users.noreply.github.com> Co-authored-by: Jason Playne <jason@jasonplayne.com>
73 lines
1.7 KiB
Go
73 lines
1.7 KiB
Go
package acmedns
|
|
|
|
import "github.com/google/uuid"
|
|
|
|
type Account struct {
|
|
Username string
|
|
Password string
|
|
Subdomain string
|
|
}
|
|
|
|
// AcmeDnsConfig holds the config structure
|
|
type AcmeDnsConfig struct {
|
|
General general
|
|
Database dbsettings
|
|
API httpapi
|
|
Logconfig logconfig
|
|
}
|
|
|
|
// Config file general section
|
|
type general struct {
|
|
Listen string
|
|
Proto string `toml:"protocol"`
|
|
Domain string
|
|
Nsname string
|
|
Nsadmin string
|
|
Debug bool
|
|
StaticRecords []string `toml:"records"`
|
|
}
|
|
|
|
type dbsettings struct {
|
|
Engine string
|
|
Connection string
|
|
}
|
|
|
|
// API config
|
|
type httpapi struct {
|
|
Domain string `toml:"api_domain"`
|
|
IP string
|
|
DisableRegistration bool `toml:"disable_registration"`
|
|
AutocertPort string `toml:"autocert_port"`
|
|
Port string `toml:"port"`
|
|
TLS string
|
|
TLSCertPrivkey string `toml:"tls_cert_privkey"`
|
|
TLSCertFullchain string `toml:"tls_cert_fullchain"`
|
|
ACMECacheDir string `toml:"acme_cache_dir"`
|
|
NotificationEmail string `toml:"notification_email"`
|
|
CorsOrigins []string
|
|
UseHeader bool `toml:"use_header"`
|
|
HeaderName string `toml:"header_name"`
|
|
}
|
|
|
|
// Logging config
|
|
type logconfig struct {
|
|
Level string `toml:"loglevel"`
|
|
Logtype string `toml:"logtype"`
|
|
File string `toml:"logfile"`
|
|
Format string `toml:"logformat"`
|
|
}
|
|
|
|
// ACMETxt is the default structure for the user controlled record
|
|
type ACMETxt struct {
|
|
Username uuid.UUID
|
|
Password string
|
|
ACMETxtPost
|
|
AllowFrom Cidrslice
|
|
}
|
|
|
|
// ACMETxtPost holds the DNS part of the ACMETxt struct
|
|
type ACMETxtPost struct {
|
|
Subdomain string `json:"subdomain"`
|
|
Value string `json:"txt"`
|
|
}
|