pom updates

client/pom.xml

@@ -14,10 +14,6 @@
 
     <name>PWM Password Self Service: Angular Client JAR</name>
 
-    <properties>
-        <project.root.basedir>${project.basedir}/..</project.root.basedir>
-    </properties>
-
     <profiles>
         <profile>
             <id>skip-frontend</id>

data-service/pom.xml

@@ -24,7 +24,6 @@
         <skipTests>false</skipTests>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.root.basedir>${project.basedir}/..</project.root.basedir>
     </properties>
 
     <profiles>

docker/pom.xml

@@ -17,7 +17,6 @@
 
     <properties>
         <skipDocker>false</skipDocker>
-        <project.root.basedir>${project.basedir}/..</project.root.basedir>
     </properties>
 
     <profiles>

onejar/pom.xml

@@ -16,7 +16,6 @@
     <name>PWM Password Self Service: Executable Server JAR</name>
 
     <properties>
-        <project.root.basedir>${project.basedir}/..</project.root.basedir>
         <tomcat.version>9.0.31</tomcat.version>
     </properties>
 

pom.xml

@@ -34,7 +34,6 @@
         <timestamp.iso>${maven.build.timestamp}</timestamp.iso>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <project.root.basedir>${project.basedir}</project.root.basedir>
         <maven.javadoc.skip>true</maven.javadoc.skip>
 
         <skipTests>false</skipTests>
@@ -71,6 +70,27 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.commonjava.maven.plugins</groupId>
+                <artifactId>directory-maven-plugin</artifactId>
+                <version>0.3.1</version>
+                <executions>
+                    <execution>
+                        <id>project-root-directory</id>
+                        <goals>
+                            <goal>directory-of</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <property>project.root.basedir</property>
+                            <project>
+                                <groupId>org.pwm-project</groupId>
+                                <artifactId>pwm-parent</artifactId>
+                            </project>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
@@ -160,7 +180,8 @@
                                     <SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
                                     <SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
                                     <SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
-                                    <SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>                                </manifestEntries>
+                                    <SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
+                                </manifestEntries>
                             </archive>
                         </configuration>
                     </execution>
@@ -305,6 +326,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>net.nicoulaj.maven.plugins</groupId>
+                <artifactId>checksum-maven-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>artifacts</goal>
+                        </goals>
+                        <phase>verify</phase>
+                        <configuration>
+                            <algorithms>
+                                <algorithm>SHA-1</algorithm>
+                            </algorithms>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- put your configurations here -->
+                </configuration>
+            </plugin>
             <plugin> <!-- checks owsp vulnerability database -->
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>

pwm-cr/pom.xml

@@ -17,10 +17,6 @@
 
     <description>Library for managing challenge/response security policies, stored data, and validation</description>
 
-    <properties>
-        <project.root.basedir>${project.basedir}/..</project.root.basedir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>

rest-test-service/pom.xml

@@ -14,10 +14,6 @@
 
     <name>PWM Password Self Service: REST Test Server WAR</name>
 
-    <properties>
-        <project.root.basedir>${project.basedir}/..</project.root.basedir>
-    </properties>
-
     <profiles>
         <profile>
             <id>enable-javadoc</id>

server/pom.xml

@@ -15,7 +15,6 @@
     <name>PWM Password Self Service: Server JAR</name>
 
     <properties>
-        <project.root.basedir>${project.basedir}/..</project.root.basedir>
         <skipTests>false</skipTests>
         <skipExtendedTests>true</skipExtendedTests>
     </properties>

server/src/main/java/password/pwm/PwmAboutProperty.java

@@ -72,6 +72,8 @@ public enum PwmAboutProperty
     app_secureHashAlgorithm( null, pwmApplication -> pwmApplication.getSecureService().getDefaultHashAlgorithm().toString() ),
     app_ldapProfileCount( null, pwmApplication -> Integer.toString( pwmApplication.getConfig().getLdapProfiles().size() ) ),
     app_ldapConnectionCount( null, pwmApplication -> Integer.toString( pwmApplication.getLdapConnectionService().connectionCount() ) ),
+    app_activeSessionCount( "Active Session Count", pwmApplication -> Integer.toString( pwmApplication.getSessionTrackService().sessionCount() ) ),
+    app_activeRequestCount( "Active Request Count", pwmApplication -> Integer.toString( pwmApplication.getInprogressRequests().get() ) ),
 
     build_Time( "Build Time", pwmApplication -> PwmConstants.BUILD_TIME ),
     build_Number( "Build Number", pwmApplication -> PwmConstants.BUILD_NUMBER ),

server/src/main/java/password/pwm/svc/event/LocalDbAuditVault.java

@@ -109,7 +109,7 @@ public class LocalDbAuditVault implements AuditVault
 
     private static class IteratorWrapper implements Iterator<AuditRecord>
     {
-        private Iterator<String> innerIter;
+        private final Iterator<String> innerIter;
 
         private IteratorWrapper( final Iterator<String> innerIter )
         {

server/src/main/java/password/pwm/util/secure/X509Utils.java

@@ -130,7 +130,7 @@ public class X509Utils
             errorMsg.append( "unable to read server certificates from host=" );
             errorMsg.append( host ).append( ", port=" ).append( port );
             errorMsg.append( " error: " );
-            errorMsg.append( e.getMessage() );
+            errorMsg.append( JavaHelper.readHostileExceptionMessage( e ) );
             LOGGER.error( () -> "ServerCertReader: " + errorMsg );
             final ErrorInformation errorInformation = new ErrorInformation( PwmError.ERROR_CERTIFICATE_ERROR, errorMsg.toString(), new String[]
                     {

webapp/pom.xml

@@ -14,10 +14,6 @@
 
     <name>PWM Password Self Service: Server WAR</name>
 
-    <properties>
-        <project.root.basedir>${project.basedir}/..</project.root.basedir>
-    </properties>
-
     <profiles>
         <profile>
             <id>enable-javadoc</id>