TS Gateway Support (working!)

client/common/cmdline.c

@@ -1298,6 +1298,20 @@ int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettin
 	if (settings->DisableThemes)
 		settings->PerformanceFlags |= PERF_DISABLE_THEMING;
 
+	arg = CommandLineFindArgumentA(args, "p");
+
+	if (arg->Flags & COMMAND_LINE_ARGUMENT_PRESENT)
+	{
+		FillMemory(arg->Value, strlen(arg->Value), '*');
+	}
+
+	arg = CommandLineFindArgumentA(args, "gp");
+
+	if (arg->Flags & COMMAND_LINE_ARGUMENT_PRESENT)
+	{
+		FillMemory(arg->Value, strlen(arg->Value), '*');
+	}
+
 	return 1;
 }
 

libfreerdp/core/CMakeLists.txt

@@ -25,9 +25,6 @@ include_directories(${ZLIB_INCLUDE_DIRS})
 
 set(${MODULE_PREFIX}_GATEWAY_DIR "gateway")
 
-include_directories(".")
-include_directories(${${MODULE_PREFIX}_GATEWAY_DIR})
-
 set(${MODULE_PREFIX}_GATEWAY_SRCS
 	${${MODULE_PREFIX}_GATEWAY_DIR}/tsg.c
 	${${MODULE_PREFIX}_GATEWAY_DIR}/tsg.h

libfreerdp/core/connection.c

@@ -104,6 +104,7 @@ BOOL rdp_client_connect(rdpRdp* rdp)
 		cookie[cookie_length] = '\0';
 
 		nego_set_cookie(rdp->nego, cookie);
+		free(cookie);
 
 		settings->RdpSecurity = TRUE;
 		settings->TlsSecurity = FALSE;

libfreerdp/core/gateway/http.c

@@ -108,7 +108,9 @@ void http_context_free(HttpContext* http_context)
 	{
 		free(http_context->UserAgent);
 		free(http_context->Host);
+		free(http_context->URI);
 		free(http_context->Accept);
+		free(http_context->Method);
 		free(http_context->CacheControl);
 		free(http_context->Connection);
 		free(http_context->Pragma);
@@ -267,6 +269,10 @@ void http_request_free(HttpRequest* http_request)
 {
 	if (http_request != NULL)
 	{
+		free(http_request->AuthParam);
+		free(http_request->AuthScheme);
+		free(http_request->Authorization);
+		free(http_request->Content);
 		free(http_request->Method);
 		free(http_request->URI);
 		free(http_request);
@@ -397,10 +403,12 @@ HttpResponse* http_response_recv(rdpTls* tls)
 
 	nbytes = 0;
 	length = 10000;
+	content = NULL;
 	buffer = malloc(length);
 	http_response = http_response_new();
 
 	p = buffer;
+	http_response->ContentLength = 0;
 
 	while (TRUE)
 	{

libfreerdp/core/gateway/ncacn_http.c

@@ -159,6 +159,8 @@ BOOL rpc_ntlm_http_in_connect(rdpRpc* rpc)
 	ntlm_client_uninit(ntlm);
 	ntlm_free(ntlm);
 
+	rpc->NtlmHttpIn->ntlm = NULL;
+
 	return TRUE;
 }
 
@@ -276,5 +278,7 @@ void ntlm_http_free(rdpNtlmHttp* ntlm_http)
 	{
 		ntlm_free(ntlm_http->ntlm);
 		http_context_free(ntlm_http->context);
+
+		free(ntlm_http);
 	}
 }

libfreerdp/core/gateway/ntlm.c

@@ -195,6 +195,12 @@ BOOL ntlm_authenticate(rdpNtlm* ntlm)
 {
 	SECURITY_STATUS status;
 
+	if (ntlm->outputBuffer.pvBuffer)
+	{
+		free(ntlm->outputBuffer.pvBuffer);
+		ntlm->outputBuffer.pvBuffer = NULL;
+	}
+
 	ntlm->outputBufferDesc.ulVersion = SECBUFFER_VERSION;
 	ntlm->outputBufferDesc.cBuffers = 1;
 	ntlm->outputBufferDesc.pBuffers = &ntlm->outputBuffer;
@@ -235,6 +241,11 @@ BOOL ntlm_authenticate(rdpNtlm* ntlm)
 			status = SEC_I_CONTINUE_NEEDED;
 	}
 
+	if (ntlm->haveInputBuffer)
+	{
+		free(ntlm->inputBuffer.pvBuffer);
+	}
+
 	ntlm->haveInputBuffer = TRUE;
 	ntlm->haveContext = TRUE;
 
@@ -243,8 +254,14 @@ BOOL ntlm_authenticate(rdpNtlm* ntlm)
 
 void ntlm_client_uninit(rdpNtlm* ntlm)
 {
+	free(ntlm->identity.User);
+	free(ntlm->identity.Domain);
+	free(ntlm->identity.Password);
+	free(ntlm->ServicePrincipalName);
+
 	ntlm->table->FreeCredentialsHandle(&ntlm->credentials);
 	ntlm->table->FreeContextBuffer(ntlm->pPackageInfo);
+	ntlm->table->DeleteSecurityContext(&ntlm->context);
 }
 
 rdpNtlm* ntlm_new()
@@ -263,6 +280,6 @@ void ntlm_free(rdpNtlm* ntlm)
 {
 	if (ntlm != NULL)
 	{
-
+		free(ntlm);
 	}
 }

libfreerdp/core/gateway/ntlm.h

@@ -25,10 +25,11 @@
 typedef struct rdp_ntlm rdpNtlm;
 typedef struct rdp_ntlm_http rdpNtlmHttp;
 
-#include "tcp.h"
+#include "../tcp.h"
+#include "../transport.h"
+
 #include "rts.h"
 #include "http.h"
-#include "transport.h"
 
 #include <time.h>
 #include <winpr/sspi.h>