From a04a9200a09430c55aa17824c2190a23e2480d7c Mon Sep 17 00:00:00 2001
From: sigal <ssax18@gmail.com>
Date: Mon, 13 May 2019 15:10:35 +0300
Subject: [PATCH] Add enterprise testing containers and configurations This
 adds enterprise containers and enterprise tests and updates configurations
 and versioning

---
 Dockerfile.nginx              |   2 +-
 Dockerfile.test               |   2 +-
 Jenkinsfile                   |   4 +
 docker-compose.yml            |  42 ++++++--
 test-cert/conjur-cucumber.der | Bin 906 -> 0 bytes
 test.sh                       | 176 +++++++++++++++++++++++++++-------
 6 files changed, 178 insertions(+), 48 deletions(-)
 delete mode 100644 test-cert/conjur-cucumber.der

diff --git a/Dockerfile.nginx b/Dockerfile.nginx
index cf4289c..8d43a31 100644
--- a/Dockerfile.nginx
+++ b/Dockerfile.nginx
@@ -1,4 +1,4 @@
-FROM nginx:1.13.3
+FROM nginx:1.13.6
 
 MAINTAINER Conjur Inc
 
diff --git a/Dockerfile.test b/Dockerfile.test
index 00ffb1b..515b0eb 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM java:8
+FROM openjdk:8
 
 MAINTAINER Conjur Inc
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 74b1cc1..0a008db 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,6 +8,10 @@ pipeline {
     buildDiscarder(logRotator(numToKeepStr: '30'))
   }
 
+  triggers {
+    cron(getDailyCronString())
+  }
+
   stages {
     stage('Create and archive the Maven package') {
       steps {
diff --git a/docker-compose.yml b/docker-compose.yml
index 8eff52c..4b07f65 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: postgres:9.3
 
   conjur:
-    image: cyberark/conjur:0.1.0-stable
+    image: cyberark/conjur:latest
     command: server -a cucumber
     environment:
       PORT: 3000
@@ -15,33 +15,40 @@ services:
     depends_on:
       - postgres
 
+  # Create EE container
+  cuke-master:
+    image: registry2.itci.conjur.net/conjur-appliance-cuke-master:5.0-stable
+    ports:
+      - "443:443"
+      - "5432:5432"
+      - "1999:1999"
+    security_opt:
+      - "seccomp:unconfined"
+
   conjur-proxy-nginx:
     build:
       context: .
       dockerfile: Dockerfile.nginx
     entrypoint: nginx-debug -g 'daemon off;'
     environment:
-        TERM: xterm
+      TERM: xterm
     ports:
-    - "8080:80"
-    - "8443:443"
+      - "8080:8080"
+      - "8443:8443"
     depends_on:
       - conjur
       - client
 
-
   client:
-    image: conjurinc/cli5
+    image: cyberark/conjur-cli:5
     volumes:
       - ./test-cert:/test-cert
     entrypoint: sleep
     command: infinity
     environment:
-      CONJUR_APPLIANCE_URL: http://conjur:3000
+      CONJUR_APPLIANCE_URL:
       CONJUR_ACCOUNT: cucumber
       CONJUR_AUTHN_LOGIN: admin
-    depends_on:
-      - conjur
 
   test:
     build:
@@ -53,6 +60,21 @@ services:
       CONJUR_APPLIANCE_URL: http://conjur:3000
       CONJUR_ACCOUNT: cucumber
 
+  # Spin up container for EE testing
+  test-dap:
+    build:
+      context: .
+      dockerfile: Dockerfile.test
+    volumes:
+      - ./target:/conjurinc/api-java/target
+      - ./test-cert:/test-cert
+    entrypoint: sleep
+    command: infinity
+    environment:
+      CONJUR_APPLIANCE_URL: https://cuke-master
+      CONJUR_ACCOUNT: cucumber
+    depends_on:
+      - cuke-master
 
   test-https:
     build:
@@ -67,4 +89,4 @@ services:
       CONJUR_APPLIANCE_URL: https://conjur-proxy-nginx
       CONJUR_ACCOUNT: cucumber
     depends_on:
-      - conjur-proxy-nginx
\ No newline at end of file
+      - conjur-proxy-nginx
diff --git a/test-cert/conjur-cucumber.der b/test-cert/conjur-cucumber.der
deleted file mode 100644
index b5ca0c16947605cb92efae011ba78b2890ac09e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 906
zcmXqLVs0~NV#-^<%*4pV#L4j8YyIT!f20=}@Un4gwRyCC=VfH%W@RvlFyuDiWMd9x
zVH0NZ^fBZI$^$tZJZzrDMTx07hCBvbAOUtB<`ADSLtX=J5RZ$8#XqmI!cf{k62xWZ
z5lYU_%PK9>Ehx&bsMO6%&&;bZkQ3)MG&is?HZ(LdGBGfT0&*>oxHPo6iBSpJn~bas
z%uS5^3<gb%Tue=jj10TkuY5fC>9fg=4bS$@mU#VLCx7+oNzGsV_dZQqqA+j2iHzs(
zMcHwi)D}9m+crEa-_y^*IdfLG;@zvq{yt$o<5<4hRpni`dftN2YOfgCn$v4uEvVAy
zb^iEaR@<KQcRueni+uZOY0RTF;nrF9oPvKXEH7p2-I{y)Xwt_s4$I=Lg``%Ti{_RR
z{(JX(>mMeTl!SaycNGrVx~Gxay{BA%?7XVJ{_N_dbFKA{tc#G8-^bB=hg<iLr{C2J
zD=j?FPK@;azFx#dM#nGU8QX$o`9J1`%4vEu${F)MsjmnXxwAd#;o>{V{70XEdg|eo
zAH*58>u5>AC+Gf|HB+Bi=)EmCukUtQl8Kp-fpKxLL7;&wF#2TqSj1RF4sIy7zEF9(
z&s){2^Hjz2%P)6sT4Nv&l2&GsFc53Nu7Dq;K$wy7KMSh?Gmt_Kc3|oP20J4|fjRe)
zT?fN{XB9p(x#jtaDUPkVcj1Z5$%@lf%KR@bpCb@rqIy@ywB@ikkLGEEfFldP?3(eT
z+vD{%)<eQS_xF45;$i3&IGFJ7ks!<bb(*WURA@JsC$Ez;mECYPZ1%LzKLQ@ON8a=8
z+1J#cIXjH!ZNtVR9ug6U7HoG-)8A72b6rk>)$(~4jXumYR}?tZdaq(@(A|sgZIXXV
zKPs4*KhOJzURvdxh}M+o{x1&M9<uWePv+FsO#NWTcU|oIeBGIMC;#&8+7`CY`entx
zGa9Y!y))}Ni#R4Vl-h&|oT$AsGgZ~UOw?t?-R-hxmA$R*)ZI!^(vPc24%y{!vP4OJ
J!NH@uN&(I}Uhx0`

diff --git a/test.sh b/test.sh
index 685413d..1e8ad08 100755
--- a/test.sh
+++ b/test.sh
@@ -1,21 +1,38 @@
 #!/usr/bin/env bash
+set -ex
 
-function finish {
-  echo '-----------------------test.sh------------------------------'
-  echo 'Removing test environment'
-  echo '------------------------------------------------------------'
-  docker-compose down -v
-}
-trap finish EXIT
+
+#function finish {
+#  echo '-----------------------test.sh------------------------------'
+#  echo 'Removing test environment'
+#  echo '------------------------------------------------------------'
+#  docker-compose down -v
+#}
+
+#trap finish EXIT
 
 function main() {
+  runDAP
+  runOSS
+}
+
+# Run DAP Enterprise test suite
+function runDAP() {
   prepareOutputDir
-  createTestEnvironment
-  loadTestPolicy
-  runTests
-  printProxyConfiguration
-  initializeCert
-  runHTTPSTests
+  createDAPTestEnvironment
+  loadDAPTestPolicy
+  initializeDAPCert
+  runDAPTests
+}
+
+function runOSS () {
+  prepareOutputDir
+  createOSSTestEnvironment
+  loadOSSTestPolicy
+  runOSSTests
+  printOSSProxyConfiguration
+  initializeOSSCert
+  runOSSHTTPSTests
 }
 
 function prepareOutputDir() {
@@ -24,13 +41,101 @@ function prepareOutputDir() {
   mkdir -p output
 }
 
-function createTestEnvironment() {
+# Build DAP test container & start the cluster
+function createDAPTestEnvironment() {
+  docker-compose build --pull client cuke-master test-dap
+  export CONJUR_APPLIANCE_URL="https://cuke-master"
+  docker-compose up -d client cuke-master test-dap
+
+  # Delay to allow time for conjur to come up
+  echo 'Waiting for conjur server to be healthy'
+  docker-compose run --rm test ./wait_for_server.sh
+}
+
+function loadDAPTestPolicy() {
+  echo '-----------------------test.sh------------------------------'
+  echo "Loading DAP test policy"
+  echo '------------------------------------------------------------'
+
+  # get DAP container id
+  dap_client_cid=$(docker-compose ps -q client)
+
+  # get certificate from cuke-master
+  ssl_cert=$(docker-compose exec cuke-master cat /opt/conjur/etc/ssl/conjur.pem)
+
+  docker exec \
+    -e CONJUR_SSL_CERTIFICATE="$ssl_cert" \
+    ${dap_client_cid} conjur authn login -u admin -p secret
+
+  # copy test-policy into a /tmp/test-policy within the client container
+  docker cp test-policy ${dap_client_cid}:/tmp
+
+  docker exec \
+    -e CONJUR_SSL_CERTIFICATE="$ssl_cert" \
+    ${dap_client_cid} conjur policy load root /tmp/test-policy/root.yml
+}
+
+function initializeDAPCert() {
+  echo '-----------------------test.sh------------------------------'
+  echo "Fetch certificate for DAP using client cli"
+  echo '------------------------------------------------------------'
+
+  dap_client_cid=$(docker-compose ps -q client)
+  # get the pem file from conjur server
+  CONJUR_ACCOUNT="cucumber"
+  CONJUR_PROXY="https://cuke-master"
+
+  echo "remove old pem file"
+  rm -rf /test-cert/*
+
+  echo "fetch pem file from enterprise server"
+  exec_command="echo yes | conjur init -u '${CONJUR_PROXY}' -a '${CONJUR_ACCOUNT}'"
+  docker exec ${dap_client_cid} /bin/bash -c "$exec_command"
+
+  echo "convert pem to der file and copy it to share memory"
+  convert_command="openssl x509 -outform der -in /root/conjur-cucumber.pem -out /test-cert/conjur-cucumber.der"
+  docker exec ${dap_client_cid} ${convert_command}
+
+  echo "import cert inside DAP test container"
+  dap_test_cid=$(docker-compose ps -q test-dap)
+
+  JRE_HOME='/usr/lib/jvm/java-8-openjdk-amd64/jre'
+  import_command="keytool \
+     -import \
+     -alias cucumber -v \
+     -trustcacerts \
+     -noprompt \
+     -keystore $JRE_HOME/lib/security/cacerts \
+     -file /test-cert/conjur-cucumber.der -storepass changeit"
+  docker exec ${dap_test_cid} ${import_command}
+}
+
+function runDAPTests() {
   echo '-----------------------test.sh------------------------------'
-  echo "Creating test environment"
+  echo "Running DAP tests"
   echo '------------------------------------------------------------'
 
-  # Build test container & start the cluster
+  dap_test_cid=$(docker-compose ps -q test-dap)
+
+  # rotate_api_key returns an extra char which effects the value of api key so it is required to remove that char to be successfu
+  api_key_admin=$(echo $(docker-compose exec client conjur user rotate_api_key) | tr -dc '[:alnum:]')
+
+  # Execute tests
+  docker exec \
+  -e CONJUR_AUTHN_API_KEY=${api_key_admin} \
+  -e CONJUR_AUTHN_LOGIN="admin" \
+  ${dap_test_cid} \
+  mvn test
+}
+
+function createOSSTestEnvironment() {
+  echo '-----------------------test.sh------------------------------'
+  echo "Creating OSS test environment"
+  echo '------------------------------------------------------------'
+
+  # Build OSS test container & start the cluster
   docker-compose build --pull client conjur postgres test test-https conjur-proxy-nginx
+  export CONJUR_APPLIANCE_URL="http://conjur:3000"
   docker-compose up -d client conjur postgres test-https
 
   # Delay to allow time for conjur to come up
@@ -39,9 +144,9 @@ function createTestEnvironment() {
   docker-compose run --rm test ./wait_for_server.sh
 }
 
-function loadTestPolicy() {
+function loadOSSTestPolicy() {
   echo '-----------------------test.sh------------------------------'
-  echo "Loading test policy"
+  echo "Loading OSS test policy"
   echo '------------------------------------------------------------'
 
   # get conjur container id
@@ -54,10 +159,10 @@ function loadTestPolicy() {
 
   docker exec -e CONJUR_AUTHN_API_KEY=${api_key} \
     ${conjur_client_cid} \
-    /bin/bash -c "conjur policy load root /tmp/test-policy/root.yml"
+    conjur policy load root /tmp/test-policy/root.yml
 }
 
-function printProxyConfiguration() {
+function printOSSProxyConfiguration() {
   echo '-----------------------test.sh------------------------------'
   echo "Print Nginx proxy server configuration"
   echo '------------------------------------------------------------'
@@ -67,13 +172,11 @@ function printProxyConfiguration() {
   conjur_proxy_cid=$(docker-compose ps -q conjur-proxy-nginx)
   exec_command='nginx-debug -T'
   docker exec ${conjur_proxy_cid} ${exec_command}
-
 }
 
-
-function initializeCert() {
+function initializeOSSCert() {
   echo '-----------------------test.sh------------------------------'
-  echo "Fetch certificate using client cli"
+  echo "Fetch certificate for OSS using client cli"
   echo '------------------------------------------------------------'
 
   # get conjur client container id
@@ -103,16 +206,20 @@ function initializeCert() {
   # get conjur test https container id
   conjur_test_cid=$(docker-compose ps -q test-https)
 
-  JRE_HOME='/usr/lib/jvm/java-7-openjdk-amd64/jre'
-  import_command="keytool -import -alias cucumber -v -trustcacerts -noprompt \
-     -keystore $JRE_HOME/lib/security/cacerts \
-     -file /test-cert/conjur-cucumber.der -storepass changeit"
-  docker exec ${conjur_test_cid} ${import_command}
-
+  JRE_HOME='/usr/lib/jvm/java-8-openjdk-amd64/jre'
+  import_command="keytool \
+    -import \
+    -alias cucumber \
+    -v -trustcacerts \
+    -noprompt \
+    -keystore $JRE_HOME/lib/security/cacerts \
+    -file /test-cert/conjur-cucumber.der -storepass changeit"
 
+  docker exec ${conjur_test_cid} ${import_command}
 }
 
-function runTests() {
+
+function runOSSTests() {
   echo '-----------------------test.sh------------------------------'
   echo "Running tests"
   echo '------------------------------------------------------------'
@@ -125,12 +232,9 @@ function runTests() {
     -e CONJUR_AUTHN_API_KEY="$api_key_admin" \
     test \
       bash -c "mvn test"
-
-
-
 }
 
-function runHTTPSTests() {
+function runOSSHTTPSTests() {
   echo '-----------------------test.sh------------------------------'
   echo "Running https tests"
   echo '------------------------------------------------------------'
@@ -165,4 +269,4 @@ function runHTTPSTests() {
   ${conjur_test_cid} ${tests_command}
 }
 
-main
+main
\ No newline at end of file