|
|
@@ -613,8 +613,6 @@ func TestHTTPDSubObjectsFromEnv(t *testing.T) {
|
|
|
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__0__SECURITY__HTTPS_PROXY_HEADERS__0__KEY", "X-Forwarded-Proto")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__0__SECURITY__HTTPS_PROXY_HEADERS__0__VALUE", "https")
|
|
|
- os.Setenv("SFTPGO_HTTPD__BINDINGS__0__WEB_CLIENT_INTEGRATIONS__0__URL", "http://127.0.0.1/")
|
|
|
- os.Setenv("SFTPGO_HTTPD__BINDINGS__0__WEB_CLIENT_INTEGRATIONS__0__FILE_EXTENSIONS", ".pdf, .txt")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__0__OIDC__CLIENT_ID", "client_id")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__0__OIDC__CLIENT_SECRET", "client_secret")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__0__OIDC__CONFIG_URL", "config_url")
|
|
|
@@ -623,8 +621,6 @@ func TestHTTPDSubObjectsFromEnv(t *testing.T) {
|
|
|
cleanup := func() {
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__0__SECURITY__HTTPS_PROXY_HEADERS__0__KEY")
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__0__SECURITY__HTTPS_PROXY_HEADERS__0__VALUE")
|
|
|
- os.Unsetenv("SFTPGO_HTTPD__BINDINGS__0__WEB_CLIENT_INTEGRATIONS__0__URL")
|
|
|
- os.Unsetenv("SFTPGO_HTTPD__BINDINGS__0__WEB_CLIENT_INTEGRATIONS__0__FILE_EXTENSIONS")
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__0__OIDC__CLIENT_ID")
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__0__OIDC__CLIENT_SECRET")
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__0__OIDC__CONFIG_URL")
|
|
|
@@ -638,7 +634,6 @@ func TestHTTPDSubObjectsFromEnv(t *testing.T) {
|
|
|
httpdConf := config.GetHTTPDConfig()
|
|
|
require.Len(t, httpdConf.Bindings, 1)
|
|
|
require.Len(t, httpdConf.Bindings[0].Security.HTTPSProxyHeaders, 1)
|
|
|
- require.Len(t, httpdConf.Bindings[0].WebClientIntegrations, 1)
|
|
|
require.Equal(t, "client_id", httpdConf.Bindings[0].OIDC.ClientID)
|
|
|
require.Equal(t, "client_secret", httpdConf.Bindings[0].OIDC.ClientSecret)
|
|
|
require.Equal(t, "config_url", httpdConf.Bindings[0].OIDC.ConfigURL)
|
|
|
@@ -656,7 +651,6 @@ func TestHTTPDSubObjectsFromEnv(t *testing.T) {
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__0__SECURITY__HTTPS_PROXY_HEADERS__0__VALUE", "http")
|
|
|
- os.Setenv("SFTPGO_HTTPD__BINDINGS__0__WEB_CLIENT_INTEGRATIONS__0__URL", "http://127.0.1.1/")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__0__OIDC__CLIENT_SECRET", "new_client_secret")
|
|
|
err = config.LoadConfig(configDir, confName)
|
|
|
assert.NoError(t, err)
|
|
|
@@ -664,8 +658,6 @@ func TestHTTPDSubObjectsFromEnv(t *testing.T) {
|
|
|
require.Len(t, httpdConf.Bindings, 1)
|
|
|
require.Len(t, httpdConf.Bindings[0].Security.HTTPSProxyHeaders, 1)
|
|
|
require.Equal(t, "http", httpdConf.Bindings[0].Security.HTTPSProxyHeaders[0].Value)
|
|
|
- require.Len(t, httpdConf.Bindings[0].WebClientIntegrations, 1)
|
|
|
- require.Equal(t, "http://127.0.1.1/", httpdConf.Bindings[0].WebClientIntegrations[0].URL)
|
|
|
require.Equal(t, "client_id", httpdConf.Bindings[0].OIDC.ClientID)
|
|
|
require.Equal(t, "new_client_secret", httpdConf.Bindings[0].OIDC.ClientSecret)
|
|
|
require.Equal(t, "config_url", httpdConf.Bindings[0].OIDC.ConfigURL)
|
|
|
@@ -1216,10 +1208,6 @@ func TestHTTPDBindingsFromEnv(t *testing.T) {
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__2__CLIENT_IP_PROXY_HEADER", "X-Real-IP")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__2__CLIENT_IP_HEADER_DEPTH", "2")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__2__HIDE_LOGIN_URL", "3")
|
|
|
- os.Setenv("SFTPGO_HTTPD__BINDINGS__2__WEB_CLIENT_INTEGRATIONS__1__URL", "http://127.0.0.1/")
|
|
|
- os.Setenv("SFTPGO_HTTPD__BINDINGS__2__WEB_CLIENT_INTEGRATIONS__1__FILE_EXTENSIONS", ".pdf, .txt")
|
|
|
- os.Setenv("SFTPGO_HTTPD__BINDINGS__2__WEB_CLIENT_INTEGRATIONS__2__URL", "http://127.0.1.1/")
|
|
|
- os.Setenv("SFTPGO_HTTPD__BINDINGS__2__WEB_CLIENT_INTEGRATIONS__3__FILE_EXTENSIONS", ".jpg, .txt")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__2__OIDC__CLIENT_ID", "client id")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__2__OIDC__CLIENT_SECRET", "client secret")
|
|
|
os.Setenv("SFTPGO_HTTPD__BINDINGS__2__OIDC__CONFIG_URL", "config url")
|
|
|
@@ -1286,10 +1274,6 @@ func TestHTTPDBindingsFromEnv(t *testing.T) {
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__CLIENT_IP_PROXY_HEADER")
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__CLIENT_IP_HEADER_DEPTH")
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__HIDE_LOGIN_URL")
|
|
|
- os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__WEB_CLIENT_INTEGRATIONS__1__URL")
|
|
|
- os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__WEB_CLIENT_INTEGRATIONS__1__FILE_EXTENSIONS")
|
|
|
- os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__WEB_CLIENT_INTEGRATIONS__2__URL")
|
|
|
- os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__WEB_CLIENT_INTEGRATIONS__3__FILE_EXTENSIONS")
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__OIDC__CLIENT_ID")
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__OIDC__CLIENT_SECRET")
|
|
|
os.Unsetenv("SFTPGO_HTTPD__BINDINGS__2__OIDC__CONFIG_URL")
|
|
|
@@ -1394,9 +1378,6 @@ func TestHTTPDBindingsFromEnv(t *testing.T) {
|
|
|
require.Equal(t, "X-Real-IP", bindings[2].ClientIPProxyHeader)
|
|
|
require.Equal(t, 2, bindings[2].ClientIPHeaderDepth)
|
|
|
require.Equal(t, 3, bindings[2].HideLoginURL)
|
|
|
- require.Len(t, bindings[2].WebClientIntegrations, 1)
|
|
|
- require.Equal(t, "http://127.0.0.1/", bindings[2].WebClientIntegrations[0].URL)
|
|
|
- require.Equal(t, []string{".pdf", ".txt"}, bindings[2].WebClientIntegrations[0].FileExtensions)
|
|
|
require.Equal(t, "client id", bindings[2].OIDC.ClientID)
|
|
|
require.Equal(t, "client secret", bindings[2].OIDC.ClientSecret)
|
|
|
require.Equal(t, "config url", bindings[2].OIDC.ConfigURL)
|
Nicola Murino