Make core.Registration.CreatedAt a *time.Time (letsencrypt#5422)

andygabby · web-flow · commit 59bab8bac475 · 2021-05-21T13:44:56.000-06:00
* Make core.Registration.CreatedAt a *time.time Fixes: letsencrypt#5421
diff --git a/core/objects.go b/core/objects.go
@@ -137,7 +137,7 @@ type Registration struct {
 	InitialIP net.IP `json:"initialIp"`
 
 	// CreatedAt is the time the registration was created.
-	CreatedAt time.Time `json:"createdAt"`
+	CreatedAt *time.Time `json:"createdAt,omitempty"`
 
 	Status AcmeStatus `json:"status"`
 }
diff --git a/grpc/pb-marshalling.go b/grpc/pb-marshalling.go
@@ -229,14 +229,18 @@ func RegistrationToPB(reg core.Registration) (*corepb.Registration, error) {
 	if reg.Contact != nil {
 		contacts = *reg.Contact
 	}
+	var createdAt int64
+	if reg.CreatedAt != nil {
+		createdAt = reg.CreatedAt.UTC().UnixNano()
+	}
 	return &corepb.Registration{
 		Id:              reg.ID,
 		Key:             keyBytes,
 		Contact:         contacts,
 		ContactsPresent: contactsPresent,
 		Agreement:       reg.Agreement,
 		InitialIP:       ipBytes,
-		CreatedAt:       reg.CreatedAt.UnixNano(),
+		CreatedAt:       createdAt,
 		Status:          string(reg.Status),
 	}, nil
 }
@@ -252,6 +256,11 @@ func PbToRegistration(pb *corepb.Registration) (core.Registration, error) {
 	if err != nil {
 		return core.Registration{}, err
 	}
+	var createdAt *time.Time
+	if pb.CreatedAt != 0 {
+		c := time.Unix(0, pb.CreatedAt).UTC()
+		createdAt = &c
+	}
 	var contacts *[]string
 	if pb.ContactsPresent {
 		if len(pb.Contact) != 0 {
@@ -272,7 +281,7 @@ func PbToRegistration(pb *corepb.Registration) (core.Registration, error) {
 		Contact:   contacts,
 		Agreement: pb.Agreement,
 		InitialIP: initialIP,
-		CreatedAt: time.Unix(0, pb.CreatedAt),
+		CreatedAt: createdAt,
 		Status:    core.AcmeStatus(pb.Status),
 	}, nil
 }
@@ -322,7 +331,7 @@ func PBToAuthz(pb *corepb.Authorization) (core.Authorization, error) {
 }
 
 func newRegistrationValid(reg *corepb.Registration) bool {
-	return !(len(reg.Key) == 0 || len(reg.InitialIP) == 0 || reg.CreatedAt == 0)
+	return !(len(reg.Key) == 0 || len(reg.InitialIP) == 0)
 }
 
 func registrationValid(reg *corepb.Registration) bool {
diff --git a/grpc/pb-marshalling_test.go b/grpc/pb-marshalling_test.go
@@ -159,13 +159,14 @@ func TestRegistration(t *testing.T) {
 		}
 	`), &key)
 	test.AssertNotError(t, err, "Could not unmarshal testing key")
+	createdAt := time.Now().Round(0).UTC()
 	inReg := core.Registration{
 		ID:        1,
 		Key:       &key,
 		Contact:   &contacts,
 		Agreement: "yup",
 		InitialIP: net.ParseIP("1.1.1.1"),
-		CreatedAt: time.Now().Round(0),
+		CreatedAt: &createdAt,
 		Status:    core.StatusValid,
 	}
 	pbReg, err := RegistrationToPB(inReg)
diff --git a/mocks/mocks.go b/mocks/mocks.go
@@ -138,7 +138,8 @@ func (sa *StorageAuthority) GetRegistration(_ context.Context, id int64) (core.R
 	}
 
 	goodReg.InitialIP = net.ParseIP("5.6.7.8")
-	goodReg.CreatedAt = time.Date(2003, 9, 27, 0, 0, 0, 0, time.UTC)
+	createdAt := time.Date(2003, 9, 27, 0, 0, 0, 0, time.UTC)
+	goodReg.CreatedAt = &createdAt
 	return goodReg, nil
 }
 
diff --git a/sa/model.go b/sa/model.go
@@ -202,14 +202,19 @@ func registrationToModel(r *core.Registration) (*regModel, error) {
 	if r.Contact == nil {
 		r.Contact = &[]string{}
 	}
+	var createdAt time.Time
+	if r.CreatedAt != nil {
+		createdAt = *r.CreatedAt
+	}
+
 	rm := regModel{
 		ID:        r.ID,
 		Key:       key,
 		KeySHA256: sha,
 		Contact:   *r.Contact,
 		Agreement: r.Agreement,
 		InitialIP: []byte(r.InitialIP.To16()),
-		CreatedAt: r.CreatedAt,
+		CreatedAt: createdAt,
 		Status:    string(r.Status),
 	}
 
@@ -241,7 +246,7 @@ func modelToRegistration(reg *regModel) (core.Registration, error) {
 		Contact:   contact,
 		Agreement: reg.Agreement,
 		InitialIP: net.IP(reg.InitialIP),
-		CreatedAt: reg.CreatedAt,
+		CreatedAt: &reg.CreatedAt,
 		Status:    core.AcmeStatus(reg.Status),
 	}
 
diff --git a/sa/sa.go b/sa/sa.go
@@ -338,7 +338,8 @@ func (ssa *SQLStorageAuthority) GetCertificateStatus(ctx context.Context, serial
 
 // NewRegistration stores a new Registration
 func (ssa *SQLStorageAuthority) NewRegistration(ctx context.Context, reg core.Registration) (core.Registration, error) {
-	reg.CreatedAt = ssa.clk.Now()
+	createdAt := ssa.clk.Now()
+	reg.CreatedAt = &createdAt
 	rm, err := registrationToModel(&reg)
 	if err != nil {
 		return reg, err
diff --git a/sa/sa_test.go b/sa/sa_test.go
@@ -137,14 +137,16 @@ func TestAddRegistration(t *testing.T) {
 	dbReg, err := sa.GetRegistration(ctx, reg.ID)
 	test.AssertNotError(t, err, fmt.Sprintf("Couldn't get registration with ID %v", reg.ID))
 
+	createdAt := clk.Now()
 	expectedReg := core.Registration{
 		ID:        reg.ID,
 		Key:       jwk,
 		InitialIP: net.ParseIP("43.34.43.34"),
-		CreatedAt: clk.Now(),
+		CreatedAt: &createdAt,
 	}
 	test.AssertEquals(t, dbReg.ID, expectedReg.ID)
 	test.Assert(t, core.KeyDigestEquals(dbReg.Key, expectedReg.Key), "Stored key != expected")
+	test.AssertDeepEquals(t, expectedReg.CreatedAt, dbReg.CreatedAt)
 
 	newReg := core.Registration{
 		ID:        reg.ID,
diff --git a/sa/satest/satest.go b/sa/satest/satest.go
@@ -41,11 +41,12 @@ func GoodJWK() *jose.JSONWebKey {
 func CreateWorkingRegistration(t *testing.T, sa core.StorageAdder) core.Registration {
 	contact := "mailto:foo@example.com"
 	contacts := &[]string{contact}
+	createdAt := time.Date(2003, 5, 10, 0, 0, 0, 0, time.UTC)
 	reg, err := sa.NewRegistration(context.Background(), core.Registration{
 		Key:       GoodJWK(),
 		Contact:   contacts,
 		InitialIP: net.ParseIP("88.77.66.11"),
-		CreatedAt: time.Date(2003, 5, 10, 0, 0, 0, 0, time.UTC),
+		CreatedAt: &createdAt,
 		Status:    core.StatusValid,
 	})
 	if err != nil {
diff --git a/wfe/wfe_test.go b/wfe/wfe_test.go
@@ -2537,7 +2537,6 @@ func TestDeactivateRegistration(t *testing.T) {
 		  ],
 		  "agreement": "http://example.invalid/terms",
 		  "initialIp": "",
-		  "createdAt": "0001-01-01T00:00:00Z",
 		  "status": "deactivated"
 		}`)
 
@@ -2558,7 +2557,6 @@ func TestDeactivateRegistration(t *testing.T) {
 		  ],
 		  "agreement": "http://example.invalid/terms",
 		  "initialIp": "",
-		  "createdAt": "0001-01-01T00:00:00Z",
 		  "status": "deactivated"
 		}`)
 
@@ -2648,7 +2646,6 @@ func TestKeyRollover(t *testing.T) {
 		     ],
 		     "agreement": "http://example.invalid/terms",
 		     "initialIp": "",
-		     "createdAt": "0001-01-01T00:00:00Z",
 		     "status": "valid"
 		   }`,
 		},
diff --git a/wfe2/wfe_test.go b/wfe2/wfe_test.go
@@ -1309,7 +1309,6 @@ func TestNewECDSAAccount(t *testing.T) {
 			"y": "S8rR-0dWa8nAcw1fbunF_ajS3PQZ-QwLps-2adgLgPk"
 		},
 		"initialIp": "",
-		"createdAt": "0001-01-01T00:00:00Z",
 		"status": ""
 		}`)
 	test.AssertEquals(t, responseWriter.Header().Get("Location"), "http://localhost/acme/acct/3")
@@ -1491,7 +1490,6 @@ func TestNewAccount(t *testing.T) {
 			"mailto:person@mail.com"
 		],
 		"initialIp": "",
-		"createdAt": "0001-01-01T00:00:00Z",
 		"status": "valid"
 	}`)
 }
@@ -2325,7 +2323,6 @@ func TestDeactivateAccount(t *testing.T) {
 		    "mailto:person@mail.com"
 		  ],
 		  "initialIp": "",
-		  "createdAt": "0001-01-01T00:00:00Z",
 		  "status": "deactivated"
 		}`)
 
@@ -2346,7 +2343,6 @@ func TestDeactivateAccount(t *testing.T) {
 		    "mailto:person@mail.com"
 		  ],
 		  "initialIp": "",
-		  "createdAt": "0001-01-01T00:00:00Z",
 		  "status": "deactivated"
 		}`)
 
@@ -2419,7 +2415,7 @@ func TestNewOrder(t *testing.T) {
 			{
 				"type": "dns",
 				"value": "not-example.com"
-			}	
+			}
 		]
 	}`
 
@@ -2745,7 +2741,6 @@ func TestKeyRollover(t *testing.T) {
 		       "mailto:person@mail.com"
 		     ],
 		     "initialIp": "",
-		     "createdAt": "0001-01-01T00:00:00Z",
 		     "status": "valid"
 		   }`,
 			NewKey: newKeyPriv,

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ type Registration struct {`
`137`	`137`	InitialIP net.IP `json:"initialIp"`
`138`	`138`
`139`	`139`	`// CreatedAt is the time the registration was created.`
`140`		- CreatedAt time.Time `json:"createdAt"`
	`140`	+ CreatedAt *time.Time `json:"createdAt,omitempty"`
`141`	`141`
`142`	`142`	Status AcmeStatus `json:"status"`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,8 @@ func (sa *StorageAuthority) GetRegistration(_ context.Context, id int64) (core.R`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`goodReg.InitialIP = net.ParseIP("5.6.7.8")`
`141`		`- goodReg.CreatedAt = time.Date(2003, 9, 27, 0, 0, 0, 0, time.UTC)`
	`141`	`+ createdAt := time.Date(2003, 9, 27, 0, 0, 0, 0, time.UTC)`
	`142`	`+ goodReg.CreatedAt = &createdAt`
`142`	`143`	`return goodReg, nil`
`143`	`144`	`}`
`144`	`145`