Rewrote Caddy from the ground up; initial commit of 0.9 branch
These changes span work from the last ~4 months in an effort to make
Caddy more extensible, reduce the coupling between its components, and
lay a more robust foundation of code going forward into 1.0. A bunch of
new features have been added, too, with even higher future potential.
The most significant design change is an overall inversion of
dependencies. Instead of the caddy package knowing about the server
and the notion of middleware and config, the caddy package exposes an
interface that other components plug into. This does introduce more
indirection when reading the code, but every piece is very modular and
pluggable. Even the HTTP server is pluggable.
The caddy package has been moved to the top level, and main has been
pushed into a subfolder called caddy. The actual logic of the main
file has been pushed even further into caddy/caddymain/run.go so that
custom builds of Caddy can be 'go get'able.
The HTTPS logic was surgically separated into two parts to divide the
TLS-specific code and the HTTPS-specific code. The caddytls package can
now be used by any type of server that needs TLS, not just HTTP. I also
added the ability to customize nearly every aspect of TLS at the site
level rather than all sites sharing the same TLS configuration. Not all
of this flexibility is exposed in the Caddyfile yet, but it may be in
the future. Caddy can also generate self-signed certificates in memory
for the convenience of a developer working on localhost who wants HTTPS.
And Caddy now supports the DNS challenge, assuming at least one DNS
provider is plugged in.
Dozens, if not hundreds, of other minor changes swept through the code
base as I literally started from an empty main function, copying over
functions or files as needed, then adjusting them to fit in the new
design. Most tests have been restored and adapted to the new API,
but more work is needed there.
A lot of what was "impossible" before is now possible, or can be made
possible with minimal disruption of the code. For example, it's fairly
easy to make plugins hook into another part of the code via callbacks.
Plugins can do more than just be directives; we now have plugins that
customize how the Caddyfile is loaded (useful when you need to get your
configuration from a remote store).
Site addresses no longer need be just a host and port. They can have a
path, allowing you to scope a configuration to a specific path. There is
no inheretance, however; each site configuration is distinct.
Thanks to amazing work by Lucas Clemente, this commit adds experimental
QUIC support. Turn it on using the -quic flag; your browser may have
to be configured to enable it.
Almost everything is here, but you will notice that most of the middle-
ware are missing. After those are transferred over, we'll be ready for
beta tests.
I'm very excited to get this out. Thanks for everyone's help and
patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
|
|
|
package caddytls
|
2015-10-17 21:17:24 -05:00
|
|
|
|
|
|
|
import (
|
2015-10-17 21:44:33 -05:00
|
|
|
"bufio"
|
2016-02-27 11:49:19 -05:00
|
|
|
"crypto"
|
2016-03-02 08:34:33 -05:00
|
|
|
"crypto/ecdsa"
|
|
|
|
"crypto/elliptic"
|
2015-10-17 21:17:24 -05:00
|
|
|
"crypto/rand"
|
|
|
|
"encoding/json"
|
|
|
|
"errors"
|
2015-10-17 21:44:33 -05:00
|
|
|
"fmt"
|
2015-10-18 13:09:06 -05:00
|
|
|
"io"
|
2015-10-17 21:17:24 -05:00
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
2015-10-17 21:44:33 -05:00
|
|
|
"strings"
|
2015-10-17 21:17:24 -05:00
|
|
|
|
|
|
|
"github.com/xenolf/lego/acme"
|
|
|
|
)
|
|
|
|
|
2015-10-18 13:09:06 -05:00
|
|
|
// User represents a Let's Encrypt user account.
|
2015-10-17 21:17:24 -05:00
|
|
|
type User struct {
|
|
|
|
Email string
|
|
|
|
Registration *acme.RegistrationResource
|
2016-03-02 08:34:33 -05:00
|
|
|
key crypto.PrivateKey
|
2015-10-17 21:17:24 -05:00
|
|
|
}
|
|
|
|
|
2015-10-18 13:09:06 -05:00
|
|
|
// GetEmail gets u's email.
|
2015-10-17 21:17:24 -05:00
|
|
|
func (u User) GetEmail() string {
|
|
|
|
return u.Email
|
|
|
|
}
|
2015-10-18 13:09:06 -05:00
|
|
|
|
|
|
|
// GetRegistration gets u's registration resource.
|
2015-10-17 21:17:24 -05:00
|
|
|
func (u User) GetRegistration() *acme.RegistrationResource {
|
|
|
|
return u.Registration
|
|
|
|
}
|
2015-10-18 13:09:06 -05:00
|
|
|
|
|
|
|
// GetPrivateKey gets u's private key.
|
2016-02-27 11:49:19 -05:00
|
|
|
func (u User) GetPrivateKey() crypto.PrivateKey {
|
2015-10-17 21:17:24 -05:00
|
|
|
return u.key
|
|
|
|
}
|
|
|
|
|
|
|
|
// newUser creates a new User for the given email address
|
2015-10-17 21:44:33 -05:00
|
|
|
// with a new private key. This function does NOT save the
|
|
|
|
// user to disk or register it via ACME. If you want to use
|
|
|
|
// a user account that might already exist, call getUser
|
2016-02-11 02:06:05 -05:00
|
|
|
// instead. It does NOT prompt the user.
|
2015-10-17 21:17:24 -05:00
|
|
|
func newUser(email string) (User, error) {
|
|
|
|
user := User{Email: email}
|
2016-03-02 08:34:33 -05:00
|
|
|
privateKey, err := ecdsa.GenerateKey(elliptic.P384(), rand.Reader)
|
2015-10-17 21:17:24 -05:00
|
|
|
if err != nil {
|
|
|
|
return user, errors.New("error generating private key: " + err.Error())
|
|
|
|
}
|
|
|
|
user.key = privateKey
|
|
|
|
return user, nil
|
|
|
|
}
|
2015-10-17 21:44:33 -05:00
|
|
|
|
|
|
|
// getEmail does everything it can to obtain an email
|
Rewrote Caddy from the ground up; initial commit of 0.9 branch
These changes span work from the last ~4 months in an effort to make
Caddy more extensible, reduce the coupling between its components, and
lay a more robust foundation of code going forward into 1.0. A bunch of
new features have been added, too, with even higher future potential.
The most significant design change is an overall inversion of
dependencies. Instead of the caddy package knowing about the server
and the notion of middleware and config, the caddy package exposes an
interface that other components plug into. This does introduce more
indirection when reading the code, but every piece is very modular and
pluggable. Even the HTTP server is pluggable.
The caddy package has been moved to the top level, and main has been
pushed into a subfolder called caddy. The actual logic of the main
file has been pushed even further into caddy/caddymain/run.go so that
custom builds of Caddy can be 'go get'able.
The HTTPS logic was surgically separated into two parts to divide the
TLS-specific code and the HTTPS-specific code. The caddytls package can
now be used by any type of server that needs TLS, not just HTTP. I also
added the ability to customize nearly every aspect of TLS at the site
level rather than all sites sharing the same TLS configuration. Not all
of this flexibility is exposed in the Caddyfile yet, but it may be in
the future. Caddy can also generate self-signed certificates in memory
for the convenience of a developer working on localhost who wants HTTPS.
And Caddy now supports the DNS challenge, assuming at least one DNS
provider is plugged in.
Dozens, if not hundreds, of other minor changes swept through the code
base as I literally started from an empty main function, copying over
functions or files as needed, then adjusting them to fit in the new
design. Most tests have been restored and adapted to the new API,
but more work is needed there.
A lot of what was "impossible" before is now possible, or can be made
possible with minimal disruption of the code. For example, it's fairly
easy to make plugins hook into another part of the code via callbacks.
Plugins can do more than just be directives; we now have plugins that
customize how the Caddyfile is loaded (useful when you need to get your
configuration from a remote store).
Site addresses no longer need be just a host and port. They can have a
path, allowing you to scope a configuration to a specific path. There is
no inheretance, however; each site configuration is distinct.
Thanks to amazing work by Lucas Clemente, this commit adds experimental
QUIC support. Turn it on using the -quic flag; your browser may have
to be configured to enable it.
Almost everything is here, but you will notice that most of the middle-
ware are missing. After those are transferred over, we'll be ready for
beta tests.
I'm very excited to get this out. Thanks for everyone's help and
patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
|
|
|
// address from the user within the scope of storage
|
|
|
|
// to use for ACME TLS. If it cannot get an email
|
|
|
|
// address, it returns empty string. (It will warn the
|
|
|
|
// user of the consequences of an empty email.) This
|
|
|
|
// function MAY prompt the user for input. If userPresent
|
|
|
|
// is false, the operator will NOT be prompted and an
|
|
|
|
// empty email may be returned.
|
|
|
|
func getEmail(storage Storage, userPresent bool) string {
|
|
|
|
// First try memory (command line flag or typed by user previously)
|
|
|
|
leEmail := DefaultEmail
|
2015-10-17 21:44:33 -05:00
|
|
|
if leEmail == "" {
|
Rewrote Caddy from the ground up; initial commit of 0.9 branch
These changes span work from the last ~4 months in an effort to make
Caddy more extensible, reduce the coupling between its components, and
lay a more robust foundation of code going forward into 1.0. A bunch of
new features have been added, too, with even higher future potential.
The most significant design change is an overall inversion of
dependencies. Instead of the caddy package knowing about the server
and the notion of middleware and config, the caddy package exposes an
interface that other components plug into. This does introduce more
indirection when reading the code, but every piece is very modular and
pluggable. Even the HTTP server is pluggable.
The caddy package has been moved to the top level, and main has been
pushed into a subfolder called caddy. The actual logic of the main
file has been pushed even further into caddy/caddymain/run.go so that
custom builds of Caddy can be 'go get'able.
The HTTPS logic was surgically separated into two parts to divide the
TLS-specific code and the HTTPS-specific code. The caddytls package can
now be used by any type of server that needs TLS, not just HTTP. I also
added the ability to customize nearly every aspect of TLS at the site
level rather than all sites sharing the same TLS configuration. Not all
of this flexibility is exposed in the Caddyfile yet, but it may be in
the future. Caddy can also generate self-signed certificates in memory
for the convenience of a developer working on localhost who wants HTTPS.
And Caddy now supports the DNS challenge, assuming at least one DNS
provider is plugged in.
Dozens, if not hundreds, of other minor changes swept through the code
base as I literally started from an empty main function, copying over
functions or files as needed, then adjusting them to fit in the new
design. Most tests have been restored and adapted to the new API,
but more work is needed there.
A lot of what was "impossible" before is now possible, or can be made
possible with minimal disruption of the code. For example, it's fairly
easy to make plugins hook into another part of the code via callbacks.
Plugins can do more than just be directives; we now have plugins that
customize how the Caddyfile is loaded (useful when you need to get your
configuration from a remote store).
Site addresses no longer need be just a host and port. They can have a
path, allowing you to scope a configuration to a specific path. There is
no inheretance, however; each site configuration is distinct.
Thanks to amazing work by Lucas Clemente, this commit adds experimental
QUIC support. Turn it on using the -quic flag; your browser may have
to be configured to enable it.
Almost everything is here, but you will notice that most of the middle-
ware are missing. After those are transferred over, we'll be ready for
beta tests.
I'm very excited to get this out. Thanks for everyone's help and
patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
|
|
|
// Then try to get most recent user email
|
2015-10-17 21:44:33 -05:00
|
|
|
userDirs, err := ioutil.ReadDir(storage.Users())
|
|
|
|
if err == nil {
|
|
|
|
var mostRecent os.FileInfo
|
|
|
|
for _, dir := range userDirs {
|
|
|
|
if !dir.IsDir() {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if mostRecent == nil || dir.ModTime().After(mostRecent.ModTime()) {
|
2016-01-11 01:40:55 -05:00
|
|
|
leEmail = dir.Name()
|
2016-02-11 02:06:05 -05:00
|
|
|
DefaultEmail = leEmail // save for next time
|
Rewrote Caddy from the ground up; initial commit of 0.9 branch
These changes span work from the last ~4 months in an effort to make
Caddy more extensible, reduce the coupling between its components, and
lay a more robust foundation of code going forward into 1.0. A bunch of
new features have been added, too, with even higher future potential.
The most significant design change is an overall inversion of
dependencies. Instead of the caddy package knowing about the server
and the notion of middleware and config, the caddy package exposes an
interface that other components plug into. This does introduce more
indirection when reading the code, but every piece is very modular and
pluggable. Even the HTTP server is pluggable.
The caddy package has been moved to the top level, and main has been
pushed into a subfolder called caddy. The actual logic of the main
file has been pushed even further into caddy/caddymain/run.go so that
custom builds of Caddy can be 'go get'able.
The HTTPS logic was surgically separated into two parts to divide the
TLS-specific code and the HTTPS-specific code. The caddytls package can
now be used by any type of server that needs TLS, not just HTTP. I also
added the ability to customize nearly every aspect of TLS at the site
level rather than all sites sharing the same TLS configuration. Not all
of this flexibility is exposed in the Caddyfile yet, but it may be in
the future. Caddy can also generate self-signed certificates in memory
for the convenience of a developer working on localhost who wants HTTPS.
And Caddy now supports the DNS challenge, assuming at least one DNS
provider is plugged in.
Dozens, if not hundreds, of other minor changes swept through the code
base as I literally started from an empty main function, copying over
functions or files as needed, then adjusting them to fit in the new
design. Most tests have been restored and adapted to the new API,
but more work is needed there.
A lot of what was "impossible" before is now possible, or can be made
possible with minimal disruption of the code. For example, it's fairly
easy to make plugins hook into another part of the code via callbacks.
Plugins can do more than just be directives; we now have plugins that
customize how the Caddyfile is loaded (useful when you need to get your
configuration from a remote store).
Site addresses no longer need be just a host and port. They can have a
path, allowing you to scope a configuration to a specific path. There is
no inheretance, however; each site configuration is distinct.
Thanks to amazing work by Lucas Clemente, this commit adds experimental
QUIC support. Turn it on using the -quic flag; your browser may have
to be configured to enable it.
Almost everything is here, but you will notice that most of the middle-
ware are missing. After those are transferred over, we'll be ready for
beta tests.
I'm very excited to get this out. Thanks for everyone's help and
patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
|
|
|
mostRecent = dir
|
2015-10-17 21:44:33 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-02-11 02:06:05 -05:00
|
|
|
if leEmail == "" && userPresent {
|
2015-10-31 14:15:47 -05:00
|
|
|
// Alas, we must bother the user and ask for an email address;
|
|
|
|
// if they proceed they also agree to the SA.
|
2015-10-18 13:09:06 -05:00
|
|
|
reader := bufio.NewReader(stdin)
|
2016-01-04 01:56:22 -05:00
|
|
|
fmt.Println("\nYour sites will be served over HTTPS automatically using Let's Encrypt.")
|
2015-10-31 00:44:00 -05:00
|
|
|
fmt.Println("By continuing, you agree to the Let's Encrypt Subscriber Agreement at:")
|
2015-11-02 13:06:42 -05:00
|
|
|
fmt.Println(" " + saURL) // TODO: Show current SA link
|
2015-10-31 00:44:00 -05:00
|
|
|
fmt.Println("Please enter your email address so you can recover your account if needed.")
|
2015-11-02 13:06:42 -05:00
|
|
|
fmt.Println("You can leave it blank, but you'll lose the ability to recover your account.")
|
2015-10-31 00:44:00 -05:00
|
|
|
fmt.Print("Email address: ")
|
2015-10-17 21:44:33 -05:00
|
|
|
var err error
|
|
|
|
leEmail, err = reader.ReadString('\n')
|
|
|
|
if err != nil {
|
|
|
|
return ""
|
|
|
|
}
|
2016-01-25 22:21:08 -05:00
|
|
|
leEmail = strings.TrimSpace(leEmail)
|
2015-10-17 21:44:33 -05:00
|
|
|
DefaultEmail = leEmail
|
2015-10-31 14:15:47 -05:00
|
|
|
Agreed = true
|
2015-10-17 21:44:33 -05:00
|
|
|
}
|
Rewrote Caddy from the ground up; initial commit of 0.9 branch
These changes span work from the last ~4 months in an effort to make
Caddy more extensible, reduce the coupling between its components, and
lay a more robust foundation of code going forward into 1.0. A bunch of
new features have been added, too, with even higher future potential.
The most significant design change is an overall inversion of
dependencies. Instead of the caddy package knowing about the server
and the notion of middleware and config, the caddy package exposes an
interface that other components plug into. This does introduce more
indirection when reading the code, but every piece is very modular and
pluggable. Even the HTTP server is pluggable.
The caddy package has been moved to the top level, and main has been
pushed into a subfolder called caddy. The actual logic of the main
file has been pushed even further into caddy/caddymain/run.go so that
custom builds of Caddy can be 'go get'able.
The HTTPS logic was surgically separated into two parts to divide the
TLS-specific code and the HTTPS-specific code. The caddytls package can
now be used by any type of server that needs TLS, not just HTTP. I also
added the ability to customize nearly every aspect of TLS at the site
level rather than all sites sharing the same TLS configuration. Not all
of this flexibility is exposed in the Caddyfile yet, but it may be in
the future. Caddy can also generate self-signed certificates in memory
for the convenience of a developer working on localhost who wants HTTPS.
And Caddy now supports the DNS challenge, assuming at least one DNS
provider is plugged in.
Dozens, if not hundreds, of other minor changes swept through the code
base as I literally started from an empty main function, copying over
functions or files as needed, then adjusting them to fit in the new
design. Most tests have been restored and adapted to the new API,
but more work is needed there.
A lot of what was "impossible" before is now possible, or can be made
possible with minimal disruption of the code. For example, it's fairly
easy to make plugins hook into another part of the code via callbacks.
Plugins can do more than just be directives; we now have plugins that
customize how the Caddyfile is loaded (useful when you need to get your
configuration from a remote store).
Site addresses no longer need be just a host and port. They can have a
path, allowing you to scope a configuration to a specific path. There is
no inheretance, however; each site configuration is distinct.
Thanks to amazing work by Lucas Clemente, this commit adds experimental
QUIC support. Turn it on using the -quic flag; your browser may have
to be configured to enable it.
Almost everything is here, but you will notice that most of the middle-
ware are missing. After those are transferred over, we'll be ready for
beta tests.
I'm very excited to get this out. Thanks for everyone's help and
patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
|
|
|
return strings.ToLower(leEmail)
|
|
|
|
}
|
|
|
|
|
|
|
|
// getUser loads the user with the given email from disk
|
|
|
|
// using the provided storage. If the user does not exist,
|
|
|
|
// it will create a new one, but it does NOT save new
|
|
|
|
// users to the disk or register them via ACME. It does
|
|
|
|
// NOT prompt the user.
|
|
|
|
func getUser(storage Storage, email string) (User, error) {
|
|
|
|
var user User
|
|
|
|
|
|
|
|
// open user file
|
|
|
|
regFile, err := os.Open(storage.UserRegFile(email))
|
|
|
|
if err != nil {
|
|
|
|
if os.IsNotExist(err) {
|
|
|
|
// create a new user
|
|
|
|
return newUser(email)
|
|
|
|
}
|
|
|
|
return user, err
|
|
|
|
}
|
|
|
|
defer regFile.Close()
|
|
|
|
|
|
|
|
// load user information
|
|
|
|
err = json.NewDecoder(regFile).Decode(&user)
|
|
|
|
if err != nil {
|
|
|
|
return user, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// load their private key
|
|
|
|
user.key, err = loadPrivateKey(storage.UserKeyFile(email))
|
|
|
|
if err != nil {
|
|
|
|
return user, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return user, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// saveUser persists a user's key and account registration
|
|
|
|
// to the file system. It does NOT register the user via ACME
|
|
|
|
// or prompt the user. You must also pass in the storage
|
|
|
|
// wherein the user should be saved. It should be the storage
|
|
|
|
// for the CA with which user has an account.
|
|
|
|
func saveUser(storage Storage, user User) error {
|
|
|
|
// make user account folder
|
|
|
|
err := os.MkdirAll(storage.User(user.Email), 0700)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// save private key file
|
|
|
|
err = savePrivateKey(user.key, storage.UserKeyFile(user.Email))
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// save registration file
|
|
|
|
jsonBytes, err := json.MarshalIndent(&user, "", "\t")
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return ioutil.WriteFile(storage.UserRegFile(user.Email), jsonBytes, 0600)
|
2015-10-17 21:44:33 -05:00
|
|
|
}
|
2015-10-18 13:09:06 -05:00
|
|
|
|
2015-10-28 19:12:07 -05:00
|
|
|
// promptUserAgreement prompts the user to agree to the agreement
|
|
|
|
// at agreementURL via stdin. If the agreement has changed, then pass
|
|
|
|
// true as the second argument. If this is the user's first time
|
|
|
|
// agreeing, pass false. It returns whether the user agreed or not.
|
|
|
|
func promptUserAgreement(agreementURL string, changed bool) bool {
|
|
|
|
if changed {
|
2015-11-02 13:06:42 -05:00
|
|
|
fmt.Printf("The Let's Encrypt Subscriber Agreement has changed:\n %s\n", agreementURL)
|
2015-10-28 19:12:07 -05:00
|
|
|
fmt.Print("Do you agree to the new terms? (y/n): ")
|
|
|
|
} else {
|
2015-11-02 13:06:42 -05:00
|
|
|
fmt.Printf("To continue, you must agree to the Let's Encrypt Subscriber Agreement:\n %s\n", agreementURL)
|
2015-10-28 19:12:07 -05:00
|
|
|
fmt.Print("Do you agree to the terms? (y/n): ")
|
|
|
|
}
|
|
|
|
|
2015-10-31 00:44:00 -05:00
|
|
|
reader := bufio.NewReader(stdin)
|
2015-10-28 19:12:07 -05:00
|
|
|
answer, err := reader.ReadString('\n')
|
|
|
|
if err != nil {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
answer = strings.ToLower(strings.TrimSpace(answer))
|
|
|
|
|
|
|
|
return answer == "y" || answer == "yes"
|
|
|
|
}
|
|
|
|
|
2015-10-18 13:09:06 -05:00
|
|
|
// stdin is used to read the user's input if prompted;
|
|
|
|
// this is changed by tests during tests.
|
|
|
|
var stdin = io.ReadWriter(os.Stdin)
|
2015-10-31 00:44:00 -05:00
|
|
|
|
|
|
|
// The name of the folder for accounts where the email
|
|
|
|
// address was not provided; default 'username' if you will.
|
|
|
|
const emptyEmail = "default"
|
2015-11-02 13:06:42 -05:00
|
|
|
|
|
|
|
// TODO: Use latest
|
|
|
|
const saURL = "https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
|