fix gitea oauth
This commit is contained in:
+13
-1
@@ -15,6 +15,7 @@ type Config struct {
|
||||
PublicURL *url.URL
|
||||
DatabaseDSN string
|
||||
GiteaURL *url.URL
|
||||
GiteaInternalURL *url.URL
|
||||
GiteaClientID string
|
||||
GiteaClientSecret string
|
||||
GiteaPackageOwner string
|
||||
@@ -65,6 +66,14 @@ func LoadConfig() (Config, error) {
|
||||
if err != nil {
|
||||
return cfg, err
|
||||
}
|
||||
cfg.GiteaInternalURL, err = parseURLValue(
|
||||
"TAPM_GITEA_INTERNAL_URL",
|
||||
envDefault("TAPM_GITEA_INTERNAL_URL", "http://gitea:3000"),
|
||||
true,
|
||||
)
|
||||
if err != nil {
|
||||
return cfg, err
|
||||
}
|
||||
cfg.CookieSecure = cfg.PublicURL.Scheme == "https"
|
||||
|
||||
cfg.DefaultDuration, err = time.ParseDuration(
|
||||
@@ -137,7 +146,10 @@ func LoadConfig() (Config, error) {
|
||||
}
|
||||
|
||||
func parseAbsoluteURL(name string, allowInsecureHTTP bool) (*url.URL, error) {
|
||||
raw := os.Getenv(name)
|
||||
return parseURLValue(name, os.Getenv(name), allowInsecureHTTP)
|
||||
}
|
||||
|
||||
func parseURLValue(name string, raw string, allowInsecureHTTP bool) (*url.URL, error) {
|
||||
parsed, err := url.Parse(raw)
|
||||
validScheme := parsed != nil && parsed.Scheme == "https"
|
||||
if allowInsecureHTTP && parsed != nil && parsed.Scheme == "http" {
|
||||
|
||||
Reference in New Issue
Block a user