Prechádzať zdrojové kódy

remove supurflous 'sspr' context references

Jason Rivard 4 rokov pred
rodič
commit
6a4bd8b0f4

+ 1 - 1
client/angular/src/services/helpdesk.service.dev.ts

@@ -150,7 +150,7 @@ export default class HelpDeskService implements IHelpDeskService {
                 'Must not include part of your name or user name.',
                 'Must not include a common word or commonly used sequence of characters.'
             ],
-            'passwordPolicyDN': 'cn=SSPR,cn=Password Policies,cn=Security',
+            'passwordPolicyDN': 'cn=Policy,cn=Password Policies,cn=Security',
             'passwordPolicyID': 'n/a',
             'statusData': [
                 {

+ 5 - 6
data-service/src/main/java/password/pwm/receiver/SummaryBean.java

@@ -21,7 +21,6 @@
 package password.pwm.receiver;
 
 import lombok.Builder;
-import lombok.Getter;
 import lombok.Value;
 import password.pwm.PwmAboutProperty;
 import password.pwm.bean.TelemetryPublishBean;
@@ -34,7 +33,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
 
-@Getter
+@Value
 @Builder
 public class SummaryBean
 {
@@ -47,7 +46,7 @@ public class SummaryBean
     private Map<String, Integer> osCount;
     private Map<String, Integer> dbCount;
     private Map<String, Integer> javaCount;
-    private Map<String, Integer> ssprVersionCount;
+    private Map<String, Integer> appVersionCount;
 
     static SummaryBean fromStorage( final Storage storage, final TimeDuration maxAge )
     {
@@ -63,7 +62,7 @@ public class SummaryBean
         final Map<String, Integer> osCount = new TreeMap<>();
         final Map<String, Integer> dbCount = new TreeMap<>();
         final Map<String, Integer> javaCount = new TreeMap<>();
-        final Map<String, Integer> ssprVersionCount = new TreeMap<>();
+        final Map<String, Integer> appVersionCount = new TreeMap<>();
 
         for ( Iterator<TelemetryPublishBean> iterator = storage.iterator(); iterator.hasNext(); )
         {
@@ -106,7 +105,7 @@ public class SummaryBean
 
                 incrementCounterMap( javaCount, siteSummary.getJavaVm() );
 
-                incrementCounterMap( ssprVersionCount, siteSummary.getVersion() );
+                incrementCounterMap( appVersionCount, siteSummary.getVersion() );
 
                 for ( final String settingKey : bean.getConfiguredSettings() )
                 {
@@ -139,7 +138,7 @@ public class SummaryBean
                 .osCount( osCount )
                 .dbCount( dbCount )
                 .javaCount( javaCount )
-                .ssprVersionCount( ssprVersionCount )
+                .appVersionCount( appVersionCount )
                 .build();
 
     }

+ 2 - 2
data-service/src/main/webapp/WEB-INF/jsp/telemetry-viewer.jsp

@@ -67,10 +67,10 @@
             <td><b>Version</b></td>
             <td><b>Count</b></td>
         </tr>
-        <% for (final String version : summaryBean.getSsprVersionCount().keySet()) { %>
+        <% for (final String version : summaryBean.getAppVersionCount().keySet()) { %>
         <tr>
             <td><%=version%></td>
-            <td><%=summaryBean.getSsprVersionCount().get(version)%></td>
+            <td><%=summaryBean.getAppVersionCount().get(version)%></td>
         </tr>
         <% } %>
     </table>

+ 2 - 2
server/src/main/java/password/pwm/http/filter/CookieManagementFilter.java

@@ -60,7 +60,7 @@ public class CookieManagementFilter implements Filter
         }
         catch ( final PwmUnrecoverableException e )
         {
-            LOGGER.trace( () -> "unable to load application configuration while checking samesite cookie attribute config", e );
+            LOGGER.trace( () -> "unable to load application configuration while checking samesite cookie attribute config" );
         }
     }
 
@@ -96,7 +96,7 @@ public class CookieManagementFilter implements Filter
             }
             catch ( final PwmUnrecoverableException e )
             {
-                LOGGER.trace( () -> "unable to load session while checking samesite cookie attribute config", e );
+                LOGGER.trace( () -> "unable to load session while checking samesite cookie attribute config" );
             }
 
             if ( pwmSession != null )

+ 1 - 1
server/src/main/resources/password/pwm/AppProperty.properties

@@ -303,7 +303,7 @@ security.http.forceRequestSequencing=false
 security.http.stripHeaderRegex=\\n|\\r|(?ism)%0A|%0D
 security.http.performCsrfHeaderChecks=false
 security.http.promiscuousEnable=false
-security.http.config.cspHeader=default-src 'self'; object-src 'none'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; report-uri /sspr/public/command/cspReport
+security.http.config.cspHeader=default-src 'self'; object-src 'none'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; report-uri @PwmContextPath@/public/command/cspReport
 security.httpsServer.selfCert.futureSeconds=63113904
 security.httpsServer.selfCert.alg=RSA
 security.httpsServer.selfCert.keySize=2048

+ 9 - 9
webapp/src/build/ldif/OracleDS-schema.ldif

@@ -9,7 +9,7 @@ add: attributeTypes
 attributeTypes: (
   1.3.6.1.4.1.35015.1.2.1
   NAME 'pwmEventLog'
-  DESC 'SSPR defined attribute type'
+  DESC 'PWM defined attribute type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
   X-ORIGIN 'iPlanet Directory Server'
  )
@@ -25,7 +25,7 @@ add: attributeTypes
 attributeTypes: (
   1.3.6.1.4.1.35015.1.2.2
   NAME 'pwmResponseSet'
-  DESC 'SSPR defined attribute type'
+  DESC 'PWM defined attribute type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
   X-ORIGIN 'iPlanet Directory Server'
  )
@@ -41,7 +41,7 @@ add: attributeTypes
 attributeTypes: (
   1.3.6.1.4.1.35015.1.2.3
   NAME 'pwmLastPwdUpdate'
-  DESC 'SSPR defined attribute type'
+  DESC 'PWM defined attribute type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
   X-ORIGIN 'iPlanet Directory Server'
  )
@@ -57,7 +57,7 @@ add: attributeTypes
 attributeTypes: (
   1.3.6.1.4.1.35015.1.2.4
   NAME 'pwmGUID'
-  DESC 'SSPR defined attribute type'
+  DESC 'PWM defined attribute type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'iPlanet Directory Server'
  )
@@ -73,7 +73,7 @@ add: attributeTypes
 attributeTypes: (
   1.3.6.1.4.1.35015.1.2.5
   NAME 'pwmToken'
-  DESC 'SSPR defined attribute type'
+  DESC 'PWM defined attribute type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'iPlanet Directory Server'
  )
@@ -89,7 +89,7 @@ add: attributeTypes
 attributeTypes: (
   1.3.6.1.4.1.35015.1.2.6
   NAME 'pwmOtpSecret'
-  DESC 'SSPR defined attribute type'
+  DESC 'PWM defined attribute type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
   X-ORIGIN 'iPlanet Directory Server'
  )
@@ -105,7 +105,7 @@ add: attributeTypes
 attributeTypes: (
   1.3.6.1.4.1.35015.1.2.7
   NAME 'pwmData'
-  DESC 'SSPR defined attribute type'
+  DESC 'PWM defined attribute type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
   X-ORIGIN 'iPlanet Directory Server'
  )
@@ -124,8 +124,8 @@ add: objectClasses
 objectClasses: (
   1.3.6.1.4.1.35015.1.1.1
   NAME 'pwmUser'
-  DESC 'SSPR defined aux class'
+  DESC 'PWM defined aux class'
   AUXILIARY
   MAY ( pwmEventLog $ pwmResponseSet $ pwmLastPwdUpdate $ pwmGUID $ pwmToken $ pwmOtpSecret $ pwmData )
-  X-ORIGIN 'SSPR Administrator'
+  X-ORIGIN 'PWM Administrator'
  )

+ 1 - 1
webapp/src/main/webapp/public/reference/rest.jsp

@@ -1628,7 +1628,7 @@ cLi2mbers
                             <td>After the form data is signed, it can be submitted as part of a request to <pwm:macro value="@PwmAppName@"/> using the
                                 <code>signedForm</code> parameter and the value is the encoded <code>data</code> value returned in the result.
                                 Values expire after a period of time.
-                                <br/><br/><b>Example:</b><br/> <code><pwm:context/>/sspr/public/newuser?signedForm=xxx</code>
+                                <br/><br/><b>Example:</b><br/> <code><pwm:context/>/public/newuser?signedForm=xxx</code>
 
                             </td>
                         </tr>