mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-01-21 04:18:21 -05:00
6814c61506
* enhancement: allow ocis to provide custom web applications * enhancement: add an option to disable web apps * test: add default logger tests * test: add app loading tests * test: add asset server tests * enhancement: make use of dedicated app conf file and app asset paths * enhancement: adjust asset locations and deprecate WEB_ASSET_PATH * enhancement: get rid of default logger and use the service level logger instead * Apply suggestions from code review Co-authored-by: Benedikt Kulmann <benedikt@kulmann.biz> Co-authored-by: kobergj <juliankoberg@googlemail.com> * enhancement: use basename as app id * Apply suggestions from code review Co-authored-by: Martin <github@diemattels.at> * enhancement: use afero as fs abstraction * enhancement: simplify logo upload * enhancement: make use of introductionVersion field annotations --------- Co-authored-by: Benedikt Kulmann <benedikt@kulmann.biz> Co-authored-by: kobergj <juliankoberg@googlemail.com> Co-authored-by: Martin <github@diemattels.at>
63 lines
1.9 KiB
Go
63 lines
1.9 KiB
Go
package parser
|
|
|
|
import (
|
|
"errors"
|
|
|
|
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
|
|
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
|
|
"github.com/owncloud/ocis/v2/ocis-pkg/log"
|
|
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
|
|
"github.com/owncloud/ocis/v2/services/web/pkg/config"
|
|
"github.com/owncloud/ocis/v2/services/web/pkg/config/defaults"
|
|
)
|
|
|
|
// ParseConfig loads configuration from known paths.
|
|
func ParseConfig(cfg *config.Config) error {
|
|
_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
defaults.EnsureDefaults(cfg)
|
|
|
|
// load all env variables relevant to the config in the current context.
|
|
if err := envdecode.Decode(cfg); err != nil {
|
|
// no environment variable set for this config is an expected "error"
|
|
if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// apps are a special case, as they are not part of the main config, but are loaded from a separate config file
|
|
_, err = ociscfg.BindSourcesToStructs("apps", &cfg.Apps)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
defaults.Sanitize(cfg)
|
|
|
|
return Validate(cfg)
|
|
}
|
|
|
|
func Validate(cfg *config.Config) error {
|
|
if cfg.TokenManager.JWTSecret == "" {
|
|
return shared.MissingJWTTokenError(cfg.Service.Name)
|
|
}
|
|
|
|
// deprecation: migration requested
|
|
// check if the config still uses the deprecated asset path, if so,
|
|
// log a warning and copy the value to the setting that is actually used
|
|
// this is to ensure a smooth transition from the old to the new core asset path (pre 5.1 to 5.1)
|
|
if cfg.Asset.DeprecatedPath != "" {
|
|
if cfg.Asset.CorePath == "" {
|
|
cfg.Asset.CorePath = cfg.Asset.DeprecatedPath
|
|
}
|
|
|
|
// message should be logged to the console,
|
|
// do not use a logger here because the message MUST be visible independent of the log level
|
|
log.Deprecation("WEB_ASSET_PATH is deprecated and will be removed in the future. Use WEB_ASSET_CORE_PATH instead.")
|
|
}
|
|
|
|
return nil
|
|
}
|