RPJosh
/
authelia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(commands): acl check panic on decode failure (#3697) 

This fixes an issue with the authelia access-control check-policy command which potentially panics when a decode hook fails to parse an item.
pull/3706/head
James Elliott 2022-07-13 17:22:42 +10:00 committed by GitHub
parent b398e031c5
commit 7d170f09b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/content/en/integration/openid-connect/argocd/index.md
View File

@ -1,6 +1,6 @@
--- ---
title: "ArgoCD" title: "Argo CD"
description: "Integrating ArgoCD with the Authelia OpenID Connect Provider." description: "Integrating Argo CD with the Authelia OpenID Connect Provider."
lead: "" lead: ""
date: 2022-07-13T03:42:47+10:00 date: 2022-07-13T03:42:47+10:00
draft: false draft: false
@ -17,7 +17,7 @@ community: true
* [Authelia] * [Authelia]
* [v4.36.2](https://github.com/authelia/authelia/releases/tag/v4.36.2) * [v4.36.2](https://github.com/authelia/authelia/releases/tag/v4.36.2)
* [ArgoCD] * [Argo CD]
* v2.4.5 * v2.4.5
## Before You Begin ## Before You Begin
@ -31,21 +31,21 @@ This example makes the following assumptions:
* __Application Root URL:__ `https://argocd.example.com` * __Application Root URL:__ `https://argocd.example.com`
* __Authelia Root URL:__ `https://auth.example.com` * __Authelia Root URL:__ `https://auth.example.com`
* __Client ID:__ `argocd` * __Client ID:__ `argocd`
* __CLI Client ID:__ `argocd-cli`
* __Client Secret:__ `argocd_client_secret` * __Client Secret:__ `argocd_client_secret`
* __CLI Client ID:__ `argocd-cli`
## Configuration ## Configuration
### Application ### Application
To configure [ArgoCD] to utilize Authelia as an [OpenID Connect] Provider use the following configuration: To configure [Argo CD] to utilize Authelia as an [OpenID Connect] Provider use the following configuration:
```yaml ```yaml
name: Authelia name: Authelia
issuer: https://auth.example.com issuer: https://auth.example.com
clientID: argocd clientID: argocd
cliClientID: argocd-cli
clientSecret: argocd_client_secret clientSecret: argocd_client_secret
cliClientID: argocd-cli
requestedScopes: requestedScopes:
- openid - openid
- profile - profile
@ -56,12 +56,12 @@ requestedScopes:
### Authelia ### Authelia
The following YAML configuration is an example __Authelia__ The following YAML configuration is an example __Authelia__
[client configuration](../../../configuration/identity-providers/open-id-connect.md#clients) for use with [ArgoCD] [client configuration](../../../configuration/identity-providers/open-id-connect.md#clients) for use with [Argo CD]
which will operate with the above example: which will operate with the above example:
```yaml ```yaml
- id: argocd - id: argocd
description: ArgoCD description: Argo CD
redirect_uris: redirect_uris:
- https://argocd.example.com/auth/callback - https://argocd.example.com/auth/callback
scopes: scopes:
@ -72,7 +72,7 @@ which will operate with the above example:
secret: argocd_client_secret secret: argocd_client_secret
userinfo_signing_algorithm: none userinfo_signing_algorithm: none
- id: argocd-cli - id: argocd-cli
description: ArgoCD CLI description: Argo CD (CLI)
public: true public: true
redirect_uris: redirect_uris:
- http://localhost:8085/auth/callback - http://localhost:8085/auth/callback
@ -86,10 +86,10 @@ which will operate with the above example:
## See Also ## See Also
* [ArgoCD OpenID Connect Documentation](https://argo-cd.readthedocs.io/en/stable/operator-manual/user-management/#existing-oidc-provider) * [Argo CD OpenID Connect Documentation](https://argo-cd.readthedocs.io/en/stable/operator-manual/user-management/#existing-oidc-provider)
[Authelia]: https://www.authelia.com [Authelia]: https://www.authelia.com
[ArgoCD]: https://argo-cd.readthedocs.io/en/stable/ [Argo CD]: https://argo-cd.readthedocs.io/en/stable/
[OpenID Connect]: ../../openid-connect/introduction.md [OpenID Connect]: ../../openid-connect/introduction.md

6
internal/commands/acl.go
View File

@ -74,11 +74,9 @@ func accessControlCheckRunE(cmd *cobra.Command, _ []string) (err error) {
return err return err
} }
v := schema.NewStructValidator() validator.ValidateAccessControl(accessControlConfig, val)
validator.ValidateAccessControl(accessControlConfig, v) if val.HasErrors() || val.HasWarnings() {
if v.HasErrors() || v.HasWarnings() {
return errors.New("your configuration has errors") return errors.New("your configuration has errors")
} }