Commit c0657544 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch 'fix_password_splitting' into 'master' 

protect cloudfoundry password with double quotes for all cf login command lines

Closes #20

See merge request to-be-continuous/cloud-foundry!32
parents 404325c2 ef5369c3

templates/gitlab-ci-cf.yml

+3 −3
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ stages: 
    - assert_defined "${ENV_PASSWORD:-$CF_PASSWORD}" 'Missing required Cloud Foundry password'

    - assert_defined "${ENV_ORG:-$CF_ORG}" 'Missing required Cloud Foundry organization'

    - assert_defined "$ENV_SPACE" 'Missing required Cloud Foundry space'

    - cf login -a ${ENV_URL:-$CF_URL} -u ${ENV_USER:-$CF_USER} -p ${ENV_PASSWORD:-$CF_PASSWORD} -o ${ENV_ORG:-$CF_ORG} -s $ENV_SPACE

    - cf login -a ${ENV_URL:-$CF_URL} -u ${ENV_USER:-$CF_USER} -p "${ENV_PASSWORD:-$CF_PASSWORD}" -o ${ENV_ORG:-$CF_ORG} -s $ENV_SPACE

  script:

    # use $CI_ENVIRONMENT_SLUG for appname to avoid service name constraints (<=50 chars)

    # use $CI_ENVIRONMENT_SLUG for hostname to avoid constraints (<=63 chars)
@@ -779,7 +779,7 @@ stages: 
    - assert_defined "${ENV_PASSWORD:-$CF_PASSWORD}" 'Missing required Cloud Foundry password'

    - assert_defined "${ENV_ORG:-$CF_ORG}" 'Missing required Cloud Foundry organization'

    - assert_defined "$ENV_SPACE" 'Missing required Cloud Foundry space'

    - cf login -a ${ENV_URL:-$CF_URL} -u ${ENV_USER:-$CF_USER} -p ${ENV_PASSWORD:-$CF_PASSWORD} -o ${ENV_ORG:-$CF_ORG} -s $ENV_SPACE

    - cf login -a ${ENV_URL:-$CF_URL} -u ${ENV_USER:-$CF_USER} -p "${ENV_PASSWORD:-$CF_PASSWORD}" -o ${ENV_ORG:-$CF_ORG} -s $ENV_SPACE

  script:

    - delete "$ENV_TYPE" ${ENV_APP_NAME:-${CF_BASE_APP_NAME}${ENV_APP_SUFFIX}}

  environment:
@@ -856,7 +856,7 @@ cf-cleanup-all-review: 
    - assert_defined "${CF_REVIEW_USER:-$CF_USER}" 'Missing required env $CF_REVIEW_USER or $CF_USER'

    - assert_defined "${CF_REVIEW_PASSWORD:-$CF_PASSWORD}" 'Missing required env $CF_REVIEW_PASSWORD or $CF_PASSWORD'

    - assert_defined "${CF_REVIEW_ORG:-$CF_ORG}" 'Missing required env $CF_REVIEW_ORG or $CF_ORG'

    - cf login -a ${CF_REVIEW_URL:-$CF_URL} -u ${CF_REVIEW_USER:-$CF_USER} -p ${CF_REVIEW_PASSWORD:-$CF_PASSWORD} -o ${CF_REVIEW_ORG:-$CF_ORG} -s $CF_REVIEW_SPACE

    - cf login -a ${CF_REVIEW_URL:-$CF_URL} -u ${CF_REVIEW_USER:-$CF_USER} -p "${CF_REVIEW_PASSWORD:-$CF_PASSWORD}" -o ${CF_REVIEW_ORG:-$CF_ORG} -s $CF_REVIEW_SPACE

  script:

    - delete_all review "${CF_REVIEW_APP_NAME:-${CF_BASE_APP_NAME}-review-.*}"

  rules: