mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

1.0.4

This commit is contained in:
DavidXanatos 2021-12-20 22:59:32 +01:00
parent 8baaa364b3
commit 20cf67307a
3 changed files with 68 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
Sandboxie/core/dll/rpcrt.c
View File

@ -507,6 +507,40 @@ _FX NTSTATUS RpcRt_FindModulePreset(
}
//---------------------------------------------------------------------------
// StoreLpcPortName
//---------------------------------------------------------------------------
const WCHAR* StoreLpcPortName(const WCHAR* wszPortId, const WCHAR* wszPortName)
{
IPC_DYNAMIC_PORT* port = List_Head(&Ipc_DynamicPortNames);
while (port)
{
if (_wcsicmp(wszPortId, port->wstrPortId) == 0)
{
wmemcpy(port->wstrPortName, wszPortName, DYNAMIC_PORT_NAME_CHARS);
break;
}
port = List_Next(port);
}
if (port == NULL)
{
port = (IPC_DYNAMIC_PORT*)Dll_Alloc(sizeof(IPC_DYNAMIC_PORT));
if (port)
{
wmemcpy(port->wstrPortId, wszPortId, DYNAMIC_PORT_ID_CHARS);
wmemcpy(port->wstrPortName, wszPortName, DYNAMIC_PORT_NAME_CHARS);
List_Insert_After(&Ipc_DynamicPortNames, NULL, port);
}
}
return port ? port->wstrPortName : NULL;
}
//---------------------------------------------------------------------------
// GetDynamicLpcPortName
//---------------------------------------------------------------------------
@ -539,33 +573,10 @@ WCHAR* GetDynamicLpcPortName(const WCHAR* wszPortId)
if (rpl && NT_SUCCESS(rpl->h.status))
{
IPC_DYNAMIC_PORT* port = List_Head(&Ipc_DynamicPortNames);
while (port)
{
if (_wcsicmp(req.wszPortId, port->wstrPortId) == 0)
{
wmemcpy(port->wstrPortName, rpl->wszPortName, DYNAMIC_PORT_NAME_CHARS);
break;
}
port = List_Next(port);
}
if (port == NULL)
{
port = (IPC_DYNAMIC_PORT*)Dll_Alloc(sizeof(IPC_DYNAMIC_PORT));
if (port)
{
wmemcpy(port->wstrPortId, req.wszPortId, DYNAMIC_PORT_ID_CHARS);
wmemcpy(port->wstrPortName, rpl->wszPortName, DYNAMIC_PORT_NAME_CHARS);
List_Insert_After(&Ipc_DynamicPortNames, NULL, port);
}
}
WCHAR* port = StoreLpcPortName(req.wszPortId, rpl->wszPortName);
Dll_Free(rpl);
if(port)
return port->wstrPortName + 13; // skip "\\RPC Control\\"
return port + 13; // skip "\\RPC Control\\"
}
return NULL;
@ -722,26 +733,30 @@ _FX ULONG RpcRt_RpcBindingFromStringBindingW(
WCHAR ModulePreset[256];
if (NT_SUCCESS(RpcRt_FindModulePreset(CallingModule, StringBinding, ModulePreset, sizeof(ModulePreset)))) {
WCHAR* pwszTempPortName = NULL;
WCHAR tagValue[96];
if (SbieDll_FindTagValue(ModulePreset, L"Resolve", tagValue, sizeof(tagValue), L'=', L','))
if (SbieDll_FindTagValue(ModulePreset, L"Resolve", tagValue, sizeof(tagValue), L'=', L',')) {
pwszTempPortName = GetDynamicLpcPortName(tagValue);
}
if (!pwszTempPortName && SbieDll_FindTagValue(ModulePreset, L"IpcPort", tagValue, sizeof(tagValue), L'=', L',')) {
pwszTempPortName = StoreLpcPortName(tagValue, tagValue);
}
if (pwszTempPortName != NULL)
{
WCHAR* pwszTempPortName = GetDynamicLpcPortName(tagValue);
if (pwszTempPortName != NULL)
WCHAR* ptr = wcsstr(StringBinding, L":");
if (ptr)
{
WCHAR* ptr = wcsstr(StringBinding, L":");
if (ptr)
{
size_t len = ptr - StringBinding;
wcsncpy(wstrPortName, StringBinding, len);
wcscat(wstrPortName, L":[");
wcscat(wstrPortName, pwszTempPortName);
if (ptr[1] == L'[')
wcscat(wstrPortName, ptr + 2);
else
wcscat(wstrPortName, L"]");
}
size_t len = ptr - StringBinding;
wcsncpy(wstrPortName, StringBinding, len);
wcscat(wstrPortName, L":[");
wcscat(wstrPortName, pwszTempPortName);
if (ptr[1] == L'[')
wcscat(wstrPortName, ptr + 2);
else
wcscat(wstrPortName, L"]");
}
// else error let it fail
}
// the "RpcPortBinding" overwrites "UseRpcMgmtSetComTimeout"
@ -848,16 +863,13 @@ _FX RPC_STATUS RpcRt_RpcBindingCreateW(
WCHAR tagValue[96];
if (RPC_PROTSEQ_LRPC == Template->ProtocolSequence && !Template->StringEndpoint)
{
if (SbieDll_FindTagValue(ModulePreset, L"Resolve", tagValue, sizeof(tagValue), L'=', L','))
{
WCHAR* pwszTempPortName = GetDynamicLpcPortName(tagValue);
if (pwszTempPortName != NULL)
Template->StringEndpoint = pwszTempPortName;
if (SbieDll_FindTagValue(ModulePreset, L"Resolve", tagValue, sizeof(tagValue), L'=', L',')) {
Template->StringEndpoint = GetDynamicLpcPortName(tagValue);
}
if (!Template->StringEndpoint && SbieDll_FindTagValue(ModulePreset, L"IpcPort", tagValue, sizeof(tagValue), L'=', L',')){
Template->StringEndpoint = StoreLpcPortName(tagValue, tagValue);
}
/*else if (SbieDll_FindTagValue(ModulePreset, L"IpcPort", tagValue, sizeof(tagValue), L'=', L','))
{
Template->StringEndpoint = (unsigned short*)...;
}*/
}
// the "RpcPortBinding" overwrites "UseRpcMgmtSetComTimeout"

2
Sandboxie/core/svc/EpMapperServer.cpp
View File

@ -203,7 +203,7 @@ MSG_HEADER *EpMapperServer::EpmapperGetPortNameHandler(MSG_HEADER *msg)
wstrPortName[23] = 0; // Take off the ']'
RpcStringFreeW(&pwszPortName);
if (wcsncmp(wstrPortName, L"LRPC-", 5) == 0)
if (wcsncmp(wstrPortName, L"LRPC-", 5) == 0 /*|| wcsncmp(wstrPortName, L"OLE", 3) == 0*/)
{
_snwprintf(rpl->wszPortName, DYNAMIC_PORT_NAME_CHARS, L"\\RPC Control\\%s", wstrPortName);
rpl->h.status = STATUS_SUCCESS;

6
Sandboxie/install/Templates.ini
View File

@ -3255,10 +3255,14 @@ RpcPortBindingIfId=GamePort,{88ABCBC3-34EA-76AE-8215-767520655A23}
Tmpl.Title=Open RPC for UAC
Tmpl.Class=Misc
NoUACProxy=y
#UAC for compartment Mode
#UAC for compartment Mode Win10
RpcPortBinding=windows.storage.dll,'201ef99a-7fa0-444c-9399-19ba84f12a1a@ncalrpc:',Resolve=UAC,TimeOut=n
RpcPortBindingIfId=UAC,{201EF99A-7FA0-444C-9399-19BA84F12A1A}
#UAC for compartment Mode Win7
RpcPortBinding=SHELL32.dll,'201ef99a-7fa0-444c-9399-19ba84f12a1a@ncalrpc:',IpcPort=senssvc,TimeOut=n
#