Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ public interface RequestMetaData {
Optional<String> userAgent();

Optional<String> sessionId();

Optional<String> url();
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

import org.eclipse.daanse.xmla.api.RequestMetaData;

public record RequestMetaDataR(Optional<String> userAgent, Optional<String> sessionId) implements RequestMetaData {
public record RequestMetaDataR(Optional<String> userAgent, Optional<String> sessionId, Optional<String> url) implements RequestMetaData {

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ public class RequestMetaDataUtils {

public static final String USER_AGENT = "User-agent";

public static RequestMetaData getRequestMetaData(Map<String, Object> headers, Optional<Session> oSession) {
public static RequestMetaData getRequestMetaData(Map<String, Object> headers, Optional<Session> oSession, String url) {
Optional<String> oUserAgent = getUserAgent(headers.get(USER_AGENT));
return new RequestMetaDataR(oUserAgent,
oSession.isPresent() ? Optional.of(oSession.get().sessionId()) : Optional.empty());
oSession.isPresent() ? Optional.of(oSession.get().sessionId()) : Optional.empty(),
Optional.ofNullable(url));
}

private static Optional<String> getUserAgent(Object o) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public XmlaApiAdapter(XmlaService xmlaService) {
private static final QName QN_SESSION = new QName("urn:schemas-microsoft-com:xml-analysis", "Session");

public SOAPMessage handleRequest(SOAPMessage messageRequest, Map<String, Object> headers, Principal principal,
Function<String, Boolean> isUserInRoleFunction) {
Function<String, Boolean> isUserInRoleFunction, String url) {
try {
SOAPMessage messageResponse = MessageFactory.newInstance().createMessage();
messageResponse.setProperty(SOAPMessage.WRITE_XML_DECLARATION, "true");
Expand Down Expand Up @@ -257,7 +257,7 @@ public boolean hasRole(String role) {
SOAPHeader header = envelopeResponse.getHeader();
header.setValue("\n");
}
RequestMetaData metaData = RequestMetaDataUtils.getRequestMetaData(headers, oSession);
RequestMetaData metaData = RequestMetaDataUtils.getRequestMetaData(headers, oSession, url);
SOAPBody bodyResponse = envelopeResponse.getBody();
handleBody(messageRequest.getSOAPBody(), bodyResponse, metaData, userPrincipal);
return messageResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,11 @@ public Optional<String> sessionId() {
return Optional.empty();
}

@Override
public Optional<String> url() {
return Optional.empty();
}

};

DbSchemaCatalogsRequest requestApi = Convert.fromDiscoverDbSchemaCatalogs(requestWs);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void activate() {
}

@Override
public SOAPMessage onMessage(SOAPMessage soapMessage,Principal principal, Function<String, Boolean> isUserInRoleFunction) {
public SOAPMessage onMessage(SOAPMessage soapMessage,Principal principal, Function<String, Boolean> isUserInRoleFunction, String url) {
try {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("SoapMessage in:", prettyPrint(soapMessage).toString());
Expand All @@ -66,7 +66,7 @@ public SOAPMessage onMessage(SOAPMessage soapMessage,Principal principal, Functi
Map<String, Object> map = StreamSupport.stream(iterable.spliterator(), true).collect(
Collectors.toMap(MimeHeader::getName, MimeHeader::getValue, (oldValue, newValue) -> oldValue));

SOAPMessage returnMessage = xmlaAdapter.handleRequest(soapMessage, map, principal, isUserInRoleFunction);
SOAPMessage returnMessage = xmlaAdapter.handleRequest(soapMessage, map, principal, isUserInRoleFunction, url);

LOGGER.debug("SoapMessage out:", prettyPrint(returnMessage).toString());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,null,null);
return wsAdapter.handleRequest(request, headers,null,null, null);
}

private SOAPFault getFault(Exception ex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ public class XmlaSoapHttpHandler extends AbstractSoapHttpHandler {

@Override
protected SOAPMessage onMessage(SOAPMessage req) {
return adapter.handleRequest(req, Collections.emptyMap(),null,null);
return adapter.handleRequest(req, Collections.emptyMap(),null,null,null);
}
};
Loading