Skip to content

wfe2: omit order expires when unset #8778

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

Open
eyupcanakman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

wfe2: omit order expires when unset #8778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions wfe2/wfe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,7 @@ func (wfe *WebFrontEndImpl) KeyRollover(

type orderJSON struct {
Status core.AcmeStatus `json:"status"`
Expires time.Time `json:"expires"`
Expires *time.Time `json:"expires,omitempty"`
Identifiers identifier.ACMEIdentifiers `json:"identifiers"`
Authorizations []string `json:"authorizations"`
Finalize string `json:"finalize"`
Expand All @@ -2073,12 +2073,16 @@ func (wfe *WebFrontEndImpl) orderToOrderJSON(request *http.Request, order *corep
fmt.Sprintf("%d", order.RegistrationID), fmt.Sprintf("%d", order.Id))
respObj := orderJSON{
Status: core.AcmeStatus(order.Status),
Expires: order.Expires.AsTime(),
Identifiers: identifier.FromProtoSlice(order.Identifiers),
Finalize: finalizeURL,
Profile: order.CertificateProfileName,
Replaces: order.Replaces,
}
// Omit expires when unset rather than serialize a zero-value timestamp.
if !core.IsAnyNilOrZero(order.Expires) {
expires := order.Expires.AsTime()
respObj.Expires = &expires
}
// If there is an order error, prefix its type with the V2 namespace
if order.Error != nil {
prob, err := bgrpc.PBToProblemDetails(order.Error)
Expand Down
26 changes: 26 additions & 0 deletions wfe2/wfe_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3812,6 +3812,32 @@ func TestOrderToOrderJSONV2Authorizations(t *testing.T) {
})
}

func TestOrderToOrderJSONExpires(t *testing.T) {
wfe, _, _ := setupWFE(t)

expires := time.Date(2024, 1, 2, 3, 4, 5, 0, time.UTC)
withExpiry := wfe.orderToOrderJSON(&http.Request{}, &corepb.Order{
Id: 1,
RegistrationID: 1,
Identifiers: []*corepb.Identifier{identifier.NewDNS("a").ToProto()},
Status: string(core.StatusPending),
Expires: timestamppb.New(expires),
})
got, err := json.Marshal(withExpiry)
test.AssertNotError(t, err, "marshaling order with an expiry")
test.AssertContains(t, string(got), `"expires":"2024-01-02T03:04:05Z"`)

withoutExpiry := wfe.orderToOrderJSON(&http.Request{}, &corepb.Order{
Id: 1,
RegistrationID: 1,
Identifiers: []*corepb.Identifier{identifier.NewDNS("a").ToProto()},
Status: string(core.StatusPending),
})
got, err = json.Marshal(withoutExpiry)
test.AssertNotError(t, err, "marshaling order without an expiry")
test.AssertNotContains(t, string(got), "expires")
}

func TestAccountMarshaling(t *testing.T) {
acct := &core.Registration{
ID: 1987,
Expand Down