From aa7680545728145abe648091613c46d7a5ccb7e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor?= <victor.sempere1@gmail.com>
Date: Thu, 3 Mar 2022 01:24:41 +0100
Subject: [PATCH] BAEL-4626

Adjusted traces levels.
Adjusted web.xml from webapps. Allows to see clearly the security constraints being applied.
Pong: Changed authentication method to DIGEST.
This is to check that SSO works with different authentication mechanisms.
---
 apache-tomcat/sso/res/conf/logging.properties |  6 ++---
 .../sso/webapps/ping/WEB-INF/web.xml          |  6 ++---
 .../sso/webapps/pong/WEB-INF/web.xml          | 12 +++------
 apache-tomcat/sso/webapps/pong/logging.html   | 26 -------------------
 .../sso/webapps/pong/logging_error.html       | 10 -------
 5 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 apache-tomcat/sso/webapps/pong/logging.html
 delete mode 100644 apache-tomcat/sso/webapps/pong/logging_error.html

diff --git a/apache-tomcat/sso/res/conf/logging.properties b/apache-tomcat/sso/res/conf/logging.properties
index 9413465201..16e37906c9 100644
--- a/apache-tomcat/sso/res/conf/logging.properties
+++ b/apache-tomcat/sso/res/conf/logging.properties
@@ -50,15 +50,15 @@ java.util.logging.ConsoleHandler.level = FINE
 java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
 java.util.logging.ConsoleHandler.encoding = UTF-8
 
-org.apache.catalina.authenticator.level = ALL
+org.apache.catalina.authenticator.level = FINE
 org.apache.catalina.authenticator.formatter = org.apache.juli.OneLineFormatter
 org.apache.catalina.authenticator.encoding = UTF-8
 
-org.apache.catalina.Realm.level = ALL
+org.apache.catalina.Realm.level = FINE
 org.apache.catalina.Realm.formatter = org.apache.juli.OneLineFormatter
 org.apache.catalina.Realm.encoding = UTF-8
 
-org.apache.catalina.realm.level = ALL
+org.apache.catalina.realm.level = FINE
 org.apache.catalina.realm.formatter = org.apache.juli.OneLineFormatter
 org.apache.catalina.realm.encoding = UTF-8
 
diff --git a/apache-tomcat/sso/webapps/ping/WEB-INF/web.xml b/apache-tomcat/sso/webapps/ping/WEB-INF/web.xml
index afe0e87bcc..7e8a76e5e9 100644
--- a/apache-tomcat/sso/webapps/ping/WEB-INF/web.xml
+++ b/apache-tomcat/sso/webapps/ping/WEB-INF/web.xml
@@ -10,7 +10,7 @@
     <security-constraint>
         <display-name>Ping Login Auth</display-name>
         <web-resource-collection>
-            <web-resource-name>Restricted Access</web-resource-name>
+            <web-resource-name>PingRestrictedAccess</web-resource-name>
             <url-pattern>/private/*</url-pattern>     
         </web-resource-collection>
         <auth-constraint>
@@ -34,7 +34,7 @@
     </login-config>
 
     <filter>
-        <filter-name>ExpiresFilter</filter-name>
+        <filter-name>PingExpiresFilter</filter-name>
         <filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class>
         <init-param>
             <param-name>ExpiresByType text/html</param-name>
@@ -43,7 +43,7 @@
     </filter>
 
     <filter-mapping>
-        <filter-name>ExpiresFilter</filter-name>
+        <filter-name>PingExpiresFilter</filter-name>
         <url-pattern>/private/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
diff --git a/apache-tomcat/sso/webapps/pong/WEB-INF/web.xml b/apache-tomcat/sso/webapps/pong/WEB-INF/web.xml
index 69728f77dc..9db95f88c4 100644
--- a/apache-tomcat/sso/webapps/pong/WEB-INF/web.xml
+++ b/apache-tomcat/sso/webapps/pong/WEB-INF/web.xml
@@ -9,7 +9,7 @@
     <security-constraint>
         <display-name>Pong Login Auth</display-name>
         <web-resource-collection>
-            <web-resource-name>Restricted Access</web-resource-name>
+            <web-resource-name>PongRestrictedAccess</web-resource-name>
             <url-pattern>/private/*</url-pattern>     
         </web-resource-collection>
         <auth-constraint>
@@ -26,15 +26,11 @@
 
 
     <login-config>
-        <auth-method>FORM</auth-method>
-        <form-login-config>
-            <form-login-page>/logging.html</form-login-page>
-            <form-error-page>/logging_error.html</form-error-page>       
-        </form-login-config>
+        <auth-method>DIGEST</auth-method>
     </login-config>
 
     <filter>
-        <filter-name>ExpiresFilter</filter-name>
+        <filter-name>PongExpiresFilter</filter-name>
         <filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class>
         <init-param>
             <param-name>ExpiresByType text/html</param-name>
@@ -43,7 +39,7 @@
     </filter>
 
     <filter-mapping>
-        <filter-name>ExpiresFilter</filter-name>
+        <filter-name>PongExpiresFilter</filter-name>
         <url-pattern>/private/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
diff --git a/apache-tomcat/sso/webapps/pong/logging.html b/apache-tomcat/sso/webapps/pong/logging.html
deleted file mode 100644
index ba2ad05c1f..0000000000
--- a/apache-tomcat/sso/webapps/pong/logging.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Pong - Login</title>
-</head>
-<body>
-    <form method="post" action="j_security_check">
-        <table role="presentation">
-            <tr>
-                <td>User name: </td>
-                <td><input type="text" name="j_username" 
-                           size="20"/></td>
-            </tr>
-            <tr>
-                <td>Password: </td>
-                <td><input type="password" name="j_password" 
-                           size="20"/></td>
-            </tr>
-        </table>
-        <p></p>
-        <input type="submit" value="Submit"/>
-        &nbsp;
-        <input type="reset" value="Reset"/>
-    </form>
-</body>
-</html>
\ No newline at end of file
diff --git a/apache-tomcat/sso/webapps/pong/logging_error.html b/apache-tomcat/sso/webapps/pong/logging_error.html
deleted file mode 100644
index b5619a5094..0000000000
--- a/apache-tomcat/sso/webapps/pong/logging_error.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Pong</title>
-</head>
-<body>
-    Error logging in!
-    <a href="index.html">Try again</a>
-</body>
-</html>
\ No newline at end of file