morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[client,common] initialize sso-mib late

Browse Source 
Only initialize the sso-mib library when a token is requested for the
first time. This allows proper rdpSettings initialization in PreConnect.
This commit is contained in:
Armin Novak
2025-05-21 13:35:18 +02:00
parent 39f7972b28
commit 66a69a26e2
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/common/client.c
View File

@@ -199,16 +199,7 @@ int freerdp_client_start(rdpContext* context)
client_context->mibClientWrapper = (MIBClientWrapper*)calloc(1, sizeof(MIBClientWrapper));
if (!client_context->mibClientWrapper)
return ERROR_NOT_ENOUGH_MEMORY;
const char* client_id =
freerdp_settings_get_string(context->settings, FreeRDP_GatewayAvdClientID);
client_context->mibClientWrapper->app =
mib_public_client_app_new(client_id, MIB_AUTHORITY_COMMON, NULL, NULL);
if (!client_context->mibClientWrapper->app)
{
free(client_context->mibClientWrapper);
client_context->mibClientWrapper = NULL;
return ERROR_INTERNAL_ERROR;
}
client_context->mibClientWrapper->GetCommonAccessToken =
freerdp_get_common_access_token(context);
if (!freerdp_set_common_access_token(context, sso_mib_get_access_token))
@@ -227,15 +218,20 @@ int freerdp_client_stop(rdpContext* context)
if (!context || !context->instance || !context->instance->pClientEntryPoints)
return ERROR_BAD_ARGUMENTS;
pEntryPoints = context->instance->pClientEntryPoints;
const int rc = IFCALLRESULT(CHANNEL_RC_OK, pEntryPoints->ClientStop, context);
#ifdef WITH_SSO_MIB
rdpClientContext* client_context = (rdpClientContext*)context;
if (client_context->mibClientWrapper->app)
g_object_unref(client_context->mibClientWrapper->app);
free(client_context->mibClientWrapper);
#endif
pEntryPoints = context->instance->pClientEntryPoints;
return IFCALLRESULT(CHANNEL_RC_OK, pEntryPoints->ClientStop, context);
if (client_context->mibClientWrapper)
{
if (client_context->mibClientWrapper->app)
g_object_unref(client_context->mibClientWrapper->app);
free(client_context->mibClientWrapper);
}
client_context->mibClientWrapper = NULL;
#endif // WITH_SSO_MIB
return rc;
}
freerdp* freerdp_client_get_instance(rdpContext* context)

12
client/common/sso_mib_tokens.c
View File

@@ -123,6 +123,18 @@ BOOL sso_mib_get_access_token(rdpContext* context, AccessTokenType tokenType, ch
BOOL rc = FALSE;
rdpClientContext* client_context = (rdpClientContext*)context;
WINPR_ASSERT(client_context);
WINPR_ASSERT(client_context->mibClientWrapper);
if (!client_context->mibClientWrapper->app)
{
const char* client_id =
freerdp_settings_get_string(context->settings, FreeRDP_GatewayAvdClientID);
client_context->mibClientWrapper->app =
mib_public_client_app_new(client_id, MIB_AUTHORITY_COMMON, NULL, NULL);
}
if (!client_context->mibClientWrapper->app)
return ERROR_INTERNAL_ERROR;
const char* scope = NULL;
const char* req_cnf = NULL;