Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 08:23:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

launcher, launchctl: testing

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-05-13 12:07:30 -07:00
parent 1802ac8878
commit be952729c9
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/launcher/launchctl.c
View File

@ -210,7 +210,7 @@ int wmain(int argc, wchar_t **argv)
if (0 == lstrcmpW(L"start", argv[0])) if (0 == lstrcmpW(L"start", argv[0]))
{ {
if (3 > argc || argc > 11) if (3 > argc || argc > 12)
usage(); usage();
return start(PipeBuf, PIPE_BUFFER_SIZE, argv[1], argv[2], argc - 3, argv + 3); return start(PipeBuf, PIPE_BUFFER_SIZE, argv[1], argv[2], argc - 3, argv + 3);

24
src/launcher/launcher.c
View File

@ -84,13 +84,13 @@ static PWSTR SvcInstanceArgumentCopy(PWSTR Dest, PWSTR Arg)
static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Argv, static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Argv,
PWSTR *PNewString) PWSTR *PNewString)
{ {
PWSTR NewString = 0; PWSTR NewString = 0, P, Q;
ULONG Length; ULONG Length;
*PNewString = 0; *PNewString = 0;
Length = 0; Length = 0;
for (PWSTR P = String; *P; P++) for (P = String; *P; P++)
{ {
switch (*P) switch (*P)
{ {
@ -98,6 +98,8 @@ static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Arg
P++; P++;
if (L'1' <= *P && *P <= '9' && Argc > (ULONG)(*P - L'1')) if (L'1' <= *P && *P <= '9' && Argc > (ULONG)(*P - L'1'))
Length += SvcInstanceArgumentLength(Argv[*P - L'1']); Length += SvcInstanceArgumentLength(Argv[*P - L'1']);
else
Length++;
break; break;
default: default:
Length++; Length++;
@ -109,8 +111,7 @@ static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Arg
if (0 == NewString) if (0 == NewString)
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
*PNewString = NewString; for (P = String, Q = NewString; *P; P++)
for (PWSTR P = String, Q = NewString; *P; P++)
{ {
switch (*P) switch (*P)
{ {
@ -118,12 +119,17 @@ static NTSTATUS SvcInstanceReplaceArguments(PWSTR String, ULONG Argc, PWSTR *Arg
P++; P++;
if (L'1' <= *P && *P <= '9' && Argc > (ULONG)(*P - L'1')) if (L'1' <= *P && *P <= '9' && Argc > (ULONG)(*P - L'1'))
Q = SvcInstanceArgumentCopy(Q, Argv[*P - L'1']); Q = SvcInstanceArgumentCopy(Q, Argv[*P - L'1']);
else
*Q++ = *P;
break; break;
default: default:
Q++; *Q++ = *P;
break; break;
} }
} }
*Q = L'\0';
*PNewString = NewString;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -221,7 +227,7 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
RegCloseKey(RegKey); RegCloseKey(RegKey);
RegKey = 0; RegKey = 0;
if (L'\0' == Security) if (L'\0' == Security[0])
lstrcpyW(Security, L"" SVC_INSTANCE_DEFAULT_SDDL); lstrcpyW(Security, L"" SVC_INSTANCE_DEFAULT_SDDL);
if (L'D' == Security[0] && L':' == Security[1]) if (L'D' == Security[0] && L':' == Security[1])
Security = SecurityBuf; Security = SecurityBuf;
@ -233,7 +239,7 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
goto exit; goto exit;
} }
FspDebugLogSD(__FUNCTION__ ": SDDL = %s", SecurityDescriptor); FspDebugLogSD(__FUNCTION__ ": SDDL = %s\n", SecurityDescriptor);
Result = SvcInstanceAccessCheck(ClientToken, SERVICE_START, SecurityDescriptor); Result = SvcInstanceAccessCheck(ClientToken, SERVICE_START, SecurityDescriptor);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))
@ -256,7 +262,7 @@ NTSTATUS SvcInstanceCreate(HANDLE ClientToken,
SvcInstance->InstanceName = SvcInstance->Buffer + ClassNameSize / sizeof(WCHAR); SvcInstance->InstanceName = SvcInstance->Buffer + ClassNameSize / sizeof(WCHAR);
SvcInstance->SecurityDescriptor = SecurityDescriptor; SvcInstance->SecurityDescriptor = SecurityDescriptor;
if (L'\0' != CommandLine) if (L'\0' != CommandLine[0])
{ {
Result = SvcInstanceReplaceArguments(CommandLine, Argc, Argv, &SvcInstance->CommandLine); Result = SvcInstanceReplaceArguments(CommandLine, Argc, Argv, &SvcInstance->CommandLine);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))
@ -472,7 +478,7 @@ static NTSTATUS SvcStart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
&SecurityAttributes.lpSecurityDescriptor, 0)) &SecurityAttributes.lpSecurityDescriptor, 0))
goto fail; goto fail;
FspDebugLogSD(__FUNCTION__ ": SDDL = %s", SecurityAttributes.lpSecurityDescriptor); FspDebugLogSD(__FUNCTION__ ": SDDL = %s\n", SecurityAttributes.lpSecurityDescriptor);
SvcEvent = CreateEventW(0, TRUE, FALSE, 0); SvcEvent = CreateEventW(0, TRUE, FALSE, 0);
if (0 == SvcEvent) if (0 == SvcEvent)

2
src/launcher/launcher.h
View File

@ -48,7 +48,7 @@
* the following SDDL: * the following SDDL:
* D:P(A;;RPWPLC;;;WD) * D:P(A;;RPWPLC;;;WD)
*/ */
#define SVC_INSTANCE_DEFAULT_SDDL "O:SYG:SYD:P(A;;RPWPSC;;;SY)(A;;RPWPSC;;;BA)" #define SVC_INSTANCE_DEFAULT_SDDL "D:P(A;;RPWPLC;;;SY)(A;;RPWPLC;;;BA)"
enum enum
{ {