stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8033757: Redo JDK-8011983 (due to bad merge with JDK-8031586)

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Vinnie Ryan 2014-02-06 12:24:42 +00:00
parent 1754033d02
commit 5911461228
1 changed files with 50 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
jdk/src/windows/native/com/sun/security/auth/module/nt.c
View File

@ -43,6 +43,12 @@ BOOL getImpersonationToken(PHANDLE impersonationToken);
BOOL getTextualSid(PSID pSid, LPTSTR TextualSid, LPDWORD lpdwBufferLen); BOOL getTextualSid(PSID pSid, LPTSTR TextualSid, LPDWORD lpdwBufferLen);
void DisplayErrorText(DWORD dwLastError); void DisplayErrorText(DWORD dwLastError);
static void throwIllegalArgumentException(JNIEnv *env, const char *msg) {
jclass clazz = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
if (clazz != NULL)
(*env)->ThrowNew(env, clazz, msg);
}
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_com_sun_security_auth_module_NTSystem_getImpersonationToken0 Java_com_sun_security_auth_module_NTSystem_getImpersonationToken0
(JNIEnv *env, jobject obj) { (JNIEnv *env, jobject obj) {
@ -62,7 +68,6 @@ Java_com_sun_security_auth_module_NTSystem_getCurrent
long i, j = 0; long i, j = 0;
HANDLE tokenHandle = INVALID_HANDLE_VALUE; HANDLE tokenHandle = INVALID_HANDLE_VALUE;
BOOL systemError = FALSE;
LPTSTR userName = NULL; // user name LPTSTR userName = NULL; // user name
LPTSTR userSid = NULL; // user sid LPTSTR userSid = NULL; // user sid
@ -116,70 +121,59 @@ Java_com_sun_security_auth_module_NTSystem_getCurrent
fid = (*env)->GetFieldID(env, cls, "userName", "Ljava/lang/String;"); fid = (*env)->GetFieldID(env, cls, "userName", "Ljava/lang/String;");
if (fid == 0) { if (fid == 0) {
jclass newExcCls = (*env)->ExceptionClear(env);
(*env)->FindClass(env, "java/lang/IllegalArgumentException"); throwIllegalArgumentException(env, "invalid field: userName");
if (newExcCls == 0) { goto cleanup;
// Unable to find exception class
systemError = TRUE;
goto out;
}
(*env)->ThrowNew(env, newExcCls, "invalid field: userName");
} }
jstr = (*env)->NewStringUTF(env, userName); jstr = (*env)->NewStringUTF(env, userName);
if (jstr == NULL)
goto cleanup;
(*env)->SetObjectField(env, obj, fid, jstr); (*env)->SetObjectField(env, obj, fid, jstr);
fid = (*env)->GetFieldID(env, cls, "userSID", "Ljava/lang/String;"); fid = (*env)->GetFieldID(env, cls, "userSID", "Ljava/lang/String;");
if (fid == 0) { if (fid == 0) {
jclass newExcCls = (*env)->ExceptionClear(env);
(*env)->FindClass(env, "java/lang/IllegalArgumentException"); throwIllegalArgumentException(env, "invalid field: userSID");
if (newExcCls == 0) { goto cleanup;
systemError = TRUE;
goto out;
}
(*env)->ThrowNew(env, newExcCls, "invalid field: userSID");
} }
jstr = (*env)->NewStringUTF(env, userSid); jstr = (*env)->NewStringUTF(env, userSid);
if (jstr == NULL)
goto cleanup;
(*env)->SetObjectField(env, obj, fid, jstr); (*env)->SetObjectField(env, obj, fid, jstr);
fid = (*env)->GetFieldID(env, cls, "domain", "Ljava/lang/String;"); fid = (*env)->GetFieldID(env, cls, "domain", "Ljava/lang/String;");
if (fid == 0) { if (fid == 0) {
jclass newExcCls = (*env)->ExceptionClear(env);
(*env)->FindClass(env, "java/lang/IllegalArgumentException"); throwIllegalArgumentException(env, "invalid field: domain");
if (newExcCls == 0) { goto cleanup;
systemError = TRUE;
goto out;
}
(*env)->ThrowNew(env, newExcCls, "invalid field: domain");
} }
jstr = (*env)->NewStringUTF(env, domainName); jstr = (*env)->NewStringUTF(env, domainName);
if (jstr == NULL)
goto cleanup;
(*env)->SetObjectField(env, obj, fid, jstr); (*env)->SetObjectField(env, obj, fid, jstr);
if (domainSid != NULL) { if (domainSid != NULL) {
fid = (*env)->GetFieldID(env, cls, "domainSID", "Ljava/lang/String;"); fid = (*env)->GetFieldID(env, cls, "domainSID", "Ljava/lang/String;");
if (fid == 0) { if (fid == 0) {
jclass newExcCls = (*env)->ExceptionClear(env);
(*env)->FindClass(env, "java/lang/IllegalArgumentException"); throwIllegalArgumentException(env, "invalid field: domainSID");
if (newExcCls == 0) { goto cleanup;
systemError = TRUE;
goto out;
}
(*env)->ThrowNew(env, newExcCls, "invalid field: domainSID");
} }
jstr = (*env)->NewStringUTF(env, domainSid); jstr = (*env)->NewStringUTF(env, domainSid);
if (jstr == NULL)
goto cleanup;
(*env)->SetObjectField(env, obj, fid, jstr); (*env)->SetObjectField(env, obj, fid, jstr);
} }
fid = (*env)->GetFieldID(env, cls, "primaryGroupID", "Ljava/lang/String;"); fid = (*env)->GetFieldID(env, cls, "primaryGroupID", "Ljava/lang/String;");
if (fid == 0) { if (fid == 0) {
jclass newExcCls = (*env)->ExceptionClear(env);
(*env)->FindClass(env, "java/lang/IllegalArgumentException"); throwIllegalArgumentException(env, "invalid field: PrimaryGroupID");
if (newExcCls == 0) { goto cleanup;
systemError = TRUE;
goto out;
}
(*env)->ThrowNew(env, newExcCls, "invalid field: PrimaryGroupID");
} }
jstr = (*env)->NewStringUTF(env, primaryGroup); jstr = (*env)->NewStringUTF(env, primaryGroup);
if (jstr == NULL)
goto cleanup;
(*env)->SetObjectField(env, obj, fid, jstr); (*env)->SetObjectField(env, obj, fid, jstr);
// primary group may or may not be part of supplementary groups // primary group may or may not be part of supplementary groups
@ -204,19 +198,14 @@ Java_com_sun_security_auth_module_NTSystem_getCurrent
fid = (*env)->GetFieldID(env, cls, "groupIDs", "[Ljava/lang/String;"); fid = (*env)->GetFieldID(env, cls, "groupIDs", "[Ljava/lang/String;");
if (fid == 0) { if (fid == 0) {
jclass newExcCls = (*env)->ExceptionClear(env);
(*env)->FindClass(env, "java/lang/IllegalArgumentException"); throwIllegalArgumentException(env, "groupIDs");
if (newExcCls == 0) { goto cleanup;
systemError = TRUE;
goto out;
}
(*env)->ThrowNew(env, newExcCls, "invalid field: groupIDs");
} }
stringClass = (*env)->FindClass(env, "java/lang/String"); stringClass = (*env)->FindClass(env, "java/lang/String");
if (stringClass == 0) { if (stringClass == NULL)
goto out; goto cleanup;
}
if (pIndex == -1) { if (pIndex == -1) {
// primary group not in groups array // primary group not in groups array
@ -226,6 +215,8 @@ Java_com_sun_security_auth_module_NTSystem_getCurrent
// allocate one less array entry and do not add into new array // allocate one less array entry and do not add into new array
jgroups = (*env)->NewObjectArray(env, numGroups-1, stringClass, 0); jgroups = (*env)->NewObjectArray(env, numGroups-1, stringClass, 0);
} }
if (jgroups == NULL)
goto cleanup;
for (i = 0, j = 0; i < (long)numGroups; i++) { for (i = 0, j = 0; i < (long)numGroups; i++) {
if (pIndex == i) { if (pIndex == i) {
@ -233,12 +224,14 @@ Java_com_sun_security_auth_module_NTSystem_getCurrent
continue; continue;
} }
jstr = (*env)->NewStringUTF(env, groups[i]); jstr = (*env)->NewStringUTF(env, groups[i]);
if (jstr == NULL)
goto cleanup;
(*env)->SetObjectArrayElement(env, jgroups, j++, jstr); (*env)->SetObjectArrayElement(env, jgroups, j++, jstr);
} }
(*env)->SetObjectField(env, obj, fid, jgroups); (*env)->SetObjectField(env, obj, fid, jgroups);
} }
out: cleanup:
if (userName != NULL) { if (userName != NULL) {
HeapFree(GetProcessHeap(), 0, userName); HeapFree(GetProcessHeap(), 0, userName);
} }
@ -264,11 +257,6 @@ out:
} }
CloseHandle(tokenHandle); CloseHandle(tokenHandle);
if (systemError && debug) {
printf(" [getCurrent] System Error: ");
printf("unable to find IllegalArgumentException class\n");
}
return; return;
} }
@ -336,7 +324,7 @@ BOOL getUser(HANDLE tokenHandle, LPTSTR *userName,
DisplayErrorText(GetLastError()); DisplayErrorText(GetLastError());
} }
error = TRUE; error = TRUE;
goto out; goto cleanup;
} }
if (debug) { if (debug) {
@ -369,7 +357,7 @@ BOOL getUser(HANDLE tokenHandle, LPTSTR *userName,
DisplayErrorText(GetLastError()); DisplayErrorText(GetLastError());
} }
error = TRUE; error = TRUE;
goto out; goto cleanup;
} }
if (debug) { if (debug) {
@ -411,7 +399,7 @@ BOOL getUser(HANDLE tokenHandle, LPTSTR *userName,
DisplayErrorText(GetLastError()); DisplayErrorText(GetLastError());
} }
// ok not to have a domain SID (no error) // ok not to have a domain SID (no error)
goto out; goto cleanup;
} }
bufSize = 0; bufSize = 0;
@ -422,7 +410,7 @@ BOOL getUser(HANDLE tokenHandle, LPTSTR *userName,
printf(" [getUser] domainSid: %s\n", *domainSid); printf(" [getUser] domainSid: %s\n", *domainSid);
} }
out: cleanup:
if (tokenUserInfo != NULL) { if (tokenUserInfo != NULL) {
HeapFree(GetProcessHeap(), 0, tokenUserInfo); HeapFree(GetProcessHeap(), 0, tokenUserInfo);
} }
@ -466,7 +454,7 @@ BOOL getPrimaryGroup(HANDLE tokenHandle, LPTSTR *primaryGroup) {
DisplayErrorText(GetLastError()); DisplayErrorText(GetLastError());
} }
error = TRUE; error = TRUE;
goto out; goto cleanup;
} }
if (debug) { if (debug) {
@ -481,7 +469,7 @@ BOOL getPrimaryGroup(HANDLE tokenHandle, LPTSTR *primaryGroup) {
printf(" [getPrimaryGroup] primaryGroup: %s\n", *primaryGroup); printf(" [getPrimaryGroup] primaryGroup: %s\n", *primaryGroup);
} }
out: cleanup:
if (tokenGroupInfo != NULL) { if (tokenGroupInfo != NULL) {
HeapFree(GetProcessHeap(), 0, tokenGroupInfo); HeapFree(GetProcessHeap(), 0, tokenGroupInfo);
} }
@ -519,7 +507,7 @@ BOOL getGroups(HANDLE tokenHandle, PDWORD numGroups, LPTSTR **groups) {
DisplayErrorText(GetLastError()); DisplayErrorText(GetLastError());
} }
error = TRUE; error = TRUE;
goto out; goto cleanup;
} }
if (debug) { if (debug) {
@ -528,7 +516,7 @@ BOOL getGroups(HANDLE tokenHandle, PDWORD numGroups, LPTSTR **groups) {
if (tokenGroupInfo->GroupCount == 0) { if (tokenGroupInfo->GroupCount == 0) {
// no groups // no groups
goto out; goto cleanup;
} }
// return group info // return group info
@ -545,7 +533,7 @@ BOOL getGroups(HANDLE tokenHandle, PDWORD numGroups, LPTSTR **groups) {
} }
} }
out: cleanup:
if (tokenGroupInfo != NULL) { if (tokenGroupInfo != NULL) {
HeapFree(GetProcessHeap(), 0, tokenGroupInfo); HeapFree(GetProcessHeap(), 0, tokenGroupInfo);
} }