October, 2015 Release

README.md

@@ -1,20 +1,20 @@
 
-Syndication Media Services - Jun 05, 2015
+Syndication Media Services - Oct 20, 2015
 ======================
 
 This release includes the following applications:
 
-- syndication_grails v3.10.1_RC2
-- syndication_admin v3.10.5
-- syndication_storefront v1.8.1
-- syndication_model v2.0.4
-- syndication_content_extraction_services v1.4.9
-- tag_cloud v2.9.0
-- tinyurl_syndication v1.12.0
-- cms-manager v2.4.0
+- syndication_api v3.11.0
+- syndication_admin v3.11.0
+- syndication_storefront v1.9.1
+- syndication_model v2.1.0
+- syndication_content_extraction_services v1.5.0
+- tag_cloud v2.10.0
+- tinyurl_syndication v1.13.0
+- cms-manager v2.5.0
 - syndication_status v0.1.0
-- syndication_delivery_handler v0.3.0
-- syndication_commons v1.1.7
+- syndication_delivery_handler v0.4.0
+- syndication_commons v1.3.1
 - syndication_desktop_client v1.1.0
 - syndication-client-drupal7-module v1.15.5.29
 

cms-manager/application.properties

@@ -1,6 +1,6 @@
 #Grails Metadata file
 #Thu Apr 23 13:33:38 EDT 2015
-app.grails.version=2.4.5
+app.grails.version=2.5.1
 app.name=CmsManager
 app.servlet.version=3.0
-app.version=2.4.0
+app.version=2.5.0

cms-manager/docs/config.groovy

@@ -1,5 +1,5 @@
 // The title of this document
-//title = "Gaiden"
+title = "CMS-Manager"
 
 // The version of this document
 //version = ""

cms-manager/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Sep 21 11:27:36 EDT 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip

cms-manager/gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

cms-manager/grails-app/conf/BuildConfig.groovy

@@ -34,8 +34,7 @@ grails.project.dependency.resolver = "maven"
 
 grails.project.dependency.resolution = {
 
-    inherits("global") {
-    }
+    inherits("global") {}
 
     log "error"
     checksums true
@@ -77,10 +76,10 @@ grails.project.dependency.resolution = {
         runtime 'mysql:mysql-connector-java:5.1.29'
         runtime 'com.ctacorp.commons:multi-read-servlet-filter:1.0.0'
 
-        compile 'org.springframework:spring-web:4.0.6.RELEASE'
+        compile 'org.springframework:spring-web:4.2.1.RELEASE'
         compile 'org.bouncycastle:bcprov-jdk16:1.46'
-        compile 'com.ctacorp.commons:api-key-utils:1.5.1'
-        compile 'com.ctacorp:syndication-commons:1.1.7'
+        compile 'com.ctacorp.commons:api-key-utils:1.6.0'
+        compile 'com.ctacorp:syndication-commons:1.3.0'
         compile ('com.ctacorp.syndication:rsrw:0.1.2') {
             excludes "jboss-common"
         }
@@ -92,46 +91,45 @@ grails.project.dependency.resolution = {
 
     plugins {
 
-        build ':tomcat:7.0.55.2'
-        build (":release:3.0.1"){
+        build ':tomcat:8.0.22'
+        build (":release:3.1.1"){
             excludes "rest-client-builder"
         }
 
         compile ":scaffolding:2.1.2"
         compile ":cache:1.1.8"
-        compile ":spring-security-core:2.0-RC4"
+        compile ":spring-security-core:2.0-RC5"
         compile ":quartz:1.0.2"
         compile ":mail:1.0.7"
         compile ":rest-client-builder:2.1.1"
-        compile ":asset-pipeline:2.1.5"
-        compile ":less-asset-pipeline:2.1.0"
-        compile ":font-awesome-resources:4.3.0.1"
-        if(runtimeConfig.mq.disableRabbitMQPlugin){
-            //do nothing
-            println ("MQ Disabled")
-        } else{
-            println ("MQ Enabeled")
-            compile ":rabbitmq-native:2.0.10"                       //mq
-        }
+        compile ":asset-pipeline:2.5.9"
+        compile ":less-asset-pipeline:2.3.0"
+        compile ":font-awesome-resources:4.3.0.2"
+        compile ":rabbitmq-native:3.1.2"                       //mq
         compile ":greenmail:1.3.4"
-        compile ":bruteforce-defender:1.0.1-spring-security-core-2.0-RC4"
+        compile ":bruteforce-defender:1.1"
 
         runtime ":hibernate4:4.3.8.1"
         runtime ":database-migration:1.4.0"
         runtime ":jquery:1.11.1"
         runtime ":twitter-bootstrap:3.3.1"
 
-        test ":build-test-data:2.2.2"
+        test ":build-test-data:2.4.0"
     }
 }
 
 //_____________________
-// Release plugin info \_________________________________________________________________
-//
-// | to release, just run 'grails maven-deploy'
+// Release War info    \_________________________________________________________________
+// |
+// | to push a snapshot, run 'grails prod maven-deploy'
+// | to release, run 'grails prod maven-deploy --repository=plugin_rel'
 // | to install locally, run 'grails maven-install'
 //_______________________________________________________________________________________
-grails.project.repos.default = "releases"
-grails.project.repos.releases.url = config.artifactory.deploymentAddress
-grails.project.repos.releases.username = config.artifactory.username
-grails.project.repos.releases.password = config.artifactory.password
+grails.project.repos.default = "app_snap"
+grails.project.repos.app_snap.url = config.artifactory.app_snap.url
+grails.project.repos.app_snap.username = config.artifactory.username
+grails.project.repos.app_snap.password = config.artifactory.password
+
+grails.project.repos.app_rel.url = config.artifactory.app_rel.url
+grails.project.repos.app_rel.username = config.artifactory.username
+grails.project.repos.app_rel.password = config.artifactory.password

cms-manager/grails-app/conf/SecurityFilters.groovy

@@ -11,6 +11,8 @@ Redistribution and use in source and binary forms, with or without modification,
         THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
+
+import com.ctacorp.syndication.manager.cms.Subscriber
 import com.ctacorp.syndication.manager.cms.rest.security.ApiKeyUtils
 import com.ctacorp.syndication.manager.cms.rest.security.AuthorizationResponseFormatter
 import com.ctacorp.syndication.manager.cms.rest.security.AuthorizationResult
@@ -71,7 +73,7 @@ class SecurityFilters {
                 setSubscriberRequestAttribute(request)
                 String senderPublicKey = request.getAttribute('senderPublicKey')
 
-                if (senderPublicKey == Holders.config.cmsManager.publicKey) {
+                if (senderPublicKey == Subscriber.findByIsPrivileged(true).keyAgreement.entity2PublicKey) {
                     return true
                 } else {
                     render status: 401, text: ([message: "Unauthorized: the sender's public key is not valid"] as JSON).toString(), encoding: "UTF-8", contentType: 'application/json'

cms-manager/grails-app/controllers/com/ctacorp/syndication/manager/cms/SubscriberController.groovy

@@ -35,8 +35,9 @@ class SubscriberController {
     static allowedMethods = [save: "POST", update: "PUT", delete: "DELETE"]
 
     def index(Integer max) {
-        params.max = Math.min(max ?: 10, 100)
-        respond Subscriber.list(params), model: [instanceCount: Subscriber.count()], view: 'index'
+        params.max = Math.min(max ?: 20, 100)
+        params.sort = params.sort ?: "name"
+        return subscriberService.indexResponse(params)
     }
 
     def show(Subscriber subscriber) {
@@ -75,6 +76,7 @@ class SubscriberController {
             subscriber.keyAgreement = keyAgreement
         }
 
+        makeOnlyPrivilegedSubscriber(subscriber)
         subscriber.save(flush: true)
 
         if (params.sendKeyAgreement) {
@@ -166,4 +168,16 @@ class SubscriberController {
         flash.message = message(code: code, args: [message(code: 'subscriber.label'), subscriber.name])
         redirect(action: "show", id: subscriber.id)
     }
+
+    @SuppressWarnings("GrMethodMayBeStatic")
+    private void makeOnlyPrivilegedSubscriber(Subscriber subscriber) {
+        def isPrivileged = subscriber.isPrivileged
+        if (isPrivileged) {
+            Subscriber.list().each {
+                it.isPrivileged = false
+                it.save(flush: true)
+            }
+        }
+        subscriber.setIsPrivileged(isPrivileged)
+    }
 }

cms-manager/grails-app/rabbit-consumers/com/ctacorp/syndication/manager/cms/EmailSubscriptionConsumer.groovy

@@ -1,5 +1,5 @@
 package com.ctacorp.syndication.manager.cms
-import com.budjb.rabbitmq.MessageContext
+import com.budjb.rabbitmq.consumer.MessageContext
 import com.ctacorp.syndication.manager.cms.utils.mq.MqUtils
 import com.ctacorp.syndication.manager.cms.utils.mq.RabbitMqConsumer
 import org.apache.commons.logging.LogFactory
@@ -17,7 +17,7 @@ class EmailSubscriptionConsumer implements RabbitMqConsumer {
     def emailSubscriptionConsumerService
 
     @Override
-    void handleMessage(String message, MessageContext messageContext) {
+    void handleMessage(def message, MessageContext messageContext) {
         MqUtils.handleMessage(message, rabbitConfig.queue, emailSubscriptionConsumerService)
     }
 }