diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/components')
7 files changed, 0 insertions, 268 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java index 6549b54d4e..593bf5194d 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java @@ -98,8 +98,6 @@ public class DmaapClientFactory { props.setProperty("AFT_DME2_EP_READ_TIMEOUT_MS", Integer.toString(parameters.getAftDme2ReadTimeoutMs())); props.setProperty("AFT_DME2_SSL_ENABLE", Boolean.toString(parameters.isAftDme2SslEnable())); props.setProperty("AFT_DME2_CLIENT_IGNORE_SSL_CONFIG", Boolean.toString(parameters.isAftDme2ClientIgnoreSslConfig())); - props.setProperty("AFT_DME2_CLIENT_KEYSTORE", parameters.getAftDme2ClientKeystore()); - props.setProperty("AFT_DME2_CLIENT_KEYSTORE_PASSWORD", parameters.getAftDme2ClientKeystorePassword()); props.setProperty("AFT_DME2_CLIENT_SSL_CERT_ALIAS", parameters.getAftDme2ClientSslCertAlias()); String dme2PreferredRouterFilePath = parameters.getDme2preferredRouterFilePath(); ensureFileExists(dme2PreferredRouterFilePath); @@ -145,8 +143,6 @@ public class DmaapClientFactory { props.setProperty("AFT_DME2_EP_READ_TIMEOUT_MS", Integer.toString(parameters.getAftDme2ReadTimeoutMs())); props.setProperty("AFT_DME2_SSL_ENABLE", Boolean.toString(parameters.isAftDme2SslEnable())); props.setProperty("AFT_DME2_CLIENT_IGNORE_SSL_CONFIG", Boolean.toString(parameters.isAftDme2ClientIgnoreSslConfig())); - props.setProperty("AFT_DME2_CLIENT_KEYSTORE", parameters.getAftDme2ClientKeystore()); - props.setProperty("AFT_DME2_CLIENT_KEYSTORE_PASSWORD", parameters.getAftDme2ClientKeystorePassword()); props.setProperty("AFT_DME2_CLIENT_SSL_CERT_ALIAS", parameters.getAftDme2ClientSslCertAlias()); String dme2PreferredRouterFilePath = parameters.getDme2preferredRouterFilePath(); ensureFileExists(dme2PreferredRouterFilePath); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java index 22013c1c04..4ba36a6a40 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java @@ -52,7 +52,6 @@ import org.apache.commons.lang3.tuple.Pair; import org.openecomp.sdc.be.catalog.impl.DmaapProducerHealth; import org.openecomp.sdc.be.components.distribution.engine.DistributionEngineClusterHealth; import org.openecomp.sdc.be.components.distribution.engine.DmaapHealth; -import org.openecomp.sdc.be.components.impl.CADIHealthCheck; import org.openecomp.sdc.be.components.impl.CassandraHealthCheck; import org.openecomp.sdc.be.config.BeEcompErrorManager; import org.openecomp.sdc.be.config.Configuration; @@ -144,8 +143,6 @@ public class HealthCheckBusinessLogic { healthCheckInfos.add(getHostedComponentsBeHealthCheck(HC_COMPONENT_ON_BOARDING, buildOnBoardingHealthCheckUrl())); //ECOMP Portal healthCheckInfos.add(portalHealthCheck.getHealthCheckInfo()); - //CADI - healthCheckInfos.add(CADIHealthCheck.getCADIHealthCheckInstance().getCADIStatus()); return healthCheckInfos; } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CADIHealthCheck.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CADIHealthCheck.java deleted file mode 100644 index bb12b317c6..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CADIHealthCheck.java +++ /dev/null @@ -1,55 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed 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. - * ============LICENSE_END========================================================= - */ -package org.openecomp.sdc.be.components.impl; - -import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_CADI; -import static org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckStatus.DOWN; - -import org.openecomp.sdc.common.api.HealthCheckInfo; -import org.openecomp.sdc.common.log.wrappers.Logger; -import org.springframework.stereotype.Component; - -@Component -public class CADIHealthCheck { - - private static final Logger log = Logger.getLogger(CADIHealthCheck.class.getName()); - private static CADIHealthCheck cadiHealthCheckInstance = new CADIHealthCheck(); - private static HealthCheckInfo.HealthCheckStatus isCADIUpOrDown = DOWN; - - public static CADIHealthCheck getCADIHealthCheckInstance() { - return cadiHealthCheckInstance; - } - - public static HealthCheckInfo getCADIStatus() { - log.debug("getCADIStatus: Checking whether CADI was up or down while its init."); - String description = "OK"; - if (isCADIUpOrDown == DOWN) { - description = "CADI filter failed initialization"; - } - return new HealthCheckInfo(HC_COMPONENT_CADI, isCADIUpOrDown, null, description); - } - - public void setIsCADIUp(HealthCheckInfo.HealthCheckStatus cadiStatus) { - if (log.isDebugEnabled()) { - log.debug("Setting cadiHealthCheckInstance status to: {}", cadiStatus.toString()); - } - isCADIUpOrDown = cadiStatus; - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/AafPermission.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/AafPermission.java deleted file mode 100644 index 4dc8c98e49..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/AafPermission.java +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed 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. - * ============LICENSE_END========================================================= - */ -package org.openecomp.sdc.be.components.impl.aaf; - -import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException; -import org.openecomp.sdc.be.config.ConfigurationManager; -import org.openecomp.sdc.be.dao.api.ActionStatus; - -public enum AafPermission { - READ(PermNames.READ_VALUE), WRITE(PermNames.WRITE_VALUE), DELETE(PermNames.DELETE_VALUE), INTERNAL_ALL(PermNames.INTERNAL_ALL_VALUE); - private String permission; - private String permissionSuffix; - - AafPermission(String permissionSuffix) { - this.permissionSuffix = permissionSuffix; - this.permission = String - .format("%s.%s", ConfigurationManager.getConfigurationManager().getConfiguration().getAafNamespace(), permissionSuffix); - } - - public static AafPermission getEnumByString(String perm) { - for (AafPermission e : AafPermission.values()) { - if (perm.equals(e.getPermissionSuffix())) { - return e; - } - } - throw new ByActionStatusComponentException(ActionStatus.INVALID_PROPERTY, perm); - } - - public String getFullPermission() { - return permission; - } - - public String getPermissionSuffix() { - return this.permissionSuffix; - } - - public static class PermNames { - - public static final String READ_VALUE = "endpoint.api.access|*|read"; - public static final String WRITE_VALUE = "endpoint.api.access|*|write"; - public static final String DELETE_VALUE = "endpoint.api.access|*|delete"; - public static final String INTERNAL_ALL_VALUE = "endpoint.api.internal.access|*|all"; - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/AafRoles.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/AafRoles.java deleted file mode 100644 index 95cebcacdc..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/AafRoles.java +++ /dev/null @@ -1,35 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed 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. - * ============LICENSE_END========================================================= - */ -package org.openecomp.sdc.be.components.impl.aaf; - -import org.openecomp.sdc.be.config.ConfigurationManager; - -public enum AafRoles { - READ_ONLY("app.readonly"), ALL("app.all"); - private String role; - - AafRoles(String roleSuffix) { - this.role = ConfigurationManager.getConfigurationManager().getConfiguration().getAafNamespace() + "." + roleSuffix; - } - - public String getRole() { - return role; - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/PermissionAllowed.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/PermissionAllowed.java deleted file mode 100644 index 782e2ea8c2..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/PermissionAllowed.java +++ /dev/null @@ -1,32 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed 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. - * ============LICENSE_END========================================================= - */ -package org.openecomp.sdc.be.components.impl.aaf; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface PermissionAllowed { - - String[] value(); -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/RoleAuthorizationHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/RoleAuthorizationHandler.java deleted file mode 100644 index bc66a8c67e..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/aaf/RoleAuthorizationHandler.java +++ /dev/null @@ -1,78 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed 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. - * ============LICENSE_END========================================================= - */ -package org.openecomp.sdc.be.components.impl.aaf; - -import javax.servlet.http.HttpServletRequest; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException; -import org.openecomp.sdc.be.config.ConfigurationManager; -import org.openecomp.sdc.be.dao.api.ActionStatus; -import org.openecomp.sdc.be.servlets.BeGenericServlet; -import org.openecomp.sdc.common.log.wrappers.Logger; -import org.openecomp.sdc.common.util.ThreadLocalsHolder; - -// aop id defined via application-context.xml. the annotations are only for test purposes -@Aspect -public class RoleAuthorizationHandler { - - private static final Logger log = Logger.getLogger(RoleAuthorizationHandler.class); - private final ConfigurationManager configurationManager = ConfigurationManager.getConfigurationManager(); - - @Before("@annotation(permissions)") - public void authorizeRole(JoinPoint joinPoint, PermissionAllowed permissions) { - if (isPermissionAuthenticationNeeded()) { - String methodName = joinPoint.getSignature().toShortString(); - HttpServletRequest request = ((BeGenericServlet) joinPoint.getThis()).getServletRequest(); - String[] perms = permissions.value(); - logAuth(methodName, perms, true, null); - for (String perm : perms) { - if (request.isUserInRole(getFullPermission(perm))) { - logAuth(methodName, perms, false, true); - return; - } - } - logAuth(methodName, perms, false, false); - throw new ByActionStatusComponentException(ActionStatus.AUTH_FAILED); - } - } - - private void logAuth(String methodName, String[] perms, boolean beforeAuth, Boolean success) { - if (beforeAuth) { - log.trace("#{} - authorizing before invoking endpoint {}", methodName); - } else { - String status = success ? "SUCCESS" : "FAILED"; - log.trace("#{} - authorizing before invoking endpoint {}, Status: {}", methodName, status); - } - } - - private String getFullPermission(String role) { - return AafPermission.getEnumByString(role).getFullPermission(); - } - - private boolean isPermissionAuthenticationNeeded() { - if (configurationManager.getConfiguration().getAafAuthNeeded() && ThreadLocalsHolder.isExternalRequest()) { - return true; - } else { - return false; - } - } -} |