From 883c91bdfbe4064cd88c7d1f21853b5ce7834fee Mon Sep 17 00:00:00 2001 From: lasantha Date: Mon, 12 Mar 2018 11:27:23 +0530 Subject: [PATCH 1/3] Add PostgreSQL script to storage db scripts PostgerSQL scripts are not in the storage db scripts folder. Therefore added it and script will copy to the storage folder when building the server --- modules/distribution/src/assembly/bin.xml | 7 +++++++ .../src/core/resources/dbscripts/storage/resource.sql | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 modules/distribution/src/core/resources/dbscripts/storage/resource.sql diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 15d97bf8..c10bb6ba 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1987,5 +1987,12 @@ 644 + + + + src/core/resources/dbscripts/storage/resource.sql + ${pom.artifactId}-${pom.version}/dbscripts/storage/postgresql + + diff --git a/modules/distribution/src/core/resources/dbscripts/storage/resource.sql b/modules/distribution/src/core/resources/dbscripts/storage/resource.sql new file mode 100644 index 00000000..7ec87c48 --- /dev/null +++ b/modules/distribution/src/core/resources/dbscripts/storage/resource.sql @@ -0,0 +1,9 @@ +CREATE TABLE IF NOT EXISTS resource ( + uuid VARCHAR(250), + tenantId VARCHAR(250), + fileName VARCHAR(250), + contentLength INT, + contentType VARCHAR(150), + content BYTEA +) +; From 2668903e8fe9104af5e5106bfeb8b49485e30785 Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 15 Mar 2018 21:45:46 +0530 Subject: [PATCH 2/3] Modify the app manager JMeter test case. As a result of GDPR compliance functionality, App manager JMeter test cases has to be changed. Hence modify the App manager logic in JMeter the test. --- .../jmeter-scripts/AppManagerTest.jmx | 374 ++++++++++++++++-- 1 file changed, 339 insertions(+), 35 deletions(-) diff --git a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx index c56a953b..a632ea4c 100644 --- a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx +++ b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx @@ -91,6 +91,12 @@ Created Date = + + superTenantDomain + carbon.super + Super Tenant Domain + = + @@ -438,15 +444,29 @@ vars.put("encoded", encoded); - + - + false - ${RelayState} + true = true - RelayState + tocommonauth + + + false + ${username} + = + true + username + + + false + ${password} + = + true + password false @@ -455,19 +475,67 @@ vars.put("encoded", encoded); true sessionDataKey - + + + ${server} + ${port} + + + https + + samlsso + POST + true + false + true + false + HttpClient4 + false + + + + + + sessionDataKey + //input[@type='hidden'][@name='sessionDataKey']/@value + false + true + false + all + -1 + + + + + + + false - ${username} + on = true - username + consent_select_all - + false - ${password} + on = true - password + consent_0 + + + false + ${sessionDataKey} + = + true + sessionDataKey + + + false + approve + = + true + consent @@ -478,7 +546,7 @@ vars.put("encoded", encoded); https commonauth - GET + POST true false true @@ -2607,6 +2675,180 @@ vars.put("encoded", encoded); + + + + + ${server} + ${port} + + + https + + publisher + GET + true + false + true + false + false + + + + + + SAMLRequest + //input[@type='hidden'][@name='SAMLRequest']/@value + false + true + false + -1 + + + + + RelayState + //input[@type='hidden'][@name='RelayState']/@value + false + true + false + -1 + + + + + SSOAuthSessionID + //input[@type='hidden'][@name='SSOAuthSessionID']/@value + false + true + false + -1 + + + + + + + + ${server} + ${port} + + + https + + publisher + GET + true + false + true + false + false + + + + + + SAMLRequest + //input[@type='hidden'][@name='SAMLRequest']/@value + false + true + false + -1 + + + + + RelayState + //input[@type='hidden'][@name='RelayState']/@value + false + true + false + -1 + + + + + SSOAuthSessionID + //input[@type='hidden'][@name='SSOAuthSessionID']/@value + false + true + false + -1 + + + + + + + + false + true + = + true + tocommonauth + + + false + ${username} + = + true + username + + + false + ${password} + = + true + password + + + false + ${sessionDataKey} + = + true + sessionDataKey + + + + ${server} + ${port} + + + https + + samlsso + POST + true + false + true + false + HttpClient4 + false + + + + + + SAMLResponse + //input[@type='hidden'][@name='SAMLResponse']/@value + false + true + false + -1 + + + + + sessionDataKey + //input[@type='hidden'][@name='sessionDataKey']/@value + false + true + false + all + -1 + + + continue @@ -2762,26 +3004,19 @@ vars.put("encoded", encoded); - + - + false - ${RelayState} - = - true - RelayState - - - false - ${sessionDataKey} + true = true - sessionDataKey + tocommonauth false - ${username}@${domain_name} + ${username} = true username @@ -2793,6 +3028,13 @@ vars.put("encoded", encoded); true password + + false + ${sessionDataKey} + = + true + sessionDataKey + ${server} @@ -2801,26 +3043,17 @@ vars.put("encoded", encoded); https - commonauth - GET + samlsso + POST true false true false + HttpClient4 false - - - RelayState1 - //input[@type='hidden'][@name='RelayState']/@value - false - true - false - -1 - - SAMLResponse @@ -2840,6 +3073,77 @@ vars.put("encoded", encoded); 16 + + + sessionDataKey + //input[@type='hidden'][@name='sessionDataKey']/@value + false + true + false + all + -1 + + + + + + + + false + on + = + true + consent_select_all + + + false + on + = + true + consent_0 + + + false + ${sessionDataKey} + = + true + sessionDataKey + + + false + approve + = + true + consent + + + + ${server} + ${port} + + + https + + commonauth + GET + true + false + true + false + false + + + + + + RelayState1 + //input[@type='hidden'][@name='RelayState']/@value + false + true + false + -1 + + From be6a089c34815c06d791097072cf6202ffd1cf1e Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 15 Mar 2018 21:48:39 +0530 Subject: [PATCH 3/3] Enable integration test cases --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dcdded28..eb338c05 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ modules/cxf-filters modules/p2-profile modules/distribution - + modules/integration