Fix config parsing, bump version

hhrutter · hhrutter · commit cd39124e5eaa · 2025-04-22T10:38:49.000+02:00
diff --git a/pkg/pdfcpu/model/parseConfig.go b/pkg/pdfcpu/model/parseConfig.go
@@ -161,7 +161,10 @@ func parseConfigFile(r io.Reader, configPath string) error {
 	}
 
 	if !types.MemberOf(c.PreferredCertRevocationChecker, []string{"crl", "ocsp"}) {
-		return errors.Errorf("invalid preferred certificate revocation checker: %s", c.PreferredCertRevocationChecker)
+		if c.PreferredCertRevocationChecker != "" {
+			return errors.Errorf("invalid preferred certificate revocation checker: %s", c.PreferredCertRevocationChecker)
+		}
+		c.PreferredCertRevocationChecker = "crl"
 	}
 
 	loadedDefaultConfig = loadedConfig(c, configPath)
diff --git a/pkg/pdfcpu/model/parseConfig_js.go b/pkg/pdfcpu/model/parseConfig_js.go
@@ -201,6 +201,8 @@ func handlePreferredCertRevocationChecker(v string, c *Configuration) error {
 		c.PreferredCertRevocationChecker = CRL
 	case "ocsp":
 		c.PreferredCertRevocationChecker = OCSP
+	case "":
+		c.PreferredCertRevocationChecker = CRL
 	default:
 		return errors.Errorf("invalid preferredCertRevocationChecker: %s", v)
 	}
diff --git a/pkg/pdfcpu/model/version.go b/pkg/pdfcpu/model/version.go
@@ -25,7 +25,7 @@ import (
 )
 
 // VersionStr is the current pdfcpu version.
-var VersionStr = "v0.10.0 dev"
+var VersionStr = "v0.10.1 dev"
 
 // Version is a type for the internal representation of PDF versions.
 type Version int

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,10 @@ func parseConfigFile(r io.Reader, configPath string) error {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`if !types.MemberOf(c.PreferredCertRevocationChecker, []string{"crl", "ocsp"}) {`
`164`		`- return errors.Errorf("invalid preferred certificate revocation checker: %s", c.PreferredCertRevocationChecker)`
	`164`	`+ if c.PreferredCertRevocationChecker != "" {`
	`165`	`+ return errors.Errorf("invalid preferred certificate revocation checker: %s", c.PreferredCertRevocationChecker)`
	`166`	`+ }`
	`167`	`+ c.PreferredCertRevocationChecker = "crl"`
`165`	`168`	`}`
`166`	`169`
`167`	`170`	`loadedDefaultConfig = loadedConfig(c, configPath)`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,8 @@ func handlePreferredCertRevocationChecker(v string, c *Configuration) error {`
`201`	`201`	`c.PreferredCertRevocationChecker = CRL`
`202`	`202`	`case "ocsp":`
`203`	`203`	`c.PreferredCertRevocationChecker = OCSP`
	`204`	`+ case "":`
	`205`	`+ c.PreferredCertRevocationChecker = CRL`
`204`	`206`	`default:`
`205`	`207`	`return errors.Errorf("invalid preferredCertRevocationChecker: %s", v)`
`206`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// VersionStr is the current pdfcpu version.`
`28`		`-var VersionStr = "v0.10.0 dev"`
	`28`	`+var VersionStr = "v0.10.1 dev"`
`29`	`29`
`30`	`30`	`// Version is a type for the internal representation of PDF versions.`
`31`	`31`	`type Version int`