Merge pull request #51 from essentialkaos/develop

Version 2.4.0
essentialkaos · Jul 9, 2019 · bb11ded · bb11ded
2 parents 1fe6e05 + d507260
commit bb11ded
Show file tree

Hide file tree

Showing 5 changed files with 239 additions and 66 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 1.0.0 using next command:
+# This Makefile generated by GoMakeGen 1.1.0 using next command:
 # gomakegen .
 #
 # More info: https://kaos.sh/gomakegen
@@ -17,18 +17,18 @@ all: sslcli ## Build all binaries
 sslcli: ## Build sslcli binary
 	go build sslcli.go
 
-install: ## Install binaries
+install: ## Install all binaries
 	cp sslcli /usr/bin/sslcli
 
-uninstall: ## Uninstall binaries
+uninstall: ## Uninstall all binaries
 	rm -f /usr/bin/sslcli
 
 git-config: ## Configure git redirects for stable import path services
 	git config --global http.https://pkg.re.followRedirects true
 
 deps: git-config ## Download dependencies
 	go get -d -v pkg.re/essentialkaos/ek.v10
-	go get -d -v pkg.re/essentialkaos/sslscan.v10
+	go get -d -v pkg.re/essentialkaos/sslscan.v11
 
 fmt: ## Format source code with gofmt
 	find . -name "*.go" -exec gofmt -s -w {} \;
@@ -37,9 +37,10 @@ clean: ## Remove generated files
 	rm -f sslcli
 
 help: ## Show this info
-	@echo -e '\nSupported targets:\n'
+	@echo -e '\n\033[1mSupported targets:\033[0m\n'
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-12s\033[0m %s\n", $$1, $$2}'
 	@echo -e ''
+	@echo -e '\033[90mGenerated by GoMakeGen 1.1.0\033[0m\n'
 
 ################################################################################
diff --git a/README.md b/README.md
@@ -1,14 +1,16 @@
 <p align="center"><a href="#readme"><img src="https://gh.kaos.st/sslcli.svg"/></a></p>
 
-<p align="center"><a href="#usage-demo">Usage demo</a> • <a href="#installation">Installation</a> • <a href="#feature-list">Feature list</a> • <a href="#usage">Usage</a> • <a href="#build-status">Build Status</a> • <a href="#contributing">Contributing</a> • <a href="#terms-of-use">Terms of Use</a> • <a href="#license">License</a></p>
-
 <p align="center">
   <a href="https://goreportcard.com/report/github.com/essentialkaos/sslcli"><img src="https://goreportcard.com/badge/github.com/essentialkaos/sslcli"></a>
   <a href="https://codebeat.co/projects/github-com-essentialkaos-sslcli-master"><img src="https://codebeat.co/badges/edc52bb1-c807-470b-8466-b86cc0cfcdbe"></a>
   <a href="https://travis-ci.org/essentialkaos/sslcli"><img src="https://travis-ci.org/essentialkaos/sslcli.svg"></a>
   <a href="#license"><img src="https://gh.kaos.st/apache2.svg"></a>
 </p>
 
+<p align="center"><a href="#usage-demo">Usage demo</a> • <a href="#installation">Installation</a> • <a href="#feature-list">Feature list</a> • <a href="#usage">Usage</a> • <a href="#build-status">Build Status</a> • <a href="#contributing">Contributing</a> • <a href="#terms-of-use">Terms of Use</a> • <a href="#license">License</a></p>
+
+<br/>
+
 `sslcli` is command-line client for <a href="https://www.ssllabs.com">SSLLabs</a> public API.
 
 **IMPORTANT:** Currently, SSLLabs API doesn't provide same info as SSLLabs website.
@@ -42,14 +44,14 @@ go get -u github.com/essentialkaos/sslcli
 #### From ESSENTIAL KAOS Public repo for RHEL6/CentOS6
 
 ```bash
-[sudo] yum install -y https://yum.kaos.st/6/release/x86_64/kaos-repo-9.1-0.el6.noarch.rpm
+[sudo] yum install -y https://yum.kaos.st/kaos-repo-latest.el6.noarch.rpm
 [sudo] yum install sslcli
 ```
 
 #### From ESSENTIAL KAOS Public repo for RHEL7/CentOS7
 
 ```bash
-[sudo] yum install -y https://yum.kaos.st/7/release/x86_64/kaos-repo-9.1-0.el7.noarch.rpm
+[sudo] yum install -y https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm
 [sudo] yum install sslcli
 ```
 
@@ -92,6 +94,7 @@ Options
   --avoid-cache, -c                  Disable cache usage
   --public, -p                       Publish results on sslscan.com
   --perfect, -P                      Return non-zero exit code if not A+
+  --max-left, -M duration            Check expiry date (num + d/w/m/y)
   --notify, -n                       Notify when check is done
   --quiet, -q                        Don't show any output
   --no-color, -nc                    Disable colors in output
@@ -109,6 +112,9 @@ Examples
   sslcli -p -c google.com
   Check google.com, publish results, disable cache usage
 
+  sslcli -M 3m -q google.com
+  Check google.com in quiet mode and return error if cert expire in 3 months
+
   sslcli hosts.txt
   Check all hosts defined in hosts.txt file