github/certigo
4
0
Fork 0
mirror of https://github.com/square/certigo.git synced 2026-10-21 05:02:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #117 from square/mmc/colours

Browse Source 
Add support for coloured output on windows
This commit is contained in:
Matthew McPherrin
2017-02-18 19:21:39 -08:00
committed by GitHub
parent 54745742a8 b866e297c8
commit 9eda6bacb6
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.go
+8 -6
View File
@@ -26,6 +26,7 @@ import (
"gopkg.in/alecthomas/kingpin.v2"
"github.com/mattn/go-colorable"
"github.com/square/certigo/lib"
"github.com/square/certigo/starttls"
"golang.org/x/crypto/ssh/terminal"
@@ -62,6 +63,7 @@ var (
func main() {
app.Version("1.6.0")
stdout := colorable.NewColorableStdout()
result := simpleResult{}
switch kingpin.MustParse(app.Parse(os.Args[1:])) {
case dump.FullCommand(): // Dump certificate
@@ -87,8 +89,8 @@ func main() {
fmt.Println(string(blob))
} else {
for i, cert := range result.Certificates {
fmt.Printf("** CERTIFICATE %d **\n", i+1)
fmt.Printf("%s\n\n", lib.EncodeX509ToText(cert))
fmt.Fprintf(stdout, "** CERTIFICATE %d **\n", i+1)
fmt.Fprintf(stdout, "%s\n\n", lib.EncodeX509ToText(cert))
}
}
}
@@ -123,10 +125,10 @@ func main() {
fmt.Println(string(blob))
} else if !*connectPem {
for i, cert := range result.Certificates {
fmt.Printf("** CERTIFICATE %d **\n", i+1)
fmt.Printf("%s\n\n", lib.EncodeX509ToText(cert))
fmt.Fprintf(stdout, "** CERTIFICATE %d **\n", i+1)
fmt.Fprintf(stdout, "%s\n\n", lib.EncodeX509ToText(cert))
}
printVerifyResult(*result.VerifyResult)
printVerifyResult(stdout, *result.VerifyResult)
}
case verify.FullCommand():
file := inputFile(*verifyFile)
@@ -142,7 +144,7 @@ func main() {
blob, _ := json.Marshal(verifyResult)
fmt.Println(string(blob))
} else {
printVerifyResult(verifyResult)
printVerifyResult(stdout, verifyResult)
}
if verifyResult.Error != "" {
os.Exit(1)
verify.go
+6 -5
View File
@@ -21,6 +21,7 @@ import (
"encoding/json"
"encoding/pem"
"fmt"
"io"
"io/ioutil"
"os"
"strconv"
@@ -170,19 +171,19 @@ func algString(algo x509.SignatureAlgorithm) string {
return strconv.Itoa(int(algo))
}
func printVerifyResult(result simpleVerification) {
func printVerifyResult(out io.Writer, result simpleVerification) {
if result.Error != "" {
red.Printf("Failed to verify certificate chain:\n")
fmt.Printf("\t%s\n", result.Error)
fmt.Fprintf(out, red.SprintfFunc()("Failed to verify certificate chain:\n"))
fmt.Fprintf(out, "\t%s\n", result.Error)
return
}
for i, chain := range result.Chains {
fmt.Printf("[%d] %s\n", i, fmtCert(chain[0]))
fmt.Fprintf(out, "[%d] %s\n", i, fmtCert(chain[0]))
for j, cert := range chain {
if j == 0 {
continue
}
fmt.Printf("\t=> %s\n", fmtCert(cert))
fmt.Fprintf(out, "\t=> %s\n", fmtCert(cert))
}
}
}