Changeset 20837 in main


Ignore:
Timestamp:
06/17/20 22:15:55 (2 weeks ago)
Author:
GarthBraithwaite_STG
Message:

admin - updated authentication.

Location:
trunk
Files:
1 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/security-db_authentication.xml

    r20835 r20837  
    7070        </bean>
    7171
    72         <bean id="securityAuthenticationFailedAuthenticationHandler" class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler">
    73                 <property name="defaultFailureUrl" value="/WEB-INF/jsp/access_denied.jsp?message=Authentication Failed"/>
    74                 <property name="useForward" value="true"/>
    75         </bean>
    76 
    7772        <bean id="securityDBAuthenticationUserLogService" class="org.ibisph.user.service.DataBeanDAOUserLog">
    7873                <property name="DAOFactory" ref="securityDBAuthenticationDAOFactory"/>
     
    109104                <property name="usernameParameter"        value="username"/>
    110105                <property name="passwordParameter"        value="password"/>
     106                <property name="authenticationSuccessHandler" ref="securityAuthenticationSuccessAuthenticationHandler"/>
    111107                <property name="authenticationFailureHandler" ref="securityAuthenticationFailedAuthenticationHandler"/>
    112 
    113                 <!-- set this to always forward to the IP list request.  This is safe and
    114                         makes it cleaner and easier as there's no dispacther serverlt, web.xml,
    115                         and index.jsp needed.
    116 
    117                         The main issue with this approach is that this code ALWAYS goes to the
    118                         edit IP list page even if alwaysUseDefault is set to false (which is
    119                         the default). 
    120                 -->
    121                 <property name="authenticationSuccessHandler">
    122                         <bean class="org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler">
    123                                 <property name="defaultTargetUrl" value="#{securityDefaultLandingURL.string}"/>
    124                         </bean>
    125                 </property>
    126108
    127109                <!-- if using DB authentication, might want to use the DB UserLogService:
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/security.xml

    r20835 r20837  
    199199        </bean>
    200200
     201        <bean id="securityAuthenticationFailedAuthenticationHandler" class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler">
     202                <property name="defaultFailureUrl" value="/WEB-INF/jsp/access_denied.jsp?message=Authentication Failed"/>
     203                <property name="useForward" value="true"/>
     204        </bean>
     205        <bean id="securityAuthenticationSuccessAuthenticationHandler" class="org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler">
     206                <property name="defaultTargetUrl" value="#{securityDefaultLandingURL.string}"/>
     207        </bean>
     208
    201209<!--
    202210        <bean id ="securityPasswordEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder" factory-method="getInstance"/>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/tags/page.tag

    r16336 r20837  
    2727                <meta name="author"                             content="Software Technology Group"/>
    2828
    29                 <link rel="shortcut icon" href="${pageContext.request.contextPath}/image/application.ico" type="image/vnd.microsoft.icon"/>
     29                <link rel="shortcut icon" href="${pageContext.request.contextPath}/favicon.ico" type="image/x-icon"/>
    3030                <link rel="icon"          href="${pageContext.request.contextPath}/image/application.ico" type="image/vnd.microsoft.icon"/>
    3131
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/web.xml

    r20835 r20837  
    441441
    442442
     443        <!-- =============================== D E F A U L T / W E L C O M E   P A G E -->
     444        <!-- the index.jsp contains a redirect.  The jsp forward has issues with
     445                spring security.  This setup works for bookmarked starting points as the
     446                index/redirect only happens for root requests.  All other requests are
     447                handled by spring secuity.
     448        -->
     449        <welcome-file-list>
     450                <welcome-file>index.jsp</welcome-file>
     451        </welcome-file-list>
     452
     453
    443454        <!-- ============================================= M I M E   M A P P I N G S -->
    444455        <mime-mapping><extension>htm</extension> <mime-type>text/html</mime-type></mime-mapping>
  • trunk/ibisph-view/src/main/webapp/xslt/html/query/module/result/Result.xslt

    r20835 r20837  
    135135                        </xsl:call-template>
    136136                </xsl:variable>
    137 <xsl:message select="'recordDimensionFields:'"/>
    138 <xsl:message select="$recordDimensionFields"/>
     137
    139138                <xsl:variable name="recordAncillaryValueFields">
    140139                        <xsl:call-template name="Interactive.recordAncillaryValueFields">
  • trunk/ibisph-view/src/main/webapp/xslt/json/Dataset.xslt

    r20835 r20837  
    143143<xsl:message select="$datasetRecordDimension"/>
    144144<xsl:message select="$dimensionValue"/>
     145
     146There's an issue with setting a default sort order as that field is used for 2-d
     147grouping.  As of 6/17/2020 all db controlled dim values require a SO.  For IBISQ
     148user defined values this is not possible.  Esp since SO MUST be numeric but the
     149user defined is typically mixed alphanumeric so the value can NOT be used.  Another
     150option is to have a SO added by Java code.  The poor mans option is to switch the
     151display grouping options where the user defined is category and a standard dim value
     152set is used for the series.
    145153-->
    146154
Note: See TracChangeset for help on using the changeset viewer.