Skip to content

Add subproblems #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsha merged 2 commits into from
Jan 19, 2023
Merged

Add subproblems #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d39b64
Add subproblems
alexzorin May 16, 2022
6fd942d
Merge branch 'main' into subproblems
jsha Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions acme/problems.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ const (
)

type ProblemDetails struct {
Type string `json:"type,omitempty"`
Detail string `json:"detail,omitempty"`
HTTPStatus int `json:"status,omitempty"`
Type string `json:"type,omitempty"`
Detail string `json:"detail,omitempty"`
HTTPStatus int `json:"status,omitempty"`
Identifier *Identifier `json:"identifier,omitempty"`
Subproblems []ProblemDetails `json:"subproblems,omitempty"`
}

func (pd *ProblemDetails) Error() string {
Expand Down Expand Up @@ -187,10 +189,17 @@ func BadPublicKeyProblem(detail string) *ProblemDetails {
}
}

func RejectedIdentifierProblem(detail string) *ProblemDetails {
func RejectedIdentifierProblem(ident Identifier, detail string) *ProblemDetails {
return &ProblemDetails{
Type: rejectedIdentifierErr,
Detail: detail,
HTTPStatus: http.StatusBadRequest,
Subproblems: []ProblemDetails{
{
Type: rejectedIdentifierErr,
Identifier: &ident,
Detail: fmt.Sprintf("%s is a forbidden domain", ident.Value),
},
},
}
}
1 change: 1 addition & 0 deletions test/config/pebble-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"tlsPort": 5001,
"ocspResponderURL": "",
"externalAccountBindingRequired": false,
"domainBlocklist": ["blocked-domain.example"],
"retryAfter": {
"authz": 3,
"order": 5
Expand Down
7 changes: 4 additions & 3 deletions wfe/wfe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,14 +1430,15 @@ func (wfe *WebFrontEndImpl) verifyOrder(order *core.Order) *acme.ProblemDetails
ident.Type, ident.Value))
}

if problem := wfe.validateDNSName(ident.Value); problem != nil {
if problem := wfe.validateDNSName(ident); problem != nil {
return problem
}
}
return nil
}

func (wfe *WebFrontEndImpl) validateDNSName(rawDomain string) *acme.ProblemDetails {
func (wfe *WebFrontEndImpl) validateDNSName(ident acme.Identifier) *acme.ProblemDetails {
rawDomain := ident.Value
if rawDomain == "" {
return acme.MalformedProblem(fmt.Sprintf(
"Order included DNS identifier with empty value"))
Expand Down Expand Up @@ -1488,7 +1489,7 @@ func (wfe *WebFrontEndImpl) validateDNSName(rawDomain string) *acme.ProblemDetai
}

if wfe.db.IsDomainBlocked(rawDomain) {
return acme.RejectedIdentifierProblem(fmt.Sprintf(
return acme.RejectedIdentifierProblem(ident, fmt.Sprintf(
"Order included an identifier for which issuance is forbidden by policy: %q",
rawDomain))
}
Expand Down