Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 3d48fa3

Browse files
mtwomeymtwomey
committed
Merge branch 'jwttoken_update' into dev
2 parents a248260 + 7be6dfc commit 3d48fa3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+716
-484
lines changed

‎build-dependencies.xml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,11 @@
353353
<property name="asm-commons-5.2.jar" value="${ext_libdir}/asm/asm-commons-5.2.jar"/>
354354
<property name="asm-tree-5.2.jar" value="${ext_libdir}/asm/asm-tree-5.2.jar"/>
355355
<property name="aws-java-sdk.jar" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
356-
<property name="jackson-core.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-asl.jar"/>
357-
<property name="jackson-mapper.jar" value="${ext_libdir}/jackson/1.9.7/jackson-mapper-asl.jar"/>
358-
<property name="jackson-annotations-2.3.0.jar" value="${ext_libdir}/jackson/1.9.7/jackson-annotations-2.3.0.jar"/>
359-
<property name="jackson-core-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-2.3.2.jar"/>
360-
<property name="jackson-databind-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-databind-2.3.2.jar"/>
356+
<property name="jackson-core.jar" value="${ext_libdir}/jackson/2.8.1/jackson-core-asl.jar"/>
357+
<property name="jackson-mapper.jar" value="${ext_libdir}/jackson/2.8.1/jackson-mapper-asl.jar"/>
358+
<property name="jackson-annotations-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-annotations-2.8.1.jar"/>
359+
<property name="jackson-core-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-core-2.8.1.jar"/>
360+
<property name="jackson-databind-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-databind-2.8.1.jar"/>
361361
<property name="axis.jar" value="${ext_libdir}/axis/1.3/axis.jar"/>
362362
<property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
363363
<property name="commons-discovery.jar" value="${ext_libdir}/commons-discovery/0.2/commons-discovery.jar"/>
@@ -442,7 +442,10 @@
442442
<property name="dom4j-1.6.1.jar" value="${poi_libdir}/ooxml-lib/dom4j-1.6.1.jar"/>
443443
<property name="xmlbeans-2.3.0.jar" value="${poi_libdir}/ooxml-lib/xmlbeans-2.3.0.jar"/>
444444

445-
<property name="java-jwt-1.0.0.jar" value="${ext_libdir}/jwt/java-jwt-1.0.0.jar"/>
445+
<property name="java-jwt-3.3.0.jar" value="${ext_libdir}/jwt/java-jwt-3.3.0.jar"/>
446+
<property name="jwks-rsa-0.3.0.jar" value="${ext_libdir}/jwt/jwks-rsa-0.3.0.jar"/>
447+
<property name="guava-19.0.jar" value="${ext_libdir}/jwt/guava-19.0.jar"/>
448+
<property name="commons-codec-1.9.jar" value="${ext_libdir}/jwt/commons-codec-1.9.jar"/>
446449

447450
<!-- Http Client libs -->
448451
<property name="httpclient_libdir" value="${ext_libdir}/httpclient"/>
@@ -641,16 +644,18 @@
641644
<pathelement location="${yuicompressor.jar}"/>
642645
<pathelement location="${jackson-core.jar}"/>
643646
<pathelement location="${jackson-mapper.jar}"/>
644-
<pathelement location="${jackson-annotations-2.3.0.jar}"/>
645-
<pathelement location="${jackson-core-2.3.2.jar}"/>
646-
<pathelement location="${jackson-databind-2.3.2.jar}"/>
647+
<pathelement location="${jackson-annotations-2.8.1.jar}"/>
648+
<pathelement location="${jackson-core-2.8.1.jar}"/>
649+
<pathelement location="${jackson-databind-2.8.1.jar}"/>
647650
<pathelement location="${scribe.jar}"/>
648651
<pathelement location="${jedis.jar}"/>
649652
<!--
650653
<pathelement location="${jsr311.jar}"/>
651654
<pathelement location="${cxf.jar}"/>
652655
-->
653-
<pathelement location="${java-jwt-1.0.0.jar}"/>
656+
<pathelement location="${java-jwt-3.3.0.jar}"/>
657+
<pathelement location="${jwks-rsa-0.3.0.jar}"/>
658+
<pathelement location="${guava-19.0.jar}"/>
654659
</path>
655660

656661
</project>

‎build.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,17 @@
309309
</copy>
310310
<copy file="${jackson-core.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
311311
<copy file="${jackson-mapper.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
312-
<copy file="${jackson-annotations-2.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
313-
<copy file="${jackson-core-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
314-
<copy file="${jackson-databind-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
312+
<copy file="${jackson-annotations-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
313+
<copy file="${jackson-core-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
314+
<copy file="${jackson-databind-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
315315
<copy file="${encoder.jar}" todir="${ear_shared_libdir}" overwrite="true" />
316316

317317
<copy file="${yuicompressor.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
318-
<copy file="${java-jwt-1.0.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
319-
318+
<copy file="${java-jwt-3.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
319+
<copy file="${jwks-rsa-0.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
320+
<copy file="${guava-19.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
321+
<copy file="${commons-codec-1.9.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
322+
320323
<!-- EJB components -->
321324
<copy file="${catalog_services_id_generator.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
322325
<copy file="${catalog_services.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
@@ -569,6 +572,8 @@
569572
<include name="com/topcoder/management/payment/calculator/impl/ProjectPaymentAdjustmentCalculator.properties" />
570573
</fileset>
571574
</copy>
575+
576+
<copy file="${commons-codec-1.9.jar}" tofile="${jboss.home}/server/${server.name}/lib/commons-codec.jar" overwrite="true"/>
572577
<copy todir="${jboss.home}/server/${server.name}/lib" flatten="true" overwrite="true">
573578
<fileset dir="${ext_libdir}">
574579
<include name="aws-java-sdk/aws-java-sdk-1.0.004.jar" />

‎components/topcoder_cockpit_asset_services/build-dependencies.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<property name="spring-framework.dir" value="${ext_libdir}/spring/"/>
2424
<property name="commons-logging.jar" value="${ext_libdir}/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
2525
<property name="hibernate.dir" value="${ext_libdir}/hibernate"/>
26-
<property name="jackson.dir" value="${ext_libdir}/jackson/1.9.7"/>
26+
<property name="jackson.dir" value="${ext_libdir}/jackson/2.8.1"/>
2727
<property name="aspectj.dir" value="${ext_libdir}/aspectj/"/>
2828

2929
<path id="component.tcs-dependencies">
@@ -58,4 +58,4 @@
5858
<pathelement location="${ifxjdbc.jar}"/>
5959
</path>
6060

61-
</project>
61+
</project>

‎conf/ApplicationServer.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ SSO_COOKIE_KEY = @ApplicationServer.SSO_COOKIE_KEY@
4444
SSO_HASH_SECRET = @ApplicationServer.SSO_HASH_SECRET@
4545
SSO_DOMAIN = @ApplicationServer.SSO_DOMAIN@
4646

47-
JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@
4847
JWT_V3_COOKIE_KEY = @ApplicationServer.JWT_V3_COOKIE_KEY@
48+
JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@

‎conf/Direct.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ JWT_EXPIRATION_SECONDS = @JWT_EXPIRATION_SECONDS@
1717
LDAP_AUTH0_CONNECTION_NAME = @LDAP_AUTH0_CONNECTION_NAME@
1818
REDIRECT_URL_AUTH0 = /reg2/callback.action
1919
REG_SERVER_NAME= @REG_SERVER_NAME@
20+
JWT_VALID_ISSUERS=@JWT_VALID_ISSUERS@
21+
JWT_V3_SECRET = @JWT_V3_SECRET@
2022

2123
#Parameter whether we use login processor or not
2224
USE_LOGIN_PROCESSOR = @useLoginProcessor@

‎conf/web/WEB-INF/applicationContext.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@
212212
<property name="loginPageName" value="anonymous"/>
213213
<property name="userSessionIdentityKey" value="user"/>
214214
<property name="redirectBackUrlIdentityKey" value="redirectBackUrl"/>
215+
<property name="authorizationURL" value="@authorizationUrl@"/>
215216
</bean>
216217

217218
<!-- LoggingInterceptor -->
@@ -340,7 +341,6 @@
340341
<property name="contestFeeService" ref="contestFeeService"/>
341342
<property name="contestFeePercentageService" ref="contestFeePercentageService"/>
342343
<property name="userGroupsApiEndpoint" value="@userGroupsApiEndpoint@"/>
343-
<property name="jwtTokenUpdater" ref="jwtTokenUpdater" />
344344
</bean>
345345

346346
<bean id="projectAction" class="com.topcoder.direct.services.view.action.contest.launch.ProjectAction"
@@ -1504,13 +1504,11 @@
15041504
class="com.topcoder.direct.services.view.action.my.MyCreatedChallengesAction" scope="prototype">
15051505
<property name="serviceURL" value="@directChallengeServicesApiUrl@"/>
15061506
<property name="userService" ref="userService"/>
1507-
<property name="jwtTokenUpdater" ref="jwtTokenUpdater"/>
15081507
</bean>
15091508

15101509
<bean id="myChallengesAction"
15111510
class="com.topcoder.direct.services.view.action.my.MyChallengesAction" scope="prototype">
15121511
<property name="serviceURL" value="@directChallengeServicesApiUrl@"/>
1513-
<property name="jwtTokenUpdater" ref="jwtTokenUpdater"/>
15141512
</bean>
15151513

15161514
<bean id="xmlPhaseTemplatePersistence"
@@ -1555,10 +1553,5 @@
15551553
<bean id="getGroupMemberAction" class="com.topcoder.direct.services.view.action.contest.launch.GetGroupMemberAction"
15561554
scope="prototype" parent="baseDirectStrutsAction">
15571555
<property name="groupApiEndpoint" value="@groupMemberApiUrl@"/>
1558-
<property name="jwtTokenUpdater" ref="jwtTokenUpdater"/>
1559-
</bean>
1560-
<bean id="jwtTokenUpdater" class="com.topcoder.direct.services.view.util.JwtTokenUpdater" scope="prototype">
1561-
<property name="ssoLoginUrl" value="@ssoLoginUrl@"/>
1562-
<property name="authorizationURL" value="@authorizationUrl@"/>
15631556
</bean>
15641557
</beans>

‎conf/web/WEB-INF/struts.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,15 +1548,13 @@
15481548
<package name="my" namespace="/my" extends="base">
15491549
<action name="createdChallenges" class="myCreatedChallengesAction">
15501550
<result name="success">/WEB-INF/my/myCreatedChallenges.jsp</result>
1551-
<result name="forward" type="redirect">${ssoLoginUrl}</result>
15521551
</action>
15531552
<action name="getCreatedChallenges" method="getMyCreatedChallenges" class="myCreatedChallengesAction">
15541553
<result name="success" type="json"/>
15551554
<result name="error" type="json"/>
15561555
</action>
15571556
<action name="challenges" class="myChallengesAction">
15581557
<result name="success">/WEB-INF/my/myChallenges.jsp</result>
1559-
<result name="forward" type="redirect">${ssoLoginUrl}</result>
15601558
</action>
15611559
<action name="getMyChallenges" method="getMyChallenges" class="myChallengesAction">
15621560
<result name="success" type="json"/>

‎lib/third_party/jackson/1.9.7/jackson-annotations-2.3.0.jar‎

-34.2 KB
Binary file not shown.

‎lib/third_party/jackson/1.9.7/jackson-core-2.3.2.jar‎

-195 KB
Binary file not shown.

‎lib/third_party/jackson/1.9.7/jackson-databind-2.3.2.jar‎

-894 KB
Binary file not shown.

0 commit comments

Comments
 (0)