Skip to content

Commit 6d57aed

Browse files
masseb974masseb974
committed
Refactoring TenantsInitializer and InternalSecurityInitializer
1 parent 2dbde83 commit 6d57aed

5 files changed

Lines changed: 140 additions & 25 deletions

File tree

‎knowage-core/src/main/java/it/eng/spagobi/commons/initializers/metadata/TenantsInitializer.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.hibernate.Session;
3030

3131
import it.eng.spago.base.SourceBean;
32-
import it.eng.spago.configuration.ConfigSingleton;
3332
import it.eng.spagobi.commons.metadata.SbiCommonInfo;
3433
import it.eng.spagobi.commons.metadata.SbiOrganizationProductType;
3534
import it.eng.spagobi.commons.metadata.SbiOrganizationProductTypeId;
@@ -43,23 +42,14 @@
4342
*/
4443
public class TenantsInitializer extends SpagoBIInitializer {
4544

46-
private static String TENANTS_CONFIG_TAG_NAME = "TENANTS";
4745
private static String TENANT_CONFIG_TAG_NAME = "TENANT";
4846
private static String TENANT_CONFIG_NAME_ATTRIBUTE = "name";
4947

50-
@Override
51-
protected SourceBean getConfiguration() throws Exception {
52-
SourceBean config = (SourceBean) ConfigSingleton.getInstance().getAttribute(TENANTS_CONFIG_TAG_NAME);
53-
if (config == null) {
54-
throw new Exception("Tenants configuration not found!!!");
55-
}
56-
return config;
57-
}
58-
5948
private static Logger logger = Logger.getLogger(TenantsInitializer.class);
6049

6150
public TenantsInitializer() {
6251
targetComponentName = "Tenants";
52+
configurationFileName = "it/eng/spagobi/commons/initializers/metadata/config/tenants.xml";
6353
}
6454

6555
@Override

‎knowage-core/src/main/java/it/eng/spagobi/security/init/InternalSecurityInitializer.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.hibernate.criterion.Restrictions;
3030

3131
import it.eng.spago.base.SourceBean;
32-
import it.eng.spago.configuration.ConfigSingleton;
3332
import it.eng.spago.error.EMFUserError;
3433
import it.eng.spagobi.commons.bo.Config;
3534
import it.eng.spagobi.commons.bo.Domain;
@@ -66,6 +65,7 @@ public class InternalSecurityInitializer extends SpagoBIInitializer {
6665

6766
public InternalSecurityInitializer() {
6867
targetComponentName = "InternalSecurity";
68+
configurationFileName = "it/eng/spagobi/commons/initializers/metadata/config/internal_profiling.xml";
6969
}
7070

7171
@Override
@@ -177,15 +177,6 @@ private void createPasswordIfNull(ISbiUserDAO userDAO) {
177177
});
178178
}
179179

180-
@Override
181-
protected SourceBean getConfiguration() throws Exception {
182-
SourceBean config = (SourceBean) ConfigSingleton.getInstance().getAttribute(INTERNAL_SECURITY_CONFIG_TAG_NAME);
183-
if (config == null) {
184-
throw new Exception("Internal security configuration not found!!!");
185-
}
186-
return config;
187-
}
188-
189180
private Integer findRoleId(List<Role> rolesList, String name, String organization) {
190181
for (Role role : rolesList) {
191182
if (role.getName().equalsIgnoreCase(name) && role.getOrganization().equals(organization)) {

‎knowage/src/main/resources/it/eng/spagobi/commons/initializers/metadata/config/internal_profiling.xml‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<INTERNAL_PROFILING_INITIALIZER>
3+
<DEFAULT_USERS>
4+
<USER userId="biadmin" password="biadmin" fullName="Knowage Administrator"
5+
organization="DEFAULT_TENANT" isSuperadmin="true">
6+
<ATTRIBUTE name="email" value="admin@eng.it" />
7+
<ATTRIBUTE name="name" value="Knowage Administrator" />
8+
<ROLE name="admin" />
9+
</USER>
10+
<USER userId="biuser" password="biuser" fullName="Knowage User"
11+
organization="DEFAULT_TENANT">
12+
<ATTRIBUTE name="name" value="Knowage User" />
13+
<ROLE name="user" />
14+
</USER>
15+
<USER userId="bidemo" password="bidemo" fullName="Knowage Demo User"
16+
organization="DEFAULT_TENANT">
17+
<ATTRIBUTE name="name" value="Knowage Demo User" />
18+
<ROLE name="demo" />
19+
</USER>
20+
<USER userId="bitest" password="bitest" fullName="Knowage Test User"
21+
organization="DEFAULT_TENANT">
22+
<ATTRIBUTE name="name" value="SpagoBI TestUser" />
23+
<ROLE name="test" />
24+
</USER>
25+
<USER userId="bidev" password="bidev" fullName="Knowage Developer"
26+
organization="DEFAULT_TENANT">
27+
<ATTRIBUTE name="name" value="Knowage Developer" />
28+
<ROLE name="dev" />
29+
</USER>
30+
<USER userId="public_user" password="public_user" fullName="Knowage Public User"
31+
organization="DEFAULT_TENANT">
32+
<ATTRIBUTE name="name" value="Public User" />
33+
</USER>
34+
35+
</DEFAULT_USERS>
36+
<DEFAULT_ATTRIBUTES>
37+
<ATTRIBUTE name="name" description="name" organization="DEFAULT_TENANT" />
38+
<ATTRIBUTE name="surname" description="surname"
39+
organization="DEFAULT_TENANT" />
40+
<ATTRIBUTE name="address" description="address"
41+
organization="DEFAULT_TENANT" />
42+
<ATTRIBUTE name="birth_date" description="birth date"
43+
organization="DEFAULT_TENANT" />
44+
<ATTRIBUTE name="email" description="email" organization="DEFAULT_TENANT" />
45+
46+
</DEFAULT_ATTRIBUTES>
47+
<DEFAULT_ROLES>
48+
<ROLE roleName="dev" description="dev"
49+
roleTypeCD="DEV_ROLE" organization="DEFAULT_TENANT" />
50+
<ROLE roleName="test" description="test"
51+
roleTypeCD="TEST_ROLE" organization="DEFAULT_TENANT" />
52+
<ROLE roleName="user" description="user"
53+
roleTypeCD="USER" organization="DEFAULT_TENANT" />
54+
<ROLE roleName="admin" description="admin"
55+
roleTypeCD="ADMIN" organization="DEFAULT_TENANT" />
56+
<ROLE roleName="modeladmin" description="modeladmin"
57+
roleTypeCD="MODEL_ADMIN" organization="DEFAULT_TENANT" />
58+
<ROLE roleName="demo" description="demo"
59+
roleTypeCD="USER" organization="DEFAULT_TENANT" />
60+
61+
</DEFAULT_ROLES>
62+
<DEFAULT_AUTHORIZATIONS>
63+
<AUTHORIZATION productType="KnowageSI" authorizationName="SAVE_SUBOBJECTS" organization="DEFAULT_TENANT" />
64+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEE_VIEWPOINTS" organization="DEFAULT_TENANT" />
65+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEE_SNAPSHOTS" organization="DEFAULT_TENANT" />
66+
<AUTHORIZATION productType="KnowageSI" authorizationName="RUN_SNAPSHOTS" organization="DEFAULT_TENANT" />
67+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEE_NOTES" organization="DEFAULT_TENANT" />
68+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEND_MAIL" organization="DEFAULT_TENANT" />
69+
<AUTHORIZATION productType="KnowageSI" authorizationName="SAVE_INTO_FOLDER" organization="DEFAULT_TENANT" />
70+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEE_METADATA" organization="DEFAULT_TENANT" />
71+
<AUTHORIZATION productType="KnowageSI" authorizationName="SAVE_METADATA" organization="DEFAULT_TENANT" />
72+
<AUTHORIZATION productType="KnowageSI" authorizationName="MANAGE_USERS" organization="DEFAULT_TENANT" />
73+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEE_DOCUMENT_BROWSER" organization="DEFAULT_TENANT" />
74+
<AUTHORIZATION productType="KnowageSI" authorizationName="CREATE_DOCUMENTS" organization="DEFAULT_TENANT" />
75+
<AUTHORIZATION productType="KnowageSI" authorizationName="ENABLE_DATASET_PERSISTENCE" organization="DEFAULT_TENANT" />
76+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEE_MY_DATA" organization="DEFAULT_TENANT"/>
77+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEE_MY_WORKSPACE" organization="DEFAULT_TENANT"/>
78+
<AUTHORIZATION productType="KnowageSI" authorizationName="BUILD_QBE_QUERY" organization="DEFAULT_TENANT"/>
79+
<AUTHORIZATION productType="KnowageSI" authorizationName="MANAGE_INTERNATIONALIZATION" organization="DEFAULT_TENANT" />
80+
<AUTHORIZATION productType="KnowageSI" authorizationName="ENABLE_TO_RATE" organization="DEFAULT_TENANT" />
81+
<AUTHORIZATION productType="KnowageSI" authorizationName="ENABLE_TO_PRINT" organization="DEFAULT_TENANT" />
82+
<AUTHORIZATION productType="KnowageSI" authorizationName="ENABLE_TO_COPY_AND_EMBED" organization="DEFAULT_TENANT" />
83+
<AUTHORIZATION productType="KnowageSI" authorizationName="CREATE_SELF_SERVICE_COCKPIT" organization="DEFAULT_TENANT" />
84+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEE_NEWS" organization="DEFAULT_TENANT" />
85+
<AUTHORIZATION productType="KnowageSI" authorizationName="CREATE_CUSTOM_CHART" organization="DEFAULT_TENANT" />
86+
<AUTHORIZATION productType="KnowageSI" authorizationName="SEE_HELP_ONLINE" organization="DEFAULT_TENANT" />
87+
<AUTHORIZATION productType="KnowageSI" authorizationName="ENABLE_DOSSIER" organization="DEFAULT_TENANT" />
88+
<AUTHORIZATION productType="KnowageSI" authorizationName="MANAGE_CALENDAR" organization="DEFAULT_TENANT" />
89+
<AUTHORIZATION productType="KnowageSI" authorizationName="FUNCTIONS_CATALOG_USAGE" organization="DEFAULT_TENANT" />
90+
</DEFAULT_AUTHORIZATIONS>
91+
92+
<DEFAULT_AUTHORIZATIONS_ROLES>
93+
<AUTHORIZATION_ROLES authorizationName="SAVE_INTO_FOLDER" roleName="admin" organization="DEFAULT_TENANT"/>
94+
<AUTHORIZATION_ROLES authorizationName="SAVE_SUBOBJECTS" roleName="admin" organization="DEFAULT_TENANT"/>
95+
<AUTHORIZATION_ROLES authorizationName="SEE_VIEWPOINTS" roleName="admin" organization="DEFAULT_TENANT"/>
96+
<AUTHORIZATION_ROLES authorizationName="SEND_MAIL" roleName="admin" organization="DEFAULT_TENANT"/>
97+
<AUTHORIZATION_ROLES authorizationName="BUILD_QBE_QUERY" roleName="admin" organization="DEFAULT_TENANT"/>
98+
<AUTHORIZATION_ROLES authorizationName="ENABLE_DATASET_PERSISTENCE" roleName="admin" organization="DEFAULT_TENANT"/>
99+
<AUTHORIZATION_ROLES authorizationName="ENABLE_TO_RATE" roleName="admin" organization="DEFAULT_TENANT"/>
100+
<AUTHORIZATION_ROLES authorizationName="ENABLE_TO_PRINT" roleName="admin" organization="DEFAULT_TENANT"/>
101+
<AUTHORIZATION_ROLES authorizationName="ENABLE_TO_COPY_AND_EMBED" roleName="admin" organization="DEFAULT_TENANT"/>
102+
<AUTHORIZATION_ROLES authorizationName="SEE_DOCUMENT_BROWSER" roleName="admin" organization="DEFAULT_TENANT"/>
103+
<AUTHORIZATION_ROLES authorizationName="SEE_MY_DATA" roleName="admin" organization="DEFAULT_TENANT"/>
104+
<AUTHORIZATION_ROLES authorizationName="SEE_MY_WORKSPACE" roleName="admin" organization="DEFAULT_TENANT"/>
105+
<AUTHORIZATION_ROLES authorizationName="CREATE_DOCUMENTS" roleName="admin" organization="DEFAULT_TENANT"/>
106+
<AUTHORIZATION_ROLES authorizationName="CREATE_SELF_SERVICE_COCKPIT" roleName="admin" organization="DEFAULT_TENANT"/>
107+
108+
109+
<AUTHORIZATION_ROLES authorizationName="SAVE_INTO_FOLDER" roleName="user" organization="DEFAULT_TENANT"/>
110+
<AUTHORIZATION_ROLES authorizationName="SAVE_SUBOBJECTS" roleName="user" organization="DEFAULT_TENANT"/>
111+
<AUTHORIZATION_ROLES authorizationName="SEE_VIEWPOINTS" roleName="user" organization="DEFAULT_TENANT"/>
112+
<AUTHORIZATION_ROLES authorizationName="BUILD_QBE_QUERY" roleName="user" organization="DEFAULT_TENANT"/>
113+
<AUTHORIZATION_ROLES authorizationName="ENABLE_TO_RATE" roleName="user" organization="DEFAULT_TENANT"/>
114+
<AUTHORIZATION_ROLES authorizationName="ENABLE_TO_PRINT" roleName="user" organization="DEFAULT_TENANT"/>
115+
<AUTHORIZATION_ROLES authorizationName="ENABLE_TO_COPY_AND_EMBED" roleName="user" organization="DEFAULT_TENANT"/>
116+
<AUTHORIZATION_ROLES authorizationName="SEE_DOCUMENT_BROWSER" roleName="user" organization="DEFAULT_TENANT"/>
117+
<AUTHORIZATION_ROLES authorizationName="SEE_MY_DATA" roleName="user" organization="DEFAULT_TENANT"/>
118+
<AUTHORIZATION_ROLES authorizationName="SEE_MY_WORKSPACE" roleName="user" organization="DEFAULT_TENANT"/>
119+
<AUTHORIZATION_ROLES authorizationName="CREATE_DOCUMENTS" roleName="user" organization="DEFAULT_TENANT"/>
120+
<AUTHORIZATION_ROLES authorizationName="CREATE_SELF_SERVICE_COCKPIT" roleName="user" organization="DEFAULT_TENANT"/>
121+
</DEFAULT_AUTHORIZATIONS_ROLES>
122+
123+
<EXT_ROLES_CATEGORIES>
124+
<EXT_ROLES_CATEGORY roleName="user" domainCd="BM_CATEGORY" organization="DEFAULT_TENANT"/>
125+
<EXT_ROLES_CATEGORY roleName="user" domainCd="DATASET_TYPE" organization="DEFAULT_TENANT"/>
126+
</EXT_ROLES_CATEGORIES>
127+
</INTERNAL_PROFILING_INITIALIZER>

‎knowage/src/main/resources/it/eng/spagobi/commons/initializers/metadata/config/tenants.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TENANTS>
3+
<TENANT name="DEFAULT_TENANT">
4+
<PRODUCT name="KnowageSI" active="true"/>
5+
</TENANT>
6+
</TENANTS>

‎knowage/src/main/webapp/WEB-INF/conf/master.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,12 @@
235235
<CONFIGURATOR path="/WEB-INF/conf/webapp/static_menu.xml" />
236236
-->
237237
<CONFIGURATOR path="/WEB-INF/conf/config/security_liferay_config.xml" />
238-
<CONFIGURATOR path="/WEB-INF/conf/config/internal_profiling.xml" />
238+
239239
<CONFIGURATOR path="/WEB-INF/conf/config/tree_initialization.xml" />
240-
<!--<CONFIGURATOR path="/WEB-INF/conf/config/spagobi_dao.xml" />-->
241-
<CONFIGURATOR path="/WEB-INF/conf/config/tenants.xml" />
242-
240+
<!--
241+
<CONFIGURATOR path="/WEB-INF/conf/config/internal_profiling.xml" />
242+
<CONFIGURATOR path="/WEB-INF/conf/config/spagobi_dao.xml" />
243+
<CONFIGURATOR path="/WEB-INF/conf/config/tenants.xml" /> -->
243244

244245
<!-- Spago Config. -->
245246
<CONFIGURATOR path="/WEB-INF/conf/config/common.xml" />

0 commit comments

Comments
 (0)