Skip to content

Fix SpnegoEngine.getCompleteServicePrincipalName when servicePrincipalName is not specified. #1588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2018
Merged

Fix SpnegoEngine.getCompleteServicePrincipalName when servicePrincipalName is not specified. #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee99520
fix when servicePrincipalName is not specified.
nddipiazza Oct 19, 2018
f52c6e9
unit test the fix.
nddipiazza Oct 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,18 +256,18 @@ public String generateToken(String host) throws SpnegoEngineException {
}
}

protected String getCompleteServicePrincipalName(String host) {
String getCompleteServicePrincipalName(String host) {
String name;
if (servicePrincipalName == null) {
if (useCanonicalHostname) {
host = getCanonicalHostname(host);
}
name = "HTTP/" + host;
name = "HTTP@" + host;
} else {
name = servicePrincipalName;
}
if (realmName != null) {
name += "@" + realmName;
if (realmName != null && !name.contains("@")) {
name += "@" + realmName;
}
}
log.debug("Service Principal Name is {}", name);
return name;
Expand All @@ -285,7 +285,7 @@ private String getCanonicalHostname(String hostname) {
return canonicalHostname;
}

public CallbackHandler getUsernamePasswordHandler() {
private CallbackHandler getUsernamePasswordHandler() {
if (username == null) {
return null;
}
Expand Down
38 changes: 38 additions & 0 deletions client/src/test/java/org/asynchttpclient/spnego/SpnegoEngineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,44 @@ public void testSpnegoGenerateTokenWithCustomLoginConfig() throws Exception {
Assert.assertTrue(token.startsWith("YII"));
}

@Test
public void testGetCompleteServicePrincipalName() throws Exception {
{
SpnegoEngine spnegoEngine = new SpnegoEngine(null,
null,
"bob",
"service.ws.apache.org",
false,
null,
null,
null);
Assert.assertEquals("bob@service.ws.apache.org", spnegoEngine.getCompleteServicePrincipalName("localhost"));
}
{
SpnegoEngine spnegoEngine = new SpnegoEngine(null,
null,
null,
"service.ws.apache.org",
true,
null,
null,
null);
Assert.assertNotEquals("HTTP@localhost", spnegoEngine.getCompleteServicePrincipalName("localhost"));
Assert.assertTrue(spnegoEngine.getCompleteServicePrincipalName("localhost").startsWith("HTTP@"));
}
{
SpnegoEngine spnegoEngine = new SpnegoEngine(null,
null,
null,
"service.ws.apache.org",
false,
null,
null,
null);
Assert.assertEquals("HTTP@localhost", spnegoEngine.getCompleteServicePrincipalName("localhost"));
}
}

@AfterClass
public static void cleanup() throws Exception {
if (kerbyServer != null) {
Expand Down