Skip to content

Commit 5d7c6fa

Browse files
andyoneandyone
authored
Merge pull request #84 from essentialkaos/develop
Version 13.1.1
2 parents 3234d1a + 5478a39 commit 5d7c6fa

File tree

9 files changed

+118
-32
lines changed

9 files changed

+118
-32
lines changed

‎.github/dependabot.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: "gomod"
5+
directory: "/"
6+
target-branch: "develop"
7+
schedule:
8+
interval: "daily"
9+
timezone: "Europe/London"
10+
time: "03:00"
11+
labels:
12+
- "PR • MAINTENANCE"
13+
assignees:
14+
- "andyone"
15+
reviewers:
16+
- "andyone"
17+
18+
- package-ecosystem: "github-actions"
19+
directory: "/"
20+
target-branch: "develop"
21+
schedule:
22+
interval: "daily"
23+
timezone: "Europe/London"
24+
time: "04:00"
25+
labels:
26+
- "PR • MAINTENANCE"
27+
assignees:
28+
- "andyone"
29+
reviewers:
30+
- "andyone"

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
go: [ '1.16.x', '1.17.x' ]
22+
go: [ '1.17.x', '1.18.x' ]
2323

2424
steps:
2525
- name: Set up Go
@@ -35,7 +35,7 @@ jobs:
3535
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
3636
3737
- name: Checkout
38-
uses: actions/checkout@v2
38+
uses: actions/checkout@v3
3939
with:
4040
path: ${{env.SRC_DIR}}
4141

@@ -61,7 +61,7 @@ jobs:
6161
- name: Set up Go
6262
uses: actions/setup-go@v2
6363
with:
64-
go-version: '1.16.x'
64+
go-version: '1.17.x'
6565
id: go
6666

6767
- name: Setup PATH
@@ -71,7 +71,7 @@ jobs:
7171
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
7272
7373
- name: Checkout
74-
uses: actions/checkout@v2
74+
uses: actions/checkout@v3
7575
with:
7676
path: ${{env.SRC_DIR}}
7777

‎.github/workflows/godoc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010

1111
steps:
1212
- name: Trigger GoSumDB and PkgGoDev
13-
uses: essentialkaos/pkgre-godoc-action@v1
13+
uses: essentialkaos/godoc-action@v1

‎Makefile‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,35 @@
11
################################################################################
22

3-
# This Makefile generated by GoMakeGen 1.3.2 using next command:
4-
# gomakegen --verbose .
3+
# This Makefile generated by GoMakeGen 1.5.1 using next command:
4+
# gomakegen --mod .
55
#
66
# More info: https://kaos.sh/gomakegen
77

88
################################################################################
99

10+
export GO111MODULE=on
11+
1012
.DEFAULT_GOAL := help
11-
.PHONY = fmt vet git-config deps deps-test test help
13+
.PHONY = fmt vet deps deps-test test mod-init mod-update mod-vendor help
1214

1315
################################################################################
1416

15-
git-config: ## Configure git redirects for stable import path services
16-
git config --global http.https://pkg.re.followRedirects true
17-
18-
deps: git-config ## Download dependencies
19-
go get -d -v github.com/valyala/fasthttp
17+
deps: mod-update ## Download dependencies
2018

21-
deps-test: git-config ## Download dependencies for tests
22-
go get -d -v pkg.re/essentialkaos/check.v1
19+
deps-test: deps ## Download dependencies for tests
2320

2421
test: ## Run tests
25-
go test -v -covermode=count .
22+
go test -covermode=count .
23+
24+
mod-init: ## Initialize new module
25+
go mod init
26+
go mod tidy
27+
28+
mod-update: ## Download modules to local cache
29+
go mod download
30+
31+
mod-vendor: ## Make vendored copy of dependencies
32+
go mod vendor
2633

2734
fmt: ## Format source code with gofmt
2835
find . -name "*.go" -exec gofmt -s -w {} \;
@@ -35,6 +42,6 @@ help: ## Show this info
3542
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
3643
| awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}'
3744
@echo -e ''
38-
@echo -e '\033[90mGenerated by GoMakeGen 1.3.2\033[0m\n'
45+
@echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n'
3946

4047
################################################################################

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ Package for Go for working with [SSLLabs](https://www.ssllabs.com) public API.
1717

1818
### Installation
1919

20-
To build the SSLScan from scratch, make sure you have a working Go 1.16+ workspace ([instructions](https://golang.org/doc/install)), then:
20+
To build the SSLScan from scratch, make sure you have a working Go 1.17+ workspace ([instructions](https://golang.org/doc/install)), then:
2121

2222
```
23-
go get -d pkg.re/essentialkaos/sslscan.v13
23+
go get -d github.com/essentialkaos/sslscan/v13
2424
```
2525

2626
If you want update SSLScan package to latest stable release, do:
2727

2828
```
29-
go get -d -u pkg.re/essentialkaos/sslscan.v13
29+
go get -d -u github.com/essentialkaos/sslscan/v13
3030
```
3131

3232
### Build Status

‎go.mod‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module github.com/essentialkaos/sslscan/v13
2+
3+
go 1.17
4+
5+
require (
6+
github.com/essentialkaos/check v1.2.1
7+
github.com/valyala/fasthttp v1.34.0
8+
)
9+
10+
require (
11+
github.com/andybalholm/brotli v1.0.4 // indirect
12+
github.com/klauspost/compress v1.15.0 // indirect
13+
github.com/kr/pretty v0.3.0 // indirect
14+
github.com/kr/text v0.2.0 // indirect
15+
github.com/rogpeppe/go-internal v1.6.1 // indirect
16+
github.com/valyala/bytebufferpool v1.0.0 // indirect
17+
)

‎go.sum‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
2+
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
3+
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
4+
github.com/essentialkaos/check v1.2.1 h1:avvyFy/1acUNwfxwuOLsHeCjfXtMygtbu0lVDr3nxFs=
5+
github.com/essentialkaos/check v1.2.1/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8=
6+
github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
7+
github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
8+
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
9+
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
10+
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
11+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
12+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
13+
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
14+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
15+
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
16+
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
17+
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
18+
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
19+
github.com/valyala/fasthttp v1.34.0 h1:d3AAQJ2DRcxJYHm7OXNXtXt2as1vMDfxeIcFvhmGGm4=
20+
github.com/valyala/fasthttp v1.34.0/go.mod h1:epZA5N+7pY6ZaEKRmstzOuYJx9HI8DI1oaCGZpdH4h0=
21+
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
22+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
23+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
24+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
25+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
26+
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
27+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
28+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
29+
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
30+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
31+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
32+
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
33+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
34+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
35+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
36+
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

‎sslscan.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package sslscan
33

44
// ////////////////////////////////////////////////////////////////////////////////// //
55
// //
6-
// Copyright (c) 2009-2021 ESSENTIAL KAOS //
6+
// Copyright (c) 2009-2022 ESSENTIAL KAOS //
77
// Apache License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0> //
88
// //
99
// ////////////////////////////////////////////////////////////////////////////////// //
@@ -149,7 +149,7 @@ const (
149149
)
150150

151151
// VERSION is current package version
152-
const VERSION = "13.1.0"
152+
const VERSION = "13.1.1"
153153

154154
// ////////////////////////////////////////////////////////////////////////////////// //
155155

‎sslscan_test.go‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package sslscan
22

33
// ////////////////////////////////////////////////////////////////////////////////// //
44
// //
5-
// Copyright (c) 2009-2021 ESSENTIAL KAOS //
5+
// Copyright (c) 2009-2022 ESSENTIAL KAOS //
66
// Apache License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0> //
77
// //
88
// ////////////////////////////////////////////////////////////////////////////////// //
@@ -12,12 +12,12 @@ import (
1212
"testing"
1313
"time"
1414

15-
check "pkg.re/essentialkaos/check.v1"
15+
check "github.com/essentialkaos/check"
1616
)
1717

1818
// ////////////////////////////////////////////////////////////////////////////////// //
1919

20-
const _TESTER_VERSION = "10.0.1"
20+
const _TESTER_VERSION = "10.0.2"
2121

2222
// ////////////////////////////////////////////////////////////////////////////////// //
2323

@@ -107,8 +107,8 @@ func (s *SSLLabsSuite) TestAnalyze(c *check.C) {
107107
c.Assert(info.Status, check.Equals, "READY")
108108
c.Assert(info.Endpoints, check.Not(check.HasLen), 0)
109109

110-
c.Assert(info.Endpoints[0].IPAdress, check.Equals, "5.79.108.150")
111-
c.Assert(info.Endpoints[0].ServerName, check.Equals, "curie.kaos.cc")
110+
c.Assert(info.Endpoints[0].IPAdress, check.Equals, "70.34.214.206")
111+
c.Assert(info.Endpoints[0].ServerName, check.Equals, "70.34.214.206.vultrusercontent.com")
112112
c.Assert(info.Endpoints[0].Grade, check.Equals, "A+")
113113
c.Assert(info.Endpoints[0].GradeTrustIgnored, check.Equals, "A+")
114114
c.Assert(info.Endpoints[0].HasWarnings, check.Equals, false)
@@ -303,11 +303,7 @@ func (s *SSLLabsSuite) TestAnalyze(c *check.C) {
303303
c.Assert(certs[0].RevocationStatus, check.Equals, 2)
304304
c.Assert(certs[0].CRLRevocationStatus, check.Equals, 2)
305305
c.Assert(certs[0].OCSPRevocationStatus, check.Equals, 2)
306-
c.Assert(certs[0].DNSCAA, check.Equals, true)
307-
c.Assert(certs[0].CAAPolicy, check.NotNil)
308-
c.Assert(certs[0].CAAPolicy.PolicyHostname, check.Equals, "essentialkaos.com")
309-
c.Assert(certs[0].CAAPolicy.CAARecords[0].Tag, check.Equals, "iodef")
310-
c.Assert(certs[0].CAAPolicy.CAARecords[0].Flags, check.Equals, 0)
306+
c.Assert(certs[0].DNSCAA, check.Equals, false)
311307
c.Assert(certs[0].MustStaple, check.Equals, false)
312308
c.Assert(certs[0].SGC, check.Equals, 0)
313309
c.Assert(certs[0].ValidationType, check.Equals, "")

0 commit comments

Comments
 (0)