From 8c87cfa8a0aad24d47e60709e14dbe5c5bc01162 Mon Sep 17 00:00:00 2001 From: RonnyFrayRegato Date: Thu, 8 Sep 2022 15:46:57 -0700 Subject: [PATCH] Create LDAP CI test (#116) * Create ldap.yml * Create a continuous integration pipeline for CWS using LDAP security and associated tests. * Test security env variable. * Configure open source LDAP for CI. * Adjust wait time for web elements * Create WebTestLdap * Publish CWS Docker image * Adjust WebTestUtil for timeout error * Run WebTestLdap * Update WebTestUtil * Update workflow files * Update web elements for integration tests --- .github/workflows/ldap.yml | 110 ++++++++++++++++++ .github/workflows/maven.yml | 76 ++++++++++-- ci/ci.sh | 12 +- ci/run_ci.sh | 2 +- cws-opensource-ldap/user.ldif | 12 +- .../src/test/java/jpl/cws/test/WebTestIT.java | 12 +- .../test/java/jpl/cws/test/WebTestUtil.java | 18 +-- .../test/integration/ui/HistoryTestIT.java | 2 +- .../test/integration/ui/InitiatorsTestIT.java | 2 +- .../cws/test/integration/ui/LogsTestIT.java | 2 +- .../test/integration/ui/SnippetsTestIT.java | 2 +- .../test/integration/ui/WorkersTestIT.java | 2 +- .../jpl/cws/test/ldap/ui/WebTestLdap.java | 53 +++++++++ install/installerPresets.properties | 2 +- install/tomcat_conf/ldap_plugin_bean.xml | 24 ++-- utils.sh | 2 +- 16 files changed, 279 insertions(+), 54 deletions(-) create mode 100644 .github/workflows/ldap.yml create mode 100644 cws-test/src/test/java/jpl/cws/test/ldap/ui/WebTestLdap.java diff --git a/.github/workflows/ldap.yml b/.github/workflows/ldap.yml new file mode 100644 index 00000000..ce2b290f --- /dev/null +++ b/.github/workflows/ldap.yml @@ -0,0 +1,110 @@ +name: CWS CI LDAP + +# Triggers the workflow on push +on: + push: + schedule: + # trigger a build and test of CWS daily at 5 AM PST / 12 PM UTC + - cron: '0 12 * * *' + +jobs: + + build-and-test-cws: + + runs-on: ubuntu-latest + env: + SECURITY: "LDAP" + + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'temurin' + cache: maven + + - name: Create open-source certs + run: | + cd cws-certs + chmod +x generate-certs.sh + ./generate-certs.sh + + - name: Download Logstash + uses: carlosperate/download-file-action@v1 + with: + file-url: https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.16.2-windows-x86_64.zip + file-name: logstash-7.16.2.zip + location: install/logging/ + + - name: Check for Logstash + run: | + cd install/logging/ + ls -l + + - name: Set up Elasticsearch + run: | + cd install/docker/es-only + docker-compose up -d + + - name: Set up CWS database using Docker + run: docker run -d -p 3306:3306 -e MYSQL_DATABASE=cws_dev -e MYSQL_ROOT_PASSWORD=adminpw --name mdb103 mariadb:10.3 + + - name: Set up CWS LDAP Server + run: | + cd cws-opensource-ldap + docker-compose up -d + + - name: Show Docker containers + run: | + sleep 5s + docker ps -a + + - name: Build CWS + id: build + run: | + cd ci + chmod +x run_ci.sh + ./run_ci.sh $SECURITY + shell: bash + + - name: Show CWS Log + run: | + cd dist/console-only/cws/server/apache-tomcat-9.0.33/logs + ls -al + + - name: Set up Google Chrome + run: | + sudo apt-get update + sudo apt-get --only-upgrade install google-chrome-stable + + - name: Display Google Chrome version + run: google-chrome --version + + - name: Run LDAP Integration Tests + id: ldap + run: mvn -DfailIfNoTests=false -Dtest=WebTestLdap clean test + shell: bash + + - name: Send custom JSON data to Slack workflow + if: ${{ always() }} + id: slack + uses: slackapi/slack-github-action@v1.19.0 + with: + # This data can be any valid JSON from a previous step in the GitHub Action + payload: | + { + "status": "CWS CI LDAP build and test result: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}\nCWS build result: ${{ steps.build.outcome }}\nLDAP integration test result: ${{ steps.ldap.outcome }}", + "blocks": [ + { + "type": "section", + "text": { + "type": "mrkdwn", + "text": "CWS CI LDAP build and test result: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}\nCWS build result: ${{ steps.build.outcome }}\nLDAP integration test result: ${{ steps.ldap.outcome }}" + } + } + ] + } + env: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5f8f14b0..04bbc5c2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,4 +1,4 @@ -name: CWS CI +name: CWS CI Camunda # Triggers the workflow on push on: @@ -9,71 +9,96 @@ on: jobs: - build-cws: + build-and-test-cws: runs-on: ubuntu-latest + env: + SECURITY: "CAMUNDA" steps: - uses: actions/checkout@v3 + - name: Set up JDK 8 uses: actions/setup-java@v3 with: java-version: '8' distribution: 'temurin' cache: maven + - name: Create open-source certs run: | cd cws-certs chmod +x generate-certs.sh ./generate-certs.sh + - name: Download Logstash uses: carlosperate/download-file-action@v1 with: file-url: https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.16.2-windows-x86_64.zip file-name: logstash-7.16.2.zip location: install/logging/ + - name: Check for Logstash run: | cd install/logging/ ls -l + - name: Set up Elasticsearch run: | cd install/docker/es-only docker-compose up -d + - name: Set up CWS database using Docker run: docker run -d -p 3306:3306 -e MYSQL_DATABASE=cws_dev -e MYSQL_ROOT_PASSWORD=adminpw --name mdb103 mariadb:10.3 + - name: Show Docker containers run: | sleep 5s docker ps -a - - name: Run CWS + + - name: Build CWS + id: build run: | cd ci chmod +x run_ci.sh - ./run_ci.sh + ./run_ci.sh $SECURITY shell: bash + - name: Show CWS Log run: | cd dist/console-only/cws/server/apache-tomcat-9.0.33/logs ls -al - - uses: browser-actions/setup-chrome@latest - - run: chrome --version + + - name: Set up Google Chrome + run: | + sudo apt-get update + sudo apt-get --only-upgrade install google-chrome-stable + + - name: Display Google Chrome version + run: google-chrome --version + - name: Run Unit Tests + id: unit run: mvn -Dmaven.compiler.debug=true -Dmaven.compiler.debuglevel=lines,vars,source clean test jacoco:report-aggregate shell: bash + - name: Run Integration Tests + id: integration run: mvn -Dmaven.compiler.debug=true -Dmaven.compiler.debuglevel=lines,vars,source integration-test verify -DskipTests shell: bash + - name: Upload Jacoco report uses: actions/upload-artifact@v3 with: name: jacoco-report path: jacoco-reports/aggregate/index.html + - name: Upload test screenshots uses: actions/upload-artifact@v3 with: name: test-screenshots path: test-screenshots/ + - name: Send custom JSON data to Slack workflow if: ${{ always() }} id: slack @@ -82,16 +107,51 @@ jobs: # This data can be any valid JSON from a previous step in the GitHub Action payload: | { - "status": "GitHub Action build result: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}", + "status": "CWS CI Camunda build and test result: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}\nCWS build result: ${{ steps.build.outcome }}\nUnit test result: ${{ steps.unit.outcome }}\nIntegration test result: ${{ steps.integration.outcome }}", "blocks": [ { "type": "section", "text": { "type": "mrkdwn", - "text": "GitHub Action build result: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}" + "text": "CWS CI Camunda build and test result: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}\nCWS build result: ${{ steps.build.outcome }}\nUnit test result: ${{ steps.unit.outcome }}\nIntegration test result: ${{ steps.integration.outcome }}" } } ] } env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + + + publish-cws-image: + + if: contains(github.event.head_commit.message, 'version') + needs: build-and-test-cws + runs-on: ubuntu-latest + + steps: + - name: Check out the repo + uses: actions/checkout@v3 + + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'temurin' + cache: maven + + - name: Log in to Docker Hub + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Generate CWS Docker image + run: | + cd install/docker/cws-image + ./build.sh + + - name: Re-Tag CWS Docker image for open source + run: docker tag nasa-ammos/common-workflow-service:${{ github.ref_name }} ${{ secrets.DOCKER_USERNAME }}/common-workflow-service:${{ github.ref_name }} + + - name: Push CWS Docker image + run: docker push ${{ secrets.DOCKER_USERNAME }}/common-workflow-service:${{ github.ref_name }} diff --git a/ci/ci.sh b/ci/ci.sh index ba773210..ebf2172b 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -36,7 +36,7 @@ source ${ROOT}/../utils.sh cat > ci_console.conf.template <<- EOF cam_server_url=NA -cws_ldap_url_default=ldaps://localhost:636 +cws_ldap_url_default=ldap://localhost:389 cam_ldap_identity_plugin_class=jpl.cws.core.identity.cam.CamLdapIdentityProviderPlugin cam_ldap_security_filter_class=jpl.cws.core.web.CwsCamSecurityFilter ldap_identity_plugin_class=org.camunda.bpm.identity.impl.ldap.plugin.LdapIdentityProviderPlugin @@ -81,8 +81,8 @@ elasticsearch_username=${ES_USERNAME} elasticsearch_password=${ES_PASSWORD} smtp_hostname=smtp.localhost default_smtp_hostname=smtp.localhost -default_cws_ldap_url=ldaps://localhost:636 -cws_ldap_url=ldaps://localhost:636 +default_cws_ldap_url=ldap://localhost:389 +cws_ldap_url=ldap://localhost:389 default_elasticsearch_use_auth=n aws_cloudwatch_endpoint=monitoring.us-west-1.amazonaws.com default_elasticsearch_port=9200 @@ -98,7 +98,7 @@ EOF cat > ci_worker.conf.template <<- EOF cam_server_url=NA -cws_ldap_url_default=ldaps://localhost:636 +cws_ldap_url_default=ldap://localhost:389 cam_ldap_identity_plugin_class=jpl.cws.core.identity.cam.CamLdapIdentityProviderPlugin cam_ldap_security_filter_class=jpl.cws.core.web.CwsCamSecurityFilter ldap_identity_plugin_class=org.camunda.bpm.identity.impl.ldap.plugin.LdapIdentityProviderPlugin @@ -142,8 +142,8 @@ elasticsearch_username=${ES_USERNAME} elasticsearch_password=${ES_PASSWORD} smtp_hostname=smtp.localhost default_smtp_hostname=smtp.localhost -default_cws_ldap_url=ldaps://localhost:636 -cws_ldap_url=ldaps://localhost:636 +default_cws_ldap_url=ldap://localhost:389 +cws_ldap_url=ldap://localhost:389 project_webapp_root= default_elasticsearch_use_auth=n aws_cloudwatch_endpoint=monitoring.us-west-1.amazonaws.com diff --git a/ci/run_ci.sh b/ci/run_ci.sh index 8dc8f470..93870f95 100755 --- a/ci/run_ci.sh +++ b/ci/run_ci.sh @@ -7,7 +7,7 @@ printf "\nHostname set to '%s'\n\n" $HOSTNAME # Used in cws-test echo "$HOSTNAME" > ../cws-test/src/test/resources/hostname.txt -SECURITY="CAMUNDA" +SECURITY=${1} # parameter is passed as an env through workflow file # Stop CWS is it is currently running #./stop_dev.sh diff --git a/cws-opensource-ldap/user.ldif b/cws-opensource-ldap/user.ldif index 761254e9..f242a17f 100644 --- a/cws-opensource-ldap/user.ldif +++ b/cws-opensource-ldap/user.ldif @@ -8,11 +8,11 @@ dn: ou=Users,dc=example,dc=com objectClass: organizationalUnit ou: Users -dn: cn=cwsuser,ou=Users,dc=example,dc=com +dn: cn=cwsci,ou=Users,dc=example,dc=com objectclass: inetOrgPerson -cn: cwsuser -givenName: cws -sn: user -uid: cwsuser -userpassword: ldapcwspassword +cn: cwsci +givenName: Ronny +sn: Fray +uid: cwsci +userpassword: changeme mail: cws.user@example.com \ No newline at end of file diff --git a/cws-test/src/test/java/jpl/cws/test/WebTestIT.java b/cws-test/src/test/java/jpl/cws/test/WebTestIT.java index f204bec5..f540b275 100644 --- a/cws-test/src/test/java/jpl/cws/test/WebTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/WebTestIT.java @@ -94,7 +94,7 @@ public void runDeployTest() { // Start Instance WebElement tasks = driver.findElement(By.xpath("//a[@href='/camunda/app/tasklist']")); tasks.click(); - findOnPage("Camunda Tasklist"); + findOnPage("Camunda Tasklist"); sleep(10000); @@ -118,7 +118,7 @@ public void runDeployTest() { // Go back to CWS WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']")); cws.click(); - findOnPage("CWS - Deployments"); + findOnPage("CWS - Deployments"); // Wait for Finish @@ -163,7 +163,7 @@ public void runErrorHandlingTest() { // Start Instance (1) through Camunda WebElement tasks = driver.findElement(By.xpath("//a[@href='/camunda/app/tasklist']")); tasks.click(); - findOnPage("Camunda Tasklist"); + findOnPage("Camunda Tasklist"); sleep(10000); @@ -187,7 +187,7 @@ public void runErrorHandlingTest() { // Go back to CWS WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']")); cws.click(); - findOnPage("CWS - Deployments"); + findOnPage("CWS - Deployments"); // Wait for Finish sleep(180000); @@ -228,7 +228,7 @@ public void runHelloWorldTest() { WebElement tasks = driver.findElement(By.xpath("//a[@href='/camunda/app/tasklist']")); tasks.click(); - findOnPage("Camunda Tasklist"); + findOnPage("Camunda Tasklist"); sleep(10000); @@ -252,7 +252,7 @@ public void runHelloWorldTest() { // Go back to CWS WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']")); cws.click(); - findOnPage("CWS - Deployments"); + findOnPage("CWS - Deployments"); // Wait for Finish sleep(90000); diff --git a/cws-test/src/test/java/jpl/cws/test/WebTestUtil.java b/cws-test/src/test/java/jpl/cws/test/WebTestUtil.java index 4618a84a..e956547b 100644 --- a/cws-test/src/test/java/jpl/cws/test/WebTestUtil.java +++ b/cws-test/src/test/java/jpl/cws/test/WebTestUtil.java @@ -126,13 +126,14 @@ protected void initChromeDriver() { chromeOptions.setHeadless(true); chromeOptions.setAcceptInsecureCerts(true); chromeOptions.addArguments("--window-size=1920,1080"); + chromeOptions.addArguments("--no-sandbox"); WebDriverManager.chromedriver().setup(); driver = new ChromeDriver(chromeOptions); log.info("Driver initialized: " + driver); - driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS); + driver.manage().timeouts().implicitlyWait(60, TimeUnit.SECONDS); } protected WebElement findElById(String id) { @@ -147,7 +148,7 @@ protected boolean findOnPage(String text) { boolean found = driver.getPageSource().contains(text); int tries = 0; long sleepTime = 4; - while (!found && tries++ < 10) { + while (!found && tries++ < 13) { sleepTime *= 2; log.warn("'" + text + "' not found ("+tries+", "+sleepTime+")"); sleep(sleepTime); @@ -178,10 +179,11 @@ protected void gotoDeployments() { protected void gotoLoginPage() { log.info("navigating to the login page..."); - driver.get("http://"+HOSTNAME+":"+PORT); - driver.manage().timeouts().pageLoadTimeout(10, TimeUnit.SECONDS); + driver.get("http://"+HOSTNAME+":"+PORT + "/cws-ui/login"); + driver.manage().window().setSize(new Dimension(1024, 768)); + driver.manage().timeouts().pageLoadTimeout(60, TimeUnit.SECONDS); // Verify we have made it to the Login page - findOnPage("Login"); + findOnPage("Login"); } @@ -203,10 +205,10 @@ protected void login() { WebElement submitBtn = findElById("submit"); submitBtn.click(); - waitForElementClass("sub-header"); + // waitForElementClass("sub-header"); // Verify we have moved past the login page to the Dashboard - findOnPage("CWS - Deployments"); + findOnPage("CWS - Deployments"); } protected void logout() { @@ -270,7 +272,7 @@ public void startProcDef(String procDef, String procName, long procTime) { wait.until(ExpectedConditions.elementToBeClickable(By.xpath("//a[@href='/camunda/app/tasklist']"))); WebElement tasks = driver.findElement(By.xpath("//a[@href='/camunda/app/tasklist']")); tasks.click(); - findOnPage("Camunda Tasklist"); + findOnPage("Camunda Tasklist"); waitForElementXPath("//*[contains(@class,'start-process-action')]"); diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java index d0135312..2190131e 100644 --- a/cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/HistoryTestIT.java @@ -81,7 +81,7 @@ public void runResultsTest() throws IOException { scrollTo(historyButton); historyButton.click(); - findOnPage("CWS - History"); + findOnPage("CWS - History"); if (findOnPage("History Page") && findOnPage("Command 'mkdir Test' exit code: 0") diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java index d52b37da..262f3567 100644 --- a/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java @@ -224,7 +224,7 @@ public void runVariableProcTest() throws IOException { waitForElement(historyButton); historyButton.sendKeys(Keys.RETURN); - findOnPage("CWS - History"); + findOnPage("CWS - History"); log.info("Looking for 'variable1 = foo' and 'variable2 = bar'"); if (findOnPage("Setting (string) variable1 = foo") diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/LogsTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/LogsTestIT.java index b9b2ec78..115033dc 100644 --- a/cws-test/src/test/java/jpl/cws/test/integration/ui/LogsTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/LogsTestIT.java @@ -182,7 +182,7 @@ public void runOutputRefreshTest() throws IOException { wait.until(ExpectedConditions.elementToBeClickable(By.xpath("//a[@href='/camunda/app/tasklist']"))); WebElement tasks = driver.findElement(By.xpath("//a[@href='/camunda/app/tasklist']")); tasks.click(); - findOnPage("Camunda Tasklist"); + findOnPage("Camunda Tasklist"); waitForElementXPath("//*[contains(@class,'start-process-action')]"); diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/SnippetsTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/SnippetsTestIT.java index 0d3ec426..2acbd3c4 100644 --- a/cws-test/src/test/java/jpl/cws/test/integration/ui/SnippetsTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/SnippetsTestIT.java @@ -125,7 +125,7 @@ public void runSnippetsModelTest() throws IOException { scrollTo(historyButton); historyButton.click(); - findOnPage("CWS - History"); + findOnPage("CWS - History"); log.info("Looking for 'This is our world: Hello World."); if(findOnPage("This is our world: Hello World")) { diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java index c6ae577e..20c0e45f 100644 --- a/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java +++ b/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java @@ -311,7 +311,7 @@ public void runThreadLimitTest() throws IOException { // Each of the 3 test_thread_limit tasks is configured to sleep for 15 seconds and since they should be // running in parallel, we expect them all to complete after 30 seconds, but before 90 (which would be // the case running serially). - sleep(40000); + sleep(80000); child = statsText.getText(); diff --git a/cws-test/src/test/java/jpl/cws/test/ldap/ui/WebTestLdap.java b/cws-test/src/test/java/jpl/cws/test/ldap/ui/WebTestLdap.java new file mode 100644 index 00000000..49456540 --- /dev/null +++ b/cws-test/src/test/java/jpl/cws/test/ldap/ui/WebTestLdap.java @@ -0,0 +1,53 @@ +package jpl.cws.test.ldap.ui; + +import jpl.cws.test.WebTestUtil; +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * + * @author rfray + * + */ +public class WebTestLdap extends WebTestUtil { + private static final Logger log = LoggerFactory.getLogger(jpl.cws.test.WebTestIT.class); + + @Test + public void loginTest() { + log.info("------ START loginTest ------"); + gotoLoginPage(); + login(); + logout(); + log.info("------ END loginTest ------"); + } + + @Test + public void userInfoTest() { + log.info("------ START userInfoTest ------"); + gotoLoginPage(); + login(); + gotoDeployments(); + + // Go to Camunda Cockpit + log.info("Clicking Cockpit button."); + waitForElementXPath("//a[@href='/camunda/app/cockpit']"); + WebElement cockpit = driver.findElement(By.xpath("//a[@href='/camunda/app/cockpit']")); + cockpit.click(); + findOnPage("Camunda Cockpit | Dashboard"); + sleep(2000); + + // Find first and last name from LDAP server + findOnPage("Ronny Fray"); + sleep(2000); + + // Go back to CWS + WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']")); + cws.click(); + findOnPage("CWS - Deployments"); + logout(); + log.info("------ END userInfoTest ------"); + } +} diff --git a/install/installerPresets.properties b/install/installerPresets.properties index 4753de0f..f66a50b2 100644 --- a/install/installerPresets.properties +++ b/install/installerPresets.properties @@ -1,7 +1,7 @@ ldap_identity_plugin_class=org.camunda.bpm.identity.impl.ldap.plugin.LdapIdentityProviderPlugin ldap_security_filter_class=jpl.cws.core.web.CwsLdapSecurityFilter camunda_security_filter_class=jpl.cws.core.web.CwsCamundaSecurityFilter -default_cws_ldap_url=ldaps://localhost:636 +default_cws_ldap_url=ldap://localhost:389 default_tomcat_web_port=38080 default_tomcat_ssl_port=38443 default_tomcat_ajp_port=38009 diff --git a/install/tomcat_conf/ldap_plugin_bean.xml b/install/tomcat_conf/ldap_plugin_bean.xml index f15efde8..eabde7fe 100644 --- a/install/tomcat_conf/ldap_plugin_bean.xml +++ b/install/tomcat_conf/ldap_plugin_bean.xml @@ -9,18 +9,18 @@ The __VALUES__ placeholders will be filled in from config at runtime. See: https://docs.camunda.org/manual/latest/user-guide/process-engine/identity-service/#activate-the-ldap-plugin --> - + - - - - - - - - + + + + + + + + - - - + + + diff --git a/utils.sh b/utils.sh index 143bcf49..c066047c 100644 --- a/utils.sh +++ b/utils.sh @@ -209,7 +209,7 @@ function auto_conf_data () { source ${ROOT}/utils.sh - LDAP_SERVER_URL="ldaps://localhost:636" + LDAP_SERVER_URL="ldap://localhost:389" CWS_CONSOLE_SSL_PORT=38443 AMQ_PORT=31616