Skip to content

Commit 9f2660f

Browse files
authored
Merge pull request #150 from essentialkaos/develop
Version 2.8.0
2 parents ff1d451 + e9711de commit 9f2660f

File tree

12 files changed

+217
-210
lines changed

12 files changed

+217
-210
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535

3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939

4040
- name: Set up Go
41-
uses: actions/setup-go@v4
41+
uses: actions/setup-go@v5
4242
with:
4343
go-version: ${{ matrix.go }}
4444

@@ -56,10 +56,10 @@ jobs:
5656

5757
steps:
5858
- name: Checkout
59-
uses: actions/checkout@v3
59+
uses: actions/checkout@v4
6060

6161
- name: Set up Go
62-
uses: actions/setup-go@v4
62+
uses: actions/setup-go@v5
6363
with:
6464
go-version: '1.19.x'
6565

@@ -79,10 +79,10 @@ jobs:
7979

8080
steps:
8181
- name: Code checkout
82-
uses: actions/checkout@v3
82+
uses: actions/checkout@v4
8383

8484
- name: Login to GitHub Container Registry
85-
uses: docker/login-action@v2
85+
uses: docker/login-action@v3
8686
with:
8787
registry: ghcr.io
8888
username: ${{ github.actor }}
@@ -101,7 +101,7 @@ jobs:
101101

102102
steps:
103103
- name: Checkout
104-
uses: actions/checkout@v3
104+
uses: actions/checkout@v4
105105

106106
- name: Check dockerfiles with Hadolint
107107
uses: essentialkaos/hadolint-action@v1
@@ -116,9 +116,10 @@ jobs:
116116

117117
steps:
118118
- name: Checkout
119-
uses: actions/checkout@v3
119+
uses: actions/checkout@v4
120120

121121
- name: Check spelling
122+
continue-on-error: true
122123
uses: crate-ci/typos@master
123124

124125
DockerBuild:
@@ -145,11 +146,11 @@ jobs:
145146
# More info about issue: https://github.com/actions/runner/issues/491
146147
147148
- name: Checkout
148-
uses: actions/checkout@v3
149+
uses: actions/checkout@v4
149150
if: ${{ github.event_name == 'pull_request' }}
150151

151152
- name: Login to DockerHub
152-
uses: docker/login-action@v2
153+
uses: docker/login-action@v3
153154
env:
154155
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
155156
if: ${{ github.event_name == 'pull_request' && env.DOCKERHUB_USERNAME != '' }}
@@ -158,7 +159,7 @@ jobs:
158159
password: ${{ secrets.DOCKERHUB_TOKEN }}
159160

160161
- name: Login to GitHub Container Registry
161-
uses: docker/login-action@v2
162+
uses: docker/login-action@v3
162163
if: ${{ github.event_name == 'pull_request' }}
163164
with:
164165
registry: ghcr.io

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020

2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 2
2626

2727
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@v2
28+
uses: github/codeql-action/init@v3
2929
with:
3030
languages: go
3131

3232
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@v2
33+
uses: github/codeql-action/analyze@v3

.github/workflows/docker-push.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ jobs:
3030

3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434
with:
3535
fetch-depth: 0
3636

3737
- name: Login to DockerHub
38-
uses: docker/login-action@v2
38+
uses: docker/login-action@v3
3939
with:
4040
username: ${{ secrets.DOCKERHUB_USERNAME }}
4141
password: ${{ secrets.DOCKERHUB_TOKEN }}
4242

4343
- name: Login to GitHub Container Registry
44-
uses: docker/login-action@v2
44+
uses: docker/login-action@v3
4545
with:
4646
registry: ghcr.io
4747
username: ${{ github.actor }}
@@ -135,7 +135,7 @@ jobs:
135135
136136
- name: Build and push Docker images (Docker)
137137
if: ${{ steps.build_check.outputs.build == 'true' }}
138-
uses: docker/build-push-action@v4
138+
uses: docker/build-push-action@v5
139139
with:
140140
push: true
141141
context: .
@@ -148,7 +148,7 @@ jobs:
148148
149149
- name: Build and push Docker images (GHCR)
150150
if: ${{ steps.build_check.outputs.build == 'true' }}
151-
uses: docker/build-push-action@v4
151+
uses: docker/build-push-action@v5
152152
with:
153153
push: true
154154
context: .

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
################################################################################
22

3-
# This Makefile generated by GoMakeGen 2.2.0 using next command:
3+
# This Makefile generated by GoMakeGen 2.3.0 using next command:
44
# gomakegen --mod .
55
#
66
# More info: https://kaos.sh/gomakegen
@@ -13,6 +13,7 @@ ifdef VERBOSE ## Print verbose information (Flag)
1313
VERBOSE_FLAG = -v
1414
endif
1515

16+
COMPAT ?= 1.18
1617
MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
1718
GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)
1819

@@ -50,7 +51,7 @@ else
5051
endif
5152

5253
ifdef COMPAT ## Compatible Go version (String)
53-
go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT)
54+
go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT)
5455
else
5556
go mod tidy $(VERBOSE_FLAG)
5657
endif
@@ -94,6 +95,6 @@ help: ## Show this info
9495
| sed 's/ifdef //' \
9596
| awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-14s\033[0m %s\n", $$1, $$2}'
9697
@echo -e ''
97-
@echo -e '\033[90mGenerated by GoMakeGen 2.2.0\033[0m\n'
98+
@echo -e '\033[90mGenerated by GoMakeGen 2.3.0\033[0m\n'
9899

99100
################################################################################

README.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ To build the SSLScan Client from scratch, make sure you have a working Go 1.19+
3030
go install github.com/essentialkaos/sslcli@latest
3131
```
3232

33-
#### From [ESSENTIAL KAOS Public Repository](https://yum.kaos.st)
33+
#### From [ESSENTIAL KAOS Public Repository](https://kaos.sh/kaos-repo)
3434

3535
```bash
36-
sudo yum install -y https://yum.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
36+
sudo yum install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
3737
sudo yum install sslcli
3838
```
3939

@@ -71,18 +71,19 @@ Usage: sslcli {options} host…
7171
7272
Options
7373
74-
--format, -f text|json|yaml|xml Output result in different formats
75-
--detailed, -d Show detailed info for each endpoint
76-
--ignore-mismatch, -i Proceed with assessments on certificate mismatch
77-
--avoid-cache, -c Disable cache usage
78-
--public, -p Publish results on sslscan.com
79-
--perfect, -P Return non-zero exit code if not A+
80-
--max-left, -M duration Check expiry date (num + d/w/m/y)
81-
--notify, -n Notify when check is done
82-
--quiet, -q Don't show any output
83-
--no-color, -nc Disable colors in output
84-
--help, -h Show this help message
85-
--version, -v Show version
74+
--format, -f format Output result in different formats (text/json/yaml/xml)
75+
--detailed, -d Show detailed info for each endpoint
76+
--ignore-mismatch, -i Proceed with assessments on certificate mismatch
77+
--avoid-cache, -c Disable cache usage
78+
--public, -p Publish results on sslscan.com
79+
--perfect, -P Return non-zero exit code if not A+
80+
--max-left, -M duration Check expiry date (num + d/w/m/y)
81+
--notify, -n Notify when check is done
82+
--quiet, -q Don't show any output
83+
--pager, -G Use pager for long output
84+
--no-color, -nc Disable colors in output
85+
--help, -h Show this help message
86+
--version, -v Show version
8687
8788
Examples
8889

0 commit comments

Comments
 (0)