safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1407: Explicitly fail early if no JDBC driver can be found for MySQL/MariaDB.

Browse Source
This commit is contained in:
Michael Jumper
2021-08-26 18:36:22 -07:00
parent be1ad5dff3
commit fc9739a4d6
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLEnvironment.java
View File

@@ -25,6 +25,7 @@ import java.sql.DatabaseMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.TimeZone; import java.util.TimeZone;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.auth.jdbc.JDBCEnvironment; import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -53,12 +54,6 @@ public class MySQLEnvironment extends JDBCEnvironment {
*/ */
private static final MySQLVersion MYSQL_SUPPORTS_CTE = new MySQLVersion(8, 0, 1, false); private static final MySQLVersion MYSQL_SUPPORTS_CTE = new MySQLVersion(8, 0, 1, false);
/**
* The default MySQL-compatible driver to use, if not specified and not
* automatically detected.
*/
private static final MySQLDriver FALLBACK_DEFAULT_DRIVER = MySQLDriver.MYSQL;
/** /**
* The default host to connect to, if MYSQL_HOSTNAME is not specified. * The default host to connect to, if MYSQL_HOSTNAME is not specified.
*/ */
@@ -181,15 +176,15 @@ public class MySQLEnvironment extends JDBCEnvironment {
* Returns the MySQL driver that will be used to talk to the MySQL-compatible * Returns the MySQL driver that will be used to talk to the MySQL-compatible
* database server hosting the Guacamole database. If unspecified, the * database server hosting the Guacamole database. If unspecified, the
* installed MySQL driver will be automatically detected by inspecting the * installed MySQL driver will be automatically detected by inspecting the
* classes available in the classpath. If automatic detection fails, the * classes available in the classpath.
* "MySQL Connector/J" driver will be assumed.
* *
* @return * @return
* The MySQL driver that will be used to communicate with the MySQL- * The MySQL driver that will be used to communicate with the MySQL-
* compatible server. * compatible server.
* *
* @throws GuacamoleException * @throws GuacamoleException
* If guacamole.properties cannot be parsed. * If guacamole.properties cannot be parsed, or if no MySQL-compatible
* JDBC driver is present.
*/ */
public MySQLDriver getMySQLDriver() throws GuacamoleException { public MySQLDriver getMySQLDriver() throws GuacamoleException {
@@ -211,10 +206,8 @@ public class MySQLEnvironment extends JDBCEnvironment {
return MySQLDriver.MYSQL; return MySQLDriver.MYSQL;
} }
// Fallback to MySQL Connector/J if nothing can be found // No driver found at all
logger.warn("JDBC driver for MySQL/MariaDB couuld not be detected " throw new GuacamoleServerException("No JDBC driver for MySQL/MariaDB is installed.");
+ "and might not be installed. Assuming MySQL Connector/J...");
return FALLBACK_DEFAULT_DRIVER;
} }