diff --git a/provider/crs-converter-ibm/crs-converter-ocp/pom.xml b/provider/crs-converter-ibm/crs-converter-ocp/pom.xml index 1e2b1e77178b6ba57804fc1318f58bd94e804d78..8fbc9e7f974a62669db1ae99d82c7878d5b12b08 100644 --- a/provider/crs-converter-ibm/crs-converter-ocp/pom.xml +++ b/provider/crs-converter-ibm/crs-converter-ocp/pom.xml @@ -15,7 +15,7 @@ <app.version>1</app.version> <app.id>crs-converter-ocp</app.id> <!--azure.version>2.3.2</azure.version--> - <os-core-lib-ibm.version>0.3.6-SNAPSHOT</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.3.8-SNAPSHOT</os-core-lib-ibm.version> </properties> <prerequisites> @@ -72,7 +72,6 @@ </execution> </executions> </plugin> - </plugins> </build> diff --git a/provider/crs-converter-ibm/crs-converter-ocp/src/main/java/org/opengroup/osdu/crs/CrsOcpApplication.java b/provider/crs-converter-ibm/crs-converter-ocp/src/main/java/org/opengroup/osdu/crs/CrsOcpApplication.java index fb23aec31c260098d1050a1741d1c81572cf7881..774815e054d65f7e327a124482cf2993cb11ed72 100644 --- a/provider/crs-converter-ibm/crs-converter-ocp/src/main/java/org/opengroup/osdu/crs/CrsOcpApplication.java +++ b/provider/crs-converter-ibm/crs-converter-ocp/src/main/java/org/opengroup/osdu/crs/CrsOcpApplication.java @@ -1,3 +1,6 @@ +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ + package org.opengroup.osdu.crs; import org.springframework.boot.SpringApplication; diff --git a/provider/crs-converter-ibm/crs-converter-ocp/src/main/java/org/opengroup/osdu/crs/security/SecurityConfig.java b/provider/crs-converter-ibm/crs-converter-ocp/src/main/java/org/opengroup/osdu/crs/security/SecurityConfig.java index e080e5951324aa9c71f990075d8684126d902d56..57fbd8ac3a8f2e8652984f0dec83f0ecd921c2a9 100644 --- a/provider/crs-converter-ibm/crs-converter-ocp/src/main/java/org/opengroup/osdu/crs/security/SecurityConfig.java +++ b/provider/crs-converter-ibm/crs-converter-ocp/src/main/java/org/opengroup/osdu/crs/security/SecurityConfig.java @@ -1,3 +1,6 @@ +/* Licensed Materials - Property of IBM */ +/* (c) Copyright IBM Corp. 2020. All Rights Reserved.*/ + package org.opengroup.osdu.crs.security; import java.io.IOException; @@ -52,17 +55,15 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter implements Acce @Override protected void configure(HttpSecurity http) throws Exception { - http.csrf().disable() - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.NEVER) - .and() - .authorizeRequests() - .antMatchers(AUTH_WHITELIST).permitAll() - .anyRequest().authenticated() - .and() - .addFilterBefore(authFilter, UsernamePasswordAuthenticationFilter.class); - //.oauth2ResourceServer().jwt(); - - + http.csrf().disable() + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.NEVER) + .and() + .authorizeRequests() + .antMatchers(AUTH_WHITELIST).permitAll() + .anyRequest().authenticated() + .and() + .addFilterBefore(authFilter, UsernamePasswordAuthenticationFilter.class); + //.oauth2ResourceServer().jwt(); } public SecurityConfig(@Value("${ENTITLEMENT_URL}") String entitlementsUrl, HandlerExceptionResolver handlerExceptionResolver) { @@ -98,6 +99,5 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter implements Acce out.print(body); out.flush(); } - } \ No newline at end of file diff --git a/testing/crs_converter_test_ibm/jwt_client.py b/testing/crs_converter_test_ibm/jwt_client.py index 8cb2d09c65cfb5ba406c7e1455fb28b68cb4cd9b..737bf6c7e20eface6ba2e8621d40208e61f53a65 100644 --- a/testing/crs_converter_test_ibm/jwt_client.py +++ b/testing/crs_converter_test_ibm/jwt_client.py @@ -1,4 +1,5 @@ - +# Licensed Materials - Property of IBM +# (c) Copyright IBM Corp. 2020. All Rights Reserved. import os from keycloak import KeycloakOpenID diff --git a/testing/crs_converter_test_ibm/run_test.py b/testing/crs_converter_test_ibm/run_test.py index 7ad8ee9f8d1dad47f149fad54cf337c0c967e627..7bc498913b842be41e2233a0ba2580f9561cd9d4 100644 --- a/testing/crs_converter_test_ibm/run_test.py +++ b/testing/crs_converter_test_ibm/run_test.py @@ -1,3 +1,5 @@ +# Licensed Materials - Property of IBM +# (c) Copyright IBM Corp. 2020. All Rights Reserved. import sys sys.path.append("..")