-
-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upgrade to github.com/greenpau/go-authcrunch v1.0.27
- Loading branch information
Showing
4 changed files
with
541 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -81,10 +81,10 @@ module github.com/greenpau/caddy-security | |
go 1.16 | ||
require ( | ||
github.com/greenpau/go-authcrunch v1.0.25 | ||
github.com/greenpau/go-authcrunch v1.0.27 | ||
) | ||
replace github.com/greenpau/go-authcrunch v1.0.25 => /home/greenpau/dev/go/src/github.com/greenpau/go-authcrunch | ||
replace github.com/greenpau/go-authcrunch v1.0.27 => /home/greenpau/dev/go/src/github.com/greenpau/go-authcrunch | ||
``` | ||
|
||
Then, modify `Makefile` such that that replacement passes to `xcaddy` builder: | ||
|
@@ -93,7 +93,7 @@ Then, modify `Makefile` such that that replacement passes to `xcaddy` builder: | |
@mkdir -p ../xcaddy-$(PLUGIN_NAME) && cd ../xcaddy-$(PLUGIN_NAME) && \ | ||
xcaddy build $(CADDY_VERSION) --output ../$(PLUGIN_NAME)/bin/caddy \ | ||
--with github.com/greenpau/caddy-security@$(LATEST_GIT_COMMIT)=$(BUILD_DIR) \ | ||
--with github.com/greenpau/[email protected].25=/home/greenpau/dev/go/src/github.com/greenpau/go-authcrunch | ||
--with github.com/greenpau/[email protected].27=/home/greenpau/dev/go/src/github.com/greenpau/go-authcrunch | ||
``` | ||
|
||
Once all the necessary packages are installed, you should be ready to compile | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ LATEST_GIT_COMMIT:=$(shell git log --format="%H" -n 1 | head -1) | |
BUILD_USER:=$(shell whoami) | ||
BUILD_DATE:=$(shell date +"%Y-%m-%d") | ||
BUILD_DIR:=$(shell pwd) | ||
CADDY_VERSION="v2.4.6" | ||
CADDY_VERSION="v2.5.1" | ||
|
||
all: info | ||
@mkdir -p bin/ | ||
|
@@ -17,7 +17,7 @@ all: info | |
xcaddy build $(CADDY_VERSION) --output ../$(PLUGIN_NAME)/bin/caddy \ | ||
--with github.com/greenpau/caddy-security@$(LATEST_GIT_COMMIT)=$(BUILD_DIR) \ | ||
--with github.com/greenpau/[email protected] | ||
@#--with github.com/greenpau/[email protected].25=/home/greenpau/dev/go/src/github.com/greenpau/go-authcrunch | ||
@#--with github.com/greenpau/[email protected].27=/home/greenpau/dev/go/src/github.com/greenpau/go-authcrunch | ||
@#bin/caddy run -config assets/config/Caddyfile | ||
@for f in `find ./assets -type f -name 'Caddyfile'`; do bin/caddy fmt -overwrite $$f; done | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,149 @@ | ||
module github.com/greenpau/caddy-security | ||
|
||
go 1.16 | ||
go 1.17 | ||
|
||
require ( | ||
github.com/caddyserver/caddy/v2 v2.4.6 | ||
github.com/caddyserver/caddy/v2 v2.5.0 | ||
github.com/google/go-cmp v0.5.7 | ||
github.com/google/uuid v1.3.0 | ||
github.com/greenpau/go-authcrunch v1.0.25 | ||
go.uber.org/zap v1.20.0 | ||
github.com/greenpau/go-authcrunch v1.0.27 | ||
go.uber.org/zap v1.21.0 | ||
) | ||
|
||
require ( | ||
filippo.io/edwards25519 v1.0.0-rc.1 // indirect | ||
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect | ||
github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect | ||
github.com/BurntSushi/toml v1.0.0 // indirect | ||
github.com/Masterminds/goutils v1.1.1 // indirect | ||
github.com/Masterminds/semver/v3 v3.1.1 // indirect | ||
github.com/Masterminds/sprig/v3 v3.2.2 // indirect | ||
github.com/alecthomas/chroma v0.10.0 // indirect | ||
github.com/antlr/antlr4 v0.0.0-20200503195918-621b933c7a7f // indirect | ||
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect | ||
github.com/beevik/etree v1.1.0 // indirect | ||
github.com/beorn7/perks v1.0.1 // indirect | ||
github.com/caddyserver/certmagic v0.16.1 // indirect | ||
github.com/cenkalti/backoff/v4 v4.1.2 // indirect | ||
github.com/cespare/xxhash v1.1.0 // indirect | ||
github.com/cespare/xxhash/v2 v2.1.2 // indirect | ||
github.com/cheekybits/genny v1.0.0 // indirect | ||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect | ||
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect | ||
github.com/crewjam/httperr v0.2.0 // indirect | ||
github.com/crewjam/saml v0.4.6 // indirect | ||
github.com/dgraph-io/badger v1.6.2 // indirect | ||
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect | ||
github.com/dgraph-io/ristretto v0.0.4-0.20200906165740-41ebdbffecfd // indirect | ||
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect | ||
github.com/dlclark/regexp2 v1.4.0 // indirect | ||
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect | ||
github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac // indirect | ||
github.com/emersion/go-smtp v0.15.0 // indirect | ||
github.com/felixge/httpsnoop v1.0.2 // indirect | ||
github.com/fsnotify/fsnotify v1.5.1 // indirect | ||
github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect | ||
github.com/go-chi/chi v4.1.2+incompatible // indirect | ||
github.com/go-kit/kit v0.10.0 // indirect | ||
github.com/go-ldap/ldap/v3 v3.4.1 // indirect | ||
github.com/go-logfmt/logfmt v0.5.0 // indirect | ||
github.com/go-logr/logr v1.2.2 // indirect | ||
github.com/go-logr/stdr v1.2.2 // indirect | ||
github.com/go-sql-driver/mysql v1.6.0 // indirect | ||
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect | ||
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect | ||
github.com/golang/protobuf v1.5.2 // indirect | ||
github.com/golang/snappy v0.0.4 // indirect | ||
github.com/google/cel-go v0.7.3 // indirect | ||
github.com/greenpau/versioned v1.0.27 // indirect | ||
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect | ||
github.com/huandu/xstrings v1.3.2 // indirect | ||
github.com/imdario/mergo v0.3.12 // indirect | ||
github.com/jackc/chunkreader/v2 v2.0.1 // indirect | ||
github.com/jackc/pgconn v1.10.1 // indirect | ||
github.com/jackc/pgio v1.0.0 // indirect | ||
github.com/jackc/pgpassfile v1.0.0 // indirect | ||
github.com/jackc/pgproto3/v2 v2.2.0 // indirect | ||
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect | ||
github.com/jackc/pgtype v1.9.0 // indirect | ||
github.com/jackc/pgx/v4 v4.14.0 // indirect | ||
github.com/jonboulle/clockwork v0.2.2 // indirect | ||
github.com/klauspost/compress v1.15.0 // indirect | ||
github.com/klauspost/cpuid/v2 v2.0.11 // indirect | ||
github.com/libdns/libdns v0.2.1 // indirect | ||
github.com/lucas-clemente/quic-go v0.26.0 // indirect | ||
github.com/manifoldco/promptui v0.9.0 // indirect | ||
github.com/marten-seemann/qpack v0.2.1 // indirect | ||
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect | ||
github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect | ||
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect | ||
github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect | ||
github.com/mattn/go-colorable v0.1.8 // indirect | ||
github.com/mattn/go-isatty v0.0.13 // indirect | ||
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect | ||
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect | ||
github.com/mholt/acmez v1.0.2 // indirect | ||
github.com/micromdm/scep/v2 v2.1.0 // indirect | ||
github.com/miekg/dns v1.1.46 // indirect | ||
github.com/mitchellh/copystructure v1.2.0 // indirect | ||
github.com/mitchellh/go-ps v1.0.0 // indirect | ||
github.com/mitchellh/reflectwalk v1.0.2 // indirect | ||
github.com/nxadm/tail v1.4.8 // indirect | ||
github.com/onsi/ginkgo v1.16.4 // indirect | ||
github.com/pkg/errors v0.9.1 // indirect | ||
github.com/prometheus/client_golang v1.12.1 // indirect | ||
github.com/prometheus/client_model v0.2.0 // indirect | ||
github.com/prometheus/common v0.32.1 // indirect | ||
github.com/prometheus/procfs v0.7.3 // indirect | ||
github.com/rs/xid v1.2.1 // indirect | ||
github.com/russellhaering/goxmldsig v1.1.1 // indirect | ||
github.com/russross/blackfriday/v2 v2.0.1 // indirect | ||
github.com/shopspring/decimal v1.2.0 // indirect | ||
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect | ||
github.com/sirupsen/logrus v1.8.1 // indirect | ||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect | ||
github.com/slackhq/nebula v1.5.2 // indirect | ||
github.com/smallstep/certificates v0.19.0 // indirect | ||
github.com/smallstep/cli v0.18.0 // indirect | ||
github.com/smallstep/nosql v0.4.0 // indirect | ||
github.com/smallstep/truststore v0.11.0 // indirect | ||
github.com/spf13/cast v1.4.1 // indirect | ||
github.com/stoewer/go-strcase v1.2.0 // indirect | ||
github.com/tailscale/tscert v0.0.0-20220125204807-4509a5fbaf74 // indirect | ||
github.com/urfave/cli v1.22.5 // indirect | ||
github.com/yuin/goldmark v1.4.8 // indirect | ||
github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 // indirect | ||
go.etcd.io/bbolt v1.3.6 // indirect | ||
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect | ||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect | ||
go.opentelemetry.io/otel v1.4.0 // indirect | ||
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.0 // indirect | ||
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.0 // indirect | ||
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.0 // indirect | ||
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect | ||
go.opentelemetry.io/otel/metric v0.27.0 // indirect | ||
go.opentelemetry.io/otel/sdk v1.4.0 // indirect | ||
go.opentelemetry.io/otel/trace v1.4.0 // indirect | ||
go.opentelemetry.io/proto/otlp v0.12.0 // indirect | ||
go.step.sm/cli-utils v0.7.0 // indirect | ||
go.step.sm/crypto v0.16.1 // indirect | ||
go.step.sm/linkedca v0.15.0 // indirect | ||
go.uber.org/atomic v1.9.0 // indirect | ||
go.uber.org/multierr v1.6.0 // indirect | ||
golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 // indirect | ||
golang.org/x/mod v0.4.2 // indirect | ||
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect | ||
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect | ||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect | ||
golang.org/x/text v0.3.8-0.20211004125949-5bd84dd9b33b // indirect | ||
golang.org/x/tools v0.1.7 // indirect | ||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | ||
google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf // indirect | ||
google.golang.org/grpc v1.44.0 // indirect | ||
google.golang.org/protobuf v1.27.1 // indirect | ||
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect | ||
gopkg.in/square/go-jose.v2 v2.6.0 // indirect | ||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect | ||
gopkg.in/yaml.v2 v2.4.0 // indirect | ||
howett.net/plist v1.0.0 // indirect | ||
) |
Oops, something went wrong.