aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-18 19:48:31 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-18 19:48:31 +0100
commit9f1968bec0756aba25f4e6bb300d23bbdab87f51 (patch)
tree804a0674d8a56b8a26e0a35ccc34a8168d399569
parent767868108a78b0c62b6613dba22e81b9134739b2 (diff)
wip
-rw-r--r--cmd/batch/main.go27
-rw-r--r--contact.go19
2 files changed, 42 insertions, 4 deletions
diff --git a/cmd/batch/main.go b/cmd/batch/main.go
index dbe1195..222d4d7 100644
--- a/cmd/batch/main.go
+++ b/cmd/batch/main.go
@@ -18,7 +18,6 @@ func main() {
if err != nil {
log.Fatal(err)
}
- _ = prov
for _, c := range crt {
if c.IsValid(*graceTime) && !*force {
@@ -33,7 +32,33 @@ func main() {
_ = csr
}
if len(*emails) > 0 && len(*domains) > 0 {
+ key, err := acme.NewKey(*keySize)
+ if err != nil {
+ log.Fatal(err)
+ }
+ sig, err := acme.NewSigner(key)
+ if err != nil {
+ log.Fatal(err)
+ }
+ var con acme.Contacts
+ for _, email := range *emails {
+ m, err := acme.NewMail(email)
+ if err != nil {
+ log.Fatal(err)
+ }
+ con = append(con, m)
+ }
+ log.Println("Register", con)
+ err = prov.Register(sig, con, agree)
+ if err != nil {
+ log.Fatal(err)
+ }
log.Println(*emails)
log.Println(*domains)
}
}
+
+func agree(tos string) bool {
+ log.Println("Agree to", tos)
+ return true
+}
diff --git a/contact.go b/contact.go
index 71b4ecd..2a69ebe 100644
--- a/contact.go
+++ b/contact.go
@@ -48,14 +48,27 @@ func (ph Phone) MarshalText() ([]byte, error) {
return []byte("tel:" + ph), nil
}
-func NewContacts(email, phone string) (Contacts, error) {
+func NewMail(email string) (Mail, error) {
m, err := mail.ParseAddress(email)
if err != nil {
+ return "", err
+ }
+ return Mail(m.Address), nil
+}
+
+func NewPhone(phone string) (Phone, error) {
+ return Phone(phone), nil
+}
+
+func NewContacts(email, phone string) (Contacts, error) {
+ m, err := NewMail(email)
+ if err != nil {
return nil, err
}
- c := Contacts{Mail(m.Address)}
+ c := Contacts{m}
if phone != "" {
- c = append(c, Phone(phone))
+ p, _ := NewPhone(phone)
+ c = append(c, p)
}
return c, nil
}