fixed ssl schema (apache/apisix#10323)

isman-usoh · May 10, 2024 · da8e71e · da8e71e
1 parent 397c0cb
commit da8e71e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 24 deletions.
diff --git a/api/internal/handler/ssl/ssl.go b/api/internal/handler/ssl/ssl.go
@@ -198,6 +198,18 @@ func (h *Handler) List(c droplet.Context) (interface{}, error) {
 	for _, item := range ret.Rows {
 		ssl := &entity.SSL{}
 		_ = utils.ObjectClone(item, ssl)
+
+		if ssl.Cert != "" {
+			certDERBlock, _ := pem.Decode([]byte(ssl.Cert))
+			if certDERBlock != nil {
+				x509Cert, err := x509.ParseCertificate(certDERBlock.Bytes)
+				if err == nil {
+					ssl.ValidityStart = x509Cert.NotBefore.Unix()
+					ssl.ValidityEnd = x509Cert.NotAfter.Unix()
+				}
+			}
+		}
+
 		ssl.Key = ""
 		ssl.Keys = nil
 		list = append(list, ssl)
@@ -383,8 +395,6 @@ func ParseCert(crt, key string) (*entity.SSL, error) {
 
 	ssl.Snis = snis
 	ssl.Key = key
-	ssl.ValidityStart = x509Cert.NotBefore.Unix()
-	ssl.ValidityEnd = x509Cert.NotAfter.Unix()
 	ssl.Cert = crt
 
 	return &ssl, nil

diff --git a/api/internal/handler/ssl/ssl_test.go b/api/internal/handler/ssl/ssl_test.go
@@ -289,8 +289,8 @@ func TestSSL_Create(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			wantInput: &entity.SSL{
@@ -305,8 +305,8 @@ func TestSSL_Create(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			wantRet: &entity.SSL{
@@ -321,8 +321,8 @@ func TestSSL_Create(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			wantErr: nil,
@@ -349,8 +349,8 @@ func TestSSL_Create(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			wantErr: fmt.Errorf("create failed"),
@@ -420,8 +420,8 @@ func TestSSL_Update(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			wantInput: &entity.SSL{
@@ -436,8 +436,8 @@ func TestSSL_Update(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			wantRet: &entity.SSL{
@@ -452,8 +452,8 @@ func TestSSL_Update(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 		},
@@ -562,8 +562,8 @@ func TestSSL_Patch(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			giveInput: &PatchInput{
@@ -598,8 +598,8 @@ func TestSSL_Patch(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			getCalled: true,
@@ -623,8 +623,8 @@ func TestSSL_Patch(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			wantInput: &entity.SSL{
@@ -654,8 +654,8 @@ func TestSSL_Patch(t *testing.T) {
 					"version": "v2",
 				},
 				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
+				ValidityStart: 0,
+				ValidityEnd:   0,
 				Status:        1,
 			},
 			getCalled: true,