mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-24 04:58:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

split string by reversing it

Browse Source
This commit is contained in:
A.Unger
2020-12-03 11:53:19 +01:00
parent 6753f38bf3
commit ef4e573e42
2 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
storage/pkg/command/frontend.go
+22 -14
View File
@@ -13,6 +13,7 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-pkg/conversions"
"github.com/owncloud/ocis/storage/pkg/config"
"github.com/owncloud/ocis/storage/pkg/flagset"
"github.com/owncloud/ocis/storage/pkg/server/debug"
@@ -26,20 +27,7 @@ func Frontend(cfg *config.Config) *cli.Command {
Flags: flagset.FrontendWithConfig(cfg),
Before: func(c *cli.Context) error {
cfg.Reva.Frontend.Services = c.StringSlice("service")
cfg.Reva.Frontend.Middleware.Auth.CredentialsByUserAgent = make(map[string]string, 0)
uaw := c.StringSlice("user-agent-whitelist")
fmt.Printf("\n\n%v\n\n", uaw)
for _, v := range uaw {
parts := strings.Split(v, ":")
if len(parts) != 2 {
return fmt.Errorf("unexpected config value for user-agent whitelist: %v, expected format is user-agent:challenge", v)
}
cfg.Reva.Frontend.Middleware.Auth.CredentialsByUserAgent[parts[0]] = parts[1]
}
return nil
return loadUserAgent(c, cfg)
},
Action: func(c *cli.Context) error {
logger := NewLogger(cfg)
@@ -313,3 +301,23 @@ func Frontend(cfg *config.Config) *cli.Command {
},
}
}
// loadUserAgent reads the user-agent-whitelist, since it is a string flag, and attempts to construct a map of
// "user-agent":"challenge" locks in for Reva.
// Modifies cfg. Spaces don't need to be trimmed as urfavecli takes care of it.
func loadUserAgent(c *cli.Context, cfg *config.Config) error {
cfg.Reva.Frontend.Middleware.Auth.CredentialsByUserAgent = make(map[string]string, 0)
locks := c.StringSlice("user-agent-whitelist")
for _, v := range locks {
vv := conversions.Reverse(v)
parts := strings.SplitN(vv, ":", 2)
if len(parts) != 2 {
return fmt.Errorf("unexpected config value for user-agent lock-in: %v, expected format is user-agent:challenge", v)
}
cfg.Reva.Frontend.Middleware.Auth.CredentialsByUserAgent[conversions.Reverse(parts[1])] = conversions.Reverse(parts[0])
}
return nil
}