2017-09-23 13:56:58 +08:00
|
|
|
// Copyright 2015 Light Code Labs, LLC
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
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-05 07:00:29 +08:00
|
|
|
package caddytls
|
2015-10-18 10:17:24 +08:00
|
|
|
|
|
|
|
import (
|
2015-10-18 10:44:33 +08:00
|
|
|
"bufio"
|
2016-02-28 00:49:19 +08:00
|
|
|
"crypto"
|
2016-03-02 21:34:33 +08:00
|
|
|
"crypto/ecdsa"
|
|
|
|
"crypto/elliptic"
|
2015-10-18 10:17:24 +08:00
|
|
|
"crypto/rand"
|
|
|
|
"encoding/json"
|
|
|
|
"errors"
|
2015-10-18 10:44:33 +08:00
|
|
|
"fmt"
|
2015-10-19 02:09:06 +08:00
|
|
|
"io"
|
2015-10-18 10:17:24 +08:00
|
|
|
"os"
|
2015-10-18 10:44:33 +08:00
|
|
|
"strings"
|
2015-10-18 10:17:24 +08:00
|
|
|
|
2018-03-15 11:44:08 +08:00
|
|
|
"github.com/xenolf/lego/acmev2"
|
2015-10-18 10:17:24 +08:00
|
|
|
)
|
|
|
|
|
2015-10-19 02:09:06 +08:00
|
|
|
// User represents a Let's Encrypt user account.
|
2015-10-18 10:17:24 +08:00
|
|
|
type User struct {
|
|
|
|
Email string
|
|
|
|
Registration *acme.RegistrationResource
|
2016-03-02 21:34:33 +08:00
|
|
|
key crypto.PrivateKey
|
2015-10-18 10:17:24 +08:00
|
|
|
}
|
|
|
|
|
2015-10-19 02:09:06 +08:00
|
|
|
// GetEmail gets u's email.
|
2015-10-18 10:17:24 +08:00
|
|
|
func (u User) GetEmail() string {
|
|
|
|
return u.Email
|
|
|
|
}
|
2015-10-19 02:09:06 +08:00
|
|
|
|
|
|
|
// GetRegistration gets u's registration resource.
|
2015-10-18 10:17:24 +08:00
|
|
|
func (u User) GetRegistration() *acme.RegistrationResource {
|
|
|
|
return u.Registration
|
|
|
|
}
|
2015-10-19 02:09:06 +08:00
|
|
|
|
|
|
|
// GetPrivateKey gets u's private key.
|
2016-02-28 00:49:19 +08:00
|
|
|
func (u User) GetPrivateKey() crypto.PrivateKey {
|
2015-10-18 10:17:24 +08:00
|
|
|
return u.key
|
|
|
|
}
|
|
|
|
|
|
|
|
// newUser creates a new User for the given email address
|
2015-10-18 10:44:33 +08: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 15:06:05 +08:00
|
|
|
// instead. It does NOT prompt the user.
|
2015-10-18 10:17:24 +08:00
|
|
|
func newUser(email string) (User, error) {
|
|
|
|
user := User{Email: email}
|
2016-03-02 21:34:33 +08:00
|
|
|
privateKey, err := ecdsa.GenerateKey(elliptic.P384(), rand.Reader)
|
2015-10-18 10:17:24 +08:00
|
|
|
if err != nil {
|
|
|
|
return user, errors.New("error generating private key: " + err.Error())
|
|
|
|
}
|
|
|
|
user.key = privateKey
|
|
|
|
return user, nil
|
|
|
|
}
|
2015-10-18 10:44:33 +08:00
|
|
|
|
2018-03-15 11:44:08 +08:00
|
|
|
// getEmail does everything it can to obtain an email address
|
|
|
|
// from the user within the scope of memory and storage to use
|
|
|
|
// for ACME TLS. If it cannot get an email address, it returns
|
|
|
|
// empty string. (If user is present, 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.
|
|
|
|
// If the user is prompted, a new User will be created and
|
|
|
|
// stored in storage according to the email address they
|
|
|
|
// provided (which might be blank).
|
|
|
|
func getEmail(cfg *Config, userPresent bool) (string, error) {
|
|
|
|
storage, err := cfg.StorageFor(cfg.CAUrl)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
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-05 07:00:29 +08:00
|
|
|
// First try memory (command line flag or typed by user previously)
|
|
|
|
leEmail := DefaultEmail
|
2018-03-15 11:44:08 +08:00
|
|
|
|
|
|
|
// Then try to get most recent user email from storage
|
2015-10-18 10:44:33 +08:00
|
|
|
if leEmail == "" {
|
2016-07-08 21:32:31 +08:00
|
|
|
leEmail = storage.MostRecentUserEmail()
|
2018-03-15 11:44:08 +08:00
|
|
|
DefaultEmail = leEmail // save for next time
|
2015-10-18 10:44:33 +08:00
|
|
|
}
|
2018-03-15 11:44:08 +08:00
|
|
|
|
|
|
|
// Looks like there is no email address readily available,
|
|
|
|
// so we will have to ask the user if we can.
|
2016-02-11 15:06:05 +08:00
|
|
|
if leEmail == "" && userPresent {
|
2018-03-15 11:44:08 +08:00
|
|
|
// evidently, no User data was present in storage;
|
|
|
|
// thus we must make a new User so that we can get
|
|
|
|
// the Terms of Service URL via our ACME client, phew!
|
|
|
|
user, err := newUser("")
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
// get the agreement URL
|
|
|
|
agreementURL := agreementTestURL
|
|
|
|
if agreementURL == "" {
|
|
|
|
// we call acme.NewClient directly because newACMEClient
|
|
|
|
// would require that we already know the user's email
|
|
|
|
caURL := DefaultCAUrl
|
|
|
|
if cfg.CAUrl != "" {
|
|
|
|
caURL = cfg.CAUrl
|
|
|
|
}
|
|
|
|
tempClient, err := acme.NewClient(caURL, user, "")
|
|
|
|
if err != nil {
|
|
|
|
return "", fmt.Errorf("making ACME client to get ToS URL: %v", err)
|
|
|
|
}
|
|
|
|
agreementURL = tempClient.GetToSURL()
|
|
|
|
}
|
|
|
|
|
|
|
|
// prompt the user for an email address and terms agreement
|
2015-10-19 02:09:06 +08:00
|
|
|
reader := bufio.NewReader(stdin)
|
2018-03-15 11:44:08 +08:00
|
|
|
promptUserAgreement(agreementURL)
|
|
|
|
fmt.Println("Please enter your email address to signify agreement and to be notified")
|
|
|
|
fmt.Println("in case of issues. You can leave it blank, but we don't recommend it.")
|
|
|
|
fmt.Print(" Email address: ")
|
2015-10-18 10:44:33 +08:00
|
|
|
leEmail, err = reader.ReadString('\n')
|
2018-03-15 11:44:08 +08:00
|
|
|
if err != nil && err != io.EOF {
|
|
|
|
return "", fmt.Errorf("reading email address: %v", err)
|
2015-10-18 10:44:33 +08:00
|
|
|
}
|
2016-01-26 11:21:08 +08:00
|
|
|
leEmail = strings.TrimSpace(leEmail)
|
2015-10-18 10:44:33 +08:00
|
|
|
DefaultEmail = leEmail
|
2015-11-01 03:15:47 +08:00
|
|
|
Agreed = true
|
2018-03-15 11:44:08 +08:00
|
|
|
|
|
|
|
// save the new user to preserve this for next time
|
|
|
|
user.Email = leEmail
|
|
|
|
err = saveUser(storage, user)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
2015-10-18 10:44:33 +08:00
|
|
|
}
|
2018-03-15 11:44:08 +08:00
|
|
|
|
|
|
|
// lower-casing the email is important for consistency
|
|
|
|
return strings.ToLower(leEmail), nil
|
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-05 07:00:29 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// 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
|
|
|
|
|
2016-07-08 21:32:31 +08:00
|
|
|
// open user reg
|
|
|
|
userData, err := storage.LoadUser(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-05 07:00:29 +08:00
|
|
|
if err != nil {
|
2016-09-09 08:48:32 +08:00
|
|
|
if _, ok := err.(ErrNotExist); ok {
|
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-05 07:00:29 +08:00
|
|
|
// create a new user
|
|
|
|
return newUser(email)
|
|
|
|
}
|
|
|
|
return user, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// load user information
|
2016-07-08 21:32:31 +08:00
|
|
|
err = json.Unmarshal(userData.Reg, &user)
|
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-05 07:00:29 +08:00
|
|
|
if err != nil {
|
|
|
|
return user, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// load their private key
|
2016-07-08 21:32:31 +08:00
|
|
|
user.key, err = loadPrivateKey(userData.Key)
|
2016-10-26 00:45:30 +08:00
|
|
|
return user, err
|
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-05 07:00:29 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// 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 {
|
2016-07-08 21:32:31 +08:00
|
|
|
// Save the private key and registration
|
|
|
|
userData := new(UserData)
|
|
|
|
var err error
|
|
|
|
userData.Key, err = savePrivateKey(user.key)
|
|
|
|
if err == nil {
|
|
|
|
userData.Reg, err = json.MarshalIndent(&user, "", "\t")
|
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-05 07:00:29 +08:00
|
|
|
}
|
2016-07-08 21:32:31 +08:00
|
|
|
if err == nil {
|
|
|
|
err = storage.StoreUser(user.Email, userData)
|
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-05 07:00:29 +08:00
|
|
|
}
|
2016-07-08 21:32:31 +08:00
|
|
|
return err
|
2015-10-18 10:44:33 +08:00
|
|
|
}
|
2015-10-19 02:09:06 +08:00
|
|
|
|
2018-03-15 11:44:08 +08:00
|
|
|
// promptUserAgreement simply outputs the standard user
|
|
|
|
// agreement prompt with the given agreement URL.
|
|
|
|
// It outputs a newline after the message.
|
|
|
|
func promptUserAgreement(agreementURL string) {
|
|
|
|
const userAgreementPrompt = `Your sites will be served over HTTPS automatically using Let's Encrypt.
|
|
|
|
By continuing, you agree to the Let's Encrypt Subscriber Agreement at:`
|
|
|
|
fmt.Printf("\n\n%s\n %s\n", userAgreementPrompt, agreementURL)
|
|
|
|
}
|
|
|
|
|
|
|
|
// askUserAgreement prompts the user to agree to the agreement
|
|
|
|
// at the given agreement URL via stdin. It returns whether the
|
|
|
|
// user agreed or not.
|
|
|
|
func askUserAgreement(agreementURL string) bool {
|
|
|
|
promptUserAgreement(agreementURL)
|
|
|
|
fmt.Print("Do you agree to the terms? (y/n): ")
|
2015-10-29 08:12:07 +08:00
|
|
|
|
2015-10-31 13:44:00 +08:00
|
|
|
reader := bufio.NewReader(stdin)
|
2015-10-29 08:12:07 +08:00
|
|
|
answer, err := reader.ReadString('\n')
|
|
|
|
if err != nil {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
answer = strings.ToLower(strings.TrimSpace(answer))
|
|
|
|
|
|
|
|
return answer == "y" || answer == "yes"
|
|
|
|
}
|
|
|
|
|
2018-03-15 11:44:08 +08:00
|
|
|
// agreementTestURL is set during tests to skip requiring
|
|
|
|
// setting up an entire ACME CA endpoint.
|
|
|
|
var agreementTestURL string
|
|
|
|
|
2015-10-19 02:09:06 +08: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 13:44:00 +08:00
|
|
|
|
|
|
|
// The name of the folder for accounts where the email
|
2018-03-15 11:44:08 +08:00
|
|
|
// address was not provided; default 'username' if you will,
|
|
|
|
// but only for local/storage use, not with the CA.
|
2015-10-31 13:44:00 +08:00
|
|
|
const emptyEmail = "default"
|