Issue #11761 fix jetty maven doco and integration test (#11771)

* Issue #11761 fix jetty maven doco and integration test
jetty · May 12, 2024 · 6f2f599 · 6f2f599
1 parent dd611b4
commit 6f2f599
Show file tree

Hide file tree

Showing 25 changed files with 168 additions and 10 deletions.
diff --git a/...documentation/src/main/asciidoc/programming-guide/maven/jetty-maven-plugin.adoc b/...documentation/src/main/asciidoc/programming-guide/maven/jetty-maven-plugin.adoc
@@ -954,7 +954,9 @@ Here's an example of setting up the `HashLoginService` for a webapp:
     <loginServices>
       <loginService implementation="org.eclipse.jetty.security.HashLoginService">
         <name>Test Realm</name>
-        <config>${project.basedir}/src/etc/realm.properties</config>
+        <config implementation="org.eclipse.jetty.maven.MavenResource">
+          <resourceAsString>${basedir}/src/etc/realm.properties</resourceAsString>
+        </config>
       </loginService>
     </loginServices>
   </configuration>

diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml
@@ -105,7 +105,9 @@
             <loginServices>
               <loginService implementation="org.eclipse.jetty.security.HashLoginService">
                 <name>Test Realm</name>
-                <config>src/test/resources/test-realm.properties</config>
+                <config implementation="org.eclipse.jetty.maven.MavenResource">
+                  <resourceAsString>src/test/resources/test-realm.properties</resourceAsString>
+                </config>
               </loginService>
             </loginServices>
           </configuration>

diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml
@@ -85,7 +85,9 @@
             <loginServices>
               <loginService implementation="org.eclipse.jetty.security.HashLoginService">
                 <name>Test Realm</name>
-                <config>src/etc/realm.properties</config>
+                <config implementation="org.eclipse.jetty.maven.MavenResource">
+                  <resourceAsString>src/etc/realm.properties</resourceAsString>
+                </config>
               </loginService>
             </loginServices>
           </configuration>

diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml
@@ -112,8 +112,9 @@
               </jettyXmls>
               <loginServices>
                   <loginService implementation="org.eclipse.jetty.security.HashLoginService">
+                      <name>Test Realm</name>
                       <config implementation="org.eclipse.jetty.maven.MavenResource">
-                          <resourceAsString>${basedir}/src/config/login.xml</resourceAsString>
+                          <resourceAsString>${basedir}/src/config/realm.properties</resourceAsString>
                       </config>
                   </loginService>
               </loginServices>

diff --git a/.../jetty-simple-webapp/src/config/login.xml → ...simple-webapp/src/config/realm.properties b/.../jetty-simple-webapp/src/config/login.xml → ...simple-webapp/src/config/realm.properties
diff --git a/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml b/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml
@@ -4,4 +4,24 @@
          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
          version="3.1">
   <display-name>Jetty Simple Webapp run-mojo-it</display-name>
+
+   <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Any Authenticated User</web-resource-name>
+      <url-pattern>/auth/*</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>*</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <login-config>
+    <auth-method>FORM</auth-method>
+    <realm-name>Test Realm</realm-name>
+    <form-login-config>
+       <form-login-page>/logon.html?param=test</form-login-page>
+       <form-error-page>/logonError.html?param=test</form-error-page>
+    </form-login-config>
+  </login-config>
+
 </web-app>
diff --git a/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/auth/index.html b/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/auth/index.html
@@ -0,0 +1,3 @@
+<html>
+    <h1>Authenticated</h1>
+</html>
diff --git a/...10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logon.html b/...10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logon.html
@@ -0,0 +1,20 @@
+<html>
+<h1>FORM Authentication demo</h1>
+<form method="POST" action="j_security_check">
+    <table border="0" cellspacing="2" cellpadding="1">
+        <tr>
+            <td>Username:</td>
+            <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
+        </tr>
+        <tr>
+            <td>Password:</td>
+            <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
+        </tr>
+        <tr>
+            <td colspan="2" align="center">
+                <input name="submit" type="submit" value="Login">
+            </td>
+        </tr>
+    </table>
+</form>
+</html>
diff --git a/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logonError.html b/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logonError.html
@@ -0,0 +1,4 @@
+<html>
+<h1>Authentication ERROR</h1>
+Username, password or role incorrect.
+</html>
diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/pom.xml
@@ -101,7 +101,9 @@
             <loginServices>
               <loginService implementation="org.eclipse.jetty.security.HashLoginService">
                 <name>Test Realm</name>
-                <config>${project.build.testOutputDirectory}/test-realm.properties</config>
+                <config implementation="org.eclipse.jetty.maven.MavenResource">
+                  <resourceAsString>${project.build.testOutputDirectory}/test-realm.properties</resourceAsString>
+                </config>
               </loginService>
             </loginServices>
           </configuration>

diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml
@@ -61,7 +61,9 @@
             <loginServices>
               <loginService implementation="org.eclipse.jetty.security.HashLoginService">
                 <name>Test Realm</name>
-                <config>${project.build.directory}/realm.properties</config>
+                <config implementation="org.eclipse.jetty.maven.MavenResource">
+                  <resourceAsString>${project.build.directory}/realm.properties</resourceAsString>
+                </config>
               </loginService>
             </loginServices>
           </configuration>

diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml
@@ -140,8 +140,9 @@
               </jettyXmls>
               <loginServices>
                 <loginService implementation="org.eclipse.jetty.security.HashLoginService">
+                  <name>Test Realm</name>
                   <config implementation="org.eclipse.jetty.maven.MavenResource">
-                    <resourceAsString>${basedir}/src/config/login.xml</resourceAsString>
+                    <resourceAsString>${basedir}/src/config/realm.properties</resourceAsString>
                   </config>
                 </loginService>
               </loginServices>

diff --git a/.../jetty-simple-webapp/src/config/login.xml → ...simple-webapp/src/config/realm.properties b/.../jetty-simple-webapp/src/config/login.xml → ...simple-webapp/src/config/realm.properties
diff --git a/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml b/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml
@@ -4,4 +4,24 @@
          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
          version="3.1">
   <display-name>Jetty Simple Webapp run-mojo-it</display-name>
+
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Any Authenticated User</web-resource-name>
+      <url-pattern>/auth/*</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>*</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <login-config>
+   <auth-method>FORM</auth-method>
+  <realm-name>Test Realm</realm-name>
+   <form-login-config>
+      <form-login-page>/logon.html?param=test</form-login-page>
+      <form-error-page>/logonError.html?param=test</form-error-page>
+   </form-login-config>
+ </login-config>
+
 </web-app>
diff --git a/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/auth/index.html b/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/auth/index.html
@@ -0,0 +1,3 @@
+<html>
+    <h1>Authenticated</h1>
+</html>
diff --git a/...e8-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logon.html b/...e8-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logon.html
@@ -0,0 +1,20 @@
+<html>
+<h1>FORM Authentication demo</h1>
+<form method="POST" action="j_security_check">
+    <table border="0" cellspacing="2" cellpadding="1">
+        <tr>
+            <td>Username:</td>
+            <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
+        </tr>
+        <tr>
+            <td>Password:</td>
+            <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
+        </tr>
+        <tr>
+            <td colspan="2" align="center">
+                <input name="submit" type="submit" value="Login">
+            </td>
+        </tr>
+    </table>
+</form>
+</html>
diff --git a/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logonError.html b/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logonError.html
@@ -0,0 +1,4 @@
+<html>
+<h1>Authentication ERROR</h1>
+Username, password or role incorrect.
+</html>
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml
@@ -111,7 +111,9 @@
             <loginServices>
               <loginService implementation="org.eclipse.jetty.security.HashLoginService">
                 <name>Test Realm</name>
-                <config>src/test/resources/test-realm.properties</config>
+                <config implementation="org.eclipse.jetty.maven.MavenResource">
+                  <resourceAsString>src/test/resources/test-realm.properties</resourceAsString>
+                </config>
               </loginService>
             </loginServices>
           </configuration>

diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml
@@ -61,7 +61,9 @@
             <loginServices>
               <loginService implementation="org.eclipse.jetty.security.HashLoginService">
                 <name>Test Realm</name>
-                <config>src/etc/realm.properties</config>
+                <config implementation="org.eclipse.jetty.maven.MavenResource">
+                  <resourceAsString>src/etc/realm.properties</resourceAsString>
+                </config>
               </loginService>
             </loginServices>
           </configuration>

diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml
@@ -112,8 +112,9 @@
               </jettyXmls>
               <loginServices>
                 <loginService implementation="org.eclipse.jetty.security.HashLoginService">
+                  <name>Test Realm</name>
                   <config implementation="org.eclipse.jetty.maven.MavenResource">
-                    <resourceAsString>${basedir}/src/config/login.xml</resourceAsString>
+                    <resourceAsString>${basedir}/src/config/realm.properties</resourceAsString>
                   </config>
                 </loginService>
               </loginServices>

diff --git a/.../jetty-simple-webapp/src/config/login.xml → ...simple-webapp/src/config/realm.properties b/.../jetty-simple-webapp/src/config/login.xml → ...simple-webapp/src/config/realm.properties
diff --git a/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml b/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml
@@ -4,4 +4,24 @@
          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
          version="3.1">
   <display-name>Jetty Simple Webapp run-mojo-it</display-name>
+
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Any Authenticated User</web-resource-name>
+      <url-pattern>/auth/*</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>*</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <login-config>
+    <auth-method>FORM</auth-method>
+   <realm-name>Test Realm</realm-name>
+    <form-login-config>
+       <form-login-page>/logon.html?param=test</form-login-page>
+       <form-error-page>/logonError.html?param=test</form-error-page>
+    </form-login-config>
+  </login-config>
+
 </web-app>
diff --git a/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/auth/index.html b/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/auth/index.html
@@ -0,0 +1,3 @@
+<html>
+    <h1>Authenticated</h1>
+</html>
diff --git a/...e9-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logon.html b/...e9-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logon.html
@@ -0,0 +1,20 @@
+<html>
+<h1>FORM Authentication demo</h1>
+<form method="POST" action="j_security_check">
+    <table border="0" cellspacing="2" cellpadding="1">
+        <tr>
+            <td>Username:</td>
+            <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
+        </tr>
+        <tr>
+            <td>Password:</td>
+            <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
+        </tr>
+        <tr>
+            <td colspan="2" align="center">
+                <input name="submit" type="submit" value="Login">
+            </td>
+        </tr>
+    </table>
+</form>
+</html>
diff --git a/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logonError.html b/...ven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/main/webapp/logonError.html
@@ -0,0 +1,4 @@
+<html>
+<h1>Authentication ERROR</h1>
+Username, password or role incorrect.
+</html>