diff --git a/api/src/main/java/org/eclipse/daanse/xmla/api/UserPrincipal.java b/api/src/main/java/org/eclipse/daanse/xmla/api/UserRolePrincipal.java similarity index 80% rename from api/src/main/java/org/eclipse/daanse/xmla/api/UserPrincipal.java rename to api/src/main/java/org/eclipse/daanse/xmla/api/UserRolePrincipal.java index 9f9f850..4f8be0d 100644 --- a/api/src/main/java/org/eclipse/daanse/xmla/api/UserPrincipal.java +++ b/api/src/main/java/org/eclipse/daanse/xmla/api/UserRolePrincipal.java @@ -13,11 +13,9 @@ */ package org.eclipse.daanse.xmla.api; -import java.util.List; +public interface UserRolePrincipal { -public interface UserPrincipal { + String userName(); - String userId(); - - List roles(); + boolean hasRole(String role); } diff --git a/api/src/main/java/org/eclipse/daanse/xmla/api/discover/DiscoverService.java b/api/src/main/java/org/eclipse/daanse/xmla/api/discover/DiscoverService.java index 9d6d3c1..5e31350 100644 --- a/api/src/main/java/org/eclipse/daanse/xmla/api/discover/DiscoverService.java +++ b/api/src/main/java/org/eclipse/daanse/xmla/api/discover/DiscoverService.java @@ -16,7 +16,7 @@ import java.util.List; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.XmlaService; import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsRequest; import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsResponseRow; @@ -89,7 +89,7 @@ public interface DiscoverService { * @return the list */ List dataSources(DiscoverDataSourcesRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * returns the catalogs that are accessible on the server. @@ -98,7 +98,7 @@ List dataSources(DiscoverDataSourcesRequest requ * @return the list */ List dbSchemaCatalogs(DbSchemaCatalogsRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * describes the structure of cubes within a database. Perspectives are also returned in this @@ -108,7 +108,7 @@ List dbSchemaCatalogs(DbSchemaCatalogsRequest reque * @return the list */ List dbSchemaColumns(DbSchemaColumnsRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * describes the properties of members and cell properties. @@ -117,7 +117,7 @@ List dbSchemaColumns(DbSchemaColumnsRequest request, * @return the list */ List dbSchemaProviderTypes(DbSchemaProviderTypesRequest request, - RequestMetaData metaData, UserPrincipal userPrincipal); + RequestMetaData metaData, UserRolePrincipal userPrincipal); /** * identifies the (base) data types supported by the server. @@ -126,7 +126,7 @@ List dbSchemaProviderTypes(DbSchemaProviderTyp * @return the list */ List dbSchemaSchemata(DbSchemaSchemataRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * @@ -135,7 +135,7 @@ List dbSchemaSchemata(DbSchemaSchemataRequest reque * @return the list */ List dbSchemaSourceTables(DbSchemaSourceTablesRequest request, - RequestMetaData metaData, UserPrincipal userPrincipal); + RequestMetaData metaData, UserRolePrincipal userPrincipal); /** * returns dimensions, measure groups, or schema rowsets exposed as tables. @@ -144,7 +144,7 @@ List dbSchemaSourceTables(DbSchemaSourceTablesR * @return the list */ List dbSchemaTables(DbSchemaTablesRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * @@ -153,7 +153,7 @@ List dbSchemaTables(DbSchemaTablesRequest request, Re * @return the list */ List dbSchemaTablesInfo(DbSchemaTablesInfoRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * returns a row for each measure, each cube dimension attribute, and each schema rowset column, @@ -164,7 +164,7 @@ List dbSchemaTablesInfo(DbSchemaTablesInfoRequest */ // discover List discoverEnumerators(DiscoverEnumeratorsRequest request, - RequestMetaData metaData, UserPrincipal userPrincipal); + RequestMetaData metaData, UserRolePrincipal userPrincipal); /** * returns information about keywords that are reserved by the XMLA server. @@ -173,7 +173,7 @@ List discoverEnumerators(DiscoverEnumeratorsRequ * @return the list */ List discoverKeywords(DiscoverKeywordsRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * returns information about literals supported by the server. @@ -182,7 +182,7 @@ List discoverKeywords(DiscoverKeywordsRequest reque * @return the list */ List discoverLiterals(DiscoverLiteralsRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * returns a list of information and values about the properties that are supported by the server @@ -192,7 +192,7 @@ List discoverLiterals(DiscoverLiteralsRequest reque * @return the list */ List discoverProperties(DiscoverPropertiesRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * returns the names, restrictions, description, and other information for all Discover requests. @@ -201,7 +201,7 @@ List discoverProperties(DiscoverPropertiesRequest * @return the list */ List discoverSchemaRowsets(DiscoverSchemaRowsetsRequest request, - RequestMetaData metaData, UserPrincipal userPrincipal); + RequestMetaData metaData, UserRolePrincipal userPrincipal); /** * describes the actions that can be available to the client application. @@ -211,7 +211,7 @@ List discoverSchemaRowsets(DiscoverSchemaRowse */ // md List mdSchemaActions(MdSchemaActionsRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * describes the structure of cubes within a database. Perspectives are also returned in this @@ -221,7 +221,7 @@ List mdSchemaActions(MdSchemaActionsRequest request, * @return the list */ List mdSchemaCubes(MdSchemaCubesRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * describes the dimensions within a database. @@ -230,7 +230,7 @@ List mdSchemaCubes(MdSchemaCubesRequest request, Reque * @return the list */ List mdSchemaDimensions(MdSchemaDimensionsRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * returns information about the functions that are currently available for use in the DAX and MDX @@ -240,7 +240,7 @@ List mdSchemaDimensions(MdSchemaDimensionsRequest * @return the list */ List mdSchemaFunctions(MdSchemaFunctionsRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * describes each hierarchy within a particular dimension. @@ -249,7 +249,7 @@ List mdSchemaFunctions(MdSchemaFunctionsRequest re * @return the list */ List mdSchemaHierarchies(MdSchemaHierarchiesRequest request, - RequestMetaData metaData, UserPrincipal userPrincipal); + RequestMetaData metaData, UserRolePrincipal userPrincipal); /** * describes the KPIs within a database @@ -258,7 +258,7 @@ List mdSchemaHierarchies(MdSchemaHierarchiesRequ * @return the list */ List mdSchemaKpis(MdSchemaKpisRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * describes each level within a particular hierarchy. @@ -267,7 +267,7 @@ List mdSchemaKpis(MdSchemaKpisRequest request, RequestM * @return the list */ List mdSchemaLevels(MdSchemaLevelsRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * enumerates the dimensions of measure groups. @@ -276,7 +276,7 @@ List mdSchemaLevels(MdSchemaLevelsRequest request, Re * @return the list */ List mdSchemaMeasureGroupDimensions( - MdSchemaMeasureGroupDimensionsRequest request, RequestMetaData metaData, UserPrincipal userPrincipal); + MdSchemaMeasureGroupDimensionsRequest request, RequestMetaData metaData, UserRolePrincipal userPrincipal); /** * describes the MeasureGroups within a database @@ -285,7 +285,7 @@ List mdSchemaMeasureGroupDimensions( * @return the list */ List mdSchemaMeasureGroups(MdSchemaMeasureGroupsRequest request, - RequestMetaData metaData, UserPrincipal userPrincipal); + RequestMetaData metaData, UserRolePrincipal userPrincipal); /** * describes the members within a database @@ -294,7 +294,7 @@ List mdSchemaMeasureGroups(MdSchemaMeasureGrou * @return the list */ List mdSchemaMeasures(MdSchemaMeasuresRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * describes the members within a database @@ -303,7 +303,7 @@ List mdSchemaMeasures(MdSchemaMeasuresRequest reque * @return the list */ List mdSchemaMembers(MdSchemaMembersRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * describes the properties of members and cell properties. @@ -312,7 +312,7 @@ List mdSchemaMembers(MdSchemaMembersRequest request, * @return the list */ List mdSchemaProperties(MdSchemaPropertiesRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * describes any sets that are currently defined in a database, including session- scoped sets. @@ -321,7 +321,7 @@ List mdSchemaProperties(MdSchemaPropertiesRequest * @return the list */ List mdSchemaSets(MdSchemaSetsRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /** * returns a rowset with one row and one column. The single cell in the rowset contains an XML @@ -331,5 +331,5 @@ List mdSchemaSets(MdSchemaSetsRequest request, RequestM * @return the list */ List xmlMetaData(DiscoverXmlMetaDataRequest request, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); } diff --git a/api/src/main/java/org/eclipse/daanse/xmla/api/execute/ExecuteService.java b/api/src/main/java/org/eclipse/daanse/xmla/api/execute/ExecuteService.java index c3344f3..31753d8 100644 --- a/api/src/main/java/org/eclipse/daanse/xmla/api/execute/ExecuteService.java +++ b/api/src/main/java/org/eclipse/daanse/xmla/api/execute/ExecuteService.java @@ -14,7 +14,7 @@ package org.eclipse.daanse.xmla.api.execute; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.execute.alter.AlterRequest; import org.eclipse.daanse.xmla.api.execute.alter.AlterResponse; import org.eclipse.daanse.xmla.api.execute.cancel.CancelRequest; @@ -29,23 +29,23 @@ public interface ExecuteService { /* * The method is used to alter an object that already exists on a server. */ - AlterResponse alter(AlterRequest statementRequest, RequestMetaData metaData, UserPrincipal userPrincipal); + AlterResponse alter(AlterRequest statementRequest, RequestMetaData metaData, UserRolePrincipal userPrincipal); /* * The method cancels the currently running command on the specified connection. */ - CancelResponse cancel(CancelRequest capture, RequestMetaData metaData, UserPrincipal userPrincipal); + CancelResponse cancel(CancelRequest capture, RequestMetaData metaData, UserRolePrincipal userPrincipal); /* * The method clears the in-memory cache of the specified object. */ ClearCacheResponse clearCache(ClearCacheRequest clearCacheRequest, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); /* * The method consists of a string. This MUST be a valid string in a language that is understood by * the server, such as MDX, DMX, or SQL. */ StatementResponse statement(StatementRequest statementRequest, RequestMetaData metaData, - UserPrincipal userPrincipal); + UserRolePrincipal userPrincipal); } diff --git a/api/src/main/java/org/eclipse/daanse/xmla/api/session/SessionService.java b/api/src/main/java/org/eclipse/daanse/xmla/api/session/SessionService.java index 3907c52..e7f4c2f 100644 --- a/api/src/main/java/org/eclipse/daanse/xmla/api/session/SessionService.java +++ b/api/src/main/java/org/eclipse/daanse/xmla/api/session/SessionService.java @@ -15,17 +15,17 @@ import java.util.Optional; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.xmla.BeginSession; import org.eclipse.daanse.xmla.api.xmla.EndSession; import org.eclipse.daanse.xmla.api.xmla.Session; public interface SessionService { - Optional beginSession(BeginSession beginSession, UserPrincipal userPrincipal); + Optional beginSession(BeginSession beginSession, UserRolePrincipal userPrincipal); - boolean checkSession(Session session, UserPrincipal userPrincipal); + boolean checkSession(Session session, UserRolePrincipal userPrincipal); - void endSession(EndSession endSession, UserPrincipal userPrincipal); + void endSession(EndSession endSession, UserRolePrincipal userPrincipal); } diff --git a/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/DiscoverServiceImpl.java b/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/DiscoverServiceImpl.java index 1eb3557..e0c28a2 100644 --- a/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/DiscoverServiceImpl.java +++ b/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/DiscoverServiceImpl.java @@ -17,7 +17,7 @@ import jakarta.xml.soap.SOAPMessage; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.discover.DiscoverService; import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsRequest; import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsResponseRow; @@ -121,7 +121,7 @@ public DiscoverServiceImpl(SoapClient soapClient) { @Override public List dbSchemaCatalogs(DbSchemaCatalogsRequest dbSchemaCatalogsRequest, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers @@ -136,7 +136,7 @@ public List dbSchemaCatalogs(DbSchemaCatalogsReques @Override public List dbSchemaTables(DbSchemaTablesRequest dbSchemaTablesRequest, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createDbSchemaTablesRequestConsumer(dbSchemaTablesRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -150,7 +150,7 @@ public List dbSchemaTables(DbSchemaTablesRequest dbSc @Override public List discoverEnumerators( DiscoverEnumeratorsRequest discoverEnumeratorsRequest, RequestMetaData metaData, - UserPrincipal userPrincipal) { + UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers .createDiscoverEnumeratorsRequestConsumer(discoverEnumeratorsRequest); @@ -164,7 +164,7 @@ public List discoverEnumerators( @Override public List discoverKeywords(DiscoverKeywordsRequest discoverKeywordsRequest, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers .createDiscoverKeywordsRequestConsumer(discoverKeywordsRequest); @@ -178,7 +178,7 @@ public List discoverKeywords(DiscoverKeywordsReques @Override public List discoverLiterals(DiscoverLiteralsRequest discoverLiteralsRequest, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers .createDiscoverLiteralsRequestConsumer(discoverLiteralsRequest); @@ -192,7 +192,7 @@ public List discoverLiterals(DiscoverLiteralsReques @Override public List discoverProperties(DiscoverPropertiesRequest discoverPropertiesRequest, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers .createDiscoverPropertiesRequestConsumer(discoverPropertiesRequest); @@ -207,7 +207,7 @@ public List discoverProperties(DiscoverProperties @Override public List discoverSchemaRowsets( DiscoverSchemaRowsetsRequest discoverSchemaRowsetsRequest, RequestMetaData metaData, - UserPrincipal userPrincipal) { + UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers .createDiscoverSchemaRowsetsRequestConsumer(discoverSchemaRowsetsRequest); @@ -221,7 +221,7 @@ public List discoverSchemaRowsets( @Override public List mdSchemaActions(MdSchemaActionsRequest mdSchemaActionsRequest, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaActionsRequestConsumer(mdSchemaActionsRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -234,7 +234,7 @@ public List mdSchemaActions(MdSchemaActionsRequest m @Override public List mdSchemaCubes(MdSchemaCubesRequest mdSchemaCubesRequest, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaCubesRequestConsumer(mdSchemaCubesRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -247,7 +247,7 @@ public List mdSchemaCubes(MdSchemaCubesRequest mdSchem @Override public List mdSchemaDimensions(MdSchemaDimensionsRequest mdSchemaDimensionsRequest, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers .createMdSchemaDimensionsRequestConsumer(mdSchemaDimensionsRequest); @@ -261,7 +261,7 @@ public List mdSchemaDimensions(MdSchemaDimensions @Override public List mdSchemaFunctions(MdSchemaFunctionsRequest mdSchemaFunctionsRequest, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers .createMdSchemaFunctionsRequestConsumer(mdSchemaFunctionsRequest); @@ -275,7 +275,7 @@ public List mdSchemaFunctions(MdSchemaFunctionsReq @Override public List mdSchemaHierarchies(MdSchemaHierarchiesRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaHierarchiesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -288,7 +288,7 @@ public List mdSchemaHierarchies(MdSchemaHierarch @Override public List dataSources(DiscoverDataSourcesRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = createDiscoverDataSourcesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -301,7 +301,7 @@ public List dataSources(DiscoverDataSourcesReque @Override public List xmlMetaData(DiscoverXmlMetaDataRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createDiscoverXmlMetaDataRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -314,7 +314,7 @@ public List xmlMetaData(DiscoverXmlMetaDataReque @Override public List dbSchemaColumns(DbSchemaColumnsRequest requestApi, RequestMetaData metaData, - UserPrincipal userPrincipal) { + UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createDbSchemaColumnsRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -327,7 +327,7 @@ public List dbSchemaColumns(DbSchemaColumnsRequest r @Override public List dbSchemaProviderTypes(DbSchemaProviderTypesRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createDbSchemaProviderTypesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -340,7 +340,7 @@ public List dbSchemaProviderTypes(DbSchemaProv @Override public List dbSchemaSchemata(DbSchemaSchemataRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createDbSchemaSchemataRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -353,7 +353,7 @@ public List dbSchemaSchemata(DbSchemaSchemataReques @Override public List mdSchemaLevels(MdSchemaLevelsRequest requestApi, RequestMetaData metaData, - UserPrincipal userPrincipal) { + UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaLevelsRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -366,7 +366,7 @@ public List mdSchemaLevels(MdSchemaLevelsRequest requ @Override public List mdSchemaMeasureGroupDimensions( - MdSchemaMeasureGroupDimensionsRequest requestApi, RequestMetaData metaData, UserPrincipal userPrincipal) { + MdSchemaMeasureGroupDimensionsRequest requestApi, RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers .createMdSchemaMeasureGroupDimensionsRequestConsumer(requestApi); @@ -380,7 +380,7 @@ public List mdSchemaMeasureGroupDimen @Override public List mdSchemaMeasures(MdSchemaMeasuresRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaMeasuresRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -393,7 +393,7 @@ public List mdSchemaMeasures(MdSchemaMeasuresReques @Override public List mdSchemaMembers(MdSchemaMembersRequest requestApi, RequestMetaData metaData, - UserPrincipal userPrincipal) { + UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaMembersRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -406,7 +406,7 @@ public List mdSchemaMembers(MdSchemaMembersRequest r @Override public List mdSchemaProperties(MdSchemaPropertiesRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaPropertiesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -419,7 +419,7 @@ public List mdSchemaProperties(MdSchemaProperties @Override public List mdSchemaSets(MdSchemaSetsRequest requestApi, RequestMetaData metaData, - UserPrincipal userPrincipal) { + UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaSetsRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -432,7 +432,7 @@ public List mdSchemaSets(MdSchemaSetsRequest requestApi @Override public List mdSchemaKpis(MdSchemaKpisRequest requestApi, RequestMetaData metaData, - UserPrincipal userPrincipal) { + UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaKpisRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -445,7 +445,7 @@ public List mdSchemaKpis(MdSchemaKpisRequest requestApi @Override public List mdSchemaMeasureGroups(MdSchemaMeasureGroupsRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createMdSchemaMeasureGroupsRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -458,7 +458,7 @@ public List mdSchemaMeasureGroups(MdSchemaMeas @Override public List dbSchemaSourceTables(DbSchemaSourceTablesRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createDbSchemaSourceTablesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -472,7 +472,7 @@ public List dbSchemaSourceTables(DbSchemaSource @Override public List dbSchemaTablesInfo(DbSchemaTablesInfoRequest requestApi, - RequestMetaData metaData, UserPrincipal userPrincipal) { + RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = DiscoverConsumers.createDbSchemaTablesInfoRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); diff --git a/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/ExecuteServiceImpl.java b/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/ExecuteServiceImpl.java index 5d39294..253f206 100644 --- a/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/ExecuteServiceImpl.java +++ b/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/ExecuteServiceImpl.java @@ -16,7 +16,7 @@ import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPMessage; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.execute.ExecuteService; import org.eclipse.daanse.xmla.api.execute.alter.AlterRequest; import org.eclipse.daanse.xmla.api.execute.alter.AlterResponse; @@ -49,7 +49,7 @@ public ExecuteServiceImpl(SoapClient soapClient) { @Override public StatementResponse statement(StatementRequest statementRequest, RequestMetaData metaData, - UserPrincipal userPrincipal) { + UserRolePrincipal userPrincipal) { try { Consumer msg = ExecuteConsumers.createStatementRequestConsumer(statementRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_EXECUTE), msg); @@ -61,7 +61,7 @@ public StatementResponse statement(StatementRequest statementRequest, RequestMet } @Override - public AlterResponse alter(AlterRequest alterRequest, RequestMetaData metaData, UserPrincipal userPrincipal) { + public AlterResponse alter(AlterRequest alterRequest, RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = ExecuteConsumers.createAlterRequestConsumer(alterRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_EXECUTE), msg); @@ -74,7 +74,7 @@ public AlterResponse alter(AlterRequest alterRequest, RequestMetaData metaData, @Override public ClearCacheResponse clearCache(ClearCacheRequest clearCacheRequest, RequestMetaData metaData, - UserPrincipal userPrincipal) { + UserRolePrincipal userPrincipal) { try { Consumer msg = ExecuteConsumers.createClearCacheRequestConsumer(clearCacheRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_EXECUTE), msg); @@ -86,7 +86,7 @@ public ClearCacheResponse clearCache(ClearCacheRequest clearCacheRequest, Reques } @Override - public CancelResponse cancel(CancelRequest cancelRequest, RequestMetaData metaData, UserPrincipal userPrincipal) { + public CancelResponse cancel(CancelRequest cancelRequest, RequestMetaData metaData, UserRolePrincipal userPrincipal) { try { Consumer msg = ExecuteConsumers.createCancelRequestConsumer(cancelRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_EXECUTE), msg); diff --git a/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/SessionServiceImpl.java b/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/SessionServiceImpl.java index 9a0229b..cabf62a 100644 --- a/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/SessionServiceImpl.java +++ b/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/SessionServiceImpl.java @@ -15,7 +15,7 @@ import java.util.Optional; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.session.SessionService; import org.eclipse.daanse.xmla.api.xmla.BeginSession; import org.eclipse.daanse.xmla.api.xmla.EndSession; @@ -24,17 +24,17 @@ public class SessionServiceImpl implements SessionService { @Override - public Optional beginSession(BeginSession beginSession, UserPrincipal userPrincipal) { + public Optional beginSession(BeginSession beginSession, UserRolePrincipal userPrincipal) { return Optional.empty(); } @Override - public boolean checkSession(Session session, UserPrincipal userPrincipal) { + public boolean checkSession(Session session, UserRolePrincipal userPrincipal) { return true; } @Override - public void endSession(EndSession endSession, UserPrincipal userPrincipal) { + public void endSession(EndSession endSession, UserRolePrincipal userPrincipal) { } diff --git a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java index 3e342aa..816fbaa 100644 --- a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java +++ b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java @@ -17,7 +17,7 @@ import jakarta.xml.ws.Provider; import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.common.enums.AccessEnum; import org.eclipse.daanse.xmla.api.common.enums.ActionTypeEnum; import org.eclipse.daanse.xmla.api.common.enums.AuthenticationModeEnum; @@ -247,7 +247,7 @@ void testDataSources() throws Exception { Optional.of(ProviderTypeEnum.DMP), Optional.of(AuthenticationModeEnum.AUTHENTICATED)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DiscoverDataSourcesRequest dataSourcesRequest = new DiscoverDataSourcesRequestR(properties, restrictions); List rows = client.discover().dataSources(dataSourcesRequest, requestMetaData, @@ -319,7 +319,7 @@ void testDiscoverEnumerators() throws Exception { DiscoverEnumeratorsRestrictionsR restrictions = new DiscoverEnumeratorsRestrictionsR(Optional.of("FoodMart")); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DiscoverEnumeratorsRequest discoverEnumeratorsRequest = new DiscoverEnumeratorsRequestR(properties, restrictions); @@ -374,7 +374,7 @@ void testDiscoverKeywords() throws Exception { DiscoverKeywordsRestrictionsR restrictions = new DiscoverKeywordsRestrictionsR(Optional.of("Keyword")); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DiscoverKeywordsRequest discoverKeywordsRequest = new DiscoverKeywordsRequestR(properties, restrictions); List rows = client.discover().discoverKeywords(discoverKeywordsRequest, @@ -423,7 +423,7 @@ void testDiscoverLiterals() throws Exception { DiscoverLiteralsRestrictionsR restrictions = new DiscoverLiteralsRestrictionsR(Optional.of("LiteralName")); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DiscoverLiteralsRequest discoverLiteralsRequest = new DiscoverLiteralsRequestR(properties, restrictions); List rows = client.discover().discoverLiterals(discoverLiteralsRequest, @@ -477,7 +477,7 @@ void testDiscoverProperties() throws Exception { DiscoverPropertiesRestrictionsR restrictions = new DiscoverPropertiesRestrictionsR(List.of("PropertyName")); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DiscoverPropertiesRequest discoverPropertiesRequest = new DiscoverPropertiesRequestR(properties, restrictions); List rows = client.discover().discoverProperties(discoverPropertiesRequest, @@ -533,7 +533,7 @@ void testSchemaRowSets() throws Exception { Optional.of("SchemaName")); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DiscoverSchemaRowsetsRequest discoverSchemaRowsetsRequest = new DiscoverSchemaRowsetsRequestR(properties, restrictions); @@ -601,7 +601,7 @@ void testXmlMetaData() throws Exception { Optional.of(ObjectExpansionEnum.EXPAND_OBJECT)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DiscoverXmlMetaDataRequest discoverXmlMetaDataRequest = new DiscoverXmlMetaDataRequestR(properties, restrictions); @@ -719,7 +719,7 @@ void testCatalogs() throws Exception { properties.addProperty(PropertyListElementDefinition.CONTENT, "SchemaData"); DbSchemaCatalogsRestrictionsR restrictions = new DbSchemaCatalogsRestrictionsR(Optional.of("CatalogName")); - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DbSchemaCatalogsRequest dbSchemaCatalogsRequest = new DbSchemaCatalogsRequestR(properties, restrictions); List rows = client.discover().dbSchemaCatalogs(dbSchemaCatalogsRequest, metaData, @@ -784,7 +784,7 @@ void testColumns() throws Exception { Optional.of(ColumnOlapTypeEnum.ATTRIBUTE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DbSchemaColumnsRequest dbSchemaColumnsRequest = new DbSchemaColumnsRequestR(properties, restrictions); List rows = client.discover().dbSchemaColumns(dbSchemaColumnsRequest, @@ -876,7 +876,7 @@ void testProviderTypes() throws Exception { Optional.of(LevelDbTypeEnum.DBTYPE_EMPTY), Optional.of(true)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DbSchemaProviderTypesRequest dbSchemaProviderTypesRequest = new DbSchemaProviderTypesRequestR(properties, restrictions); @@ -952,7 +952,7 @@ void testSchemata() throws Exception { "SchemaOwner"); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DbSchemaSchemataRequest dbSchemaSchemataRequest = new DbSchemaSchemataRequestR(properties, restrictions); List rows = client.discover().dbSchemaSchemata(dbSchemaSchemataRequest, @@ -1012,7 +1012,7 @@ void testSourceTables() throws Exception { Optional.of("CatalogName"), Optional.of("SchemaName"), "TableName", TableTypeEnum.TABLE); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DbSchemaSourceTablesRequest dbSchemaSourceTablesRequest = new DbSchemaSourceTablesRequestR(properties, restrictions); @@ -1077,7 +1077,7 @@ void testTables() throws Exception { Optional.of("TableSchema"), Optional.of("TableName"), Optional.of("TableType")); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DbSchemaTablesRequest dbSchemaTablesRequest = new DbSchemaTablesRequestR(properties, restrictions); List rows = client.discover().dbSchemaTables(dbSchemaTablesRequest, requestMetaData, @@ -1147,7 +1147,7 @@ void testTablesInfo() throws Exception { Optional.of("TableSchema"), "TableName", TableTypeEnum.TABLE); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; DbSchemaTablesInfoRequest dbSchemaTablesInfoRequest = new DbSchemaTablesInfoRequestR(properties, restrictions); List rows = client.discover().dbSchemaTablesInfo(dbSchemaTablesInfoRequest, @@ -1224,7 +1224,7 @@ void testActions() throws Exception { Optional.of(CubeSourceEnum.CUBE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaActionsRequest mdSchemaActionsRequest = new MdSchemaActionsRequestR(properties, restrictions); List rows = client.discover().mdSchemaActions(mdSchemaActionsRequest, @@ -1313,7 +1313,7 @@ void testCubes() throws Exception { Optional.of("BaseCubeName"), Optional.of(CubeSourceEnum.CUBE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaCubesRequest mdSchemaCubesRequest = new MdSchemaCubesRequestR(properties, restrictions); List rows = client.discover().mdSchemaCubes(mdSchemaCubesRequest, requestMetaData, @@ -1399,7 +1399,7 @@ void testDimensions() throws Exception { Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaDimensionsRequest mdSchemaDimensionsRequest = new MdSchemaDimensionsRequestR(properties, restrictions); List rows = client.discover().mdSchemaDimensions(mdSchemaDimensionsRequest, @@ -1487,7 +1487,7 @@ void testFunctions() throws Exception { Optional.of(OriginEnum.MSOLAP), Optional.of(InterfaceNameEnum.FILTER), Optional.of("LibraryName")); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaFunctionsRequest mdSchemaFunctionsRequest = new MdSchemaFunctionsRequestR(properties, restrictions); List rows = client.discover().mdSchemaFunctions(mdSchemaFunctionsRequest, @@ -1569,7 +1569,7 @@ void testHierarchies() throws Exception { Optional.of(CubeSourceEnum.CUBE), Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaHierarchiesRequest mdSchemaHierarchiesRequest = new MdSchemaHierarchiesRequestR(properties, restrictions); @@ -1674,7 +1674,7 @@ void testKpis() throws Exception { Optional.of(CubeSourceEnum.CUBE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaKpisRequest mdSchemaKpisRequest = new MdSchemaKpisRequestR(properties, restrictions); List rows = client.discover().mdSchemaKpis(mdSchemaKpisRequest, requestMetaData, @@ -1760,7 +1760,7 @@ void testLevels() throws Exception { Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaLevelsRequest mdSchemaLevelsRequest = new MdSchemaLevelsRequestR(properties, restrictions); List rows = client.discover().mdSchemaLevels(mdSchemaLevelsRequest, requestMetaData, @@ -1864,7 +1864,7 @@ void testMeasureGroupDimensions() throws Exception { Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaMeasureGroupDimensionsRequest mdSchemaMeasureGroupDimensionsRequest = new MdSchemaMeasureGroupDimensionsRequestR( properties, restrictions); @@ -1947,7 +1947,7 @@ void testMeasureGroups() throws Exception { Optional.of("MeasureGroupName")); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaMeasureGroupsRequest mdSchemaMeasureGroupsRequest = new MdSchemaMeasureGroupsRequestR(properties, restrictions); @@ -2018,7 +2018,7 @@ void testMeasures() throws Exception { Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaMeasuresRequest mdSchemaMeasuresRequest = new MdSchemaMeasuresRequestR(properties, restrictions); List rows = client.discover().mdSchemaMeasures(mdSchemaMeasuresRequest, @@ -2114,7 +2114,7 @@ void testMembers() throws Exception { Optional.of("MemberCaption"), Optional.of(CubeSourceEnum.CUBE), Optional.of(TreeOpEnum.CHILDREN)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaMembersRequest mdSchemaMembersRequest = new MdSchemaMembersRequestR(properties, restrictions); List rows = client.discover().mdSchemaMembers(mdSchemaMembersRequest, @@ -2228,7 +2228,7 @@ void testMdProperties() throws Exception { Optional.of(CubeSourceEnum.CUBE), Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaPropertiesRequest mdSchemaPropertiesRequest = new MdSchemaPropertiesRequestR(properties, restrictions); List rows = client.discover().mdSchemaProperties(mdSchemaPropertiesRequest, @@ -2339,7 +2339,7 @@ void testSets() throws Exception { Optional.of("HierarchyUniqueName")); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; MdSchemaSetsRequest mdSchemaSetsRequest = new MdSchemaSetsRequestR(properties, restrictions); List rows = client.discover().mdSchemaSets(mdSchemaSetsRequest, requestMetaData, diff --git a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java index 0f532fd..a2de243 100644 --- a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java +++ b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java @@ -17,7 +17,7 @@ import jakarta.xml.ws.Provider; import org.eclipse.daanse.jakarta.xml.ws.api.whiteboard.annotations.RequireSoapWhiteboard; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.common.properties.AxisFormat; import org.eclipse.daanse.xmla.api.common.properties.PropertyListElementDefinition; import org.eclipse.daanse.xmla.api.engine200.WarningColumn; @@ -137,7 +137,7 @@ void testCancel() throws Exception { Cancel command = new CancelR(BigInteger.valueOf(100), "SessionID", BigInteger.valueOf(101), true); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; CancelRequest cancelRequest = new CancelRequestR(properties, parameters, command); CancelResponse response = client.execute().cancel(cancelRequest, requestMetaData, userPrincipal); @@ -192,7 +192,7 @@ void testClearCache() throws Exception { ClearCache command = new ClearCacheR(objectReference); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; ClearCacheRequest clearCacheRequest = new ClearCacheRequestR(properties, parameters, command); ClearCacheResponse response = client.execute().clearCache(clearCacheRequest, requestMetaData, userPrincipal); @@ -280,7 +280,7 @@ void testStatement() throws Exception { StatementR command = new StatementR( "select [Measures].[Sales Count] on 0, non empty [Store].[Store State]" + ".members on 1 from [Sales]"); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; StatementRequest statementRequest = new StatementRequestR(properties, parameters, command, null); @@ -357,7 +357,7 @@ void testAlter() throws Exception { AlterR command = new AlterR(object, objectDefinition, Scope.SESSION, true, ObjectExpansion.EXPAND_FULL); RequestMetaData requestMetaData = null; - UserPrincipal userPrincipal = null; + UserRolePrincipal userPrincipal = null; AlterRequest alterRequest = new AlterRequestR(properties, parameters, command); AlterResponse response = client.execute().alter(alterRequest, requestMetaData, userPrincipal); diff --git a/model.record/src/main/java/org/eclipse/daanse/xmla/model/record/UserPrincipalR.java b/model.record/src/main/java/org/eclipse/daanse/xmla/model/record/UserPrincipalR.java deleted file mode 100644 index 9a6efc6..0000000 --- a/model.record/src/main/java/org/eclipse/daanse/xmla/model/record/UserPrincipalR.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2023 Contributors to the Eclipse Foundation. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * SmartCity Jena - initial - * Stefan Bischof (bipolis.org) - initial - */ -package org.eclipse.daanse.xmla.model.record; - -import org.eclipse.daanse.xmla.api.UserPrincipal; - -import java.util.List; - -public record UserPrincipalR(String userId, List roles) implements UserPrincipal { - -} diff --git a/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/XmlaApiAdapter.java b/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/XmlaApiAdapter.java index 056fb53..48535fc 100644 --- a/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/XmlaApiAdapter.java +++ b/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/XmlaApiAdapter.java @@ -13,16 +13,17 @@ */ package org.eclipse.daanse.xmla.server.adapter.soapmessage; -import java.util.Arrays; +import java.security.Principal; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.function.Function; import javax.xml.namespace.QName; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.XmlaService; import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsRequest; import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsResponseRow; @@ -91,7 +92,6 @@ import org.eclipse.daanse.xmla.api.xmla.Command; import org.eclipse.daanse.xmla.api.xmla.EndSession; import org.eclipse.daanse.xmla.api.xmla.Session; -import org.eclipse.daanse.xmla.model.record.UserPrincipalR; import org.eclipse.daanse.xmla.model.record.discover.PropertiesR; import org.eclipse.daanse.xmla.model.record.discover.dbschema.catalogs.DbSchemaCatalogsRequestR; import org.eclipse.daanse.xmla.model.record.discover.dbschema.catalogs.DbSchemaCatalogsRestrictionsR; @@ -207,25 +207,48 @@ public XmlaApiAdapter(XmlaService xmlaService) { private static final String MDSCHEMA_MEASUREGROUPS = "MDSCHEMA_MEASUREGROUPS"; private static final QName QN_SESSION = new QName("urn:schemas-microsoft-com:xml-analysis", "Session"); - public SOAPMessage handleRequest(SOAPMessage messageRequest, Map headers) { + public SOAPMessage handleRequest(SOAPMessage messageRequest, Map headers, Principal principal, + Function isUserInRoleFunction) { try { SOAPMessage messageResponse = MessageFactory.newInstance().createMessage(); messageResponse.setProperty(SOAPMessage.WRITE_XML_DECLARATION, "true"); SOAPPart soapPartResponse = messageResponse.getSOAPPart(); SOAPEnvelope envelopeResponse = soapPartResponse.getEnvelope(); - //envelopeResponse.addNamespaceDeclaration(Constants.MSXMLA.PREFIX, Constants.MSXMLA.NS_URN); - //envelopeResponse.addNamespaceDeclaration(Constants.ROWSET.PREFIX, Constants.ROWSET.NS_URN); - //envelopeResponse.addNamespaceDeclaration(Constants.MDDATASET.PREFIX, Constants.MDDATASET.NS_URN); - //envelopeResponse.addNamespaceDeclaration(Constants.ENGINE.PREFIX, Constants.ENGINE.NS_URN); - //envelopeResponse.addNamespaceDeclaration(Constants.ENGINE200.PREFIX, Constants.ENGINE200.NS_URN); - //envelopeResponse.addNamespaceDeclaration(Constants.EMPTY.PREFIX, Constants.EMPTY.NS_URN); - //envelopeResponse.addNamespaceDeclaration(Constants.XSI.PREFIX, Constants.XSI.NS_URN); - - Object role = headers.get("ROLE"); - Object user = headers.get("USER"); - UserPrincipal userPrincipal = new UserPrincipalR(getStringOrNull(user), getRoles(role)); - Optional oSession =session(messageRequest.getSOAPHeader(),userPrincipal); + // envelopeResponse.addNamespaceDeclaration(Constants.MSXMLA.PREFIX, + // Constants.MSXMLA.NS_URN); + // envelopeResponse.addNamespaceDeclaration(Constants.ROWSET.PREFIX, + // Constants.ROWSET.NS_URN); + // envelopeResponse.addNamespaceDeclaration(Constants.MDDATASET.PREFIX, + // Constants.MDDATASET.NS_URN); + // envelopeResponse.addNamespaceDeclaration(Constants.ENGINE.PREFIX, + // Constants.ENGINE.NS_URN); + // envelopeResponse.addNamespaceDeclaration(Constants.ENGINE200.PREFIX, + // Constants.ENGINE200.NS_URN); + // envelopeResponse.addNamespaceDeclaration(Constants.EMPTY.PREFIX, + // Constants.EMPTY.NS_URN); + // envelopeResponse.addNamespaceDeclaration(Constants.XSI.PREFIX, + // Constants.XSI.NS_URN); + + UserRolePrincipal userPrincipal = new UserRolePrincipal() { + + @Override + public String userName() { + if (principal == null) { + return ""; + } + return principal.getName(); + } + + @Override + public boolean hasRole(String role) { + if (isUserInRoleFunction == null) { + return false; + } + return isUserInRoleFunction.apply(role); + } + }; + Optional oSession = session(messageRequest.getSOAPHeader(), userPrincipal); if (oSession.isPresent()) { SOAPHeader header = envelopeResponse.getHeader(); SOAPHeaderElement sessionElement = header.addHeaderElement(QN_SESSION); @@ -244,21 +267,7 @@ public SOAPMessage handleRequest(SOAPMessage messageRequest, Map return null; } - private List getRoles(Object ob) { - if (ob != null && ob instanceof String str) { - return Arrays.asList(str.split(",")); - } - return List.of(); - } - - private String getStringOrNull(Object ob) { - if (ob != null && ob instanceof String str) { - return str; - } - return null; - } - - private Optional session(SOAPHeader soapRequestHeader, UserPrincipal userPrincipal) throws SOAPException { + private Optional session(SOAPHeader soapRequestHeader, UserRolePrincipal userPrincipal) throws SOAPException { Optional oSession = Convert.getSession(soapRequestHeader); if (oSession.isPresent()) { boolean checked = xmlaService.session().checkSession(oSession.get(), userPrincipal); @@ -283,7 +292,7 @@ private Optional session(SOAPHeader soapRequestHeader, UserPrincipal us return Optional.empty(); } - private void handleBody(SOAPBody body, SOAPBody responseBody, RequestMetaData metaData, UserPrincipal userPrincipal) + private void handleBody(SOAPBody body, SOAPBody responseBody, RequestMetaData metaData, UserRolePrincipal userPrincipal) throws SOAPException { SOAPElement node = null; @@ -310,9 +319,8 @@ private void handleBody(SOAPBody body, SOAPBody responseBody, RequestMetaData me } - private void discover(SOAPElement discover, SOAPBody responseBody, RequestMetaData metaData, - UserPrincipal userPrincipal) throws SOAPException { + UserRolePrincipal userPrincipal) throws SOAPException { String requestType = null; PropertiesR properties = null; @@ -340,7 +348,7 @@ private void discover(SOAPElement discover, SOAPBody responseBody, RequestMetaDa } private void execute(SOAPElement discover, SOAPBody responseBody, RequestMetaData metaData, - UserPrincipal userPrincipal) throws SOAPException { + UserRolePrincipal userPrincipal) throws SOAPException { Command command = null; PropertiesR properties = null; @@ -379,7 +387,7 @@ private void printNode(SOAPElement node) { } private void execute(Command command, PropertiesR properties, List parameters, - SOAPBody responseBody, RequestMetaData metaData, UserPrincipal userPrincipal) throws SOAPException { + SOAPBody responseBody, RequestMetaData metaData, UserRolePrincipal userPrincipal) throws SOAPException { if (command instanceof StatementR statement) { handleStatement(metaData, userPrincipal, statement, properties, parameters, responseBody); @@ -395,7 +403,7 @@ private void execute(Command command, PropertiesR properties, List parameters, SOAPBody responseBody) throws SOAPException { String sessionId = metaData != null && metaData.sessionId() != null && metaData.sessionId().isPresent() ? metaData.sessionId().get() @@ -762,14 +770,14 @@ private void handleStatement(RequestMetaData metaData, UserPrincipal userPrincip SoapUtil.toStatementResponse(statementResponse, responseBody); } - private void handleAlter(RequestMetaData metaData, UserPrincipal userPrincipal, AlterR alter, + private void handleAlter(RequestMetaData metaData, UserRolePrincipal userPrincipal, AlterR alter, PropertiesR properties, List parameters, SOAPBody responseBody) throws SOAPException { AlterRequest alterRequest = new AlterRequestR(properties, parameters, alter); AlterResponse alterResponse = xmlaService.execute().alter(alterRequest, metaData, userPrincipal); SoapUtil.toAlterResponse(alterResponse, responseBody); } - private void handleClearCache(RequestMetaData metaData, UserPrincipal userPrincipal, ClearCacheR clearCache, + private void handleClearCache(RequestMetaData metaData, UserRolePrincipal userPrincipal, ClearCacheR clearCache, PropertiesR properties, List parameters, SOAPBody responseBody) throws SOAPException { ClearCacheRequest clearCacheRequest = new ClearCacheRequestR(properties, parameters, clearCache); ClearCacheResponse clearCacheResponse = xmlaService.execute().clearCache(clearCacheRequest, metaData, @@ -777,7 +785,7 @@ private void handleClearCache(RequestMetaData metaData, UserPrincipal userPrinci SoapUtil.toClearCacheResponse(clearCacheResponse, responseBody); } - private void handleCancel(RequestMetaData metaData, UserPrincipal userPrincipal, CancelR cancel, + private void handleCancel(RequestMetaData metaData, UserRolePrincipal userPrincipal, CancelR cancel, PropertiesR properties, List parameters, SOAPBody responseBody) throws SOAPException { CancelRequest cancelRequest = new CancelRequestR(properties, parameters, cancel); CancelResponse cancelResponse = xmlaService.execute().cancel(cancelRequest, metaData, userPrincipal); diff --git a/server/authentication/src/main/java/org/eclipse/daanse/xmla/server/authentication/NameToRoleAuthFilter.java b/server/authentication/src/main/java/org/eclipse/daanse/xmla/server/authentication/NameToRoleAuthFilter.java index 1843583..7618497 100644 --- a/server/authentication/src/main/java/org/eclipse/daanse/xmla/server/authentication/NameToRoleAuthFilter.java +++ b/server/authentication/src/main/java/org/eclipse/daanse/xmla/server/authentication/NameToRoleAuthFilter.java @@ -1,80 +1,87 @@ -/* - * Copyright (c) 2023 Contributors to the Eclipse Foundation. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * SmartCity Jena - initial - * Stefan Bischof (bipolis.org) - initial - */ package org.eclipse.daanse.xmla.server.authentication; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.ServiceScope; -import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardFilterPattern; - +import jakarta.servlet.*; +import jakarta.servlet.http.*; import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.Principal; import java.util.Base64; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import static org.osgi.service.servlet.context.ServletContextHelper.AUTHENTICATION_TYPE; -import static org.osgi.service.servlet.context.ServletContextHelper.REMOTE_USER; - -@Component(scope = ServiceScope.SINGLETON) public class NameToRoleAuthFilter implements Filter { @Override - public void init(FilterConfig filterConfig) { - // empty - } - - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { - final HttpServletRequest httpRequest = (HttpServletRequest) request; - final HttpServletResponse httpResponse = (HttpServletResponse) response; - if (httpRequest.getHeader("Authorization") == null) { - httpResponse.addHeader("WWW-Authenticate", "Basic"); - httpResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED); - } - HeaderMapRequestWrapper requestWrapper = new HeaderMapRequestWrapper(httpRequest); - if (authenticated(requestWrapper)) { - chain.doFilter(requestWrapper, response);// sends request to next resource - } else { - httpResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED); + + HttpServletRequest request = (HttpServletRequest) req; + HttpServletResponse response = (HttpServletResponse) res; + + String auth = request.getHeader("Authorization"); + if (auth == null || !auth.startsWith("Basic ")) { + response.setHeader("WWW-Authenticate", "Basic realm=\"app\""); + response.sendError(HttpServletResponse.SC_UNAUTHORIZED); + return; } - } + // --- Decode credentials --- + String base64 = auth.substring("Basic ".length()); + String credentials = new String(Base64.getDecoder().decode(base64), StandardCharsets.UTF_8); + + int idx = credentials.indexOf(':'); + if (idx < 0) { + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Invalid Basic header"); + return; + } - protected boolean authenticated(HeaderMapRequestWrapper request) { - request.setAttribute(AUTHENTICATION_TYPE, HttpServletRequest.BASIC_AUTH); - String authHeader = request.getHeader("Authorization"); + String usernameAndRoles = credentials.substring(0, idx); + String password = credentials.substring(idx + 1); - if (authHeader != null) { - String usernameAndPassword = new String(Base64.getDecoder().decode(authHeader.substring(6).getBytes())); + // Split username and roles using '|' + String[] parts = usernameAndRoles.split("\\|"); + String username = parts[0]; - int userNameIndex = usernameAndPassword.indexOf(":"); - String username = usernameAndPassword.substring(0, userNameIndex); - String password = usernameAndPassword.substring(userNameIndex + 1); + Set roles = Stream.of(parts).skip(1) // skip username + .collect(Collectors.toSet()); - request.setAttribute(REMOTE_USER, username); + // Hier kannst du Passwort prüfen (DB, LDAP, etc.) + if (!authenticate(username, password)) { + response.sendError(HttpServletResponse.SC_UNAUTHORIZED); + return; } - return true; - } - @Override - public void destroy() { - // empty + // Request wrappen, um Security-Methoden bereitzustellen + HttpServletRequest wrapped = new HttpServletRequestWrapper(request) { + private final Principal principal = (Principal) () -> username; + + @Override + public Principal getUserPrincipal() { + return principal; + } + + @Override + public String getRemoteUser() { + return username; + } + + @Override + public String getAuthType() { + return HttpServletRequest.BASIC_AUTH; + } + + @Override + public boolean isUserInRole(String role) { + return roles.contains(role); + } + }; + + chain.doFilter(wrapped, response); } + private boolean authenticate(String u, String p) { + // sichere Prüfung implementieren + return true; + } } diff --git a/server/jakarta.saaj/src/main/java/org/eclipse/daanse/xmla/server/jakarta/saaj/impl/XmlaServlet.java b/server/jakarta.saaj/src/main/java/org/eclipse/daanse/xmla/server/jakarta/saaj/impl/XmlaServlet.java index 9764074..ad30e9a 100644 --- a/server/jakarta.saaj/src/main/java/org/eclipse/daanse/xmla/server/jakarta/saaj/impl/XmlaServlet.java +++ b/server/jakarta.saaj/src/main/java/org/eclipse/daanse/xmla/server/jakarta/saaj/impl/XmlaServlet.java @@ -33,7 +33,9 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import java.io.ByteArrayOutputStream; +import java.security.Principal; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.StreamSupport; @@ -55,7 +57,7 @@ public void activate() { } @Override - public SOAPMessage onMessage(SOAPMessage soapMessage) { + public SOAPMessage onMessage(SOAPMessage soapMessage,Principal principal, Function isUserInRoleFunction) { try { if (LOGGER.isDebugEnabled()) { LOGGER.debug("SoapMessage in:", prettyPrint(soapMessage).toString()); @@ -64,7 +66,7 @@ public SOAPMessage onMessage(SOAPMessage soapMessage) { Map map = StreamSupport.stream(iterable.spliterator(), true).collect( Collectors.toMap(MimeHeader::getName, MimeHeader::getValue, (oldValue, newValue) -> oldValue)); - SOAPMessage returnMessage = xmlaAdapter.handleRequest(soapMessage, map); + SOAPMessage returnMessage = xmlaAdapter.handleRequest(soapMessage, map, principal, isUserInRoleFunction); LOGGER.debug("SoapMessage out:", prettyPrint(returnMessage).toString()); diff --git a/server/jakarta.xml.ws.provider.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/XmlaWebserviceProvider.java b/server/jakarta.xml.ws.provider.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/XmlaWebserviceProvider.java index 1a38078..fe4d538 100644 --- a/server/jakarta.xml.ws.provider.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/XmlaWebserviceProvider.java +++ b/server/jakarta.xml.ws.provider.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/XmlaWebserviceProvider.java @@ -76,7 +76,7 @@ public SOAPMessage invoke(SOAPMessage request) { .get(MessageContext.HTTP_REQUEST_HEADERS); LOGGER.debug("===== The provider got a request ====="); - return wsAdapter.handleRequest(request, headers); + return wsAdapter.handleRequest(request, headers,null,null); } private SOAPFault getFault(Exception ex) { diff --git a/server/jdk.httpserver/pom.xml b/server/jdk.httpserver/pom.xml index ed55508..8989851 100644 --- a/server/jdk.httpserver/pom.xml +++ b/server/jdk.httpserver/pom.xml @@ -43,10 +43,5 @@ 0.0.1-SNAPSHOT - - org.eclipse.daanse - org.eclipse.daanse.xmla.server.adapter.soapmessage - ${revision} - diff --git a/server/jdk.httpserver/src/main/java/org/eclipse/daanse/xmla/server/jdk/httpserver/XmlaSoapHttpHandler.java b/server/jdk.httpserver/src/main/java/org/eclipse/daanse/xmla/server/jdk/httpserver/XmlaSoapHttpHandler.java index 0d67ba7..9d29050 100644 --- a/server/jdk.httpserver/src/main/java/org/eclipse/daanse/xmla/server/jdk/httpserver/XmlaSoapHttpHandler.java +++ b/server/jdk.httpserver/src/main/java/org/eclipse/daanse/xmla/server/jdk/httpserver/XmlaSoapHttpHandler.java @@ -29,6 +29,6 @@ public class XmlaSoapHttpHandler extends AbstractSoapHttpHandler { @Override protected SOAPMessage onMessage(SOAPMessage req) { - return adapter.handleRequest(req, Collections.emptyMap()); + return adapter.handleRequest(req, Collections.emptyMap(),null,null); } }; diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java index 5b014d4..7e117c4 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java @@ -14,7 +14,7 @@ package org.eclipse.daanse.xmla.server.tck; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.XmlaService; import org.eclipse.daanse.xmla.api.common.enums.AuthenticationModeEnum; import org.eclipse.daanse.xmla.api.common.enums.ColumnOlapTypeEnum; @@ -128,7 +128,7 @@ void beforaEach() { void testDiscoverPropertiesLocaleIdentifier(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverPropertiesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ @@ -168,7 +168,7 @@ void testDiscoverPropertiesLocaleIdentifier(@InjectService XmlaService xmlaServi void testDiscoverPropertiesRestricted(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverPropertiesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ @@ -213,7 +213,7 @@ void testDiscoverSchemaRowSets(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor .forClass(DiscoverSchemaRowsetsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DISCOVER_SCHEMA_ROWSETS @@ -258,7 +258,7 @@ void testDiscoverSchemaRowSets(@InjectService XmlaService xmlaService) { void testDiscoverEnumerators(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverEnumeratorsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ @@ -302,7 +302,7 @@ void testDiscoverEnumerators(@InjectService XmlaService xmlaService) { void testDiscoverKeywords(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverKeywordsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DISCOVER_KEYWORDS @@ -345,7 +345,7 @@ void testDiscoverKeywords(@InjectService XmlaService xmlaService) { void testDiscoverLiterals(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverLiteralsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DISCOVER_LITERALS @@ -388,7 +388,7 @@ void testDiscoverLiterals(@InjectService XmlaService xmlaService) { void testDbSchemaTables(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaTablesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DBSCHEMA_TABLES @@ -438,7 +438,7 @@ void testMdSchemaActions(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaActionsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_ACTIONS @@ -503,7 +503,7 @@ void testMdSchemaCubes(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaCubesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_CUBES @@ -557,7 +557,7 @@ void testMdSchemaDimensions(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaDimensionsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_DIMENSIONS @@ -617,7 +617,7 @@ void testMdSchemaFunctions(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaFunctionsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_FUNCTIONS @@ -664,7 +664,7 @@ void testMdSchemaHierarchies(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaHierarchiesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_HIERARCHIES @@ -728,7 +728,7 @@ void testDiscoverDataSources(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverDataSourcesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DISCOVER_DATASOURCES @@ -790,7 +790,7 @@ void testDiscoverXmlMetadata(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverXmlMetaDataRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DISCOVER_XML_METADATA @@ -885,7 +885,7 @@ void testDbSchemaColumns(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaColumnsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DBSCHEMA_COLUMNS @@ -942,7 +942,7 @@ void testDbSchemaProviderTypes(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor .forClass(DbSchemaProviderTypesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DBSCHEMA_PROVIDER_TYPES @@ -992,7 +992,7 @@ void testMdSchemaLevels(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaLevelsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_LEVELS @@ -1061,7 +1061,7 @@ void testMdSchemaMeasureGroupDimensions(@InjectService XmlaService xmlaService) ArgumentCaptor captor = ArgumentCaptor .forClass(MdSchemaMeasureGroupDimensionsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_MEASUREGROUP_DIMENSIONS @@ -1122,7 +1122,7 @@ void testMdSchemaMeasures(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaMeasuresRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_MEASURES @@ -1186,7 +1186,7 @@ void testMdSchemaMembers(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaMembersRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ @@ -1261,7 +1261,7 @@ void testMdSchemaProperties(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaPropertiesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_PROPERTIES @@ -1334,7 +1334,7 @@ void testMdSchemaSets(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaSetsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_SETS @@ -1396,7 +1396,7 @@ void testMdSchemaKpis(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaKpisRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_KPIS @@ -1455,7 +1455,7 @@ void testMdSchemaMeasureGroups(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor .forClass(MdSchemaMeasureGroupsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ MDSCHEMA_MEASUREGROUPS @@ -1511,7 +1511,7 @@ void testDbSchemaTablesInfo(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaTablesInfoRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DBSCHEMA_TABLES_INFO @@ -1567,7 +1567,7 @@ void testDbschemaSourceTables(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaSourceTablesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DBSCHEMA_SOURCE_TABLES @@ -1623,7 +1623,7 @@ void testDbschemaSchemata(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaSchemataRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); final String sRequest = """ DBSCHEMA_SCHEMATA diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteRequestTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteRequestTest.java index f3d6c63..ba3b089 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteRequestTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteRequestTest.java @@ -14,7 +14,7 @@ package org.eclipse.daanse.xmla.server.tck; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserPrincipal; +import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.XmlaService; import org.eclipse.daanse.xmla.api.execute.ExecuteService; import org.eclipse.daanse.xmla.api.execute.alter.AlterRequest; @@ -95,7 +95,7 @@ void beforaEach() { void testStatement(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(StatementRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_EXECUTE), SOAPUtil.envelop(STATEMENT_REQUEST)); @@ -121,7 +121,7 @@ void testStatement(@InjectService XmlaService xmlaService) { void testClearcache(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(ClearCacheRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_EXECUTE), SOAPUtil.envelop(CLEAR_CACHE_REQUEST)); @@ -167,7 +167,7 @@ void testClearcache(@InjectService XmlaService xmlaService) { void testCancel(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(CancelRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_EXECUTE), SOAPUtil.envelop(CANCEL_REQUEST)); @@ -195,7 +195,7 @@ void testCancel(@InjectService XmlaService xmlaService) { void testAlter(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(AlterRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserPrincipal.class); + ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); Duration duration = Duration.parse("-PT1S"); SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_EXECUTE),