mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5512 from kubistika/proxy/config-loader-refactor

Browse Source 
Proxy/config loader refactor
This commit is contained in:
David Fort 2019-08-06 12:34:05 +02:00 committed by GitHub
commit 60636a754d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 168 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/proxy/config.ini
View File

@ -18,19 +18,14 @@ Port = 3389
Mouse = 1
Keyboard = 1
[Graphics]
GFX = 1
BitmapUpdate = 1
[Security]
NlaSecurity = 0
TlsSecurity = 1
RdpSecurity = 1
[Channels]
WhitelistMode = 0
AllowedChannels = "cliprdr,Microsoft::Windows::RDS::Video::Control"
DeniedChannels = "Microsoft::Windows::RDS::Geometry"
GFX = 1
DisplayControl = 1
[Filters]
; FilterName = FilterPath

5
server/proxy/filters/filter_demo.c
View File

@ -17,6 +17,8 @@
* limitations under the License.
*/
#include <stdio.h>
#include "filters_api.h"
static PF_FILTER_RESULT demo_filter_keyboard_event(connectionInfo* info, void* param)
@ -33,7 +35,8 @@ static PF_FILTER_RESULT demo_filter_mouse_event(connectionInfo* info, void* para
if (event_data->x % 100 == 0)
{
return FILTER_DROP;
printf("filter_demo: mouse x is currently %"PRIu16"\n", event_data->x);
return FILTER_PASS;
}
return FILTER_PASS;

5
server/proxy/filters/filters_api.h
View File

@ -22,8 +22,11 @@
#ifndef FREERDP_SERVER_PROXY_FILTERS_API_H
#define FREERDP_SERVER_PROXY_FILTERS_API_H
#include <freerdp/freerdp.h>
#include <winpr/winpr.h>
#define PROXY_API FREERDP_API
enum pf_filter_result {
FILTER_PASS = 0,
FILTER_DROP,
@ -64,6 +67,6 @@ struct proxy_mouse_event_info {
/* implement this method and register callbacks for proxy events
* return TRUE if initialization succeeded, otherwise FALSE.
**/
BOOL filter_init(proxyEvents* events);
PROXY_API BOOL filter_init(proxyEvents* events);
#endif /* FREERDP_SERVER_PROXY_FILTERS_API_H */

38
server/proxy/freerdp_proxy.c
View File

@ -32,9 +32,6 @@ int main(int argc, char* argv[])
{
const char* cfg = "config.ini";
int status = 0;
DWORD ld;
UINT32 i;
UINT32 count;
proxyConfig* config = calloc(1, sizeof(proxyConfig));
if (!config)
@ -43,39 +40,10 @@ int main(int argc, char* argv[])
if (argc > 1)
cfg = argv[1];
ld = pf_server_load_config(cfg, config);
switch (ld)
{
case CONFIG_PARSE_SUCCESS:
WLog_DBG(TAG, "Configuration parsed successfully");
break;
case CONFIG_PARSE_ERROR:
WLog_ERR(TAG, "An error occured while parsing configuration file, exiting...");
goto fail;
case CONFIG_INVALID:
goto fail;
}
if (config->WhitelistMode)
{
WLog_INFO(TAG, "Channels mode: WHITELIST");
count = ArrayList_Count(config->AllowedChannels);
for (i = 0; i < count; i++)
WLog_INFO(TAG, "Allowing %s", (char*) ArrayList_GetItem(config->AllowedChannels, i));
}
else
{
WLog_INFO(TAG, "Channels mode: BLACKLIST");
count = ArrayList_Count(config->BlockedChannels);
for (i = 0; i < count; i++)
WLog_INFO(TAG, "Blocking %s", (char*) ArrayList_GetItem(config->BlockedChannels, i));
}
if (!pf_server_config_load(cfg, config))
goto fail;
pf_server_config_print(config);
status = pf_server_start(config);
fail:
pf_server_config_free(config);

29
server/proxy/pf_channels.c
View File

@ -55,25 +55,25 @@ void pf_OnChannelConnectedEventHandler(void* data,
}
else if (strcmp(e->name, RDPGFX_DVC_CHANNEL_NAME) == 0)
{
pc->gfx = (RdpgfxClientContext*) e->pInterface;
pf_rdpgfx_pipeline_init(pc->gfx, ps->gfx, pc->pdata);
if (!ps->gfx->Open(ps->gfx))
{
WLog_ERR(TAG, "failed to open GFX server");
return;
}
pc->gfx = (RdpgfxClientContext*) e->pInterface;
pf_rdpgfx_pipeline_init(pc->gfx, ps->gfx, pc->pdata);
}
else if (strcmp(e->name, DISP_DVC_CHANNEL_NAME) == 0)
{
pc->disp = (DispClientContext*) e->pInterface;
pf_disp_register_callbacks(pc->disp, ps->disp, pc->pdata);
if (ps->disp->Open(ps->disp) != CHANNEL_RC_OK)
{
WLog_ERR(TAG, "failed to open disp channel");
return;
}
pc->disp = (DispClientContext*) e->pInterface;
pf_disp_register_callbacks(pc->disp, ps->disp, pc->pdata);
}
}
@ -108,11 +108,20 @@ void pf_OnChannelDisconnectedEventHandler(void* data,
BOOL pf_server_channels_init(pServerContext* ps)
{
if (!pf_server_rdpgfx_init(ps))
return FALSE;
rdpContext* context = (rdpContext*) ps;
proxyConfig* config = ps->pdata->config;
if (!pf_server_disp_init(ps))
return FALSE;
if (context->settings->SupportGraphicsPipeline && config->GFX)
{
if (!pf_server_rdpgfx_init(ps))
return FALSE;
}
if (config->DisplayControl)
{
if (!pf_server_disp_init(ps))
return FALSE;
}
return TRUE;
}

281
server/proxy/pf_config.c
View File

@ -30,195 +30,174 @@
#define TAG PROXY_TAG("config")
#define CHANNELS_SEPERATOR ","
#define CONFIG_PRINT_SECTION(section) WLog_INFO(TAG, "\t%s:", section)
#define CONFIG_PRINT_STR(config, key) WLog_INFO(TAG, "\t\t%s: %s", #key, config->key)
#define CONFIG_PRINT_BOOL(config, key) WLog_INFO(TAG, "\t\t%s: %s", #key, config->key ? "TRUE" : "FALSE")
#define CONFIG_PRINT_UINT16(config, key) WLog_INFO(TAG, "\t\t%s: %"PRIu16"", #key, config->key);
wArrayList* parse_string_array_from_str(const char* str)
#define CONFIG_GET_STR(ini, section, key) IniFile_GetKeyValueString(ini, section, key)
#define CONFIG_GET_BOOL(ini, section, key) IniFile_GetKeyValueInt(ini, section, key)
static BOOL pf_config_get_uint16(wIniFile* ini, const char* section, const char* key, UINT16* result)
{
wArrayList* list = ArrayList_New(FALSE);
char* s;
char* temp;
char* token;
int val;
if (list == NULL)
val = IniFile_GetKeyValueInt(ini, section, key);
if ((val < 0) || (val > UINT16_MAX))
{
WLog_ERR(TAG, "parse_string_array_from_str(): ArrayList_New failed!");
return NULL;
WLog_ERR(TAG, "pf_config_get_uint16(): invalid value %d for section '%s', key '%s'!", val, section, key);
return FALSE;
}
temp = s = _strdup(str);
if (!s)
{
WLog_ERR(TAG, "parse_string_array_from_str(): strdup failed!");
return NULL;
}
if (s == NULL)
{
WLog_ERR(TAG, "parse_string_array_from_str(): strdup failed!");
goto error;
}
while ((token = StrSep(&temp, CHANNELS_SEPERATOR)) != NULL)
{
char* current_token = _strdup(token);
if (current_token == NULL)
{
WLog_ERR(TAG, "parse_string_array_from_str(): strdup failed!");
goto error;
}
if (ArrayList_Add(list, current_token) < 0)
{
free(current_token);
goto error;
}
}
free(s);
return list;
error:
free(s);
ArrayList_Free(list);
return NULL;
*result = (UINT16) val;
return TRUE;
}
static BOOL pf_server_is_config_valid(proxyConfig* config)
static BOOL pf_config_load_server(wIniFile* ini, proxyConfig* config)
{
if (config->Host == NULL)
{
WLog_ERR(TAG, "Configuration value for `Server.Host` is not valid");
config->Host = _strdup(CONFIG_GET_STR(ini, "Server", "Host"));
config->LocalOnly = CONFIG_GET_BOOL(ini, "Server", "LocalOnly");
if (!pf_config_get_uint16(ini, "Server", "Port", &config->Port))
return FALSE;
}
if (config->Port <= 0)
{
WLog_ERR(TAG, "Configuration value for `Server.Port` is not valid");
return FALSE;
}
if (!config->UseLoadBalanceInfo)
{
if (config->TargetHost == NULL)
{
WLog_ERR(TAG, "Configuration value for `Target.Host` is not valid");
return FALSE;
}
if (config->TargetPort <= 0)
{
WLog_ERR(TAG, "Configuration value for `Target.Port` is not valid");
return FALSE;
}
}
return TRUE;
}
DWORD pf_server_load_config(const char* path, proxyConfig* config)
static BOOL pf_config_load_target(wIniFile* ini, proxyConfig* config)
{
config->TargetHost = _strdup(CONFIG_GET_STR(ini, "Target", "Host"));
config->UseLoadBalanceInfo = CONFIG_GET_BOOL(ini, "Target", "UseLoadBalanceInfo");
if (pf_config_get_uint16(ini, "Target", "Port", &config->TargetPort))
return TRUE;
return FALSE;
}
static BOOL pf_config_load_channels(wIniFile* ini, proxyConfig* config)
{
config->GFX = CONFIG_GET_BOOL(ini, "Channels", "GFX");
config->DisplayControl = CONFIG_GET_BOOL(ini, "Channels", "DisplayControl");
return TRUE;
}
static BOOL pf_config_load_input(wIniFile* ini, proxyConfig* config)
{
config->Keyboard = CONFIG_GET_BOOL(ini, "Input", "Keyboard");
config->Mouse = CONFIG_GET_BOOL(ini, "Input", "Mouse");
return TRUE;
}
static BOOL pf_config_load_security(wIniFile* ini, proxyConfig* config)
{
config->TlsSecurity = CONFIG_GET_BOOL(ini, "Security", "TlsSecurity");
config->NlaSecurity = CONFIG_GET_BOOL(ini, "Security", "NlaSecurity");
config->RdpSecurity = CONFIG_GET_BOOL(ini, "Security", "RdpSecurity");
return TRUE;
}
static BOOL pf_config_load_filters(wIniFile* ini, proxyConfig* config)
{
const char* input;
char** filters_names;
int rc;
int filters_count = 0;
UINT32 index;
DWORD result = CONFIG_PARSE_ERROR;
wIniFile* ini = IniFile_New();
if (!ini)
return CONFIG_PARSE_ERROR;
if (IniFile_ReadFile(ini, path) < 0)
goto out;
/* server */
config->Host = _strdup(IniFile_GetKeyValueString(ini, "Server", "Host"));
config->LocalOnly = IniFile_GetKeyValueInt(ini, "Server", "LocalOnly");
rc = IniFile_GetKeyValueInt(ini, "Server", "Port");
if ((rc < 0) || (rc > UINT16_MAX))
goto out;
config->Port = (UINT16)rc;
/* target */
config->UseLoadBalanceInfo = IniFile_GetKeyValueInt(ini, "Target", "UseLoadBalanceInfo");
config->TargetHost = _strdup(IniFile_GetKeyValueString(ini, "Target", "Host"));
rc = IniFile_GetKeyValueInt(ini, "Target", "Port");
if ((rc < 0) || (rc > UINT16_MAX))
goto out;
config->TargetPort = (UINT16)rc;
/* graphics */
config->GFX = IniFile_GetKeyValueInt(ini, "Graphics", "GFX");
config->BitmapUpdate = IniFile_GetKeyValueInt(ini, "Graphics", "BitmapUpdate");
/* input */
config->Keyboard = IniFile_GetKeyValueInt(ini, "Input", "Keyboard");
config->Mouse = IniFile_GetKeyValueInt(ini, "Input", "Mouse");
/* security */
config->TlsSecurity = IniFile_GetKeyValueInt(ini, "Security", "TlsSecurity");
config->NlaSecurity = IniFile_GetKeyValueInt(ini, "Security", "NlaSecurity");
config->RdpSecurity = IniFile_GetKeyValueInt(ini, "Security", "RdpSecurity");
/* channels filtering */
config->WhitelistMode = IniFile_GetKeyValueInt(ini, "Channels", "WhitelistMode");
input = IniFile_GetKeyValueString(ini, "Channels", "AllowedChannels");
/* filters api */
if (input)
{
config->AllowedChannels = parse_string_array_from_str(input);
if (config->AllowedChannels == NULL)
goto out;
}
input = IniFile_GetKeyValueString(ini, "Channels", "DeniedChannels");
if (input)
{
config->BlockedChannels = parse_string_array_from_str(input);
if (config->BlockedChannels == NULL)
goto out;
}
result = CONFIG_PARSE_SUCCESS;
int filters_count;
char** filters_names;
if (!pf_filters_init(&config->Filters))
goto out;
return FALSE;
filters_names = IniFile_GetSectionKeyNames(ini, "Filters", &filters_count);
for (index = 0; index < filters_count; index++)
{
char* filter_name = filters_names[index];
const char* path = IniFile_GetKeyValueString(ini, "Filters", filter_name);
const char* path = CONFIG_GET_STR(ini, "Filters", filter_name);
if (!pf_filters_register_new(config->Filters, path, filter_name))
{
WLog_DBG(TAG, "pf_server_load_config(): failed to register %s (%s)", filter_name, path);
}
else
{
WLog_DBG(TAG, "pf_server_load_config(): registered filter %s (%s) successfully", filter_name, path);
WLog_DBG(TAG, "pf_config_load_filters(): failed to register %s (%s)", filter_name, path);
continue;
}
WLog_DBG(TAG, "pf_config_load_filters(): filter %s is registered", filter_name);
}
return TRUE;
}
BOOL pf_server_config_load(const char* path, proxyConfig* config)
{
BOOL ok = FALSE;
wIniFile* ini = IniFile_New();
if (!ini)
{
WLog_ERR(TAG, "pf_server_load_config(): IniFile_New() failed!");
return FALSE;
}
if (IniFile_ReadFile(ini, path) < 0)
{
WLog_ERR(TAG, "pf_server_load_config(): IniFile_ReadFile() failed!");
goto out;
}
if (!pf_config_load_server(ini, config))
goto out;
if (!pf_config_load_target(ini, config))
goto out;
if (!pf_config_load_channels(ini, config))
goto out;
if (!pf_config_load_input(ini, config))
goto out;
if (!pf_config_load_security(ini, config))
goto out;
if (!pf_config_load_filters(ini, config))
goto out;
ok = TRUE;
out:
IniFile_Free(ini);
return ok;
}
if (!pf_server_is_config_valid(config))
return CONFIG_INVALID;
void pf_server_config_print(proxyConfig* config)
{
WLog_INFO(TAG, "Proxy configuration:");
return result;
CONFIG_PRINT_SECTION("Server");
CONFIG_PRINT_STR(config, Host);
CONFIG_PRINT_UINT16(config, Port);
if (!config->UseLoadBalanceInfo)
{
CONFIG_PRINT_SECTION("Target");
CONFIG_PRINT_STR(config, TargetHost);
CONFIG_PRINT_UINT16(config, TargetPort);
}
CONFIG_PRINT_SECTION("Input");
CONFIG_PRINT_BOOL(config, Keyboard);
CONFIG_PRINT_BOOL(config, Mouse);
CONFIG_PRINT_SECTION("Security");
CONFIG_PRINT_BOOL(config, NlaSecurity);
CONFIG_PRINT_BOOL(config, TlsSecurity);
CONFIG_PRINT_BOOL(config, RdpSecurity);
CONFIG_PRINT_SECTION("Channels");
CONFIG_PRINT_BOOL(config, GFX);
CONFIG_PRINT_BOOL(config, DisplayControl);
}
void pf_server_config_free(proxyConfig* config)
{
pf_filters_unregister_all(config->Filters);
ArrayList_Free(config->AllowedChannels);
ArrayList_Free(config->BlockedChannels);
free(config->TargetHost);
free(config->Host);
free(config);

17
server/proxy/pf_config.h
View File

@ -22,10 +22,6 @@
#ifndef FREERDP_SERVER_PROXY_PFCONFIG_H
#define FREERDP_SERVER_PROXY_PFCONFIG_H
#define CONFIG_PARSE_SUCCESS 0
#define CONFIG_PARSE_ERROR 1
#define CONFIG_INVALID 2
#include <winpr/ini.h>
#include "pf_filters.h"
@ -42,10 +38,6 @@ struct proxy_config
char* TargetHost;
UINT16 TargetPort;
/* graphics */
BOOL GFX;
BOOL BitmapUpdate;
/* input */
BOOL Keyboard;
BOOL Mouse;
@ -56,10 +48,8 @@ struct proxy_config
BOOL RdpSecurity;
/* channels */
BOOL WhitelistMode;
wArrayList* AllowedChannels;
wArrayList* BlockedChannels;
BOOL GFX;
BOOL DisplayControl;
/* filters */
filters_list* Filters;
@ -67,7 +57,8 @@ struct proxy_config
typedef struct proxy_config proxyConfig;
DWORD pf_server_load_config(const char* path, proxyConfig* config);
BOOL pf_server_config_load(const char* path, proxyConfig* config);
void pf_server_config_print(proxyConfig* config);
void pf_server_config_free(proxyConfig* config);
#endif /* FREERDP_SERVER_PROXY_PFCONFIG_H */

4
server/proxy/pf_server.c
View File

@ -245,9 +245,9 @@ static DWORD WINAPI pf_server_handle_client(LPVOID arg)
goto out_free_peer;
}
client->settings->SupportDisplayControl = TRUE;
client->settings->SupportDisplayControl = config->DisplayControl;
client->settings->DynamicResolutionUpdate = config->DisplayControl;
client->settings->SupportMonitorLayoutPdu = TRUE;
client->settings->DynamicResolutionUpdate = TRUE;
client->settings->RdpSecurity = config->RdpSecurity;
client->settings->TlsSecurity = config->TlsSecurity;
client->settings->NlaSecurity = config->NlaSecurity;