Merge pull request #128 from lixin9311/fix-self-sign

madeye · web-flow · commit ca361195f584 · 2019-09-20T17:17:13.000+08:00
Fix passing self signed cert via arg/env
diff --git a/main.go b/main.go
@@ -78,7 +78,10 @@ func readCertificate() ([]byte, error) {
 		return filesystem.ReadFile(*cert)
 	}
 	if *certRaw != "" {
-		return []byte(*certRaw), nil
+		certHead := "-----BEGIN CERTIFICATE-----"
+		certTail := "-----END CERTIFICATE-----"
+		fixedCert := certHead + "\n" + (*certRaw)[len(certHead):len(*certRaw)-len(certTail)] + "\n" + certTail
+		return []byte(fixedCert), nil
 	}
 	panic("thou shalt not reach hear")
 }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,10 @@ func readCertificate() ([]byte, error) {`
`78`	`78`	`return filesystem.ReadFile(*cert)`
`79`	`79`	`}`
`80`	`80`	`if *certRaw != "" {`
`81`		`- return []byte(*certRaw), nil`
	`81`	`+ certHead := "-----BEGIN CERTIFICATE-----"`
	`82`	`+ certTail := "-----END CERTIFICATE-----"`
	`83`	`+ fixedCert := certHead + "\n" + (certRaw)[len(certHead):len(certRaw)-len(certTail)] + "\n" + certTail`
	`84`	`+ return []byte(fixedCert), nil`
`82`	`85`	`}`
`83`	`86`	`panic("thou shalt not reach hear")`
`84`	`87`	`}`