diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java index 329aeae13..a259e449d 100644 --- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java @@ -58,7 +58,7 @@ public class CASAuthenticationProviderModule extends AbstractModule { throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Store associated auth provider this.authProvider = authProvider; diff --git a/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProviderModule.java b/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProviderModule.java index 705e37dec..a60523bf8 100644 --- a/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/DuoAuthenticationProviderModule.java @@ -58,7 +58,7 @@ public class DuoAuthenticationProviderModule extends AbstractModule { throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Store associated auth provider this.authProvider = authProvider; diff --git a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProviderModule.java b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProviderModule.java index b0e755a2a..a31d633f8 100644 --- a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderAuthenticationProviderModule.java @@ -56,7 +56,7 @@ public class HTTPHeaderAuthenticationProviderModule extends AbstractModule { throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Store associated auth provider this.authProvider = authProvider; diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java index 838ad4d58..ea4bcd959 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java @@ -20,25 +20,23 @@ package org.apache.guacamole.auth.jdbc; import org.apache.guacamole.GuacamoleException; -import org.apache.guacamole.environment.LocalEnvironment; import org.apache.guacamole.auth.jdbc.security.PasswordPolicy; +import org.apache.guacamole.environment.DelegatingEnvironment; +import org.apache.guacamole.environment.LocalEnvironment; import org.apache.ibatis.session.SqlSession; /** * A JDBC-specific implementation of Environment that defines generic properties * intended for use within JDBC based authentication providers. */ -public abstract class JDBCEnvironment extends LocalEnvironment { +public abstract class JDBCEnvironment extends DelegatingEnvironment { /** * Constructs a new JDBCEnvironment using an underlying LocalEnviroment to * read properties from the file system. - * - * @throws GuacamoleException - * If an error occurs while setting up the underlying LocalEnvironment. */ - public JDBCEnvironment() throws GuacamoleException { - super(); + public JDBCEnvironment() { + super(LocalEnvironment.getInstance()); } /** diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/JSONAuthenticationProviderModule.java b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/JSONAuthenticationProviderModule.java index ba12edc79..325b31e43 100644 --- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/JSONAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/JSONAuthenticationProviderModule.java @@ -59,7 +59,7 @@ public class JSONAuthenticationProviderModule extends AbstractModule { throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Store associated auth provider this.authProvider = authProvider; diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java index 9cfaadf63..fb6f915cf 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPAuthenticationProviderModule.java @@ -60,7 +60,7 @@ public class LDAPAuthenticationProviderModule extends AbstractModule { throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Store associated auth provider this.authProvider = authProvider; diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java b/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java index 17510cbe5..83e8c3777 100644 --- a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java @@ -59,7 +59,7 @@ public class OpenIDAuthenticationProviderModule extends AbstractModule { throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Store associated auth provider this.authProvider = authProvider; diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProviderModule.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProviderModule.java index 7841316be..5243e5371 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectAuthenticationProviderModule.java @@ -57,7 +57,7 @@ public class QuickConnectAuthenticationProviderModule extends AbstractModule { AuthenticationProvider authProvider) throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Store associated auth provider this.authProvider = authProvider; diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusAuthenticationProviderModule.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusAuthenticationProviderModule.java index fa8b1cf88..82b9c408e 100644 --- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusAuthenticationProviderModule.java @@ -63,7 +63,7 @@ public class RadiusAuthenticationProviderModule extends AbstractModule { throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Check for MD4 requirement RadiusAuthenticationProtocol authProtocol = environment.getProperty(RadiusGuacamoleProperties.RADIUS_AUTH_PROTOCOL); diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java b/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java index faa093550..9405b1e86 100644 --- a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java @@ -57,7 +57,7 @@ public class SAMLAuthenticationProviderModule extends AbstractModule { throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Store associated auth provider this.authProvider = authProvider; diff --git a/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/TOTPAuthenticationProviderModule.java b/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/TOTPAuthenticationProviderModule.java index d1f7f9616..51650d8ed 100644 --- a/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/TOTPAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/TOTPAuthenticationProviderModule.java @@ -59,7 +59,7 @@ public class TOTPAuthenticationProviderModule extends AbstractModule { throws GuacamoleException { // Get local environment - this.environment = new LocalEnvironment(); + this.environment = LocalEnvironment.getInstance(); // Store associated auth provider this.authProvider = authProvider; diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java index ba61f7a7c..aa7e74853 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java @@ -202,7 +202,7 @@ public class SimpleConnection extends AbstractConnection { throws GuacamoleException { // Retrieve proxy configuration from environment - Environment environment = new LocalEnvironment(); + Environment environment = LocalEnvironment.getInstance(); GuacamoleProxyConfiguration proxyConfig = environment.getDefaultGuacamoleProxyConfiguration(); // Get guacd connection parameters diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java index 53ae7ebe9..3099b3b92 100644 --- a/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java @@ -63,25 +63,13 @@ public class FileAuthenticationProvider extends SimpleAuthenticationProvider { /** * Guacamole server environment. */ - private final Environment environment; + private final Environment environment = LocalEnvironment.getInstance(); /** * The filename to use for the user mapping. */ public static final String USER_MAPPING_FILENAME = "user-mapping.xml"; - /** - * Creates a new FileAuthenticationProvider that authenticates users against - * simple, monolithic XML file. - * - * @throws GuacamoleException - * If a required property is missing, or an error occurs while parsing - * a property. - */ - public FileAuthenticationProvider() throws GuacamoleException { - environment = new LocalEnvironment(); - } - @Override public String getIdentifier() { return "default"; diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java index 211885def..9086ac93e 100644 --- a/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java @@ -171,7 +171,7 @@ public class SchemaResource { public Map getProtocols() throws GuacamoleException { // Get and return a map of all protocols. - Environment env = new LocalEnvironment(); + Environment env = LocalEnvironment.getInstance(); return env.getProtocols(); }