simon/acme-dns
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cpu-differentiate-errors

Browse Source
This commit is contained in:
Daniel McCarney 2018-03-01 09:54:41 -05:00 committed by GitHub
commit f463d07d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -110,13 +110,11 @@ Check out how in the INSTALL section.
1) Install [Go 1.9 or newer](https://golang.org/doc/install) 1) Install [Go 1.9 or newer](https://golang.org/doc/install)
2) Clone this repo: `git clone https://github.com/joohoi/acme-dns $GOPATH/src/acme-dns` 2) Install acme-dns: `go get github.com/joohoi/acme-dns/...`
3) Build ACME-DNS: `go build` 3) Edit config.cfg to suit your needs (see [configuration](#configuration)). `acme-dns` will read the configuration file from `/etc/acme-dns/config.cfg` or `./config.cfg`
4) Edit config.cfg to suit your needs (see [configuration](#configuration)) 4) Run acme-dns. Please note that acme-dns needs to open a privileged port (53, domain), so it needs to be run with elevated privileges.
5) Run acme-dns. Please note that acme-dns needs to open a privileged port (53, domain), so it needs to be run with elevated privileges.
## Using Docker ## Using Docker
@ -188,6 +186,8 @@ connection = "acme-dns.db"
api_domain = "" api_domain = ""
# autocert HTTP port, eg. 80 for answering Let's Encrypt HTTP-01 challenges. Mandatory if using tls = "letsencrypt". # autocert HTTP port, eg. 80 for answering Let's Encrypt HTTP-01 challenges. Mandatory if using tls = "letsencrypt".
autocert_port = "80" autocert_port = "80"
# listen ip, default "" listens on all interfaces/addresses
ip = "127.0.0.1"
# listen port, eg. 443 for default HTTPS # listen port, eg. 443 for default HTTPS
port = "8080" port = "8080"
# possible values: "letsencrypt", "cert", "none" # possible values: "letsencrypt", "cert", "none"

2
acmetxt.go
View File

@ -5,6 +5,7 @@ import (
"net" "net"
"github.com/satori/go.uuid" "github.com/satori/go.uuid"
log "github.com/sirupsen/logrus"
) )
// ACMETxt is the default structure for the user controlled record // ACMETxt is the default structure for the user controlled record
@ -47,6 +48,7 @@ func (a ACMETxt) allowedFrom(ip string) bool {
if len(a.AllowFrom.ValidEntries()) == 0 { if len(a.AllowFrom.ValidEntries()) == 0 {
return true return true
} }
log.WithFields(log.Fields{"ip": remoteIP}).Debug("Checking if update is permitted from IP")
for _, v := range a.AllowFrom.ValidEntries() { for _, v := range a.AllowFrom.ValidEntries() {
_, vnet, _ := net.ParseCIDR(v) _, vnet, _ := net.ParseCIDR(v)
if vnet.Contains(remoteIP) { if vnet.Contains(remoteIP) {