Improvements

Author: andyone

.travis.yml

@@ -1,5 +1,3 @@
-sudo: false
-
 language: go
 
 go:
@@ -23,7 +21,6 @@ matrix:
     - go: tip
 
 before_install:
-  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
   - make deps
   - make deps-test
 

Gopkg.lock

@@ -1,45 +1,37 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 1.0.0 using next command:
-# gomakegen --dep --verbose .
+# This Makefile generated by GoMakeGen 1.1.0 using next command:
+# gomakegen --verbose .
 #
 # More info: https://kaos.sh/gomakegen
 
 ################################################################################
 
 .DEFAULT_GOAL := help
-.PHONY = fmt git-config deps deps-test test dep-init dep-update help
+.PHONY = fmt git-config deps deps-test test help
 
 ################################################################################
 
 git-config: ## Configure git redirects for stable import path services
 	git config --global http.https://pkg.re.followRedirects true
 
-deps: git-config dep-update ## Download dependencies
+deps: git-config ## Download dependencies
+	go get -d -v github.com/valyala/fasthttp
 
-deps-test: ## Download dependencies for tests
-	git config --global http.https://pkg.re.followRedirects true
+deps-test: git-config ## Download dependencies for tests
 	go get -d -v pkg.re/check.v1
 
 test: ## Run tests
 	go test -v -covermode=count .
 
-dep-init: ## Initialize dep workspace
-	which dep &>/dev/null || go get -u -v github.com/golang/dep/cmd/dep
-	dep init
-
-dep-update: ## Update packages and dependencies through dep
-	which dep &>/dev/null || go get -u -v github.com/golang/dep/cmd/dep
-	test -s Gopkg.toml || dep init
-	dep ensure -update
-
 fmt: ## Format source code with gofmt
 	find . -name "*.go" -exec gofmt -s -w {} \;
 
 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'
 
 ################################################################################

Gopkg.toml

@@ -1,29 +1,31 @@
 <p align="center"><a href="#readme"><img src="https://gh.kaos.st/sslscan.svg"/></a></p>
 
-<p align="center"><a href="#installation">Installation</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://godoc.org/pkg.re/essentialkaos/sslscan.v10"><img src="https://godoc.org/github.com/essentialkaos/sslscan?status.svg"></a>
+  <a href="https://godoc.org/pkg.re/essentialkaos/sslscan.v11"><img src="https://godoc.org/github.com/essentialkaos/sslscan?status.svg"></a>
   <a href="https://goreportcard.com/report/github.com/essentialkaos/sslscan"><img src="https://goreportcard.com/badge/github.com/essentialkaos/sslscan"></a>
   <a href="https://codebeat.co/projects/github-com-essentialkaos-sslscan"><img src="https://codebeat.co/badges/59a17b0e-b974-425e-a442-b9bcc3ccf7c0"></a>
   <a href="https://travis-ci.org/essentialkaos/sslscan"><img src="https://travis-ci.org/essentialkaos/sslscan.svg"></a>
   <a href="#license"><img src="https://gh.kaos.st/apache2.svg"></a>
 </p>
 
+<p align="center"><a href="#installation">Installation</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/>
+
 Package for Go for working with [SSLLabs](https://www.ssllabs.com) public API.
 
 ### Installation
 
 To build the SSLScan from scratch, make sure you have a working Go 1.9+ workspace ([instructions](https://golang.org/doc/install)), then:
 
 ```
-go get pkg.re/essentialkaos/sslscan.v10
+go get pkg.re/essentialkaos/sslscan.v11
 ```
 
 If you want update SSLScan package to latest stable release, do:
 
 ```
-go get -u pkg.re/essentialkaos/sslscan.v10
+go get -u pkg.re/essentialkaos/sslscan.v11
 ```
 
 ### Build Status

Makefile

@@ -149,7 +149,7 @@ const (
 )
 
 // VERSION is current package version
-const VERSION = "10.2.1"
+const VERSION = "11.0.0"
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
@@ -170,6 +170,8 @@ type AnalyzeProgress struct {
 	host       string
 	prevStatus string
 
+	maxAge int
+
 	api *API
 }
 
@@ -544,7 +546,7 @@ func NewAPI(app, version string) (*API, error) {
 
 // Analyze start check for host
 func (api *API) Analyze(host string, params AnalyzeParams) (*AnalyzeProgress, error) {
-	progress := &AnalyzeProgress{host: host, api: api}
+	progress := &AnalyzeProgress{host: host, api: api, maxAge: params.MaxAge}
 	query := "host=" + host
 	query += "&" + paramsToQuery(params)
 
@@ -558,13 +560,21 @@ func (api *API) Analyze(host string, params AnalyzeParams) (*AnalyzeProgress, er
 }
 
 // Info return short info
-func (ap *AnalyzeProgress) Info(detailed bool) (*AnalyzeInfo, error) {
+func (ap *AnalyzeProgress) Info(detailed, fromCache bool) (*AnalyzeInfo, error) {
 	query := "host=" + ap.host
 
 	if detailed {
 		query += "&all=on"
 	}
 
+	if fromCache {
+		query += "&fromCache=on"
+
+		if ap.maxAge > 0 {
+			query += "&maxAge=" + fmt.Sprintf("%d", ap.maxAge)
+		}
+	}
+
 	info := &AnalyzeInfo{}
 	err := ap.api.doRequest(API_URL_ANALYZE+"?"+query, info)
 
@@ -578,11 +588,11 @@ func (ap *AnalyzeProgress) Info(detailed bool) (*AnalyzeInfo, error) {
 }
 
 // GetEndpointInfo returns detailed endpoint info
-func (ap *AnalyzeProgress) GetEndpointInfo(ip string) (*EndpointInfo, error) {
+func (ap *AnalyzeProgress) GetEndpointInfo(ip string, fromCache bool) (*EndpointInfo, error) {
 	var err error
 
 	if ap.prevStatus != STATUS_READY {
-		_, err = ap.Info(false)
+		_, err = ap.Info(false, false)
 
 		if err != nil {
 			return nil, err
@@ -594,8 +604,16 @@ func (ap *AnalyzeProgress) GetEndpointInfo(ip string) (*EndpointInfo, error) {
 	}
 
 	query := "host=" + ap.host + "&s=" + ip
-	info := &EndpointInfo{}
 
+	if fromCache {
+		query += "&fromCache=on"
+
+		if ap.maxAge > 0 {
+			query += "&maxAge=" + fmt.Sprintf("%d", ap.maxAge)
+		}
+	}
+
+	info := &EndpointInfo{}
 	err = ap.api.doRequest(API_URL_DETAILED+"?"+query, info)
 
 	if err != nil {

README.md

@@ -58,10 +58,10 @@ func (s *SSLLabsSuite) TestAnalyze(c *check.C) {
 
 	var info *AnalyzeInfo
 
-	fmt.Printf("Progress: ")
+	fmt.Printf("Progress: ∙")
 
 	for {
-		info, err = progress.Info(false)
+		info, err = progress.Info(false, true)
 
 		c.Assert(info, check.NotNil)
 		c.Assert(err, check.IsNil)
@@ -98,7 +98,7 @@ func (s *SSLLabsSuite) TestAnalyze(c *check.C) {
 	c.Assert(info.Endpoints[0].Delegation, check.Equals, 1)
 	c.Assert(info.Endpoints[0].Details, check.IsNil)
 
-	fullInfo, err := progress.Info(true)
+	fullInfo, err := progress.Info(true, true)
 
 	c.Assert(err, check.IsNil)
 	c.Assert(fullInfo, check.NotNil)