Merge branch 'jwttoken_update' into dev

Author: mtwomey

build-dependencies.xml

@@ -353,11 +353,11 @@
     <property name="asm-commons-5.2.jar" value="${ext_libdir}/asm/asm-commons-5.2.jar"/>
     <property name="asm-tree-5.2.jar" value="${ext_libdir}/asm/asm-tree-5.2.jar"/>
     <property name="aws-java-sdk.jar" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
-    <property name="jackson-core.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-asl.jar"/>
-    <property name="jackson-mapper.jar" value="${ext_libdir}/jackson/1.9.7/jackson-mapper-asl.jar"/>
-    <property name="jackson-annotations-2.3.0.jar" value="${ext_libdir}/jackson/1.9.7/jackson-annotations-2.3.0.jar"/>
-    <property name="jackson-core-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-2.3.2.jar"/>
-    <property name="jackson-databind-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-databind-2.3.2.jar"/>
+    <property name="jackson-core.jar" value="${ext_libdir}/jackson/2.8.1/jackson-core-asl.jar"/>
+    <property name="jackson-mapper.jar" value="${ext_libdir}/jackson/2.8.1/jackson-mapper-asl.jar"/>
+    <property name="jackson-annotations-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-annotations-2.8.1.jar"/>
+    <property name="jackson-core-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-core-2.8.1.jar"/>
+    <property name="jackson-databind-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-databind-2.8.1.jar"/>
     <property name="axis.jar" value="${ext_libdir}/axis/1.3/axis.jar"/>
     <property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
     <property name="commons-discovery.jar" value="${ext_libdir}/commons-discovery/0.2/commons-discovery.jar"/>
@@ -442,7 +442,10 @@
     <property name="dom4j-1.6.1.jar" value="${poi_libdir}/ooxml-lib/dom4j-1.6.1.jar"/>
     <property name="xmlbeans-2.3.0.jar" value="${poi_libdir}/ooxml-lib/xmlbeans-2.3.0.jar"/>
 
-    <property name="java-jwt-1.0.0.jar" value="${ext_libdir}/jwt/java-jwt-1.0.0.jar"/>
+    <property name="java-jwt-3.3.0.jar" value="${ext_libdir}/jwt/java-jwt-3.3.0.jar"/>
+    <property name="jwks-rsa-0.3.0.jar" value="${ext_libdir}/jwt/jwks-rsa-0.3.0.jar"/>
+    <property name="guava-19.0.jar" value="${ext_libdir}/jwt/guava-19.0.jar"/>
+    <property name="commons-codec-1.9.jar" value="${ext_libdir}/jwt/commons-codec-1.9.jar"/>
 
     <!-- Http Client libs -->
     <property name="httpclient_libdir" value="${ext_libdir}/httpclient"/>
@@ -641,16 +644,18 @@
         <pathelement location="${yuicompressor.jar}"/>
         <pathelement location="${jackson-core.jar}"/>
         <pathelement location="${jackson-mapper.jar}"/>
-        <pathelement location="${jackson-annotations-2.3.0.jar}"/>
-        <pathelement location="${jackson-core-2.3.2.jar}"/>
-        <pathelement location="${jackson-databind-2.3.2.jar}"/>
+        <pathelement location="${jackson-annotations-2.8.1.jar}"/>
+        <pathelement location="${jackson-core-2.8.1.jar}"/>
+        <pathelement location="${jackson-databind-2.8.1.jar}"/>
         <pathelement location="${scribe.jar}"/>
         <pathelement location="${jedis.jar}"/>
 <!--
         <pathelement location="${jsr311.jar}"/>
         <pathelement location="${cxf.jar}"/>
 -->
-        <pathelement location="${java-jwt-1.0.0.jar}"/>
+        <pathelement location="${java-jwt-3.3.0.jar}"/>
+        <pathelement location="${jwks-rsa-0.3.0.jar}"/>
+        <pathelement location="${guava-19.0.jar}"/>
     </path>
 
 </project>

build.xml

@@ -309,14 +309,17 @@
         </copy>
     	<copy file="${jackson-core.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
     	<copy file="${jackson-mapper.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${jackson-annotations-2.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${jackson-core-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${jackson-databind-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jackson-annotations-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jackson-core-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jackson-databind-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${encoder.jar}" todir="${ear_shared_libdir}" overwrite="true" />
 
     	<copy file="${yuicompressor.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${java-jwt-1.0.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-
+        <copy file="${java-jwt-3.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${jwks-rsa-0.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${guava-19.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${commons-codec-1.9.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+	    
         <!-- EJB components -->
         <copy file="${catalog_services_id_generator.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
         <copy file="${catalog_services.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
@@ -569,6 +572,8 @@
                 <include name="com/topcoder/management/payment/calculator/impl/ProjectPaymentAdjustmentCalculator.properties" />
             </fileset>
         </copy>
+	    
+        <copy file="${commons-codec-1.9.jar}" tofile="${jboss.home}/server/${server.name}/lib/commons-codec.jar" overwrite="true"/>
         <copy todir="${jboss.home}/server/${server.name}/lib" flatten="true"  overwrite="true">
             <fileset dir="${ext_libdir}">
                 <include name="aws-java-sdk/aws-java-sdk-1.0.004.jar" />

components/topcoder_cockpit_asset_services/build-dependencies.xml

@@ -23,7 +23,7 @@
     <property name="spring-framework.dir" value="${ext_libdir}/spring/"/>
     <property name="commons-logging.jar" value="${ext_libdir}/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
     <property name="hibernate.dir" value="${ext_libdir}/hibernate"/>
-    <property name="jackson.dir" value="${ext_libdir}/jackson/1.9.7"/>
+    <property name="jackson.dir" value="${ext_libdir}/jackson/2.8.1"/>
     <property name="aspectj.dir" value="${ext_libdir}/aspectj/"/>
 
     <path id="component.tcs-dependencies">
@@ -58,4 +58,4 @@
         <pathelement location="${ifxjdbc.jar}"/>
     </path>
 
-</project>
+</project>

conf/ApplicationServer.properties

@@ -44,5 +44,5 @@ SSO_COOKIE_KEY = @ApplicationServer.SSO_COOKIE_KEY@
 SSO_HASH_SECRET = @ApplicationServer.SSO_HASH_SECRET@
 SSO_DOMAIN = @ApplicationServer.SSO_DOMAIN@
 
-JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@
 JWT_V3_COOKIE_KEY = @ApplicationServer.JWT_V3_COOKIE_KEY@
+JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@

conf/Direct.properties

@@ -17,6 +17,8 @@ JWT_EXPIRATION_SECONDS = @JWT_EXPIRATION_SECONDS@
 LDAP_AUTH0_CONNECTION_NAME = @LDAP_AUTH0_CONNECTION_NAME@
 REDIRECT_URL_AUTH0 = /reg2/callback.action
 REG_SERVER_NAME= @REG_SERVER_NAME@
+JWT_VALID_ISSUERS=@JWT_VALID_ISSUERS@
+JWT_V3_SECRET = @JWT_V3_SECRET@
 
 #Parameter whether we use login processor or not
 USE_LOGIN_PROCESSOR = @useLoginProcessor@

conf/web/WEB-INF/applicationContext.xml

@@ -212,6 +212,7 @@
         <property name="loginPageName" value="anonymous"/>
         <property name="userSessionIdentityKey" value="user"/>
         <property name="redirectBackUrlIdentityKey" value="redirectBackUrl"/>
+        <property name="authorizationURL" value="@authorizationUrl@"/>
     </bean>
 
     <!-- LoggingInterceptor -->
@@ -340,7 +341,6 @@
         <property name="contestFeeService" ref="contestFeeService"/>
         <property name="contestFeePercentageService" ref="contestFeePercentageService"/>
         <property name="userGroupsApiEndpoint" value="@userGroupsApiEndpoint@"/>
-        <property name="jwtTokenUpdater" ref="jwtTokenUpdater" />
     </bean>
 
     <bean id="projectAction" class="com.topcoder.direct.services.view.action.contest.launch.ProjectAction"
@@ -1504,13 +1504,11 @@
           class="com.topcoder.direct.services.view.action.my.MyCreatedChallengesAction" scope="prototype">
         <property name="serviceURL" value="@directChallengeServicesApiUrl@"/>
         <property name="userService" ref="userService"/>
-        <property name="jwtTokenUpdater" ref="jwtTokenUpdater"/>
     </bean>
 
     <bean id="myChallengesAction"
           class="com.topcoder.direct.services.view.action.my.MyChallengesAction" scope="prototype">
         <property name="serviceURL" value="@directChallengeServicesApiUrl@"/>
-        <property name="jwtTokenUpdater" ref="jwtTokenUpdater"/>
     </bean>
 
     <bean id="xmlPhaseTemplatePersistence"
@@ -1555,10 +1553,5 @@
     <bean id="getGroupMemberAction" class="com.topcoder.direct.services.view.action.contest.launch.GetGroupMemberAction"
           scope="prototype" parent="baseDirectStrutsAction">
         <property name="groupApiEndpoint" value="@groupMemberApiUrl@"/>
-        <property name="jwtTokenUpdater" ref="jwtTokenUpdater"/>
-    </bean>
-    <bean id="jwtTokenUpdater" class="com.topcoder.direct.services.view.util.JwtTokenUpdater" scope="prototype">
-        <property name="ssoLoginUrl" value="@ssoLoginUrl@"/>
-        <property name="authorizationURL" value="@authorizationUrl@"/>
     </bean>
 </beans>

conf/web/WEB-INF/struts.xml

@@ -1548,15 +1548,13 @@
     <package name="my" namespace="/my" extends="base">
         <action name="createdChallenges" class="myCreatedChallengesAction">
             <result name="success">/WEB-INF/my/myCreatedChallenges.jsp</result>
-            <result name="forward" type="redirect">${ssoLoginUrl}</result>
         </action>
         <action name="getCreatedChallenges" method="getMyCreatedChallenges" class="myCreatedChallengesAction">
             <result name="success" type="json"/>
             <result name="error" type="json"/>
         </action>
         <action name="challenges" class="myChallengesAction">
             <result name="success">/WEB-INF/my/myChallenges.jsp</result>
-            <result name="forward" type="redirect">${ssoLoginUrl}</result>
         </action>
         <action name="getMyChallenges" method="getMyChallenges" class="myChallengesAction">
             <result name="success" type="json"/>

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

@@ -167,8 +167,8 @@
     <property name="xerces.jar" value="${ext_libdir}/xerces/2.6.2/xerces.jar"/>
     <property name="commons-discovery.jar" value="${ext_libdir}/commons-discovery/0.2/commons-discovery.jar"/>
     <property name="aws-java" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
-    <property name="jackson-core" value="${ext_libdir}/jackson/1.9.7/jackson-core-asl.jar"/>
-    <property name="jackson-mapper" value="${ext_libdir}/jackson/1.9.7/jackson-mapper-asl.jar"/>
+    <property name="jackson-core" value="${ext_libdir}/jackson/2.8.1/jackson-core-asl.jar"/>
+    <property name="jackson-mapper" value="${ext_libdir}/jackson/2.8.1/jackson-mapper-asl.jar"/>
 
 
     <path id="component.tcs-dependencies">

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

@@ -55,7 +55,7 @@ public class ServerConfiguration extends ApplicationServer {
      *
      * @since 1.1
      */
-    public static String JWT_COOOKIE_KEY = bundle.getProperty("JWT_COOKIE_KEY", "tcjwt");
-
     public static String JWT_V3_COOKIE_KEY = bundle.getProperty("JWT_V3_COOKIE_KEY", "v3jwt");
+
+    public static String JWT_COOKIE_KEY = bundle.getProperty("JWT_COOKIE_KEY", "tcjwt");
 }

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

@@ -3,11 +3,11 @@
  */
 package com.topcoder.direct.services.view.action;
 
+import com.topcoder.direct.services.configs.ServerConfiguration;
 import com.topcoder.direct.services.view.dto.contest.ContestStatus;
 import com.topcoder.direct.services.view.dto.project.ProjectBriefDTO;
 import com.topcoder.direct.services.view.util.DataProvider;
 import com.topcoder.direct.services.view.util.DirectUtils;
-import com.topcoder.direct.services.view.util.JwtTokenUpdater;
 import com.topcoder.security.TCSubject;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
@@ -17,6 +17,7 @@
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.log4j.Logger;
+import org.apache.struts2.ServletActionContext;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -215,11 +216,6 @@ public abstract class ServiceBackendDataTablesAction extends AbstractAction {
      */
     protected static final ObjectMapper objectMapper;
 
-    /**
-     * JwtTokenUpdater
-     */
-    private JwtTokenUpdater jwtTokenUpdater;
-
     /**
      * <p>A static <code>Map</code> mapping the existing contest statuses to their textual presentations.</p>
      *
@@ -323,7 +319,8 @@ protected JsonNode getJsonResultFromAPI(URI apiEndPoint) throws Exception {
             // specify the get request
             HttpGet getRequest = new HttpGet(apiEndPoint);
 
-            String token = jwtTokenUpdater.check().getToken();
+            String token = DirectUtils.getCookieFromRequest(ServletActionContext.getRequest(),
+                    ServerConfiguration.JWT_V3_COOKIE_KEY).getValue();
 
             getRequest.setHeader(HttpHeaders.AUTHORIZATION,
                     "Bearer " + token);
@@ -702,12 +699,4 @@ public String getEndDateTo() {
     public void setEndDateTo(String endDateTo) {
         this.endDateTo = endDateTo;
     }
-
-    public JwtTokenUpdater getJwtTokenUpdater() {
-        return jwtTokenUpdater;
-    }
-
-    public void setJwtTokenUpdater(JwtTokenUpdater jwtTokenUpdater) {
-        this.jwtTokenUpdater = jwtTokenUpdater;
-    }
 }

lib/third_party/jackson/2.8.1/jackson-annotations-2.8.1.jar

@@ -20,7 +20,6 @@
 import com.topcoder.direct.services.view.util.AuthorizationProvider;
 import com.topcoder.direct.services.view.util.DataProvider;
 import com.topcoder.direct.services.view.util.DirectUtils;
-import com.topcoder.direct.services.view.util.JwtTokenUpdater;
 import com.topcoder.direct.services.view.util.challenge.CostCalculationService;
 import com.topcoder.management.project.ProjectGroup;
 import com.topcoder.security.TCSubject;
@@ -129,7 +128,6 @@ public class CommonAction extends BaseContestFeeAction {
      */
     private String userGroupsApiEndpoint;
 
-    private JwtTokenUpdater jwtTokenUpdater;
 
     /**
      * <p>
@@ -561,7 +559,7 @@ public void setCategoryId(long categoryId) {
     public String getGroups()  {
         try {
             TCSubject tcSubject = DirectUtils.getTCSubjectFromSession();
-            Set<ProjectGroup> projectGroups = DirectUtils.getGroups(tcSubject, jwtTokenUpdater, userGroupsApiEndpoint);
+            Set<ProjectGroup> projectGroups = DirectUtils.getGroups(tcSubject, userGroupsApiEndpoint);
             setResult(projectGroups);
         } catch (Throwable e) {
             if (getModel() != null) {
@@ -578,12 +576,4 @@ public String getUserGroupsApiEndpoint() {
     public void setUserGroupsApiEndpoint(String userGroupsApiEndpoint) {
         this.userGroupsApiEndpoint = userGroupsApiEndpoint;
     }
-
-    public JwtTokenUpdater getJwtTokenUpdater() {
-        return jwtTokenUpdater;
-    }
-
-    public void setJwtTokenUpdater(JwtTokenUpdater jwtTokenUpdater) {
-        this.jwtTokenUpdater = jwtTokenUpdater;
-    }
 }

lib/third_party/jackson/2.8.1/jackson-core-2.8.1.jar

@@ -6,9 +6,7 @@
 import com.topcoder.direct.services.configs.ServerConfiguration;
 import com.topcoder.direct.services.view.dto.contest.GroupMember;
 import com.topcoder.direct.services.view.dto.my.RestResult;
-import com.topcoder.direct.services.view.exception.JwtAuthenticationException;
 import com.topcoder.direct.services.view.util.DirectUtils;
-import com.topcoder.direct.services.view.util.JwtTokenUpdater;
 import com.topcoder.direct.services.view.util.SortedCacheAddress;
 import com.topcoder.web.common.cache.CacheClient;
 import com.topcoder.web.common.cache.CacheClientFactory;
@@ -27,9 +25,13 @@
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
 
-import javax.servlet.http.Cookie;
 import java.net.URI;
-import java.util.*;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * This action handle group member search for given list of groups and substringof user's handle
@@ -62,11 +64,6 @@ class GetGroupMemberAction extends ContestAction {
      */
     private String handle;
 
-    /**
-     * JwtTokenUpdater
-     */
-    private JwtTokenUpdater jwtTokenUpdater;
-
     /**
      * Json object mapper
      */
@@ -188,13 +185,8 @@ private RestResult<GroupMember> getGroupMemberByGid(Long gid) throws Exception {
         try{
             URI groupApiEndpointUri = new URI(String.format(groupApiEndpoint, gid));
             HttpGet request = new HttpGet(groupApiEndpointUri);
-            String jwtToken;
-            try{
-                jwtToken = jwtTokenUpdater.check().getToken();
-            } catch (Exception e) {
-                logger.error("Can't get jwt token");
-                throw e;
-            }
+            String jwtToken = DirectUtils.getCookieFromRequest(ServletActionContext.getRequest(),
+                    ServerConfiguration.JWT_V3_COOKIE_KEY).getValue();
 
             request.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + jwtToken);
             request.addHeader(HttpHeaders.ACCEPT, "application/json");
@@ -239,12 +231,4 @@ public String getHandle() {
     public void setHandle(String handle) {
         this.handle = handle;
     }
-
-    public JwtTokenUpdater getJwtTokenUpdater() {
-        return jwtTokenUpdater;
-    }
-
-    public void setJwtTokenUpdater(JwtTokenUpdater jwtTokenUpdater) {
-        this.jwtTokenUpdater = jwtTokenUpdater;
-    }
 }

lib/third_party/jackson/1.9.7/jackson-core-asl.jar renamed to lib/third_party/jackson/2.8.1/jackson-core-asl.jar

@@ -6,13 +6,17 @@
 import com.topcoder.direct.services.view.action.ServiceBackendDataTablesAction;
 import com.topcoder.direct.services.view.dto.my.Challenge;
 import com.topcoder.direct.services.view.dto.my.RestResult;
-import com.topcoder.direct.services.view.exception.JwtAuthenticationException;
 import org.codehaus.jackson.JsonNode;
 
 import java.text.DateFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TimeZone;
 
 /**
  * <p>
@@ -46,12 +50,6 @@ public class MyChallengesAction extends ServiceBackendDataTablesAction {
      */
     @Override
     public String execute() throws Exception {
-        try {
-            getJwtTokenUpdater().check();
-        } catch (JwtAuthenticationException e) {
-            return "forward";
-        }
-
         // populate filter data
         this.setupFilterPanel();