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>
107 lines
4.7 KiB
C
107 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 "pf_common.h"
|
|
|
|
BOOL pf_common_connection_aborted_by_peer(proxyData* pdata)
|
|
{
|
|
return WaitForSingleObject(pdata->connectionClosed, 0) == WAIT_OBJECT_0;
|
|
}
|
|
|
|
void pf_common_copy_settings(rdpSettings* dst, rdpSettings* src)
|
|
{
|
|
/* Client/server CORE options */
|
|
dst->RdpVersion = src->RdpVersion;
|
|
dst->DesktopWidth = src->DesktopWidth;
|
|
dst->DesktopHeight = src->DesktopHeight;
|
|
dst->ColorDepth = src->ColorDepth;
|
|
dst->ConnectionType = src->ConnectionType;
|
|
dst->ClientBuild = src->ClientBuild;
|
|
dst->ClientHostname = _strdup(src->ClientHostname);
|
|
dst->ClientProductId = _strdup(src->ClientProductId);
|
|
dst->EarlyCapabilityFlags = src->EarlyCapabilityFlags;
|
|
dst->NetworkAutoDetect = src->NetworkAutoDetect;
|
|
dst->SupportAsymetricKeys = src->SupportAsymetricKeys;
|
|
dst->SupportErrorInfoPdu = src->SupportErrorInfoPdu;
|
|
dst->SupportStatusInfoPdu = src->SupportStatusInfoPdu;
|
|
dst->SupportMonitorLayoutPdu = src->SupportMonitorLayoutPdu;
|
|
dst->SupportGraphicsPipeline = src->SupportGraphicsPipeline;
|
|
dst->SupportDynamicTimeZone = src->SupportDynamicTimeZone;
|
|
dst->SupportHeartbeatPdu = src->SupportHeartbeatPdu;
|
|
dst->DesktopPhysicalWidth = src->DesktopPhysicalWidth;
|
|
dst->DesktopPhysicalHeight = src->DesktopPhysicalHeight;
|
|
dst->DesktopOrientation = src->DesktopOrientation;
|
|
dst->DesktopScaleFactor = src->DesktopScaleFactor;
|
|
dst->DeviceScaleFactor = src->DeviceScaleFactor;
|
|
/* client info */
|
|
dst->AutoLogonEnabled = src->AutoLogonEnabled;
|
|
dst->CompressionEnabled = src->CompressionEnabled;
|
|
dst->DisableCtrlAltDel = src->DisableCtrlAltDel;
|
|
dst->EnableWindowsKey = src->EnableWindowsKey;
|
|
dst->MaximizeShell = src->MaximizeShell;
|
|
dst->LogonNotify = src->LogonNotify;
|
|
dst->LogonErrors = src->LogonErrors;
|
|
dst->MouseAttached = src->MouseAttached;
|
|
dst->MouseHasWheel = src->MouseHasWheel;
|
|
dst->RemoteConsoleAudio = src->RemoteConsoleAudio;
|
|
dst->AudioPlayback = src->AudioPlayback;
|
|
dst->AudioCapture = src->AudioCapture;
|
|
dst->VideoDisable = src->VideoDisable;
|
|
dst->PasswordIsSmartcardPin = src->PasswordIsSmartcardPin;
|
|
dst->UsingSavedCredentials = src->UsingSavedCredentials;
|
|
dst->ForceEncryptedCsPdu = src->ForceEncryptedCsPdu;
|
|
dst->HiDefRemoteApp = src->HiDefRemoteApp;
|
|
dst->CompressionLevel = src->CompressionLevel;
|
|
dst->PerformanceFlags = src->PerformanceFlags;
|
|
dst->AllowFontSmoothing = src->AllowFontSmoothing;
|
|
dst->DisableWallpaper = src->DisableWallpaper;
|
|
dst->DisableFullWindowDrag = src->DisableFullWindowDrag;
|
|
dst->DisableMenuAnims = src->DisableMenuAnims;
|
|
dst->DisableThemes = src->DisableThemes;
|
|
dst->DisableCursorShadow = src->DisableCursorShadow;
|
|
dst->DisableCursorBlinking = src->DisableCursorBlinking;
|
|
dst->AllowDesktopComposition = src->AllowDesktopComposition;
|
|
dst->DisableThemes = src->DisableThemes;
|
|
/* Remote App */
|
|
dst->RemoteApplicationMode = src->RemoteApplicationMode;
|
|
dst->RemoteApplicationName = src->RemoteApplicationName;
|
|
dst->RemoteApplicationIcon = src->RemoteApplicationIcon;
|
|
dst->RemoteApplicationProgram = src->RemoteApplicationProgram;
|
|
dst->RemoteApplicationFile = src->RemoteApplicationFile;
|
|
dst->RemoteApplicationGuid = src->RemoteApplicationGuid;
|
|
dst->RemoteApplicationCmdLine = src->RemoteApplicationCmdLine;
|
|
dst->RemoteApplicationExpandCmdLine = src->RemoteApplicationExpandCmdLine;
|
|
dst->RemoteApplicationExpandWorkingDir = src->RemoteApplicationExpandWorkingDir;
|
|
dst->DisableRemoteAppCapsCheck = src->DisableRemoteAppCapsCheck;
|
|
dst->RemoteAppNumIconCaches = src->RemoteAppNumIconCaches;
|
|
dst->RemoteAppNumIconCacheEntries = src->RemoteAppNumIconCacheEntries;
|
|
dst->RemoteAppLanguageBarSupported = src->RemoteAppLanguageBarSupported;
|
|
dst->RemoteWndSupportLevel = src->RemoteWndSupportLevel;
|
|
/* GFX */
|
|
dst->GfxThinClient = src->GfxThinClient;
|
|
dst->GfxSmallCache = src->GfxSmallCache;
|
|
dst->GfxProgressive = src->GfxProgressive;
|
|
dst->GfxProgressiveV2 = src->GfxProgressiveV2;
|
|
dst->GfxH264 = src->GfxH264;
|
|
dst->GfxAVC444 = src->GfxAVC444;
|
|
dst->GfxSendQoeAck = src->GfxSendQoeAck;
|
|
dst->GfxAVC444v2 = src->GfxAVC444v2;
|
|
} |