diff --git a/src/include/settings.hpp b/src/include/settings.hpp index a1a35c6..b9bdd88 100644 --- a/src/include/settings.hpp +++ b/src/include/settings.hpp @@ -1,11 +1,14 @@ #pragma once -#include #include +#include #define UI_LOCAL_PORT_SETTING_NAME "ui_local_port" +#define UI_LOCAL_PORT_SETTING_DEFAULT 4213 #define UI_REMOTE_URL_SETTING_NAME "ui_remote_url" +#define UI_REMOTE_URL_SETTING_DEFAULT "https://ui.duckdb.org" #define UI_POLLING_INTERVAL_SETTING_NAME "ui_polling_interval" +#define UI_POLLING_INTERVAL_SETTING_DEFAULT 284 namespace duckdb { diff --git a/src/settings.cpp b/src/settings.cpp index ad5c782..e08aa59 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1,8 +1,13 @@ #include "settings.hpp" +#include + namespace duckdb { std::string GetRemoteUrl(const ClientContext &context) { + if (!context.db->config.options.allow_unsigned_extensions) { + return UI_REMOTE_URL_SETTING_DEFAULT; + } return internal::GetSetting(context, UI_REMOTE_URL_SETTING_NAME); } diff --git a/src/ui_extension.cpp b/src/ui_extension.cpp index 7e9736c..e8ae1cc 100644 --- a/src/ui_extension.cpp +++ b/src/ui_extension.cpp @@ -76,15 +76,16 @@ static void LoadInternal(DatabaseInstance &instance) { auto &config = DBConfig::GetConfig(instance); { - auto default_port = GetEnvOrDefaultInt(UI_LOCAL_PORT_SETTING_NAME, 4213); + auto default_port = GetEnvOrDefaultInt(UI_LOCAL_PORT_SETTING_NAME, + UI_LOCAL_PORT_SETTING_DEFAULT); config.AddExtensionOption( UI_LOCAL_PORT_SETTING_NAME, "Local port on which the UI server listens", LogicalType::USMALLINT, Value::USMALLINT(default_port)); } { - auto def = - GetEnvOrDefault(UI_REMOTE_URL_SETTING_NAME, "https://ui.duckdb.org"); + auto def = GetEnvOrDefault(UI_REMOTE_URL_SETTING_NAME, + UI_REMOTE_URL_SETTING_DEFAULT); config.AddExtensionOption( UI_REMOTE_URL_SETTING_NAME, "Remote URL to which the UI server forwards GET requests", @@ -92,7 +93,8 @@ static void LoadInternal(DatabaseInstance &instance) { } { - auto def = GetEnvOrDefaultInt(UI_POLLING_INTERVAL_SETTING_NAME, 284); + auto def = GetEnvOrDefaultInt(UI_POLLING_INTERVAL_SETTING_NAME, + UI_POLLING_INTERVAL_SETTING_DEFAULT); config.AddExtensionOption( UI_POLLING_INTERVAL_SETTING_NAME, "Period of time between UI polling requests (in ms)",