Skip to content

Commit b08f5fa

Browse files
greenpaugreenpau
committed
upgrade go modules
1 parent 3282bea commit b08f5fa

File tree

6 files changed

+66
-44
lines changed

6 files changed

+66
-44
lines changed

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
core:
1414
strategy:
1515
matrix:
16-
go-version: [1.18.x]
16+
go-version: [1.19.x, 1.20.x]
1717
platform: [ubuntu-latest]
1818
name: Build
1919
runs-on: ${{ matrix.platform }}

‎Makefile

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
.PHONY: test ctest covdir coverage docs linter qtest clean dep release license envvar templates
21
APP_VERSION:=$(shell cat VERSION | head -1)
32
GIT_COMMIT:=$(shell git describe --dirty --always)
43
GIT_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD -- | head -1)
@@ -12,10 +11,12 @@ endif
1211
all: envvar build
1312
@echo "$@: complete"
1413

14+
.PHONY: envvar
1515
envvar:
1616
@echo "Version: $(APP_VERSION), Branch: $(GIT_BRANCH), Revision: $(GIT_COMMIT)"
1717
@echo "Build on $(BUILD_DATE) by $(BUILD_USER)"
1818

19+
.PHONY: build
1920
build: templates
2021
@mkdir -p bin/
2122
@rm -rf ./bin/*
@@ -34,58 +35,70 @@ build: templates
3435
@./bin/authdbctl --help
3536
@echo "$@: complete"
3637

38+
.PHONY: linter
3739
linter:
3840
@echo "Running lint checks"
3941
@golint -set_exit_status ./...
4042
@echo "$@: complete"
4143

44+
.PHONY: gtest
4245
gtest:
4346
@go test $(VERBOSE) -coverprofile=.coverage/coverage.out ./...
4447
@echo "$@: complete"
4548

49+
.PHONY: test
4650
test: templates envvar covdir linter gtest coverage
4751
@echo "$@: complete"
4852

53+
.PHONY: ctest
4954
ctest: templates covdir linter
5055
@richgo version || go install github.com/kyoh86/richgo@latest
5156
@time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out ./...
5257
@echo "$@: complete"
5358

59+
.PHONY: covdir
5460
covdir:
5561
@echo "Creating .coverage/ directory"
5662
@mkdir -p .coverage
5763
@echo "$@: complete"
5864

65+
.PHONY: coverage
5966
coverage:
6067
@#go tool cover -help
6168
@go tool cover -html=.coverage/coverage.out -o .coverage/coverage.html
6269
@go test -covermode=count -coverprofile=.coverage/coverage.out ./...
6370
@go tool cover -func=.coverage/coverage.out | grep -v "100.0"
6471
@echo "$@: complete"
6572

73+
.PHONY: ui-templates
6674
ui-templates:
6775
@./assets/scripts/generate_ui.sh
6876
@echo "$@: complete"
6977

78+
.PHONY: email-templates
7079
email-templates:
7180
@./assets/scripts/generate_email_templates.sh
7281
@echo "$@: complete"
7382

83+
.PHONY: templates
7484
templates: ui-templates email-templates license
7585
@echo "$@: complete"
7686

87+
.PHONY: docs
7788
docs:
7889
@mkdir -p .doc
7990
@go doc -all > .doc/index.txt
8091
@cat .doc/index.txt
8192
@echo "$@: complete"
8293

94+
.PHONY: clean
8395
clean:
8496
@rm -rf .doc
8597
@rm -rf .coverage
8698
@rm -rf bin/
8799
@echo "$@: complete"
88100

101+
.PHONY: qtest
89102
qtest: covdir
90103
@echo "Perform quick tests ..."
91104
@#time richgo test -v -coverprofile=.coverage/coverage.out internal/tag/*.go
@@ -107,7 +120,7 @@ qtest: covdir
107120
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out -run TestNewSingleSignOnProviderConfig ./pkg/sso/*.go
108121
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out -run TestNewSingleSignOnProvider ./pkg/sso/*.go
109122
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out -run TestParseRequestURL ./pkg/sso/request*.go
110-
@time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out -run TestGetMetadata ./pkg/sso/*.go
123+
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out -run TestGetMetadata ./pkg/sso/*.go
111124
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out -run TestValidateJwksKey ./pkg/authn/backends/oauth2/jwks*.go
112125
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out -run TestTransformData ./pkg/authn/transformer/*.go
113126
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out ./pkg/authn/icons/...
@@ -134,24 +147,28 @@ qtest: covdir
134147
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out ./pkg/authproxy/...
135148
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out ./pkg/identity/...
136149
@#time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out ./pkg/authn/backends/...
150+
@time richgo test $(VERBOSE) $(TEST) -coverprofile=.coverage/coverage.out -run NewAPIKey ./pkg/identity/...
137151
@go tool cover -html=.coverage/coverage.out -o .coverage/coverage.html
138152
@#go tool cover -func=.coverage/coverage.out | grep -v "100.0"
139153
@go tool cover -func=.coverage/coverage.out
140154
@echo "$@: complete"
141155

156+
.PHONY: dep
142157
dep:
143158
@echo "Making dependencies check ..."
144159
@golint || go install golang.org/x/lint/golint@latest
145160
@go install github.com/kyoh86/richgo@latest
146161
@versioned || go install github.com/greenpau/versioned/cmd/versioned@latest
147162
@echo "$@: complete"
148163

164+
.PHONY: license
149165
license:
150166
@versioned || go install github.com/greenpau/versioned/cmd/versioned@latest
151167
@for f in `find ./ -type f -name '*.go'`; do versioned -addlicense -copyright="Paul Greenberg [email protected]" -year=2022 -filepath=$$f; done
152168
@#for f in `find ./ -type f -name '*.go'`; do versioned -striplicense -filepath=$$f; done
153169
@echo "$@: complete"
154170

171+
.PHONY: release
155172
release:
156173
@echo "Making release"
157174
@go mod tidy

‎go.mod

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
module github.com/greenpau/go-authcrunch
22

3-
go 1.18
3+
go 1.19
44

55
require (
6-
github.com/crewjam/saml v0.4.11-0.20230112210550-cfc9c7538d2c
6+
github.com/crewjam/saml v0.4.13
77
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
8-
github.com/emersion/go-smtp v0.15.0
8+
github.com/emersion/go-smtp v0.16.0
99
github.com/go-ldap/ldap/v3 v3.4.4
10-
github.com/golang-jwt/jwt/v4 v4.4.3
10+
github.com/golang-jwt/jwt/v4 v4.5.0
1111
github.com/google/go-cmp v0.5.9
1212
github.com/google/uuid v1.3.0
13-
github.com/greenpau/versioned v1.0.27
13+
github.com/greenpau/versioned v1.0.28
1414
github.com/iancoleman/strcase v0.2.0
1515
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
16-
github.com/urfave/cli/v2 v2.23.7
16+
github.com/urfave/cli/v2 v2.25.1
1717
go.uber.org/zap v1.24.0
18-
golang.org/x/crypto v0.4.0
19-
golang.org/x/net v0.4.0
18+
golang.org/x/crypto v0.7.0
19+
golang.org/x/net v0.8.0
2020
gopkg.in/yaml.v3 v3.0.1
2121
)
2222

@@ -28,15 +28,13 @@ require (
2828
github.com/crewjam/httperr v0.2.0 // indirect
2929
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
3030
github.com/jonboulle/clockwork v0.3.0 // indirect
31-
github.com/kr/pretty v0.3.1 // indirect
3231
github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect
3332
github.com/pkg/errors v0.9.1 // indirect
34-
github.com/russellhaering/goxmldsig v1.2.0 // indirect
33+
github.com/russellhaering/goxmldsig v1.3.0 // indirect
3534
github.com/russross/blackfriday/v2 v2.1.0 // indirect
36-
github.com/stretchr/testify v1.8.1 // indirect
3735
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
3836
go.uber.org/atomic v1.10.0 // indirect
3937
go.uber.org/goleak v1.2.0 // indirect
40-
go.uber.org/multierr v1.9.0 // indirect
41-
golang.org/x/sys v0.3.0 // indirect
38+
go.uber.org/multierr v1.10.0 // indirect
39+
golang.org/x/sys v0.6.0 // indirect
4240
)

‎go.sum

+21-19
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,30 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
1010
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
1111
github.com/crewjam/httperr v0.2.0 h1:b2BfXR8U3AlIHwNeFFvZ+BV1LFvKLlzMjzaTnZMybNo=
1212
github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4=
13-
github.com/crewjam/saml v0.4.11-0.20230112210550-cfc9c7538d2c h1:WMbWtDn14coRF5GmhBENh5tyGlnVXC/2PVu0WNlO/6A=
14-
github.com/crewjam/saml v0.4.11-0.20230112210550-cfc9c7538d2c/go.mod h1:vYn7XUqWMRMK4gu+vRIopyrLA1J0jeTpD6fD0UmCZjE=
13+
github.com/crewjam/saml v0.4.13 h1:TYHggH/hwP7eArqiXSJUvtOPNzQDyQ7vwmwEqlFWhMc=
14+
github.com/crewjam/saml v0.4.13/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA=
1515
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1616
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1717
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1818
github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY=
1919
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
2020
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
2121
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
22-
github.com/emersion/go-smtp v0.15.0 h1:3+hMGMGrqP/lqd7qoxZc1hTU8LY8gHV9RFGWlqSDmP8=
23-
github.com/emersion/go-smtp v0.15.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
22+
github.com/emersion/go-smtp v0.16.0 h1:eB9CY9527WdEZSs5sWisTmilDX7gG+Q/2IdRcmubpa8=
23+
github.com/emersion/go-smtp v0.16.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
2424
github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
2525
github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
2626
github.com/go-ldap/ldap/v3 v3.4.4 h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs=
2727
github.com/go-ldap/ldap/v3 v3.4.4/go.mod h1:fe1MsuN5eJJ1FeLT/LEBVdWfNWKh459R7aXgXtJC+aI=
28-
github.com/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5AU=
2928
github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
29+
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
30+
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
3031
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
3132
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
3233
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
3334
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
34-
github.com/greenpau/versioned v1.0.27 h1:aFJ16tzsUkbc6WT7DRia60S0VrgWzBNuul3h0RXFKxM=
35-
github.com/greenpau/versioned v1.0.27/go.mod h1:rtFCvaWWNbMH4CJnje/xicgmrM63j++rUh5juSu0k/A=
35+
github.com/greenpau/versioned v1.0.28 h1:qgoZYy2bNbWAC5Bb0sVVfv/UHSac4PuCwdQMHpp/f6s=
36+
github.com/greenpau/versioned v1.0.28/go.mod h1:rtFCvaWWNbMH4CJnje/xicgmrM63j++rUh5juSu0k/A=
3637
github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=
3738
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
3839
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
@@ -59,8 +60,9 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
5960
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
6061
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
6162
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
62-
github.com/russellhaering/goxmldsig v1.2.0 h1:Y6GTTc9Un5hCxSzVz4UIWQ/zuVwDvzJk80guqzwx6Vg=
6363
github.com/russellhaering/goxmldsig v1.2.0/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw=
64+
github.com/russellhaering/goxmldsig v1.3.0 h1:DllIWUgMy0cRUMfGiASiYEa35nsieyD3cigIwLonTPM=
65+
github.com/russellhaering/goxmldsig v1.3.0/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw=
6466
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
6567
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
6668
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
@@ -75,33 +77,33 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F
7577
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
7678
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
7779
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
78-
github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY=
79-
github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
80+
github.com/urfave/cli/v2 v2.25.1 h1:zw8dSP7ghX0Gmm8vugrs6q9Ku0wzweqPyshy+syu9Gw=
81+
github.com/urfave/cli/v2 v2.25.1/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
8082
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
8183
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
8284
github.com/zenazn/goji v1.0.1/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
8385
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
8486
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
8587
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
8688
go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
87-
go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
88-
go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
89+
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
90+
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
8991
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
9092
go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
9193
golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
9294
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
93-
golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
94-
golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
95+
golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
96+
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
9597
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
96-
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
97-
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
98+
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
99+
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
98100
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
99101
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
100102
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
101-
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
102-
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
103+
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
104+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
103105
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
104-
golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
106+
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
105107
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
106108
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
107109
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎pkg/identity/api_key_test.go

+11-7
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ package identity
1616

1717
import (
1818
"fmt"
19+
"testing"
20+
1921
"github.com/greenpau/go-authcrunch/internal/tests"
2022
"github.com/greenpau/go-authcrunch/pkg/errors"
2123
"github.com/greenpau/go-authcrunch/pkg/requests"
22-
"testing"
2324
)
2425

2526
func TestNewAPIKey(t *testing.T) {
@@ -36,7 +37,7 @@ func TestNewAPIKey(t *testing.T) {
3637
Key: requests.Key{
3738
Usage: "api",
3839
Comment: "jsmith-api-key",
39-
Payload: GetRandomStringFromRange(72, 96),
40+
Payload: GetRandomStringFromRange(54, 72),
4041
},
4142
},
4243
want: map[string]interface{}{
@@ -52,7 +53,7 @@ func TestNewAPIKey(t *testing.T) {
5253
Usage: "api",
5354
Comment: "jsmith-api-key",
5455
Disabled: true,
55-
Payload: GetRandomStringFromRange(72, 96),
56+
Payload: GetRandomStringFromRange(54, 72),
5657
},
5758
},
5859
want: map[string]interface{}{
@@ -90,7 +91,7 @@ func TestNewAPIKey(t *testing.T) {
9091
req: &requests.Request{
9192
Key: requests.Key{
9293
Comment: "jsmith-api-key",
93-
Payload: GetRandomStringFromRange(72, 96),
94+
Payload: GetRandomStringFromRange(54, 72),
9495
Disabled: true,
9596
},
9697
},
@@ -103,7 +104,7 @@ func TestNewAPIKey(t *testing.T) {
103104
Key: requests.Key{
104105
Usage: "foo",
105106
Comment: "jsmith-api-key",
106-
Payload: GetRandomStringFromRange(72, 96),
107+
Payload: GetRandomStringFromRange(54, 72),
107108
Disabled: true,
108109
},
109110
},
@@ -115,7 +116,7 @@ func TestNewAPIKey(t *testing.T) {
115116
req: &requests.Request{
116117
Key: requests.Key{
117118
Usage: "api",
118-
Payload: GetRandomStringFromRange(72, 96),
119+
Payload: GetRandomStringFromRange(54, 72),
119120
Disabled: true,
120121
},
121122
},
@@ -129,7 +130,10 @@ func TestNewAPIKey(t *testing.T) {
129130
msgs := []string{fmt.Sprintf("test name: %s", tc.name)}
130131
if tc.req.Key.Payload != "" {
131132
tc.req.Response.Payload = tc.req.Key.Payload
132-
hk, _ := NewPassword(tc.req.Key.Payload)
133+
hk, err := NewPassword(tc.req.Key.Payload)
134+
if err != nil {
135+
t.Fatalf("unexpected password generation error: %s", err)
136+
}
133137
tc.req.Key.Payload = hk.Hash
134138
}
135139
key, err := NewAPIKey(tc.req)

‎pkg/identity/password.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
package identity
1616

1717
import (
18-
"github.com/greenpau/go-authcrunch/pkg/errors"
19-
"golang.org/x/crypto/bcrypt"
2018
"strconv"
2119
"strings"
2220
"time"
21+
22+
"github.com/greenpau/go-authcrunch/pkg/errors"
23+
"golang.org/x/crypto/bcrypt"
2324
)
2425

2526
// Password is a memorized secret, typically a string of characters,

0 commit comments

Comments
 (0)