mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Sync with master
This commit is contained in:
Dharmakeerthi Lasantha
commit
fe4011cc7e
@ -22,17 +22,25 @@ import com.google.gson.JsonObject;
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.GrafanaAPIProxyService;
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.bean.ErrorResponse;
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.exception.RefererNotValid;
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.impl.util.GrafanaMgtAPIUtils;
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.impl.util.GrafanaRequestHandlerUtil;
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.bean.GrafanaPanelIdentifier;
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.MaliciousQueryAttempt;
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal.GrafanaMgtDataHolder;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.exceptions.DBConnectionException;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
import javax.ws.rs.*;
|
||||
import javax.ws.rs.core.*;
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.Context;
|
||||
import javax.ws.rs.core.HttpHeaders;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import javax.ws.rs.core.UriInfo;
|
||||
import java.io.IOException;
|
||||
import java.sql.SQLException;
|
||||
|
||||
@ -49,8 +57,8 @@ public class GrafanaAPIProxyServiceImpl implements GrafanaAPIProxyService {
|
||||
public Response queryDatasource(JsonObject body, @Context HttpHeaders headers, @Context UriInfo requestUriInfo) {
|
||||
try {
|
||||
GrafanaPanelIdentifier panelIdentifier = GrafanaRequestHandlerUtil.getPanelIdentifier(headers);
|
||||
GrafanaMgtDataHolder.getInstance().getGrafanaQueryService().
|
||||
buildSafeQuery(body, panelIdentifier.getDashboardId(), panelIdentifier.getPanelId(), requestUriInfo.getRequestUri());
|
||||
GrafanaMgtAPIUtils.getGrafanaQueryService().buildSafeQuery(body, panelIdentifier.getDashboardId(),
|
||||
panelIdentifier.getPanelId(), requestUriInfo.getRequestUri());
|
||||
return GrafanaRequestHandlerUtil.proxyPassPostRequest(body, requestUriInfo, panelIdentifier.getOrgId());
|
||||
} catch (MaliciousQueryAttempt e) {
|
||||
return Response.status(Response.Status.BAD_REQUEST).entity(
|
||||
|
||||
@ -0,0 +1,52 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.impl.util;
|
||||
|
||||
import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.GrafanaQueryService;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||
|
||||
public class GrafanaMgtAPIUtils {
|
||||
|
||||
private static final Log log = LogFactory.getLog(GrafanaMgtAPIUtils.class);
|
||||
private static volatile GrafanaQueryService grafanaQueryService;
|
||||
|
||||
/**
|
||||
* Accessing GrafanaQueryService from OSGI service context
|
||||
* @return GrafanaQueryService instance
|
||||
*/
|
||||
public static GrafanaQueryService getGrafanaQueryService() {
|
||||
if (grafanaQueryService == null) {
|
||||
synchronized (GrafanaMgtAPIUtils.class) {
|
||||
if (grafanaQueryService == null) {
|
||||
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
|
||||
grafanaQueryService =
|
||||
(GrafanaQueryService) ctx.getOSGiService(GrafanaQueryService.class, null);
|
||||
if (grafanaQueryService == null) {
|
||||
String msg = "Grafana Query service has not initialized.";
|
||||
log.error(msg);
|
||||
throw new IllegalStateException(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return grafanaQueryService;
|
||||
}
|
||||
}
|
||||
@ -124,7 +124,7 @@
|
||||
org.wso2.carbon.utils;version="[4.8,5)"
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
!io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal,
|
||||
!io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal,
|
||||
io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.*
|
||||
</Export-Package>
|
||||
<Embed-Dependency>
|
||||
|
||||
@ -227,6 +227,19 @@
|
||||
<Scope>perm:android:clear-application</Scope>
|
||||
<Scope>perm:android:suspend-package</Scope>
|
||||
<Scope>perm:android:alternate-install</Scope>
|
||||
<Scope>perm:ios:lock</Scope>
|
||||
<Scope>perm:ios:location</Scope>
|
||||
<Scope>perm:ios:ring</Scope>
|
||||
<Scope>perm:ios:clear-passcode</Scope>
|
||||
<Scope>perm:ios:enterprise-wipe</Scope>
|
||||
<Scope>perm:ios:notification</Scope>
|
||||
<Scope>perm:ios:wipe-data</Scope>
|
||||
<Scope>perm:ios:boolean-setting</Scope>
|
||||
<Scope>perm:ios:wallpaper</Scope>
|
||||
<Scope>perm:ios:app-attributes</Scope>
|
||||
<Scope>perm:ios:app-configurations</Scope>
|
||||
<Scope>perm:mac-os:restart</Scope>
|
||||
<Scope>perm:mac-os:shut-down</Scope>
|
||||
</Scopes>
|
||||
<SSOConfiguration>
|
||||
<Issuer>device-mgt</Issuer>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user