From ebe22410c429aba4316a5cd1dfd1de5e197b1777 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Thu, 1 Dec 2016 16:45:42 +0530 Subject: [PATCH 1/7] Adding missing certificate management web apps features --- modules/core/p2-profile-gen/pom.xml | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml index 0e9eb687..fb56f45a 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -110,6 +110,12 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version} + + org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.api.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.cert.admin.api.feature:${carbon.device.mgt.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version} @@ -2166,6 +2172,14 @@ org.wso2.carbon.apimgt.application.extension.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.certificate.mgt.api.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.certificate.mgt.server.feature.group ${carbon.device.mgt.version} @@ -2249,6 +2263,14 @@ org.wso2.carbon.email.sender.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.certificate.mgt.api.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.certificate.mgt.server.feature.group ${carbon.device.mgt.version} @@ -2706,6 +2728,14 @@ org.wso2.carbon.apimgt.application.extension.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.certificate.mgt.api.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.certificate.mgt.server.feature.group ${carbon.device.mgt.version} From 96d0d048df98ea0eb4a0be36836bbfa28810c1b3 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 6 Dec 2016 10:25:40 +0530 Subject: [PATCH 2/7] Adding APNS and GCM commented on cdm-config --- modules/core/distribution/src/repository/conf/cdm-config.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/core/distribution/src/repository/conf/cdm-config.xml b/modules/core/distribution/src/repository/conf/cdm-config.xml index bd22a4b0..caa367a5 100644 --- a/modules/core/distribution/src/repository/conf/cdm-config.xml +++ b/modules/core/distribution/src/repository/conf/cdm-config.xml @@ -28,6 +28,8 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider + + https://localhost:9443 From 694a7087b0e8860d92100922134f62f57f72f025 Mon Sep 17 00:00:00 2001 From: Harshan Liyanage Date: Tue, 6 Dec 2016 10:37:55 +0530 Subject: [PATCH 3/7] Updated carbon component versions to include security fixes --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index aea41c23..28c672e5 100644 --- a/pom.xml +++ b/pom.xml @@ -1513,7 +1513,7 @@ 4.5.4 - 4.7.0 + 4.7.2 5.2.0 @@ -1534,12 +1534,12 @@ 1.0.2 - 4.6.0 + 4.6.1 - 4.5.6 + 4.5.8 - 4.6.4 + 4.6.5 2.0.3-SNAPSHOT From ae96430e0d2f2475c9e2fc8bbdba80ab24c0687f Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 6 Dec 2016 10:59:45 +0530 Subject: [PATCH 4/7] Adding /devicemgt/login as authentication url when sso enabled --- .../identity/application-authentication.xml | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 modules/core/distribution/src/repository/conf/identity/application-authentication.xml diff --git a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml new file mode 100644 index 00000000..2139b873 --- /dev/null +++ b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml @@ -0,0 +1,162 @@ + + + + + + + smart + + + https://${carbon.host}:${carbon.management.port}/devicemgt/login + https://${carbon.host}:${carbon.management.port}/devicemgt/login?retry=true + + + + org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultRequestCoordinator + org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultAuthenticationRequestHandler + org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultLogoutRequestHandler + org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultStepBasedSequenceHandler + org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultRequestPathBasedSequenceHandler + org.wso2.carbon.identity.application.authentication.framework.handler.step.impl.DefaultStepHandler + org.wso2.carbon.identity.application.authentication.framework.handler.hrd.impl.DefaultHomeRealmDiscoverer + org.wso2.carbon.identity.application.authentication.framework.handler.claims.impl.DefaultClaimHandler + org.wso2.carbon.identity.application.authentication.framework.handler.provisioning.impl.DefaultProvisioningHandler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /authenticationendpoint/login.do + /repository/resources/security/client-truststore.jks + wso2carbon + + + + https://accounts.google.com/o/oauth2/token + https://accounts.google.com/o/oauth2/auth + https://www.googleapis.com/oauth2/v3/userinfo + + + https://login.live.com/oauth20_token.srf + https://login.live.com/oauth20_authorize.srf + https://apis.live.net/v5.0/me?access_token= + + + https://graph.facebook.com/oauth/access_token + http://www.facebook.com/dialog/oauth + https://graph.facebook.com/me + + + /authenticationendpoint/fido-auth.jsp + + + https://api.login.yahoo.com/oauth2/get_token + https://api.login.yahoo.com/oauth2/request_auth + https://social.yahooapis.com/v1/user/ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 945c581d99e759bcac786a315b3930951a6bbbbb Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 6 Dec 2016 11:59:23 +0530 Subject: [PATCH 5/7] Copying application-authentication.xml into pack --- modules/core/distribution/src/assembly/bin.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml index c504063c..10700d27 100644 --- a/modules/core/distribution/src/assembly/bin.xml +++ b/modules/core/distribution/src/assembly/bin.xml @@ -851,6 +851,12 @@ 644 + + src/repository/conf/identity/application-authentication.xml + ${pom.artifactId}-${pom.version}/repository/conf/identity + + 644 + src/repository/conf/identity/thrift-authentication.xml ${pom.artifactId}-${pom.version}/repository/conf/identity From 3e3bf1ce3826108d25eb61e330537334913de045 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 6 Dec 2016 12:18:30 +0530 Subject: [PATCH 6/7] Fixing application-authentication.xml not replaced --- modules/core/distribution/src/assembly/bin.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml index 10700d27..0e2a2e26 100644 --- a/modules/core/distribution/src/assembly/bin.xml +++ b/modules/core/distribution/src/assembly/bin.xml @@ -822,15 +822,6 @@ true 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml - - ${pom.artifactId}-${pom.version}/repository/conf/identity - - true - 644 - src/repository/conf/application-authenticators.xml From 9874844082b0714f19b36bd41c44bfe372cea998 Mon Sep 17 00:00:00 2001 From: Chatura Dilan Date: Tue, 6 Dec 2016 13:48:08 +0530 Subject: [PATCH 7/7] Added config to remove webapps --- .../core/distribution/src/assembly/bin.xml | 6 +++++ .../repository/resources/appm-tenant-conf.xml | 25 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 modules/core/distribution/src/repository/resources/appm-tenant-conf.xml diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml index c504063c..8b50b7bd 100644 --- a/modules/core/distribution/src/assembly/bin.xml +++ b/modules/core/distribution/src/assembly/bin.xml @@ -965,6 +965,12 @@ true 644 + + src/repository/resources/appm-tenant-conf.xml + ${pom.artifactId}-${pom.version}/repository/resources + true + 644 + diff --git a/modules/core/distribution/src/repository/resources/appm-tenant-conf.xml b/modules/core/distribution/src/repository/resources/appm-tenant-conf.xml new file mode 100644 index 00000000..377b7d54 --- /dev/null +++ b/modules/core/distribution/src/repository/resources/appm-tenant-conf.xml @@ -0,0 +1,25 @@ + + + + + + + false + false + + + + + mobileapp + + +