Skip to content

Option to be less verbose (for easier script parsing) #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eripa wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Option to be less verbose (for easier script parsing) #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee5a882
Make PrintDefaults if no arg a little bit more flexible
eripa Mar 14, 2016
1ead051
Add '-s' option for less verbose output, also:
eripa Mar 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions certchk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,40 @@ import (
)

var (
dialer = &net.Dialer{Timeout: 5 * time.Second}
file = flag.String("f", "", "read server names from `file`")
dialer = &net.Dialer{Timeout: 5 * time.Second}
domainFile string
scriptOutput bool
)

func init() {
flag.BoolVar(&scriptOutput, "s", false, "produce less verbose output")
flag.StringVar(&domainFile, "f", "", "read server names from `file`")
}

func check(server string, width int) {
conn, err := tls.DialWithDialer(dialer, "tcp", server+":443", nil)
if err != nil {
fmt.Printf("%*s | %v\n", width, server, err)
if scriptOutput {
fmt.Printf("%*s error 1970-01-01 (%v)\n", width, server, err)
} else {
fmt.Printf("%*s | %v\n", width, server, err)
}
return
}
defer conn.Close()
valid := conn.VerifyHostname(server)

for _, c := range conn.ConnectionState().PeerCertificates {
if valid == nil {
fmt.Printf("%*s | valid, expires on %s (%s)\n", width, server,
c.NotAfter.Format("2006-01-02"), humanize.Time(c.NotAfter))
if scriptOutput {
fmt.Printf("%*s valid %s\n", width, server,
c.NotAfter.Format("2006-01-02"))
} else {
fmt.Printf("%*s | valid, expires on %s (%s)\n", width, server,
c.NotAfter.Format("2006-01-02"), humanize.Time(c.NotAfter))
}
} else {
fmt.Printf("%*s | %v\n", width, server, valid)
fmt.Printf("%*s, %v\n", width, server, valid)
}
return
}
Expand All @@ -65,8 +80,8 @@ func check(server string, width int) {
func main() {
// parse command-line args
flag.Parse()
if flag.NArg() == 0 && len(*file) == 0 {
fmt.Fprintf(os.Stderr, "Usage: certchk [-f file] servername ...\n")
if flag.NArg() == 0 && len(domainFile) == 0 {
fmt.Fprintf(os.Stderr, "Usage of certchk:\n")
flag.PrintDefaults()
os.Exit(1)
}
Expand All @@ -83,8 +98,11 @@ func main() {
}

// actually check
fmt.Printf("%*s | Certificate status\n%s-+-%s\n", width, "Server",
strings.Repeat("-", width), strings.Repeat("-", 80-width-2))
if !scriptOutput {
fmt.Printf("%*s | Certificate status\n%s-+-%s\n", width, "Server",
strings.Repeat("-", width), strings.Repeat("-", 80-width-2))
}

for _, name := range names {
check(name, width)
}
Expand All @@ -93,8 +111,8 @@ func main() {
func getNames() (names []string) {

// read names from the file
if len(*file) > 0 {
f, err := os.Open(*file)
if len(domainFile) > 0 {
f, err := os.Open(domainFile)
if err != nil {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
Expand Down