Merge pull request #63 from cloudspokes/technology-2014-11-13

Technology 2014 11 13

Author: mashannon168

README.md

@@ -7,6 +7,10 @@ Setup on VM:
 * Delete the whole directory /home/direct/direct
 * Git Clone the direct-app repo into folder /home/direct/direct.
 * Copy the back up *.properties files back to /home/direct/direct
+* Among the *.properties, update topcoder_global.properties, add line 'direct_service_libdir=${libdir}/tcs/ejb' after tcs_libdir property
+* Make sure JDK7 is used: run 
+* + export JAVA_HOME=/opt/jdk1.7.0_17
+* + export PATH=/opt/jdk1.7.0_17/bin:$PATH
 
 Setup on Local env - Refer to http://apps.topcoder.com/wiki/display/docs/TC+Direct+Setup+Guide
 * Instead of using SVN, you will use the codes from this git repo
@@ -16,7 +20,7 @@ VM Info:
 * http://apps.topcoder.com/wiki/display/docs/VM+Image+2.5
 
 Build/Compile
-* run 'ant'
+* run 'ant deploy'
 
 Deploy:
 * simply run 'ant deploy' to build all the components and the direct and deploy the direct to jboss

components/cockpit_facade_util/build-dependencies.xml

@@ -76,6 +76,9 @@
 
     <property name="xercesImpl.jar" value="${jboss_home}/lib/endorsed/xercesImpl.jar" />
 
+    <property name="spring.jar" value="${ext_libdir}/spring/spring.jar"/>
+
+
     <path id="component.tcs-dependencies">
         <pathelement location="${base_exception.jar}" />
         <pathelement location="${logging_wrapper.jar}" />
@@ -98,6 +101,7 @@
         <pathelement location="${jbossall-client.jar}" />
         <pathelement location="${jboss-jaxws.jar}" />
         <pathelement location="${jaxb-api.jar}" />
+        <pathelement location="${spring.jar}" />
     </path>
 
     <path id="component.test.3rdParty-dependencies">

components/cockpit_facade_util/src/java/main/com/topcoder/service/util/SpringApplicationContext.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 TopCoder Inc., All Rights Reserved.
+ */
+package com.topcoder.service.util;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+/**
+ * <p>Spring Application Context share the spring application context</p>
+ *
+ * @author TCSASSEMBLER
+ * @version 1.0
+ */
+public class SpringApplicationContext implements ApplicationContextAware {
+
+    private static ApplicationContext CONTEXT;
+
+    /**
+     * This method is called from within the ApplicationContext once it is
+     * done starting up, it will stick a reference to itself into this bean.
+     * @param context a reference to the ApplicationContext.
+     */
+    public void setApplicationContext(ApplicationContext context) throws BeansException {
+        CONTEXT = context;
+    }
+
+    /**
+     * This is about the same as context.getBean("beanName"), except it has its
+     * own static handle to the Spring context, so calling this method statically
+     * will give access to the beans by name in the Spring application context.
+     * As in the context.getBean("beanName") call, the caller must cast to the
+     * appropriate target class. If the bean does not exist, then a Runtime error
+     * will be thrown.
+     * @param beanName the name of the bean to get.
+     * @return an Object reference to the named bean.
+     */
+    public static Object getBean(String beanName) {
+        return CONTEXT.getBean(beanName);
+    }
+}

conf/web/WEB-INF/applicationContext.xml

@@ -21,6 +21,8 @@
 
     <tx:annotation-driven transaction-manager="transactionManager" />
 
+    <bean id="springApplicationContext" class="com.topcoder.service.util.SpringApplicationContext"/>
+
     <!-- Services -->
     <bean id="projectServiceFacade" class="org.springframework.jndi.JndiObjectFactoryBean">
         <property name="jndiName" value="remote/ProjectServiceFacadeBean"/>

conf/web/WEB-INF/struts.xml

@@ -869,48 +869,56 @@
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json" />
             <result name="error" type="json" />
+            <result name="permissionDenied" type="json"/>
         </action>
 
         <action name="saveClientProjectManagers" class="saveCockpitProjectSettingAction"
                 method="saveClientProjectManagers">
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>
+            <result name="permissionDenied" type="json"/>
+
         </action>
 
         <action name="saveTopCoderAccountManagers" class="saveCockpitProjectSettingAction"
                 method="saveTopCoderAccountManagers">
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>
+            <result name="permissionDenied" type="json"/>
         </action>
 
         <action name="saveTopCoderManagers" class="saveCockpitProjectSettingAction"
                 method="saveTopCoderManagers">
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>
+            <result name="permissionDenied" type="json"/>
         </action>
 
         <action name="saveAppirioManagers" class="saveCockpitProjectSettingAction"
                 method="saveAppirioManagers">
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>
+            <result name="permissionDenied" type="json"/>
         </action>
 
         <action name="addNewCustomMetadataKey" class="saveCockpitProjectSettingAction"
                 method="addNewCustomMetadataKey">
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>
+            <result name="permissionDenied" type="json"/>
         </action>
 
         <action name="removeProjectBillingAccount" class="saveCockpitProjectSettingAction"
                 method="removeProjectBillingAccount">
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>
+            <result name="permissionDenied" type="json"/>
         </action>
 
         <action name="associateProjectBillingAccount" class="saveCockpitProjectSettingAction"
@@ -925,13 +933,15 @@
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>
+            <result name="permissionDenied" type="json"/>
         </action>
 
         <action name="saveContestsNotificationsForUser" class="saveCockpitProjectSettingAction"
                 method="saveContestsNotificationsForUser">
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>
+            <result name="permissionDenied" type="json"/>
         </action>
 
         <action name="calendar" class="com.topcoder.direct.services.view.action.dashboard.CalendarAction">

services/game_plan_service/src/java/main/com/topcoder/service/gameplan/ejb/GamePlanServiceBean.java

@@ -129,8 +129,15 @@
  * </ol>
  * </p>
  *
+ * <p>
+ * Version 1.4 (TopCoder Direct - Add Group Permission Logic and project full permission checking)
+ * <ul>
+ *     <li>Updated {@link #PERMISSION_CHECKING} to add customer admin logic</li>
+ * </ul>
+ * </p>
+ *
  * @author saarixx, FireIce, isv, lmmortal, GreatKevin, TCSASSEMBLER, freegod
- * @version 1.3
+ * @version 1.4
  */
 @Stateless
 public class GamePlanServiceBean implements GamePlanServiceLocal, GamePlanServiceRemote {
@@ -262,7 +269,35 @@ public class GamePlanServiceBean implements GamePlanServiceLocal, GamePlanServic
             "                        AND   sg.archived = 0\n" +
             "                        AND ttc.client_status_id = 1\n" +
             "                        AND tdp.project_id = p.tc_direct_project_id\n" +
-            "                        ))";
+            "                        )\n" +
+            "OR EXISTS (\n"+
+            "                        SELECT \n"+
+            "                        tdp.project_id as tc_direct_project_id\n"+
+            "                        FROM project_info pi\n"+
+            "                        INNER JOIN tc_direct_project tdp ON p.tc_direct_project_id = tdp.project_id\n"+
+            "                        INNER JOIN tt_client_project cp ON cp.project_id = pi.value\n"+
+            "                        INNER JOIN tt_client c ON c.client_id = cp.client_id\n"+
+            "                        INNER JOIN customer_administrator ca ON ca.client_id = c.client_id\n"+
+            "                        WHERE pi.project_info_type_id = 32\n"+
+            "                        AND   c.status = 1\n"+
+            "                        AND   c.is_deleted = 0\n"+
+            "                        AND   pi.project_id = p.project_id\n"+
+            "                        AND   tdp.project_id = p.tc_direct_project_id\n"+
+            "                        AND   ca.user_id = :userId \n"+
+            "               )\n" +
+            "OR EXISTS (\n" +
+            "                        SELECT tdp.project_id AS tc_direct_project_id\n" +
+            "                        FROM tc_direct_project tdp\n" +
+            "                        INNER JOIN direct_project_account dpa ON tdp.project_id = dpa.project_id\n" +
+            "                        INNER JOIN tt_project ttp ON dpa.billing_account_id = ttp.project_id\n" +
+            "                        INNER JOIN tt_client_project ttcp ON ttp.project_id = ttcp.project_id\n" +
+            "                        INNER JOIN tt_client ttc ON ttcp.client_id = ttc.client_id\n" +
+            "                        INNER JOIN customer_administrator ca ON ca.client_id = ttc.client_id\n" +
+            "                        WHERE ttc.status = 1\n" +
+            "                           AND   ttc.is_deleted = 0\n" +
+            "                           AND   tdp.project_id = p.tc_direct_project_id\n" +
+            "                           AND   ca.user_id = :userId \n" +
+            "               ))\n";
 
     /**
      * Represents the name for active status.

services/permission_service_facade/build-dependencies.xml

@@ -117,6 +117,8 @@
 
     <property name="security.jar" value="${tcs_libdir}/security/1.0/security.jar"/>
 
+    <property name="topcoder_security_groups.jar" value="${tcs_libdir}/topcoder_security_groups/1.0.0/topcoder_security_groups.jar"/>
+
 
     <!-- Direct Dependencies -->
 
@@ -229,6 +231,7 @@
         <pathelement location="${auditor.jar}"/>
         <pathelement location="${search_builder.jar}"/>
         <pathelement location="${typesafe_enum.jar}"/>
+        <pathelement location="${topcoder_security_groups.jar}"/>
         <pathelement location="${project_service.jar}"/>
         <pathelement location="${jbossws-client.jar}"/>
         <pathelement location="${activation.jar}"/>