From 5caf0800a080d3ac4fb9573b319336160b2ebcba Mon Sep 17 00:00:00 2001
From: Zlatko Murgoski <zlatko.murgoski@nokia.com>
Date: Wed, 17 Apr 2019 10:10:30 +0200
Subject: VES Collector - certBasicAuth

https://jira.onap.org/browse/DCAEGEN2-1440

Issue-ID: DCAEGEN2-1440
Change-Id: I7976d03c65e261930533a49a6716fd6161124ad9
Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
---
 .../onap/dcae/common/configuration/CertAuth.java   | 29 +---------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'src/main/java/org/onap/dcae/common/configuration/CertAuth.java')

diff --git a/src/main/java/org/onap/dcae/common/configuration/CertAuth.java b/src/main/java/org/onap/dcae/common/configuration/CertAuth.java
index 481fb5ec..6bd924c3 100644
--- a/src/main/java/org/onap/dcae/common/configuration/CertAuth.java
+++ b/src/main/java/org/onap/dcae/common/configuration/CertAuth.java
@@ -21,24 +21,15 @@
 
 package org.onap.dcae.common.configuration;
 
-import org.onap.dcae.ApplicationException;
 import org.onap.dcae.ApplicationSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.web.server.Ssl.ClientAuth;
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 
 @Configuration
-@Order(0)
-@EnableWebSecurity
-public class CertAuth extends WebSecurityConfigurerAdapter implements AuthMethod {
+public class CertAuth implements AuthMethod {
 
   private static final Logger log = LoggerFactory.getLogger(CertAuth.class);
   private final ConfigurableServletWebServerFactory container;
@@ -49,24 +40,6 @@ public class CertAuth extends WebSecurityConfigurerAdapter implements AuthMethod
     this.properties = properties;
   }
 
-  @Override
-  public void configure(WebSecurity web) {
-    web.ignoring().anyRequest();
-  }
-
-  @Override
-  protected void configure(HttpSecurity http) {
-    try {
-      http.authorizeRequests()
-          .anyRequest().authenticated().and()
-          .addFilterBefore(new CustomFilter(properties), FilterSecurityInterceptor.class);
-
-    } catch (Exception ex) {
-      log.error("Cannot authorize request cause: ",ex);
-      throw new ApplicationException(ex);
-    }
-  }
-
   @Override
   public void configure() {
     SslContextCreator sslContextCreator = new SslContextCreator(properties);
-- 
cgit 1.2.3-korg