b907324009
* server: Add proxy dir with barebones server * sever/proxy: Remove licensing * server/proxy: Add client files * server/proxy: rm binary * server/proxy: Formatting * server/proxy: Fixed includes and added basic client creation functionality * server/proxy: Remove licensing and fix ifndef * proxy/server: Fix cmake indentation * server/proxy: Fix licensing * server/proxy: Forward connection on peer_post_connect * server/proxy: Fix function signature * server/proxy: Changed function signature of proxy_client_start * server/proxy: Now peer_post_connect calls proxy_client_start in a new thread * pfreerdp.c: Clean up useless comments and logs * server/proxy: Fix license * server/proxy: Remove all non-connection related data from proxy_context * server/proxy: Move Log Tag definition to pf_log.h * server/proxy: Move context definition to pf_context * server/proxy: Delete pfreerdp.h * pfreerdp.c: Move context callbacks to pf_context.c * server/proxy: Update CMakeLists.txt * pf_channels: Use new proxy context API * pf_client: Move context to pf_context * pf_client.c: Remove unnessecary event handling * server/proxy: Formatting * proxy/server: Move server logic to pf_server.c * server/proxy: Handle client disconnection * Merge stash * pf_server.c: Open GFX Connection to client * server: CMakeLists: build proxy along with other servers * server: proxy: get target server from rdpNego->RoutingToken Iv'e omitted a check from which im not sure is right. Should check in docs * server/proxy: Handle remote server -> client disconnection * server/proxy: Move common function to pf_common.c * server/proxy: Move common function to pf_common.c * rdpgfx.h: Add reference to freerdp.h for rdpContext * pf_channels: Pipe GFX on channel connection * server/proxy: Add pf_rdpgfx for proxy gfx callbacks * pf_client: Declare dynvc and gfx capabilities on connection * server/proxy: Add graphics callbacks * server/proxy: Add graphics callbacks * pf_server: Listen to channel events * Pass user settings to server * pf_server: Proxy mouse events * fixup! server/proxy: Add graphics callbacks * pf_client: Fix setting initialization * Merge feat/proxy-gfx to feat/proxy * pf_server: Fix double freed credentials * server/proxy: Remove unnecessary call to freerdp_client_settings_parse_command_line * server/proxy: Refactor re-activation code * server/proxy: Run format scripts * server/proxy: Fix segfault when post_disconnect return FALSE * server/proxy: Refactor proxy_settings_mirror * server/proxy: Redirect credentials * server/proxy: move proxy_settings_mirror to pf_common.c * server/proxy: Redirect desktop_resize event * pf_client: Remove interactive CLI auth methods * fixup! server/proxy: Redirect credentials * server/proxy: Rename proxy_mirror_settings to pf_common_copy_settings * pf_server.c: Fixed non-freed context When the disconnection is forced by the target server, the function `pf_server_handle_client_disconnection` isn't called. Therefore, the context of the connection between the proxy to tagrget isn't freed. * fixup! pf_server.c: Fixed non-freed context * pf_client: Prefix all client methods with pf_client * pf_context: Add init client to proxy context method * pf_server: Confirm all GFX caps regardless of settings * pf_server: Prefix all methods with pf_server * pf_server: Move variable decleration to start of method * pf_server: Fix client setting * pf_server: Fix GFX init method * pf_server: Move variable decleration to start of methods * server/proxy: Formatting * Merge feat/proxy * pf_server: Proxy synchronize event * pf_server: Proxy refresh rect update events * pf_server: Proxy suppress output messages * server/proxy: Fix licensing * server/proxy: Move client input callbacks to pf_input * server/proxy: Move client update callbacks to pf_update * server/proxy: Fix non-terminated target host string * Feat/proxy config (#2) * server/proxy: Add config loading support * server/proxy: Add config file * server/proxy: Format code * server/proxy: Code refactor, rename update_register_callbacks and input_register_callbacks * server/proxy: Update config file * server/proxy: Remove config.ini from root directory * Remove comment from config file * server/proxy: Fix leak in pf_server_load_config * server/proxy: Add rdpServerProxy struct and embed it in proxyContext * server/proxy: Load configuration and pass it inside every proxyContext instance * server/proxy: Move rdpProxyServer to proxy.h * server/proxy: Use configuration while proxying input events * server/proxy: Update CMakeLists * server/proxy: Refactor pf_input.c * server/proxy: Add AllowedChannels, DeniedChannels in configuration * server/proxy: Remove unnecessary variable from parse_channels_from_str * server/proxy: Update config file * server/proxy: config: Rename to * server/proxy: config: Add mode - blacklist/whitelist * server/proxy: Refactor, fix NULL deref * server/proxy: Add license to proxy.h * server/proxy: Fix newline in pf_config.c * server/proxy: config: Rename Mode to WhitelistMode * Add target in config. Add checks for configuration validity (#3) * Add target in config. Add checks for configuration validity * Update config file * libfreerdp: nego: revert commented out check of routingToken length * pf_server: Fix target host info from RoutingToken * pf_server: Remove hardcoded lenght of routing token prefix * Feat/refactor context (#8) * Refactor main structs * Update CMakeLists.txt * pf_server.c: Free pdata at the end of the connection * Run format scripts * Rename tf to pc * Fix licenses * pf_server: Refactor names of structs and functions * proxy: gfx: sync caps (#4) * proxy: gfx: sync caps * proxy: gfx: sync caps, hook gfx client's OnClose() call and close server resources * fixup! Feat/refactor context (#8) * fixup! fixup! Feat/refactor context (#8) * rdpgfx/client: Fix rdpgfx_recv_caps_confirm_pdu caps set length parsing * Run format scripts * proxy config.ini: Change default port to 3389 * pf_rdpgfx: Limit caps version to freerdp's supported versions * Gfx OnOpen() wait for dynvc ready (#10) * proxy/gfx: Wait for dynvc ready state before open * pf_channels: Initialize pc->gfx * pf_rdpgfx: Add log and fix comments * rdpgfx: Fix GFX v10.6 PDUs parsing and naming according to the spec * pf_rdpgfx: Proxy rdpgfx v10.6 PDUs * gfx client: Publish FrameAck sending and add auto ack flag * proxy/gfx: Forward frame ack messages * pf_context: Forward domain on connection * pf_rdpgfx: Change max supported caps to 10.6 * proxy: Update config * server/proxy: Use configuration in pf_server_handle_client * rdpgfx/client: Fix size of surface_to_scaled_window, surface_to_window * pf_rdpgfx: Fix formatting * pf_server.c: Fix comments * Move pf_server_rdpgfx_init to pf_rdpgfx * server/proxy/CMakeLists.txt: Fix formatting * pf_client.c: Add comment in proxy_server_reactivate * Fixed const correctness of gfx function pointer Signed-off-by: Mati Shabtay <matishabtay@gmail.com> * server: proxy: update copyright * server: proxy: wrap rdpNego and add a getter for routing token * Refactor routing token getter (#14) * Refactor routing token getter * pf_server_parse_target_from_routing_token change routing_token_length to be DWORD * libfreerdp/core/nego.c: Run format script * pf_server: Run format script * server/proxy: Fix os msbuild tests * pf_channels.c: Remove unused channels * pf_client: Remove unused callbacks * proxy: Remove encomsp callbacks from proxy's client * client/rdpgfx_main.c: Fix msbuild test * pf_config.c: Use StrSep instead of strsep for Windows builds * Removed nego struct from direct access. Signed-off-by: Mati Shabtay <matishabtay@gmail.com> * proxy: Rename binary to freerdp-proxy * rdpgfx_main.c: Revert unwanted double change to send_supported_caps * Cleaned up proxy server code. * All internal functions static * Added simple command line argument to supply a config file * Silence compiler warnings Signed-off-by: kubistika <kmizrachi18@gmail.com>
189 lines
4.7 KiB
C
189 lines
4.7 KiB
C
/**
|
|
* FreeRDP: A Remote Desktop Protocol Implementation
|
|
* FreeRDP Proxy Server
|
|
*
|
|
* Copyright 2019 Mati Shabtay <matishabtay@gmail.com>
|
|
* Copyright 2019 Kobi Mizrachi <kmizrachi18@gmail.com>
|
|
* Copyright 2019 Idan Freiberg <speidy@gmail.com>
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <winpr/crt.h>
|
|
#include "pf_log.h"
|
|
#include "pf_server.h"
|
|
#include "pf_config.h"
|
|
|
|
#define TAG PROXY_TAG("config")
|
|
|
|
#define CHANNELS_SEPERATOR ","
|
|
|
|
static char** parse_channels_from_str(const char* str, UINT32* length)
|
|
{
|
|
char* s = strdup(str);
|
|
size_t tokens_alloc = 1;
|
|
size_t tokens_count = 0;
|
|
char** tokens = calloc(tokens_alloc, sizeof(char*));
|
|
char* token;
|
|
|
|
while ((token = StrSep(&s, CHANNELS_SEPERATOR)) != NULL)
|
|
{
|
|
if (tokens_count == tokens_alloc)
|
|
{
|
|
tokens_alloc *= 2;
|
|
tokens = realloc(tokens, tokens_alloc * sizeof(char*));
|
|
}
|
|
|
|
tokens[tokens_count++] = strdup(token);
|
|
}
|
|
|
|
if ((tokens_count == 0) || (tokens_count > UINT32_MAX))
|
|
{
|
|
free(tokens);
|
|
tokens = NULL;
|
|
tokens_count = 0;
|
|
}
|
|
else
|
|
{
|
|
tokens = realloc(tokens, tokens_count * sizeof(char*));
|
|
}
|
|
|
|
*length = (DWORD)tokens_count;
|
|
free(s);
|
|
return tokens;
|
|
}
|
|
|
|
static BOOL pf_server_is_config_valid(proxyConfig* config)
|
|
{
|
|
if (config->Host == NULL)
|
|
{
|
|
WLog_ERR(TAG, "Configuration value for `Server.Host` is not valid");
|
|
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)
|
|
{
|
|
const char* input;
|
|
int rc;
|
|
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");
|
|
|
|
if (input)
|
|
{
|
|
config->AllowedChannels = parse_channels_from_str(input, &config->AllowedChannelsCount);
|
|
|
|
if (config->AllowedChannels == NULL)
|
|
goto out;
|
|
}
|
|
|
|
input = IniFile_GetKeyValueString(ini, "Channels", "DeniedChannels");
|
|
|
|
if (input)
|
|
{
|
|
config->BlockedChannels = parse_channels_from_str(input, &config->BlockedChannelsCount);
|
|
|
|
if (config->BlockedChannels == NULL)
|
|
goto out;
|
|
}
|
|
|
|
result = CONFIG_PARSE_SUCCESS;
|
|
out:
|
|
IniFile_Free(ini);
|
|
|
|
if (!pf_server_is_config_valid(config))
|
|
return CONFIG_INVALID;
|
|
|
|
return result;
|
|
}
|
|
|
|
void pf_server_config_free(proxyConfig* config)
|
|
{
|
|
UINT32 i;
|
|
|
|
for (i = 0; i < config->AllowedChannelsCount; i++)
|
|
free(config->AllowedChannels[i]);
|
|
|
|
for (i = 0; i < config->BlockedChannelsCount; i++)
|
|
free(config->BlockedChannels[i]);
|
|
|
|
free(config->AllowedChannels);
|
|
free(config->BlockedChannels);
|
|
free(config->TargetHost);
|
|
free(config->Host);
|
|
free(config);
|
|
}
|