Refactor jaas login sequence to only fetch role data if user is authenticated according to that module.

2 files changed, 17 insertions, 2 deletions

diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml
index 40e4c475b6..5d2261b581 100644
--- a/tests/test-webapps/test-jaas-webapp/pom.xml
+++ b/tests/test-webapps/test-jaas-webapp/pom.xml
@@ -50,6 +50,13 @@
             </securityHandler>
           </webAppConfig>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.19</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/etc/login.conf b/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/etc/login.conf
index a97b0eddee..e26c7c58a6 100644
--- a/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/etc/login.conf
+++ b/tests/test-webapps/test-jaas-webapp/src/main/config/demo-base/etc/login.conf
@@ -1,5 +1,13 @@
 xyz {
-org.eclipse.jetty.jaas.spi.PropertyFileLoginModule required
+org.eclipse.jetty.jaas.spi.JDBCLoginModule required
 debug="true"
-file="${jetty.base}/etc/login.properties";
+userTable="users"
+userField="username"
+credentialField="pwd"
+userRoleTable="userroles"
+userRoleUserField="username"
+userRoleRoleField="rolename"
+dbDriver="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource"
+dbUrl="jdbc:mysql://localhost:3306/jaas"
+dbUserName="janb";
 };