Browse Source

Fixed panic on loading certs generated by v2

Toby Chui 10 months ago
parent
commit
dd9990520f
2 changed files with 7 additions and 6 deletions
  1. 5 4
      cert.go
  2. 2 2
      config.go

+ 5 - 4
cert.go

@@ -84,9 +84,10 @@ func handleListCertificate(w http.ResponseWriter, r *http.Request) {
 				}
 			}
 			certInfoFilename := filepath.Join(tlsCertManager.CertStore, filename+".json")
-			certInfo, err := acme.LoadCertInfoJSON(certInfoFilename)
-			if err != nil {
-				SystemWideLogger.PrintAndLog("Could not Load CertInfoJson", certInfoFilename, err)
+			useDNSValidation := false                                //Default to false for HTTP TLS certificates
+			certInfo, err := acme.LoadCertInfoJSON(certInfoFilename) //Note: Not all certs have info json
+			if err == nil {
+				useDNSValidation = certInfo.UseDNS
 			}
 
 			thisCertInfo := CertInfo{
@@ -94,7 +95,7 @@ func handleListCertificate(w http.ResponseWriter, r *http.Request) {
 				LastModifiedDate: modifiedTime,
 				ExpireDate:       certExpireTime,
 				RemainingDays:    expiredIn,
-				UseDNS:           certInfo.UseDNS,
+				UseDNS:           useDNSValidation,
 			}
 
 			results = append(results, &thisCertInfo)

+ 2 - 2
config.go

@@ -155,7 +155,7 @@ func GetDefaultRootConfig() (*dynamicproxy.ProxyEndpoint, error) {
 */
 
 func ExportConfigAsZip(w http.ResponseWriter, r *http.Request) {
-	includeSysDBRaw, err := utils.GetPara(r, "includeDB")
+	includeSysDBRaw, _ := utils.GetPara(r, "includeDB")
 	includeSysDB := false
 	if includeSysDBRaw == "true" {
 		//Include the system database in backup snapshot
@@ -177,7 +177,7 @@ func ExportConfigAsZip(w http.ResponseWriter, r *http.Request) {
 	defer zipWriter.Close()
 
 	// Walk through the folder and add files to the zip
-	err = filepath.Walk(folderPath, func(filePath string, fileInfo os.FileInfo, err error) error {
+	err := filepath.Walk(folderPath, func(filePath string, fileInfo os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}