Skip to content

Config json #13578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
akallabeth wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Config json #13578

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fc8f3eb
[winpr,path] add winpr_GetJSONConfigFile
akallabeth Oct 1, 2026
c49360e
[winpr,utils] add JSON config reader helper
akallabeth Oct 1, 2026
7022277
[codec,rfx] implement remotefx.json
akallabeth Oct 1, 2026
71b2d24
[core,credssp] implement credssp.json
akallabeth Oct 1, 2026
adf7ba2
[winpr,sspi] implement ntlm.json
akallabeth Oct 1, 2026
90c2834
[winpr,negotiate] implement negotiate.json
akallabeth Oct 1, 2026
693c5cc
[common,settings] add freerdp_settings_apply_from_json
akallabeth Oct 1, 2026
c3f9ed3
[core,settings] load default settings from json
akallabeth Oct 1, 2026
b4fd777
[winpr,utils] deprecate winpr_getApplicatonDetailsRegKey
akallabeth Oct 1, 2026
e0dffbf
[utils,helpers] deprecate freerdp_getApplicatonDetailsRegKey
akallabeth Oct 1, 2026
eff06d4
[winpr,registry] deprecate registry
akallabeth Oct 1, 2026
572017f
[ci,qa] disable deprecation warnings
akallabeth Oct 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[core,settings] load default settings from json
  • Loading branch information
@akallabeth
akallabeth committed Oct 1, 2026
commit c3f9ed3a0c82c5997e784b21e48ae931a5c02f8f
75 changes: 56 additions & 19 deletions libfreerdp/core/settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,22 @@ static BOOL settings_reg_query_bool(rdpSettings* settings, FreeRDP_Settings_Keys
return freerdp_settings_set_bool(settings, id, (dwValue != 0));
}

static void settings_load_config(rdpSettings* settings, const char* config)
{
WINPR_JSON* json = freerdp_GetJSONConfigFile(TRUE, config);
if (!json)
return;

if (!freerdp_settings_apply_from_json(settings, json))
{
WLog_DBG(TAG, "%s could not be applied. File does not exist or is not valid", config);
}
WINPR_JSON_Delete(json);
}

static void settings_client_load_hkey_local_machine(rdpSettings* settings)
{
const char config[] = "settings-defaults-client.json";
{
char* key = freerdp_getApplicatonDetailsRegKey(CLIENT_KEY);
if (key)
Expand All @@ -200,6 +214,9 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings)

if (status == ERROR_SUCCESS)
{
WLog_WARN(TAG, "HKLM.reg is deprecated since 3.33.0. ATTENTION Use %s instead",
config);

settings_reg_query_dword(settings, FreeRDP_DesktopWidth, hKey, _T("DesktopWidth"));
settings_reg_query_dword(settings, FreeRDP_DesktopHeight, hKey,
_T("DesktopHeight"));
Expand Down Expand Up @@ -337,38 +354,57 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings)
}
}
}
settings_load_config(settings, config);
}

static void settings_server_load_hkey_local_machine(rdpSettings* settings)
{
HKEY hKey = nullptr;
const char config[] = "settings-defaults-server.json";

char* key = freerdp_getApplicatonDetailsRegKey(SERVER_KEY);
if (!key)
return;
{
HKEY hKey = nullptr;

const LONG status =
RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ | KEY_WOW64_64KEY, &hKey);
free(key);
char* key = freerdp_getApplicatonDetailsRegKey(SERVER_KEY);
if (!key)
return;

if (status != ERROR_SUCCESS)
return;
const LONG status =
RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ | KEY_WOW64_64KEY, &hKey);
free(key);

settings_reg_query_bool(settings, FreeRDP_ExtSecurity, hKey, _T("ExtSecurity"));
settings_reg_query_bool(settings, FreeRDP_NlaSecurity, hKey, _T("NlaSecurity"));
settings_reg_query_bool(settings, FreeRDP_TlsSecurity, hKey, _T("TlsSecurity"));
settings_reg_query_dword(settings, FreeRDP_TlsSecLevel, hKey, _T("TlsSecLevel"));
settings_reg_query_bool(settings, FreeRDP_RdpSecurity, hKey, _T("RdpSecurity"));
if (status != ERROR_SUCCESS)
return;

RegCloseKey(hKey);
WLog_WARN(TAG, "HKLM.reg is deprecated since 3.33.0. ATTENTION Use %s instead", config);

settings_reg_query_bool(settings, FreeRDP_ExtSecurity, hKey, _T("ExtSecurity"));
settings_reg_query_bool(settings, FreeRDP_NlaSecurity, hKey, _T("NlaSecurity"));
settings_reg_query_bool(settings, FreeRDP_TlsSecurity, hKey, _T("TlsSecurity"));
settings_reg_query_dword(settings, FreeRDP_TlsSecLevel, hKey, _T("TlsSecLevel"));
settings_reg_query_bool(settings, FreeRDP_RdpSecurity, hKey, _T("RdpSecurity"));

RegCloseKey(hKey);
}

settings_load_config(settings, config);
}

static void settings_load_hkey_local_machine(rdpSettings* settings)
WINPR_ATTR_NODISCARD
static BOOL settings_load_hkey_local_machine(rdpSettings* settings)
{
if (freerdp_settings_get_bool(settings, FreeRDP_ServerMode))
const BOOL server = freerdp_settings_get_bool(settings, FreeRDP_ServerMode);
if (server)
settings_server_load_hkey_local_machine(settings);
else
settings_client_load_hkey_local_machine(settings);

const BOOL fail = server != freerdp_settings_get_bool(settings, FreeRDP_ServerMode);
if (fail)
{
WLog_ERR(TAG,
"default configuration changed FreeRDP_ServerMode! This is not allowed, aborting");
}
return !fail;
}

static BOOL settings_init_computer_name(rdpSettings* settings)
Expand Down Expand Up @@ -1317,8 +1353,6 @@ rdpSettings* freerdp_settings_new(DWORD flags)
goto out_fail;
}

settings_load_hkey_local_machine(settings);

if (!freerdp_settings_set_bool(settings, FreeRDP_SmartcardLogon, FALSE))
goto out_fail;
if (!freerdp_settings_set_uint32(settings, FreeRDP_TlsSecLevel, FREERDP_TLS_SECLEVEL_112BIT))
Expand Down Expand Up @@ -1366,6 +1400,9 @@ rdpSettings* freerdp_settings_new(DWORD flags)
guid2str(&corrId, buffer, sizeof(buffer))))
goto out_fail;

if (!settings_load_hkey_local_machine(settings))
goto out_fail;

return settings;
out_fail:
WINPR_PRAGMA_DIAG_PUSH
Expand Down