infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-04 10:46:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

8304264: Debug messages always show up for NativeGSS

Browse Source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2023-03-15 21:22:53 +00:00
parent 1ae69e3e91
commit be08a256ab
5 changed files with 61 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSLibStub.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -105,7 +105,9 @@ class GSSLibStub {
return s;
}
private GSSLibStub(Oid mech) throws GSSException {
SunNativeProvider.debug("Created GSSLibStub for mech " + mech);
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Created GSSLibStub for mech " + mech);
}
this.mech = mech;
this.pMech = getMechPtr(mech.getDER());
}

30
src/java.security.jgss/share/classes/sun/security/jgss/wrapper/GSSNameElement.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -73,12 +73,16 @@ public class GSSNameElement implements GSSNameSpi {
supportedNTs = stub.inquireNamesForMech();
} catch (GSSException ge2) {
// Should never happen
SunNativeProvider.debug("Name type list unavailable: " +
ge2.getMajorString());
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Name type list unavailable: " +
ge2.getMajorString());
}
}
} else {
SunNativeProvider.debug("Name type list unavailable: " +
ge.getMajorString());
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Name type list unavailable: " +
ge.getMajorString());
}
}
}
if (supportedNTs != null) {
@ -86,8 +90,10 @@ public class GSSNameElement implements GSSNameSpi {
if (supportedNTs[i].equals(nameType)) return nameType;
}
// Special handling the specified name type
SunNativeProvider.debug("Override " + nameType +
" with mechanism default(null)");
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Override " + nameType +
" with mechanism default(null)");
}
return null; // Use mechanism specific default
}
}
@ -185,8 +191,10 @@ public class GSSNameElement implements GSSNameSpi {
}
}
SunNativeProvider.debug("Imported " + printableName + " w/ type " +
printableType);
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Imported " + printableName + " w/ type " +
printableType);
}
}
private void setPrintables() throws GSSException {
@ -211,7 +219,9 @@ public class GSSNameElement implements GSSNameSpi {
mName = stub.canonicalizeName(pName);
Object[] printables2 = stub.displayName(mName);
stub.releaseName(mName);
SunNativeProvider.debug("Got kerberized name: " + printables2[0]);
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Got kerberized name: " + printables2[0]);
}
return (String) printables2[0];
}

8
src/java.security.jgss/share/classes/sun/security/jgss/wrapper/Krb5Util.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -53,8 +53,10 @@ class Krb5Util {
@SuppressWarnings("removal")
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
SunNativeProvider.debug("Checking ServicePermission(" +
target + ", " + action + ")");
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Checking ServicePermission(" +
target + ", " + action + ")");
}
ServicePermission perm =
new ServicePermission(target, action);
sm.checkPermission(perm);

44
src/java.security.jgss/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -148,8 +148,10 @@ class NativeGSSContext implements GSSContextSpi {
String tgsStr = Krb5Util.getTGSName(targetName);
String krbPrincPair = "\"" + targetStr + "\" \"" +
tgsStr + '\"';
SunNativeProvider.debug("Checking DelegationPermission (" +
krbPrincPair + ")");
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Checking DelegationPermission (" +
krbPrincPair + ")");
}
DelegationPermission perm =
new DelegationPermission(krbPrincPair);
sm.checkPermission(perm);
@ -163,8 +165,10 @@ class NativeGSSContext implements GSSContextSpi {
byte[] result;
if (mechTokenLen != -1) {
// Need to add back the GSS header for a complete GSS token
SunNativeProvider.debug("Precomputed mechToken length: " +
mechTokenLen);
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Precomputed mechToken length: " +
mechTokenLen);
}
GSSHeader gssHeader = new GSSHeader
(ObjectIdentifier.of(cStub.getMech().toString()),
mechTokenLen);
@ -182,8 +186,10 @@ class NativeGSSContext implements GSSContextSpi {
DerValue dv = new DerValue(is);
result = dv.toByteArray();
}
SunNativeProvider.debug("Complete Token length: " +
result.length);
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("Complete Token length: " +
result.length);
}
return result;
} catch (IOException ioe) {
throw new GSSExceptionImpl(GSSException.FAILURE, ioe);
@ -273,8 +279,10 @@ class NativeGSSContext implements GSSContextSpi {
// Ignore the specified input stream on the first call
if (pContext != 0) {
inToken = retrieveToken(is, mechTokenLen);
SunNativeProvider.debug("initSecContext=> inToken len=" +
inToken.length);
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("initSecContext=> inToken len=" +
inToken.length);
}
}
if (!getCredDelegState()) skipDelegPermCheck = true;
@ -286,8 +294,10 @@ class NativeGSSContext implements GSSContextSpi {
long pCred = (cred == null? 0 : cred.pCred);
outToken = cStub.initContext(pCred, targetName.pName,
cb, inToken, this);
SunNativeProvider.debug("initSecContext=> outToken len=" +
(outToken == null ? 0 : outToken.length));
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("initSecContext=> outToken len=" +
(outToken == null ? 0 : outToken.length));
}
// Only inspect the token when the permission check
// has not been performed
@ -321,13 +331,17 @@ class NativeGSSContext implements GSSContextSpi {
byte[] outToken = null;
if ((!isEstablished) && (!isInitiator)) {
byte[] inToken = retrieveToken(is, mechTokenLen);
SunNativeProvider.debug("acceptSecContext=> inToken len=" +
inToken.length);
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("acceptSecContext=> inToken len=" +
inToken.length);
}
long pCred = (cred == null? 0 : cred.pCred);
outToken = cStub.acceptContext(pCred, cb, inToken, this);
disposeDelegatedCred = delegatedCred;
SunNativeProvider.debug("acceptSecContext=> outToken len=" +
(outToken == null? 0 : outToken.length));
if (SunNativeProvider.DEBUG) {
SunNativeProvider.debug("acceptSecContext=> outToken len=" +
(outToken == null ? 0 : outToken.length));
}
if (targetName == null) {
targetName = new GSSNameElement

5
src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -54,7 +54,8 @@ public final class SunNativeProvider extends Provider {
private static final String INFO = "Sun Native GSS provider";
private static final String MF_CLASS =
"sun.security.jgss.wrapper.NativeGSSFactory";
private static final boolean DEBUG =
static final boolean DEBUG =
GetBooleanAction.privilegedGetProperty("sun.security.nativegss.debug");
static void debug(String message) {