upgrade to go1.21 and github.com/greenpau/go-authcrunch v1.1.2

greenpau · Mar 24, 2024 · b3739cf · b3739cf
1 parent 2a4b891
commit b3739cf
Show file tree

Hide file tree

Showing 10 changed files with 136 additions and 8 deletions.
diff --git a/caddyfile_authn.go b/caddyfile_authn.go
@@ -87,6 +87,9 @@ func parseCaddyfileAuthentication(d *caddyfile.Dispenser, repl *caddy.Replacer,
  CookieConfig: &cookie.Config{},
  TokenValidatorOptions: &options.TokenValidatorOptions{},
  TokenGrantorOptions: &options.TokenGrantorOptions{},
+ API: &authn.APIConfig{
+ ProfileEnabled: true,
+ },
  }
  for nesting := d.Nesting(); d.NextBlock(nesting); {
  k := d.Val()

diff --git a/caddyfile_authn_misc.go b/caddyfile_authn_misc.go
@@ -31,10 +31,7 @@ func parseCaddyfileAuthPortalMisc(h *caddyfile.Dispenser, repl *caddy.Replacer,
  case v == "source ip tracking":
  portal.TokenGrantorOptions.EnableSourceAddress = true
  case v == "admin api":
- if portal.API == nil {
- portal.API = &authn.APIConfig{}
- portal.API.Enabled = true
- }
+ portal.API.AdminEnabled = true
  case strings.HasPrefix(v, "identity provider"):
  if len(args) < 3 {
  return h.Errf("malformed directive for %s: %s", rootDirective, v)

diff --git a/caddyfile_authn_misc_test.go b/caddyfile_authn_misc_test.go
@@ -75,7 +75,19 @@ func TestParseCaddyfileAuthenticationMisc(t *testing.T) {
  {
  "cookie_config": {},
  "identity_stores": ["localdb"],
+ "portal_admin_roles": {
+ "authp/admin": true
+ },
+ "portal_user_roles": {
+ "authp/user": true
+ },
+ "portal_guest_roles": {
+ "authp/guest": true
+ },
  "name": "myportal",
+ "api": {
+ "profile_enabled": true
+ },
  "token_grantor_options": {},
  "trusted_logout_redirect_uri_configs": [
  {

diff --git a/caddyfile_authn_test.go b/caddyfile_authn_test.go
@@ -163,6 +163,9 @@ func TestParseCaddyfileAuthentication(t *testing.T) {
  ]
  }
  ],
+ "api": {
+ "profile_enabled": true
+ },
  "cookie_config": {
  "domains": {
  "contoso.com": {
@@ -179,6 +182,15 @@ func TestParseCaddyfileAuthentication(t *testing.T) {
  "azure",
  "okta"
  ],
+ "portal_admin_roles": {
+ "authp/admin": true
+ },
+ "portal_user_roles": {
+ "authp/user": true
+ },
+ "portal_guest_roles": {
+ "authp/guest": true
+ },
  "token_validator_options": {
  "validate_source_address": true
  },

diff --git a/caddyfile_identity_provider_test.go b/caddyfile_identity_provider_test.go
@@ -57,10 +57,22 @@ func TestParseCaddyfileIdentityProvider(t *testing.T) {
  {
  "name": "myportal",
  "ui": {},
+ "api": {
+ "profile_enabled": true
+ },
  "cookie_config": {},
  "identity_providers": [
  "authp"
  ],
+ "portal_admin_roles": {
+ "authp/admin": true
+ },
+ "portal_user_roles": {
+ "authp/user": true
+ },
+ "portal_guest_roles": {
+ "authp/guest": true
+ },
  "token_validator_options": {},
  "token_grantor_options": {}
  }
@@ -125,6 +137,18 @@ func TestParseCaddyfileIdentityProvider(t *testing.T) {
  "name": "myportal",
  "ui": {},
  "cookie_config": {},
+ "api": {
+ "profile_enabled": true
+ },
+ "portal_admin_roles": {
+ "authp/admin": true
+ },
+ "portal_user_roles": {
+ "authp/user": true
+ },
+ "portal_guest_roles": {
+ "authp/guest": true
+ },
  "identity_providers": [
  "authp"
  ],

diff --git a/caddyfile_identity_store_test.go b/caddyfile_identity_store_test.go
@@ -51,6 +51,18 @@ func TestParseCaddyfileIdentityStore(t *testing.T) {
  "identity_stores": [
  "localdb"
  ],
+ "portal_admin_roles": {
+ "authp/admin": true
+ },
+ "portal_user_roles": {
+ "authp/user": true
+ },
+ "portal_guest_roles": {
+ "authp/guest": true
+ },
+ "api": {
+ "profile_enabled": true
+ },
  "token_validator_options": {},
  "token_grantor_options": {}
  }
@@ -104,10 +116,22 @@ func TestParseCaddyfileIdentityStore(t *testing.T) {
  {
  "name": "myportal",
  "ui": {},
+ "api": {
+ "profile_enabled": true
+ },
  "cookie_config": {},
  "identity_stores": [
  "contoso.com"
  ],
+ "portal_admin_roles": {
+ "authp/admin": true
+ },
+ "portal_user_roles": {
+ "authp/user": true
+ },
+ "portal_guest_roles": {
+ "authp/guest": true
+ },
  "token_validator_options": {},
  "token_grantor_options": {}
  }

diff --git a/caddyfile_identity_test.go b/caddyfile_identity_test.go
@@ -72,10 +72,22 @@ func TestParseCaddyfileIdentity(t *testing.T) {
  "identity_stores": [
  "localdb"
  ],
+ "api": {
+ "profile_enabled": true
+ },
  "identity_providers": [
  "authp",
  "github"
  ],
+ "portal_admin_roles": {
+ "authp/admin": true
+ },
+ "portal_user_roles": {
+ "authp/user": true
+ },
+ "portal_guest_roles": {
+ "authp/guest": true
+ },
  "token_validator_options": {},
  "token_grantor_options": {}
  }

diff --git a/caddyfile_sso_provider_test.go b/caddyfile_sso_provider_test.go
@@ -60,9 +60,21 @@ func TestParseCaddyfileSingleSignOnProvider(t *testing.T) {
  "identity_stores": [
  "localdb"
  ],
+ "portal_admin_roles": {
+ "authp/admin": true
+ },
+ "portal_user_roles": {
+ "authp/user": true
+ },
+ "portal_guest_roles": {
+ "authp/guest": true
+ },
  "sso_providers": [
  "aws"
  ],
+ "api": {
+ "profile_enabled": true
+ },
  "token_validator_options": {},
  "token_grantor_options": {}
  }

diff --git a/go.mod b/go.mod
@@ -1,13 +1,13 @@
 module github.com/greenpau/caddy-security
 
-go 1.20
+go 1.21
 
 require (
  github.com/caddyserver/caddy/v2 v2.7.6
  github.com/google/go-cmp v0.6.0
  github.com/google/uuid v1.6.0
  github.com/greenpau/caddy-trace v1.1.13
- github.com/greenpau/go-authcrunch v1.0.50
+ github.com/greenpau/go-authcrunch v1.1.2
  github.com/tidwall/gjson v1.17.1
  go.uber.org/zap v1.27.0
 )