Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
8a511989
Commit
8a511989
authored
Feb 24, 2019
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vendor: Update CertMagic; fix bug related to accounts with empty emails
parent
44e3a97a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
16 deletions
+28
-16
vendor/github.com/mholt/certmagic/config.go
vendor/github.com/mholt/certmagic/config.go
+7
-6
vendor/github.com/mholt/certmagic/user.go
vendor/github.com/mholt/certmagic/user.go
+20
-9
vendor/manifest
vendor/manifest
+1
-1
No files found.
vendor/github.com/mholt/certmagic/config.go
View file @
8a511989
...
...
@@ -240,6 +240,10 @@ func NewWithCache(certCache *Cache, cfg Config) *Config {
// prepared to serve them up during TLS handshakes.
func
(
cfg
*
Config
)
Manage
(
domainNames
[]
string
)
error
{
for
_
,
domainName
:=
range
domainNames
{
if
!
HostQualifies
(
domainName
)
{
return
fmt
.
Errorf
(
"name does not qualify for automatic certificate management: %s"
,
domainName
)
}
// if on-demand is configured, simply whitelist this name
if
cfg
.
OnDemand
!=
nil
{
if
!
cfg
.
OnDemand
.
whitelistContains
(
domainName
)
{
...
...
@@ -289,6 +293,9 @@ func (cfg *Config) Manage(domainNames []string) error {
// it does not load them into memory. If interactive is true,
// the user may be shown a prompt.
func
(
cfg
*
Config
)
ObtainCert
(
name
string
,
interactive
bool
)
error
{
if
cfg
.
storageHasCertResources
(
name
)
{
return
nil
}
skip
,
err
:=
cfg
.
preObtainOrRenewChecks
(
name
,
interactive
)
if
err
!=
nil
{
return
err
...
...
@@ -296,16 +303,10 @@ func (cfg *Config) ObtainCert(name string, interactive bool) error {
if
skip
{
return
nil
}
if
cfg
.
storageHasCertResources
(
name
)
{
return
nil
}
client
,
err
:=
cfg
.
newACMEClient
(
interactive
)
if
err
!=
nil
{
return
err
}
return
client
.
Obtain
(
name
)
}
...
...
vendor/github.com/mholt/certmagic/user.go
View file @
8a511989
...
...
@@ -84,10 +84,11 @@ func (cfg *Config) getEmail(allowPrompts bool) error {
leEmail
=
Email
}
// Then try to get most recent user email from storage
var
gotRecentEmail
bool
if
leEmail
==
""
{
leEmail
=
cfg
.
mostRecentUserEmail
()
leEmail
,
gotRecentEmail
=
cfg
.
mostRecentUserEmail
()
}
if
leEmail
==
""
&&
allowPrompts
{
if
!
gotRecentEmail
&&
leEmail
==
""
&&
allowPrompts
{
// Looks like there is no email address readily available,
// so we will have to ask the user if we can.
var
err
error
...
...
@@ -95,10 +96,14 @@ func (cfg *Config) getEmail(allowPrompts bool) error {
if
err
!=
nil
{
return
err
}
cfg
.
Agreed
=
true
}
// lower-casing the email is important for consistency
cfg
.
Email
=
strings
.
ToLower
(
leEmail
)
// save the email for later and ensure it is consistent
// for repeated use; then update cfg with our new defaults
Email
=
strings
.
TrimSpace
(
strings
.
ToLower
(
leEmail
))
cfg
.
Email
=
Email
cfg
.
Agreed
=
Agreed
return
nil
}
...
...
@@ -123,6 +128,11 @@ func (cfg *Config) getAgreementURL() (string, error) {
return
dir
.
Meta
.
TermsOfService
,
nil
}
// promptUserForEmail prompts the user for an email address
// and returns the email address they entered (which could
// be the empty string). If no error is returned, then Agreed
// will also be set to true, since continuing through the
// prompt signifies agreement.
func
(
cfg
*
Config
)
promptUserForEmail
()
(
string
,
error
)
{
agreementURL
,
err
:=
cfg
.
getAgreementURL
()
if
err
!=
nil
{
...
...
@@ -139,6 +149,7 @@ func (cfg *Config) promptUserForEmail() (string, error) {
return
""
,
fmt
.
Errorf
(
"reading email address: %v"
,
err
)
}
leEmail
=
strings
.
TrimSpace
(
leEmail
)
Agreed
=
true
return
leEmail
,
nil
}
...
...
@@ -234,10 +245,10 @@ func (cfg *Config) askUserAgreement(agreementURL string) bool {
// in s. Since this is part of a complex sequence to get a user
// account, errors here are discarded to simplify code flow in
// the caller, and errors are not important here anyway.
func
(
cfg
*
Config
)
mostRecentUserEmail
()
string
{
func
(
cfg
*
Config
)
mostRecentUserEmail
()
(
string
,
bool
)
{
userList
,
err
:=
cfg
.
certCache
.
storage
.
List
(
StorageKeys
.
UsersPrefix
(
cfg
.
CA
),
false
)
if
err
!=
nil
||
len
(
userList
)
==
0
{
return
""
return
""
,
false
}
sort
.
Slice
(
userList
,
func
(
i
,
j
int
)
bool
{
iInfo
,
_
:=
cfg
.
certCache
.
storage
.
Stat
(
userList
[
i
])
...
...
@@ -246,9 +257,9 @@ func (cfg *Config) mostRecentUserEmail() string {
})
user
,
err
:=
cfg
.
getUser
(
path
.
Base
(
userList
[
0
]))
if
err
!=
nil
{
return
""
return
""
,
false
}
return
user
.
Email
return
user
.
Email
,
true
}
// agreementTestURL is set during tests to skip requiring
...
...
vendor/manifest
View file @
8a511989
...
...
@@ -138,7 +138,7 @@
"importpath": "github.com/mholt/certmagic",
"repository": "https://github.com/mholt/certmagic",
"vcs": "git",
"revision": "
a7f18a937c080b88693cd4e14d48e42cc067b26
8",
"revision": "
e3e89d1096d76d61680f8eeb8f67649baa6c54b
8",
"branch": "master",
"notests": true
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment