This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 65131a77bc Add missing algorithm callback
65131a77bc is described below
commit 65131a77bc40c8707c77428ca2b233823c2e1ac3
Author: remm <[email protected]>
AuthorDate: Tue Jun 25 11:24:00 2024 +0200
Add missing algorithm callback
---
.../apache/catalina/realm/JAASCallbackHandler.java | 8 ++++
test/org/apache/catalina/realm/TestJAASRealm.java | 43 ++++++++++++++++++++++
webapps/docs/changelog.xml | 4 ++
3 files changed, 55 insertions(+)
diff --git a/java/org/apache/catalina/realm/JAASCallbackHandler.java
b/java/org/apache/catalina/realm/JAASCallbackHandler.java
index 5d540b01d0..77de1246eb 100644
--- a/java/org/apache/catalina/realm/JAASCallbackHandler.java
+++ b/java/org/apache/catalina/realm/JAASCallbackHandler.java
@@ -97,6 +97,7 @@ public class JAASCallbackHandler implements CallbackHandler {
this.realmName = realmName;
this.digestA2 = digestA2;
this.authMethod = authMethod;
+ this.algorithm = algorithm;
}
// ----------------------------------------------------- Instance Variables
@@ -157,6 +158,11 @@ public class JAASCallbackHandler implements
CallbackHandler {
*/
protected final String authMethod;
+ /**
+ * Algorithm.
+ */
+ protected final String algorithm;
+
// --------------------------------------------------------- Public Methods
@@ -204,6 +210,8 @@ public class JAASCallbackHandler implements CallbackHandler
{
cb.setText(digestA2);
} else if (cb.getPrompt().equals("authMethod")) {
cb.setText(authMethod);
+ } else if (cb.getPrompt().equals("algorithm")) {
+ cb.setText(algorithm);
} else if (cb.getPrompt().equals("catalinaBase")) {
cb.setText(realm.getContainer().getCatalinaBase().getAbsolutePath());
} else {
diff --git a/test/org/apache/catalina/realm/TestJAASRealm.java
b/test/org/apache/catalina/realm/TestJAASRealm.java
index 8cee07d7dc..f77239ae49 100644
--- a/test/org/apache/catalina/realm/TestJAASRealm.java
+++ b/test/org/apache/catalina/realm/TestJAASRealm.java
@@ -35,6 +35,12 @@ public class TestJAASRealm extends TomcatBaseTest {
" sufficient;\n" +
"};";
+ private static final String CONFIG_MEMORY =
+ "MemoryLogin {\n" +
+ " org.apache.catalina.realm.JAASMemoryLoginModule\n" +
+ " sufficient pathname=\"tomcat-users-lm.xml\";\n" +
+ "};";
+
@Test
public void testRealm() throws Exception {
@@ -67,4 +73,41 @@ public class TestJAASRealm extends TomcatBaseTest {
Assert.assertTrue(gp.hasRole("role1"));
}
+ @Test
+ public void testMemoryLoginModule() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File tomcatUsersXml = new File(getTemporaryDirectory(),
"tomcat-users-lm.xml");
+ try (PrintWriter writer = new PrintWriter(tomcatUsersXml)) {
+ writer.write(TestMemoryRealm.CONFIG);
+ }
+ addDeleteOnTearDown(tomcatUsersXml);
+
+ // Write login config to the temp path
+ File loginConfFile = new File(getTemporaryDirectory(),
"memoryLoginConfig.conf");
+ try (PrintWriter writer = new PrintWriter(loginConfFile)) {
+ writer.write(CONFIG_MEMORY.replace("tomcat-users-lm.xml",
tomcatUsersXml.getAbsolutePath()));
+ }
+ addDeleteOnTearDown(loginConfFile);
+
+ JAASRealm jaasRealm = new JAASRealm();
+ jaasRealm.setAppName("MemoryLogin");
+ jaasRealm.setCredentialHandler(new MessageDigestCredentialHandler());
+ jaasRealm.setUserClassNames(GenericPrincipal.class.getName());
+ jaasRealm.setRoleClassNames(GenericPrincipal.class.getName());
+ jaasRealm.setConfigFile(loginConfFile.getAbsolutePath());
+ Context context = tomcat.addContext("/jaastest", null);
+ context.setRealm(jaasRealm);
+
+ tomcat.start();
+
+ Principal p = jaasRealm.authenticate("foo", "bar");
+ Assert.assertNull(p);
+ p = jaasRealm.authenticate("admin", "sekr3t");
+ Assert.assertNotNull(p);
+ Assert.assertTrue(p instanceof GenericPrincipal);
+ GenericPrincipal gp = (GenericPrincipal) p;
+ Assert.assertTrue(gp.hasRole("testrole"));
+ }
+
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b8375abefe..ff3ef8409a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -117,6 +117,10 @@
<code>setCharacterEncoding(Charset)</code> is called with
<code>null</code>. (markt)
</fix>
+ <fix>
+ Add missing algorithm callback to the <code>JAASCallbackHandler</code>.
+ (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
