diff --git a/.scripts/create-maven-settings.sh b/.scripts/create-maven-settings.sh deleted file mode 100644 index 0e5188f..0000000 --- a/.scripts/create-maven-settings.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -# -# Creates the Maven settings file for the CI process. Said file will be stored on -# the ~/settings.xml path, and its contents will be created from a series of -# environmental variables. -# -# The most important information it will contain will be the connection settings for all -# the repositories used during deployment. -# -# For security reasons the data stored in the generated file should not be shared. Never -# print it on the console or let it be accessed in any way. -# -# The following environmental variables are required by the script: -# - DEPLOY_USER: string, user for the releases repo -# - DEPLOY_PASSWORD: string, password for the releases repo -# - DEPLOY_DEVELOP_USER: string, user for the development repo -# - DEPLOY_DEVELOP_PASSWORD: string, password for the development repo -# - DEPLOY_DOCS_USER: string, user for the releases documentation site repo -# - DEPLOY_DOCS_PASSWORD: string, password for the releases documentation site repo -# - DEPLOY_DOCS_DEVELOP_USER: string, user for the development documentation site repo -# - DEPLOY_DOCS_DEVELOP_PASSWORD: string, password for the development documentation site repo -# - VERSION_TYPE: string, the type of version of the code. One of 'release', 'develop' or 'other'. - -set -o nounset -set -e - -{ - echo ""; - - # ---------------- - # Servers settings - # ---------------- - echo ""; - - # Releases artifacts server - echo ""; - echo "releases"; - echo "\${env.DEPLOY_USER}"; - echo "\${env.DEPLOY_PASSWORD}"; - echo ""; - # Release site server - echo ""; - echo "site"; - echo "\${env.DEPLOY_DOCS_USER}"; - echo "\${env.DEPLOY_DOCS_PASSWORD}"; - echo ""; - - # Development artifacts server - echo ""; - echo "snapshots"; - echo "\${env.DEPLOY_DEVELOP_USER}"; - echo "\${env.DEPLOY_DEVELOP_PASSWORD}"; - echo ""; - # Release site server - echo ""; - echo "site-development"; - echo "\${env.DEPLOY_DOCS_DEVELOP_USER}"; - echo "\${env.DEPLOY_DOCS_DEVELOP_PASSWORD}"; - echo ""; - - echo ""; - # --------------------- - # Ends servers settings - # --------------------- - - # -------------- - # Active profile - # -------------- - - # These profiles are used to set the site repository info - if [ "$VERSION_TYPE" == "develop" ]; then - # Development version - echo "" - echo "deploy-site-development" - echo "" - elif [ "$VERSION_TYPE" == "release" ]; then - # Release version - echo "" - echo "deploy-site-release" - echo "" - fi - - # ------------------- - # Ends active profile - # ------------------- - - echo ""; -} >> ~/settings.xml - -echo "Created Maven settings file" - -exit 0 diff --git a/.scripts/deploy-site.sh b/.scripts/deploy-site.sh deleted file mode 100644 index 017e794..0000000 --- a/.scripts/deploy-site.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# -# Deploys the Maven site. -# -# Make sure you have the deployment configuration ready before using it, including -# the environment variables which will indicate if the script is to be run or not. -# -# If everything is correct, the deployment will only occur with release or development -# versions. And any pull request, in case the code comes from SCM, will be ignored. -# -# Note that if required the DEPLOY_DOCS environment variable can be used to stop the script -# from running by setting it to 'false'. -# -# The following environmental variables are used: -# - DEPLOY_DOCS: boolean, control flag for deployment, should be true to deploy -# - PULL_REQUEST: boolean, indicates if this is a pull request, should be false for deployment -# - VERSION_TYPE: string, the type of version of the code. One of 'release', 'develop' or 'other'. - -set -o nounset -set -e - -if [ "$DEPLOY_DOCS" == "true" ] && [ "$PULL_REQUEST" == "false" ] && [ "$VERSION_TYPE" != "other" ]; then - - echo "Deploying Maven site" - - mvn site site:deploy -P deployment --settings ~/settings.xml > site_output.txt - - head -50 site_output.txt - echo " " - echo "(...)" - echo " " - tail -50 site_output.txt - - exit 0 - -else - - echo "Maven site won't be deployed" - - exit 0 - -fi diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh deleted file mode 100644 index 06580db..0000000 --- a/.scripts/deploy.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# -# Deploys the project artifact. -# -# Make sure you have the deployment configuration ready before using it, including -# the environment variables which will indicate if the script is to be run or not. -# -# If everything is correct, the deployment will only occur with release or development -# versions. And any pull request, in case the code comes from SCM, will be ignored. -# -# Note that if required the DEPLOY environment variable can be used to stop the script -# from running by setting it to 'false'. -# -# The following environmental variables are used: -# - DEPLOY: boolean, control flag for deployment, should be true to deploy -# - PULL_REQUEST: boolean, indicates if this is a pull request, should be false for deployment -# - VERSION_TYPE: string, the type of version of the code. One of 'release', 'develop' or 'other'. - -set -o nounset -set -e - -if [ "$DEPLOY" == "true" ] && [ "$PULL_REQUEST" == "false" ] && [ "$VERSION_TYPE" != "other" ]; then - - echo "Deploying Java artifact" - - mvn deploy -P deployment --settings ~/settings.xml - - exit 0 - -else - - echo "Java artifact won't be deployed" - - exit 0 - -fi diff --git a/.scripts/load-travis-environment.sh b/.scripts/load-travis-environment.sh deleted file mode 100644 index 20e9d87..0000000 --- a/.scripts/load-travis-environment.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Sets up the CI environment. -# -# It is prepared for the Travis CI service, and will set up the environmental -# variables for all the CI procedure, but mainly for deployment. -# -# As this script will set environmetal variables it should be run as part of the -# parent shell commands by using the 'source' command. For this reason no value is -# returned, and the 'set' command is not used. -# -# These variables will be used by the other scripts for flow control. Meaning -# that they will be used to know if the other scripts will be executed, and -# how. -# -# While the DEPLOY and DEPLOY_DOCS variables are set to a default value of false, -# they should be taken care in the Travis configuration file. -# -# The following environmental variables are required by the script: -# - TRAVIS_BRANCH: string, Travis variable with the name of the SCM branch from which the code was taken -# - TRAVIS_PULL_REQUEST: boolean, Travis CI flag indicating if this is a pull request -# - DEPLOY: boolean, flag indicating if the artifacts will be deployed -# - DEPLOY_DOCS: boolean, flag indicating if the documents will be deployed -# -# The following environmental variables will be set by the script: -# - VERSION_TYPE: string, indicates if this is a release or development version - -# Flag to know if this is a pull request -export PULL_REQUEST=$TRAVIS_PULL_REQUEST - -# Flag for deploying artifacts -if [ -z "$DEPLOY" ]; then - export DEPLOY=false; -fi - -# Flag for deploying documentation -if [ -z "$DEPLOY_DOCS" ]; then - export DEPLOY_DOCS=false; -fi - -# Flag to know if this is a release or a development version -if [ "$TRAVIS_BRANCH" == "master" ]; then - export VERSION_TYPE=release; -elif [ "$TRAVIS_BRANCH" == "develop" ]; then - export VERSION_TYPE=develop; -else - export VERSION_TYPE=other; -fi - -echo "CI environmental variables set:"; -echo "PULL_REQUEST: $PULL_REQUEST"; -echo "VERSION_TYPE: $VERSION_TYPE"; -echo "DEPLOY: $DEPLOY"; -echo "DEPLOY_DOCS: $DEPLOY_DOCS"; diff --git a/.travis.yml b/.travis.yml index 55d2e83..181ff00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,22 +7,7 @@ jdk: - oraclejdk8 - oraclejdk7 - openjdk7 - -before_install: - # Scripts are set as executable - - chmod +x ./.scripts/load-travis-environment.sh - - chmod +x ./.scripts/create-maven-settings.sh - - chmod +x ./.scripts/deploy.sh - - chmod +x ./.scripts/deploy-site.sh - # Prepares CI environment - - source ./.scripts/load-travis-environment.sh - # Creates Maven settings - - ./.scripts/create-maven-settings.sh + script: # Unit and integration tests are run - mvn clean verify -after_success: - # Documentation deployment script - - ./.scripts/deploy-site.sh - # Code artifacts deployment script - - ./.scripts/deploy.sh diff --git a/pom.xml b/pom.xml index 3abc0a2..93b8e86 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.wandrell.example mule-ws-security-soap-example - 2.3.0 + 2.3.1 mule Mule SOAP Web Services WS-Security Example @@ -267,7 +267,7 @@ 1.1.1 3.3.0.Final 1.0.17 - 1.2.12 + 1.2.14 1.0.4 4.12 2.6.1 diff --git a/readme.md b/readme.md index 499a8ed..d293b56 100644 --- a/readme.md +++ b/readme.md @@ -82,7 +82,6 @@ The endpoint consumer does not support querying for the WSDL, and only accepts t |Password with SAML|WSDL-First|[http://localhost:8080/mule-wss/cxf/password/saml/wsdl_first?wsdl](http://localhost:8080/mule-wss/cxf/password/saml/wsdl_first?wsdl)| |Password with SAML|Simple|[http://localhost:8080/mule-wss/cxf/password/saml/simple?wsdl](http://localhost:8080/mule-wss/cxf/password/saml/simple?wsdl)| |Password with SAML|Proxy|[http://localhost:8080/mule-wss/cxf/password/saml/proxy?wsdl](http://localhost:8080/mule-wss/cxf/password/saml/proxy?wsdl)| -|Password with SAML|Consumer|[http://localhost:8080/mule-wss/consumer/password/saml](http://localhost:8080/mule-wss/consumer/password/saml)| |Signature|Code-First|[http://localhost:8080/mule-wss/cxf/signature/code_first?wsdl](http://localhost:8080/mule-wss/cxf/signature/code_first?wsdl)| |Signature|WSDL-First|[http://localhost:8080/mule-wss/cxf/signature/wsdl_first?wsdl](http://localhost:8080/mule-wss/cxf/signature/wsdl_first?wsdl)| |Signature|Simple|[http://localhost:8080/mule-wss/cxf/signature/simple?wsdl](http://localhost:8080/mule-wss/cxf/signature/simple?wsdl)| @@ -116,7 +115,6 @@ To change the entity queried just change the id value on the URL. |Password with SAML|WSDL-First|[http://localhost:8080/mule-wss/client/cxf/password/saml/wsdl_first?id=1](http://localhost:8080/mule-wss/client/cxf/password/saml/wsdl_first?id=1)| |Password with SAML|Simple|[http://localhost:8080/mule-wss/client/cxf/password/saml/simple?id=1](http://localhost:8080/mule-wss/client/cxf/password/saml/simple?id=1)| |Password with SAML|Proxy|[http://localhost:8080/mule-wss/client/cxf/password/saml/proxy?id=1](http://localhost:8080/mule-wss/client/cxf/password/saml/proxy?id=1)| -|Password with SAML|Consumer|[http://localhost:8080/mule-wss/client/consumer/password/saml?id=1](http://localhost:8080/mule-wss/client/consumer/password/saml?id=1)| |Signature|Code-First|[http://localhost:8080/mule-wss/client/signature/cxf/code_first?id=1](http://localhost:8080/mule-wss/client/cxf/signature/code_first?id=1)| |Signature|WSDL-First|[http://localhost:8080/mule-wss/client/signature/cxf/wsdl_first?id=1](http://localhost:8080/mule-wss/client/cxf/signature/wsdl_first?id=1)| |Signature|Simple|[http://localhost:8080/mule-wss/client/signature/cxf/simple?id=1](http://localhost:8080/mule-wss/client/cxf/signature/simple?id=1)| @@ -149,6 +147,6 @@ The project has been released under the [MIT License][license]. [issues]: https://github.com/bernardo-mg/mule-ws-security-soap-example/issues [license]: http://www.opensource.org/licenses/mit-license.php -[scm]: https://github.com/bernardo-mg/spring-ws-security-soap-example +[scm]: https://github.com/bernardo-mg/mule-ws-security-soap-example [mule]: https://www.mulesoft.com diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7f6c5ca..1fe9f3e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -64,5 +64,19 @@ Added more MUnit tests. + + + Consumers now use digested passwords. + + + Added console appender to logger config. + + + Corrected CSF proxy endpoints names. + + + Removed SAML password consumer URLs, as they no longer exist. + + - \ No newline at end of file + diff --git a/src/main/app/consumer.xml b/src/main/app/consumer.xml index e5b8a7d..b62d262 100644 --- a/src/main/app/consumer.xml +++ b/src/main/app/consumer.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch serviceAddress="http://${app.url.host}:${app.url.port}/${app.url.path}/${endpoint.cxf.password.codeFirst.path}"> + password="${security.credentials.password}" passwordType="DIGEST" /> @@ -37,7 +37,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch serviceAddress="http://${app.url.host}:${app.url.port}/${app.url.path}/${endpoint.cxf.signature.codeFirst.path}"> + password="${keystore.password}" passwordType="DIGEST" /> @@ -48,7 +48,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch serviceAddress="http://${app.url.host}:${app.url.port}/${app.url.path}/${endpoint.cxf.encryption.codeFirst.path}"> + password="${keystore.password}" passwordType="DIGEST" /> diff --git a/src/main/app/ws-cxf-encryption.xml b/src/main/app/ws-cxf-encryption.xml index 175e37a..1cd9fbd 100644 --- a/src/main/app/ws-cxf-encryption.xml +++ b/src/main/app/ws-cxf-encryption.xml @@ -138,7 +138,7 @@ http://www.mulesoft.org/schema/mule/ws http://www.mulesoft.org/schema/mule/ws/cu - - + + + diff --git a/src/main/resources/security/wssecurity.properties b/src/main/resources/security/wssecurity.properties index 7cec9ad..fb4a4fa 100644 --- a/src/main/resources/security/wssecurity.properties +++ b/src/main/resources/security/wssecurity.properties @@ -1,5 +1,6 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=123456 +org.apache.ws.security.crypto.merlin.keystore.private.password=123456 org.apache.ws.security.crypto.merlin.keystore.alias=swss-cert org.apache.ws.security.crypto.merlin.file=keystore/keystore.jks \ No newline at end of file