Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

I config.xml er der tilføjet følgende import:

Code Block
title2.7.8 config.xml
    <import resource="uuid2cpr.xml"/>

I log4j-sts.xml er timing log blevet disabled:

Code Block
title2.7.8 log4j-sts.xml
   <category name="STS.TIMING" additivity="false">
      <priority value="OFF"/>
      <appender-ref ref="TIMING"/>
   </category>

services.xml er der tilføjet følgende beans:

Code Block
title2.7.8 services.xml beans
	<bean id="userDataService" class="dk.sosi.sts.user.data.DbUserDataService">
		<property name="dataSource" ref="sts.db"/>
		<property name="sql" value="select * from sts_audconf.userData where cpr = ?" />
	</bean>

	<bean id="idpConfigService" class="dk.sosi.sts.idp.DBIdpConfigService">
		<constructor-arg ref="sts.db"/> <!-- the dataSource used -->
		<property name="selectByIssuer" value="SELECT attribute, attribute_value FROM sts_audconf.trustedIdpConfiguration WHERE issuer = ?" />
		<property name="selectAllEncryptionKeys" value="SELECT attribute_value FROM sts_audconf.trustedIdpConfiguration WHERE attribute like 'encryptionKey%'" />
	</bean>

	<bean id="idpCitizenConfigService" class="dk.sosi.sts.idp.DBIdpConfigService">
		<constructor-arg ref="sts.db"/> <!-- the dataSource used -->
		<property name="selectByIssuer" value="SELECT attribute, attribute_value FROM sts_audconf.trustedIdpCitizenConfiguration WHERE issuer = ?" />
		<property name="selectAllEncryptionKeys" value="SELECT attribute_value FROM sts_audconf.trustedIdpCitizenConfiguration WHERE attribute like 'encryptionKey%'" />
	</bean>

	<bean id="BST2SOSIRequestHandler" class="dk.sosi.sts.server.BST2SOSIRequestHandler" parent="abstractRequestHandler">
    	<property name="allowedDriftInSeconds" value="120"/> <!-- the number of seconds that the NemLogin IdP may drift from STS time -->
    	<property name="allowedAudience" value="https://sts.sosi.dk/"/>
    	<property name="fuzzyTime" value="300000"/> <!-- validity back in time for 5 minutes -->
		<property name="idCardDuration" value="86400000"/> <!-- validity forward in time for 24 hours -->
    	<property name="userValidationService" ref="userValidationService" />
    	<property name="userDataService" ref="userDataService" />
    	<property name="idpConfigService" ref="idpConfigService" />
		<property name="whitelistValidation" value="true" />
    </bean>

services.xml har følgende beans fået nye properties:

Code Block
title2.7.8 services.xml properties
	<bean id="nationalRolesService" class="dk.sosi.sts.roles.nationalroles.DbNationalRoleService">
		...
		<property name="uuidSql" value="select * from stamdata.nationalRoles where global_employee_uuid = ? and ValidFrom <= ? and (ValidTo is null or ValidTo > ?)" />
	</bean>

	<bean id="userValidationService" class="dk.sosi.sts.server.UserValidationService">
		...
		<constructor-arg ref="uuidService" />
	</bean>

	<bean name="nboConfiguration" class="dk.sosi.sts.server.NboConfig">
		...
		<property name="cprTrustCertificates">
			<list>
				...
                <value>UI:DK-O:G:23550132-5e1f-4e43-a5f9-048acf49e0b8</value><!-- lokal IT test - OCES3 -->
			</list>
		</property>
	</bean>

	<bean id="bs2IdwsRequestHandler" class="dk.sosi.sts.server.Bootstrap2IdwsRequestHandler" parent="abstractRequestHandler">
		...
		<property name="idpConfigService" ref="idpCitizenConfigService" />
	</bean>

	<bean id="iboRequestHandler" class="dk.sosi.sts.server.IboRequestHandler" parent="abstractRequestHandler">
		...
		<property name="emptyAttributeValue" value="NONE"/>
	</bean>

...

Et nyt volume er blevet tilføjet til docker-compose.yml:

Code Block
title2.7.8 docker-compose.yml
services:
  sts:
    ...
    volumes:
      - ../configuration/uuid2cpr.xml:/pack/wildfly8/standalone/configuration/sts/uuid2cpr.xml
...

...