From 60bcc3653812623818bb8f73fb8a717eccc9dce8 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 May 2020 12:27:22 +0300 Subject: [PATCH 1/3] Fix panic if HPKPPolicy is empty --- cli/cli.go | 2 +- cli/details.go | 1 + common/sslcli.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index c35b167..0f2bd51 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -35,7 +35,7 @@ import ( const ( APP = "SSLScan Client" - VER = "2.5.0" + VER = "2.6.0" DESC = "Command-line client for the SSL Labs API" ) diff --git a/cli/details.go b/cli/details.go index 8f6436c..3dc224f 100644 --- a/cli/details.go +++ b/cli/details.go @@ -1126,6 +1126,7 @@ func print0RTTStatus(status int) { func printPolicyInfo(policy *sslscan.HPKPPolicy) { if policy == nil { fmtc.Println("No") + return } switch policy.Status { diff --git a/common/sslcli.spec b/common/sslcli.spec index 014d813..26eefdf 100644 --- a/common/sslcli.spec +++ b/common/sslcli.spec @@ -44,7 +44,7 @@ Summary: Pretty awesome command-line client for public SSLLabs API Name: sslcli -Version: 2.5.0 +Version: 2.6.0 Release: 0%{?dist} Group: Applications/System License: EKOL @@ -119,6 +119,10 @@ fi ################################################################################ %changelog +* Wed May 06 2020 Anton Novojilov - 2.6.0-0 +- Fixed panic if HPKPPolicy is empty +- ek package updated to v12 + * Fri Jan 03 2020 Anton Novojilov - 2.5.0-0 - Updated for compatibility with the latest version of SSLLabs API From 13425c5cd7bfeed57fbf8fe0ae02c46fc38fe4f2 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 May 2020 12:29:31 +0300 Subject: [PATCH 2/3] Update ek to v12 --- Makefile | 2 +- cli/cli.go | 22 +++++++++++----------- cli/details.go | 14 +++++++------- sslcli.go | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index f744d99..4239854 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ 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.v11 + go get -d -v pkg.re/essentialkaos/ek.v12 go get -d -v pkg.re/essentialkaos/sslscan.v12 fmt: ## Format source code with gofmt diff --git a/cli/cli.go b/cli/cli.go index 0f2bd51..901ea37 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -2,7 +2,7 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2009-2019 ESSENTIAL KAOS // +// Copyright (c) 2009-2020 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -17,16 +17,16 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v11/fmtc" - "pkg.re/essentialkaos/ek.v11/fmtutil" - "pkg.re/essentialkaos/ek.v11/fsutil" - "pkg.re/essentialkaos/ek.v11/options" - "pkg.re/essentialkaos/ek.v11/strutil" - "pkg.re/essentialkaos/ek.v11/usage" - "pkg.re/essentialkaos/ek.v11/usage/completion/bash" - "pkg.re/essentialkaos/ek.v11/usage/completion/fish" - "pkg.re/essentialkaos/ek.v11/usage/completion/zsh" - "pkg.re/essentialkaos/ek.v11/usage/update" + "pkg.re/essentialkaos/ek.v12/fmtc" + "pkg.re/essentialkaos/ek.v12/fmtutil" + "pkg.re/essentialkaos/ek.v12/fsutil" + "pkg.re/essentialkaos/ek.v12/options" + "pkg.re/essentialkaos/ek.v12/strutil" + "pkg.re/essentialkaos/ek.v12/usage" + "pkg.re/essentialkaos/ek.v12/usage/completion/bash" + "pkg.re/essentialkaos/ek.v12/usage/completion/fish" + "pkg.re/essentialkaos/ek.v12/usage/completion/zsh" + "pkg.re/essentialkaos/ek.v12/usage/update" "pkg.re/essentialkaos/sslscan.v12" ) diff --git a/cli/details.go b/cli/details.go index 3dc224f..34ba742 100644 --- a/cli/details.go +++ b/cli/details.go @@ -2,7 +2,7 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2009-2019 ESSENTIAL KAOS // +// Copyright (c) 2009-2020 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -12,12 +12,12 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v11/fmtc" - "pkg.re/essentialkaos/ek.v11/fmtutil" - "pkg.re/essentialkaos/ek.v11/pluralize" - "pkg.re/essentialkaos/ek.v11/sliceutil" - "pkg.re/essentialkaos/ek.v11/strutil" - "pkg.re/essentialkaos/ek.v11/timeutil" + "pkg.re/essentialkaos/ek.v12/fmtc" + "pkg.re/essentialkaos/ek.v12/fmtutil" + "pkg.re/essentialkaos/ek.v12/pluralize" + "pkg.re/essentialkaos/ek.v12/sliceutil" + "pkg.re/essentialkaos/ek.v12/strutil" + "pkg.re/essentialkaos/ek.v12/timeutil" "pkg.re/essentialkaos/sslscan.v12" ) diff --git a/sslcli.go b/sslcli.go index 0d1bd68..1149621 100644 --- a/sslcli.go +++ b/sslcli.go @@ -4,7 +4,7 @@ package main // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2009-2019 ESSENTIAL KAOS // +// Copyright (c) 2009-2020 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // From 72b8be652356cdb3078826ac270db9d49100f80e Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 6 May 2020 13:40:48 +0300 Subject: [PATCH 3/3] Improve TravisCI config --- .travis.yml | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a138c7..6162a6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: go go: - - 1.11.x - 1.12.x - 1.13.x + - 1.14.x - tip os: @@ -19,7 +19,7 @@ branches: env: global: - - IMAGE=essentialkaos/perfecto:centos7 + - IMAGE=essentialkaos/perfecto:centos7 HADOLINT_VERSION=1.17.5 matrix: fast_finish: true @@ -29,7 +29,7 @@ matrix: before_install: - docker pull "$IMAGE" - wget https://kaos.sh/perfecto/perfecto-docker - - wget -O hadolint https://github.com/hadolint/hadolint/releases/download/v1.17.4/hadolint-Linux-x86_64 + - wget -O hadolint https://github.com/hadolint/hadolint/releases/download/v${HADOLINT_VERSION}/hadolint-Linux-x86_64 - chmod +x perfecto-docker - chmod +x hadolint - ./hadolint --version diff --git a/README.md b/README.md index b9ccc26..a56557a 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Before the initial install allows git to use redirects for [pkg.re](https://gith git config --global http.https://pkg.re.followRedirects true ``` -To build the SSLScan Client from scratch, make sure you have a working Go 1.11+ workspace ([instructions](https://golang.org/doc/install)), then: +To build the SSLScan Client from scratch, make sure you have a working Go 1.12+ workspace ([instructions](https://golang.org/doc/install)), then: ``` go get github.com/essentialkaos/sslcli