mirrors/acme-dns
1
0
Fork 0
mirror of https://github.com/joohoi/acme-dns.git synced 2025-07-13 01:07:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Joona Hoikkala
2016-11-27 21:21:38 +02:00
parent bff6310dc7
commit 74b82c87a6
6 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
util.go
View File

@ -6,8 +6,10 @@ import (
"fmt"
"github.com/BurntSushi/toml"
log "github.com/Sirupsen/logrus"
"github.com/miekg/dns"
"github.com/satori/go.uuid"
"math/big"
"os"
"regexp"
"strings"
)
@ -22,27 +24,20 @@ func readConfig(fname string) (DNSConfig, error) {
func sanitizeString(s string) string {
// URL safe base64 alphabet without padding as defined in ACME
re, err := regexp.Compile("[^A-Za-z\\-\\_0-9]+")
if err != nil {
log.Errorf("%v", err)
return ""
}
re, _ := regexp.Compile("[^A-Za-z\\-\\_0-9]+")
return re.ReplaceAllString(s, "")
}
func generatePassword(length int) (string, error) {
func generatePassword(length int) string {
ret := make([]byte, length)
const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-_"
alphalen := big.NewInt(int64(len(alphabet)))
for i := 0; i < length; i++ {
c, err := rand.Int(rand.Reader, alphalen)
if err != nil {
return "", err
}
c, _ := rand.Int(rand.Reader, alphalen)
r := int(c.Int64())
ret[i] = alphabet[r]
}
return string(ret), nil
return string(ret)
}
func sanitizeDomainQuestion(d string) string {
@ -57,17 +52,14 @@ func sanitizeDomainQuestion(d string) string {
func newACMETxt() (ACMETxt, error) {
var a = ACMETxt{}
password, err := generatePassword(40)
if err != nil {
return a, err
}
password := generatePassword(40)
a.Username = uuid.NewV4()
a.Password = password
a.Subdomain = uuid.NewV4().String()
return a, nil
}
func setupLogging() {
func setupLogging(format string, level string) {
if DNSConf.Logconfig.Format == "json" {
log.SetFormatter(&log.JSONFormatter{})
}
@ -83,3 +75,17 @@ func setupLogging() {
}
// TODO: file logging
}
func startDNS(listen string) *dns.Server {
// DNS server part
dns.HandleFunc(".", handleRequest)
server := &dns.Server{Addr: listen, Net: "udp"}
go func() {
err := server.ListenAndServe()
if err != nil {
log.Errorf("%v", err)
os.Exit(1)
}
}()
return server
}