Merge pull request duckdb#116 from Mytherin/externalaccess

Disable attaching new MySQL databases when enable external access is disabled

Author: Mytherin

src/mysql_storage.cpp

@@ -9,6 +9,10 @@ namespace duckdb {
 
 static unique_ptr<Catalog> MySQLAttach(StorageExtensionInfo *storage_info, ClientContext &context, AttachedDatabase &db,
                                        const string &name, AttachInfo &info, AccessMode access_mode) {
+	auto &config = DBConfig::GetConfig(context);
+	if (!config.options.enable_external_access) {
+		throw PermissionException("Attaching MySQL databases is disabled through configuration");
+	}
 	// check if we have a secret provided
 	string secret_name;
 	for (auto &entry : info.options) {

src/storage/mysql_catalog.cpp

@@ -10,8 +10,10 @@
 
 namespace duckdb {
 
-MySQLCatalog::MySQLCatalog(AttachedDatabase &db_p, string connection_string_p, string attach_path_p, AccessMode access_mode)
-    : Catalog(db_p), connection_string(std::move(connection_string_p)), attach_path(std::move(attach_path_p)), access_mode(access_mode), schemas(*this) {
+MySQLCatalog::MySQLCatalog(AttachedDatabase &db_p, string connection_string_p, string attach_path_p,
+                           AccessMode access_mode)
+    : Catalog(db_p), connection_string(std::move(connection_string_p)), attach_path(std::move(attach_path_p)),
+      access_mode(access_mode), schemas(*this) {
 	default_schema = MySQLUtils::ParseConnectionParameters(connection_string).db;
 	// try to connect
 	auto connection = MySQLConnection::Open(connection_string);

test/sql/attach_external_access.test

@@ -0,0 +1,15 @@
+# name: test/sql/attach_external_access.test
+# description: Test that we cannot attach new databases if external access is disabled
+# group: [storage]
+
+require mysql_scanner
+
+require-env MYSQL_TEST_DATABASE_AVAILABLE
+
+statement ok
+SET enable_external_access=false
+
+statement error
+ATTACH 'host=localhost user=root port=0 database=mysqlscanner' AS s1 (TYPE MYSQL_SCANNER)
+----
+disabled through configuration