diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 04426d7..3ba6106 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,13 +52,13 @@ Second, fork the following repositories in Github into to your own Github handle, e.g. `anonymous`: * `https://github.com/greenpau/caddy-security` => `https://github.com/anonymous/caddy-security` -* `https://github.com/greenpau/aaasf` => `https://github.com/anonymous/aaasf` +* `https://github.com/greenpau/go-authcrunch` => `https://github.com/anonymous/go-authcrunch` Provided you are in `tmpdev` directory, clone the forked repositories: ```bash git clone git@github.com:anonymous/caddy-security.git -git clone git@github.com:anonymous/aaasf.git +git clone git@github.com:anonymous/go-authcrunch.git ``` Next, browse to `caddy-security` and run the following `make` command to install @@ -81,10 +81,10 @@ module github.com/greenpau/caddy-security go 1.16 require ( - github.com/greenpau/aaasf v1.0.4 + github.com/greenpau/go-authcrunch v1.0.5 ) -replace github.com/greenpau/aaasf v1.0.4 => /home/greenpau/dev/go/src/github.com/greenpau/aaasf +replace github.com/greenpau/go-authcrunch v1.0.5 => /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/aaasf@v1.0.4=/home/greenpau/dev/go/src/github.com/greenpau/aaasf + --with github.com/greenpau/go-authcrunch@v1.0.5=/home/greenpau/dev/go/src/github.com/greenpau/go-authcrunch ``` Once all the necessary packages are installed, you should be ready to compile diff --git a/Makefile b/Makefile index 7da4f87..cfa6257 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ all: info @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/aaasf@v1.0.4=/home/greenpau/dev/go/src/github.com/greenpau/aaasf + @#--with github.com/greenpau/go-authcrunch@v1.0.5=/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 diff --git a/README.md b/README.md index e26d9c6..6757ef2 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ and serves authentication portal with `authenticate` keyword. The app and plugin use Authentication, Authorization, and Accounting (AAA) Security Functions (SF) from -[github.com/greenpau/aaasf](https://github.com/greenpau/aaasf). +[github.com/greenpau/authcrunch](https://github.com/greenpau/go-authcrunch). ## Getting Started diff --git a/app.go b/app.go index 98f7eb3..fd20048 100644 --- a/app.go +++ b/app.go @@ -16,9 +16,9 @@ package security import ( "github.com/caddyserver/caddy/v2" - "github.com/greenpau/aaasf" - "github.com/greenpau/aaasf/pkg/authn" - "github.com/greenpau/aaasf/pkg/authz" + "github.com/greenpau/go-authcrunch" + "github.com/greenpau/go-authcrunch/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/authz" "go.uber.org/zap" ) @@ -37,9 +37,8 @@ func init() { // App implements security manager. type App struct { - Name string `json:"-"` - Config *aaasf.Config `json:"config,omitempty"` - // server *aaasf.Server + Name string `json:"-"` + Config *authcrunch.Config `json:"config,omitempty"` logger *zap.Logger portals []*authn.Portal gatekeepers []*authz.Gatekeeper diff --git a/caddyfile.go b/caddyfile.go index 5c0b033..56547dc 100644 --- a/caddyfile.go +++ b/caddyfile.go @@ -21,7 +21,7 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" // "github.com/caddyserver/caddy/v2/modules/caddyhttp" - "github.com/greenpau/aaasf" + "github.com/greenpau/go-authcrunch" // "strconv" // "strings" ) @@ -43,7 +43,7 @@ func init() { func parseCaddyfile(d *caddyfile.Dispenser, _ interface{}) (interface{}, error) { repl := caddy.NewReplacer() app := new(App) - app.Config = aaasf.NewConfig() + app.Config = authcrunch.NewConfig() if !d.Next() { return nil, d.ArgErr() diff --git a/caddyfile_authn.go b/caddyfile_authn.go index d09ea9b..f5e01b8 100644 --- a/caddyfile_authn.go +++ b/caddyfile_authn.go @@ -17,14 +17,14 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf" - "github.com/greenpau/aaasf/pkg/authn" - "github.com/greenpau/aaasf/pkg/authn/cookie" - "github.com/greenpau/aaasf/pkg/authn/registration" - "github.com/greenpau/aaasf/pkg/authn/ui" - "github.com/greenpau/aaasf/pkg/authz/options" - "github.com/greenpau/aaasf/pkg/errors" "github.com/greenpau/caddy-security/pkg/util" + "github.com/greenpau/go-authcrunch" + "github.com/greenpau/go-authcrunch/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/authn/cookie" + "github.com/greenpau/go-authcrunch/pkg/authn/registration" + "github.com/greenpau/go-authcrunch/pkg/authn/ui" + "github.com/greenpau/go-authcrunch/pkg/authz/options" + "github.com/greenpau/go-authcrunch/pkg/errors" "strings" ) @@ -104,7 +104,7 @@ const ( // validate source address // } // -func parseCaddyfileAuthentication(d *caddyfile.Dispenser, repl *caddy.Replacer, cfg *aaasf.Config) error { +func parseCaddyfileAuthentication(d *caddyfile.Dispenser, repl *caddy.Replacer, cfg *authcrunch.Config) error { // rootDirective is config key prefix. var rootDirective string args := util.FindReplaceAll(repl, d.RemainingArgs()) diff --git a/caddyfile_authn_backend_shortcut.go b/caddyfile_authn_backend_shortcut.go index a72bb64..e6caba0 100644 --- a/caddyfile_authn_backend_shortcut.go +++ b/caddyfile_authn_backend_shortcut.go @@ -18,9 +18,9 @@ import ( "fmt" "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authn" - "github.com/greenpau/aaasf/pkg/authn/backends" - "github.com/greenpau/aaasf/pkg/errors" + "github.com/greenpau/go-authcrunch/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/authn/backends" + "github.com/greenpau/go-authcrunch/pkg/errors" ) func parseCaddyfileAuthPortalBackendShortcuts(h *caddyfile.Dispenser, repl *caddy.Replacer, portal *authn.PortalConfig, ckp string, v []string) error { diff --git a/caddyfile_authn_backends.go b/caddyfile_authn_backends.go index ad1a1c8..e115445 100644 --- a/caddyfile_authn_backends.go +++ b/caddyfile_authn_backends.go @@ -17,8 +17,8 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authn" - "github.com/greenpau/aaasf/pkg/authn/backends" + "github.com/greenpau/go-authcrunch/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/authn/backends" "github.com/greenpau/caddy-security/pkg/util" "strconv" "strings" diff --git a/caddyfile_authn_cookie.go b/caddyfile_authn_cookie.go index c6659b8..07dace8 100644 --- a/caddyfile_authn_cookie.go +++ b/caddyfile_authn_cookie.go @@ -17,8 +17,8 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authn" - cfgutil "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/authn" + cfgutil "github.com/greenpau/go-authcrunch/pkg/util/cfg" "strconv" "strings" ) diff --git a/caddyfile_authn_crypto.go b/caddyfile_authn_crypto.go index 10438a8..0352642 100644 --- a/caddyfile_authn_crypto.go +++ b/caddyfile_authn_crypto.go @@ -17,9 +17,9 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authn" - "github.com/greenpau/aaasf/pkg/errors" - cfgutil "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/errors" + cfgutil "github.com/greenpau/go-authcrunch/pkg/util/cfg" ) func parseCaddyfileAuthPortalCrypto(h *caddyfile.Dispenser, repl *caddy.Replacer, portal *authn.PortalConfig, rootDirective string, args []string) error { diff --git a/caddyfile_authn_misc.go b/caddyfile_authn_misc.go index f3520f3..eaff4c9 100644 --- a/caddyfile_authn_misc.go +++ b/caddyfile_authn_misc.go @@ -17,7 +17,7 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/authn" "strings" ) diff --git a/caddyfile_authn_registration.go b/caddyfile_authn_registration.go index 785ce30..12b6c07 100644 --- a/caddyfile_authn_registration.go +++ b/caddyfile_authn_registration.go @@ -17,7 +17,7 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/authn" "strings" ) diff --git a/caddyfile_authn_test.go b/caddyfile_authn_test.go index dbc4994..f27e717 100644 --- a/caddyfile_authn_test.go +++ b/caddyfile_authn_test.go @@ -21,7 +21,7 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/google/go-cmp/cmp" - "github.com/greenpau/aaasf/pkg/errors" + "github.com/greenpau/go-authcrunch/pkg/errors" ) func TestParseCaddyfileAuthentication(t *testing.T) { diff --git a/caddyfile_authn_transform.go b/caddyfile_authn_transform.go index 885cb57..d651601 100644 --- a/caddyfile_authn_transform.go +++ b/caddyfile_authn_transform.go @@ -17,9 +17,9 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authn" - "github.com/greenpau/aaasf/pkg/authn/transformer" - cfgutil "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/authn/transformer" + cfgutil "github.com/greenpau/go-authcrunch/pkg/util/cfg" "strings" ) diff --git a/caddyfile_authn_ui.go b/caddyfile_authn_ui.go index 39a68cb..3a4941e 100644 --- a/caddyfile_authn_ui.go +++ b/caddyfile_authn_ui.go @@ -17,8 +17,8 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authn" - "github.com/greenpau/aaasf/pkg/authn/ui" + "github.com/greenpau/go-authcrunch/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/authn/ui" "io/ioutil" "strings" ) diff --git a/caddyfile_authz.go b/caddyfile_authz.go index 78d0dae..5726a7f 100644 --- a/caddyfile_authz.go +++ b/caddyfile_authz.go @@ -17,10 +17,10 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf" - "github.com/greenpau/aaasf/pkg/authz" - "github.com/greenpau/aaasf/pkg/errors" "github.com/greenpau/caddy-security/pkg/util" + "github.com/greenpau/go-authcrunch" + "github.com/greenpau/go-authcrunch/pkg/authz" + "github.com/greenpau/go-authcrunch/pkg/errors" ) const ( @@ -34,7 +34,7 @@ const ( // authorization portal { // } // -func parseCaddyfileAuthorization(d *caddyfile.Dispenser, repl *caddy.Replacer, cfg *aaasf.Config) error { +func parseCaddyfileAuthorization(d *caddyfile.Dispenser, repl *caddy.Replacer, cfg *authcrunch.Config) error { var rootDirective string args := util.FindReplaceAll(repl, d.RemainingArgs()) if len(args) != 2 { diff --git a/caddyfile_authz_acl.go b/caddyfile_authz_acl.go index dcf2e5b..9ae5859 100644 --- a/caddyfile_authz_acl.go +++ b/caddyfile_authz_acl.go @@ -17,9 +17,9 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/acl" - "github.com/greenpau/aaasf/pkg/authz" - cfgutil "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/acl" + "github.com/greenpau/go-authcrunch/pkg/authz" + cfgutil "github.com/greenpau/go-authcrunch/pkg/util/cfg" "strings" ) diff --git a/caddyfile_authz_acl_shortcuts.go b/caddyfile_authz_acl_shortcuts.go index 6ac60d2..4eb4d00 100644 --- a/caddyfile_authz_acl_shortcuts.go +++ b/caddyfile_authz_acl_shortcuts.go @@ -17,9 +17,9 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/acl" - "github.com/greenpau/aaasf/pkg/authz" - cfgutil "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/acl" + "github.com/greenpau/go-authcrunch/pkg/authz" + cfgutil "github.com/greenpau/go-authcrunch/pkg/util/cfg" "strings" ) diff --git a/caddyfile_authz_bypass.go b/caddyfile_authz_bypass.go index b4687fb..674fc65 100644 --- a/caddyfile_authz_bypass.go +++ b/caddyfile_authz_bypass.go @@ -17,9 +17,9 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authz" - "github.com/greenpau/aaasf/pkg/authz/bypass" - cfgutil "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/authz" + "github.com/greenpau/go-authcrunch/pkg/authz/bypass" + cfgutil "github.com/greenpau/go-authcrunch/pkg/util/cfg" ) func parseCaddyfileAuthorizationBypass(h *caddyfile.Dispenser, repl *caddy.Replacer, p *authz.PolicyConfig, rootDirective string, args []string) error { diff --git a/caddyfile_authz_crypto.go b/caddyfile_authz_crypto.go index e399209..a408611 100644 --- a/caddyfile_authz_crypto.go +++ b/caddyfile_authz_crypto.go @@ -17,9 +17,9 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authz" - "github.com/greenpau/aaasf/pkg/errors" - cfgutil "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/authz" + "github.com/greenpau/go-authcrunch/pkg/errors" + cfgutil "github.com/greenpau/go-authcrunch/pkg/util/cfg" ) func parseCaddyfileAuthorizationCrypto(h *caddyfile.Dispenser, repl *caddy.Replacer, policy *authz.PolicyConfig, rootDirective string, args []string) error { diff --git a/caddyfile_authz_inject.go b/caddyfile_authz_inject.go index c7852e0..bd00d6a 100644 --- a/caddyfile_authz_inject.go +++ b/caddyfile_authz_inject.go @@ -17,9 +17,9 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authz" - "github.com/greenpau/aaasf/pkg/authz/injector" - cfgutil "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/authz" + "github.com/greenpau/go-authcrunch/pkg/authz/injector" + cfgutil "github.com/greenpau/go-authcrunch/pkg/util/cfg" ) func parseCaddyfileAuthorizationHeaderInjection(h *caddyfile.Dispenser, repl *caddy.Replacer, p *authz.PolicyConfig, rootDirective string, args []string) error { diff --git a/caddyfile_authz_misc.go b/caddyfile_authz_misc.go index 1686eee..34486d4 100644 --- a/caddyfile_authz_misc.go +++ b/caddyfile_authz_misc.go @@ -17,8 +17,8 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf/pkg/authz" - cfgutil "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/authz" + cfgutil "github.com/greenpau/go-authcrunch/pkg/util/cfg" "strconv" "strings" ) diff --git a/caddyfile_authz_test.go b/caddyfile_authz_test.go index 1c3c192..f41b141 100644 --- a/caddyfile_authz_test.go +++ b/caddyfile_authz_test.go @@ -21,7 +21,7 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/google/go-cmp/cmp" - "github.com/greenpau/aaasf/pkg/errors" + "github.com/greenpau/go-authcrunch/pkg/errors" ) func TestParseCaddyfileAuthorization(t *testing.T) { diff --git a/caddyfile_credentials.go b/caddyfile_credentials.go index 2bc6312..da47fea 100644 --- a/caddyfile_credentials.go +++ b/caddyfile_credentials.go @@ -17,10 +17,10 @@ package security import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/greenpau/aaasf" - "github.com/greenpau/aaasf/pkg/credentials" - "github.com/greenpau/aaasf/pkg/errors" "github.com/greenpau/caddy-security/pkg/util" + "github.com/greenpau/go-authcrunch" + "github.com/greenpau/go-authcrunch/pkg/credentials" + "github.com/greenpau/go-authcrunch/pkg/errors" ) const ( @@ -38,7 +38,7 @@ const ( // password // } // -func parseCaddyfileCredentials(d *caddyfile.Dispenser, repl *caddy.Replacer, cfg *aaasf.Config) error { +func parseCaddyfileCredentials(d *caddyfile.Dispenser, repl *caddy.Replacer, cfg *authcrunch.Config) error { args := util.FindReplaceAll(repl, d.RemainingArgs()) if len(args) != 2 { return d.ArgErr() diff --git a/caddyfile_credentials_test.go b/caddyfile_credentials_test.go index a657679..f53dbce 100644 --- a/caddyfile_credentials_test.go +++ b/caddyfile_credentials_test.go @@ -21,7 +21,7 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/google/go-cmp/cmp" - "github.com/greenpau/aaasf/pkg/errors" + "github.com/greenpau/go-authcrunch/pkg/errors" ) func TestParseCaddyfileCredentials(t *testing.T) { diff --git a/caddyfile_plugin_authn.go b/caddyfile_plugin_authn.go index f2d5856..0f22e5a 100644 --- a/caddyfile_plugin_authn.go +++ b/caddyfile_plugin_authn.go @@ -20,7 +20,7 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/caddyserver/caddy/v2/modules/caddyhttp" - "github.com/greenpau/aaasf/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/authn" "github.com/greenpau/caddy-security/pkg/util" ) diff --git a/caddyfile_plugin_authz.go b/caddyfile_plugin_authz.go index bb11495..cca6db5 100644 --- a/caddyfile_plugin_authz.go +++ b/caddyfile_plugin_authz.go @@ -20,7 +20,7 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/caddyserver/caddy/v2/modules/caddyhttp" "github.com/caddyserver/caddy/v2/modules/caddyhttp/caddyauth" - "github.com/greenpau/aaasf/pkg/authz" + "github.com/greenpau/go-authcrunch/pkg/authz" "github.com/greenpau/caddy-security/pkg/util" ) diff --git a/go.mod b/go.mod index b61f5c0..ec936a6 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.16 require ( github.com/caddyserver/caddy/v2 v2.4.6 - github.com/google/go-cmp v0.5.6 - github.com/greenpau/aaasf v1.0.4 + github.com/google/go-cmp v0.5.7 + github.com/greenpau/go-authcrunch v1.0.5 github.com/satori/go.uuid v1.2.0 go.uber.org/zap v1.20.0 ) diff --git a/go.sum b/go.sum index 14079bc..4204eb8 100644 --- a/go.sum +++ b/go.sum @@ -410,8 +410,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod h1:+TYOmkVoJOpwnS0wfdsJCV9CoD5nJYsHoFk/0CrTK4M= @@ -470,8 +471,8 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/greenpau/aaasf v1.0.4 h1:LssRPymmvdVq6H1VrQD6MRiJ7e6tJBNwL0VUru7lgvE= -github.com/greenpau/aaasf v1.0.4/go.mod h1:YnxGkpCMOdyxu8iq42HFbnw7tfY3jcXG/0liY5B1qfA= +github.com/greenpau/go-authcrunch v1.0.5 h1:vLnLPQZjUMVr+sz1xMTHAAoGIqpker6H/KeD4v41AQQ= +github.com/greenpau/go-authcrunch v1.0.5/go.mod h1:guuktZjZUnHdP5pZ7D164GtiqKF1s1rlL99GR107XJk= github.com/greenpau/versioned v1.0.27 h1:aFJ16tzsUkbc6WT7DRia60S0VrgWzBNuul3h0RXFKxM= github.com/greenpau/versioned v1.0.27/go.mod h1:rtFCvaWWNbMH4CJnje/xicgmrM63j++rUh5juSu0k/A= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= diff --git a/pkg/util/util.go b/pkg/util/util.go index a0150e3..6fb55e7 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -17,7 +17,7 @@ package util import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/modules/caddyhttp" - "github.com/greenpau/aaasf/pkg/util/cfg" + "github.com/greenpau/go-authcrunch/pkg/util/cfg" "github.com/satori/go.uuid" "net/http" ) diff --git a/plugin_authn.go b/plugin_authn.go index 868c620..4e33764 100644 --- a/plugin_authn.go +++ b/plugin_authn.go @@ -22,8 +22,8 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/caddyserver/caddy/v2/modules/caddyhttp" - "github.com/greenpau/aaasf/pkg/authn" - "github.com/greenpau/aaasf/pkg/requests" + "github.com/greenpau/go-authcrunch/pkg/authn" + "github.com/greenpau/go-authcrunch/pkg/requests" "github.com/greenpau/caddy-security/pkg/util" ) diff --git a/plugin_authz.go b/plugin_authz.go index 3cd08da..7606bc3 100644 --- a/plugin_authz.go +++ b/plugin_authz.go @@ -22,9 +22,9 @@ import ( "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/caddyserver/caddy/v2/modules/caddyhttp/caddyauth" - "github.com/greenpau/aaasf/pkg/authz" - "github.com/greenpau/aaasf/pkg/errors" - "github.com/greenpau/aaasf/pkg/requests" + "github.com/greenpau/go-authcrunch/pkg/authz" + "github.com/greenpau/go-authcrunch/pkg/errors" + "github.com/greenpau/go-authcrunch/pkg/requests" "github.com/greenpau/caddy-security/pkg/util" )