-
-
Notifications
You must be signed in to change notification settings - Fork 237
feat: ACL labels from environment variables #422
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
steveiliop56
merged 5 commits into
tinyauthapp:main
from
chrellrich:feat/label-from-env
Oct 21, 2025
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3fadf35
feat: add LabelService to retrieve application labels from environmen…
chrellrich e7075ab
feat: allow usage of labels from docker and env variables simultaneously
chrellrich f7a1182
fix: handle error returned by label_serive.go/LoadLabels
chrellrich c5ab1bb
refactor(label_service): use simple loop instead of slices.ContainsFu…
chrellrich 3e87831
refactor: merge acl logic into one service
steveiliop56 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| package service | ||
|
|
||
| import ( | ||
| "os" | ||
| "strings" | ||
| "tinyauth/internal/config" | ||
| "tinyauth/internal/utils/decoders" | ||
|
|
||
| "github.com/rs/zerolog/log" | ||
| ) | ||
|
|
||
| type AccessControlsService struct { | ||
| docker *DockerService | ||
| envACLs config.Apps | ||
| } | ||
|
|
||
| func NewAccessControlsService(docker *DockerService) *AccessControlsService { | ||
| return &AccessControlsService{ | ||
| docker: docker, | ||
| } | ||
| } | ||
|
|
||
| func (acls *AccessControlsService) Init() error { | ||
| acls.envACLs = config.Apps{} | ||
| env := os.Environ() | ||
| appEnvVars := []string{} | ||
|
|
||
| for _, e := range env { | ||
| if strings.HasPrefix(e, "TINYAUTH_APPS_") { | ||
| appEnvVars = append(appEnvVars, e) | ||
| } | ||
| } | ||
|
|
||
| err := acls.loadEnvACLs(appEnvVars) | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (acls *AccessControlsService) loadEnvACLs(appEnvVars []string) error { | ||
| if len(appEnvVars) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| envAcls := map[string]string{} | ||
|
|
||
| for _, e := range appEnvVars { | ||
| parts := strings.SplitN(e, "=", 2) | ||
| if len(parts) != 2 { | ||
| continue | ||
| } | ||
|
|
||
| // Normalize key, this should use the same normalization logic as in utils/decoders/decoders.go | ||
| key := parts[0] | ||
| key = strings.ToLower(key) | ||
| key = strings.ReplaceAll(key, "_", ".") | ||
| value := parts[1] | ||
| envAcls[key] = value | ||
| } | ||
|
|
||
| apps, err := decoders.DecodeLabels(envAcls) | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| acls.envACLs = apps | ||
| return nil | ||
| } | ||
|
|
||
| func (acls *AccessControlsService) lookupEnvACLs(appDomain string) *config.App { | ||
| if len(acls.envACLs.Apps) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| for appName, appACLs := range acls.envACLs.Apps { | ||
| if appACLs.Config.Domain == appDomain { | ||
| return &appACLs | ||
| } | ||
|
|
||
| if strings.SplitN(appDomain, ".", 2)[0] == appName { | ||
| return &appACLs | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (acls *AccessControlsService) GetAccessControls(appDomain string) (config.App, error) { | ||
| // First check environment variables | ||
| envACLs := acls.lookupEnvACLs(appDomain) | ||
|
|
||
| if envACLs != nil { | ||
| log.Debug().Str("domain", appDomain).Msg("Found matching access controls in environment variables") | ||
| return *envACLs, nil | ||
| } | ||
|
|
||
| // Fallback to Docker labels | ||
| return acls.docker.GetLabels(appDomain) | ||
| } | ||
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.