diff --git a/Docker_Tecnalia_DataUsage/datausage/Dockerfile b/Docker_Tecnalia_DataUsage/datausage/Dockerfile index d336b3eeb6e762f5ea8006fa6c3c410942573107..cbbce923393ab2849169e720e5309e5b5f6880c5 100644 --- a/Docker_Tecnalia_DataUsage/datausage/Dockerfile +++ b/Docker_Tecnalia_DataUsage/datausage/Dockerfile @@ -2,5 +2,4 @@ FROM openjdk:11-jdk-slim WORKDIR tmp COPY *.jar datausage.jar COPY etc/platoon_datausage_cape.properties /etc/platoon_datausage_cape.properties -COPY etc/keycloak/keystore.jks /etc/keycloak/keystore.jks ENTRYPOINT ["java","-jar","datausage.jar"] diff --git a/Docker_Tecnalia_DataUsage/datausage/dataUsage-1.0.0.jar b/Docker_Tecnalia_DataUsage/datausage/dataUsage-1.0.0.jar index f54aed00c41fd0ecfcd0bbc33d330ae4bcc08491..56696a732f818ab96b8d85c01d08e88a974a011b 100644 Binary files a/Docker_Tecnalia_DataUsage/datausage/dataUsage-1.0.0.jar and b/Docker_Tecnalia_DataUsage/datausage/dataUsage-1.0.0.jar differ diff --git a/Docker_Tecnalia_DataUsage/datausage/etc/keycloak/keystore.jks b/Docker_Tecnalia_DataUsage/datausage/etc/keycloak/keystore.jks deleted file mode 100755 index a86a77ca90a4d78bc54c88e1e18b799f9cd7be31..0000000000000000000000000000000000000000 Binary files a/Docker_Tecnalia_DataUsage/datausage/etc/keycloak/keystore.jks and /dev/null differ diff --git a/pom.xml b/pom.xml index 9f900c5808511faea997a23fc557bebfaf63a4e1..136c78f61db5e65c7cc028faaae5d6019f60ca0d 100755 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ <version>1.5.9</version> </dependency> <!-- oauth --> - <dependency> +<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-oauth2-client</artifactId> <version>2.5.0</version> @@ -267,7 +267,7 @@ <artifactId>spring-boot-starter-oauth2-resource-server</artifactId> <version>2.5.0</version> </dependency> - +--> <!-- diff --git a/src/main/java/com/tecnalia/datausage/Swagger2SpringBoot.java b/src/main/java/com/tecnalia/datausage/Swagger2SpringBoot.java index 0c91d915affff9cc7a11dcdbc499354dd1957baa..baf691168b35f992c1594383754fd91d31b63158 100644 --- a/src/main/java/com/tecnalia/datausage/Swagger2SpringBoot.java +++ b/src/main/java/com/tecnalia/datausage/Swagger2SpringBoot.java @@ -25,7 +25,7 @@ import org.springframework.context.annotation.ComponentScan; @SpringBootApplication -@ComponentScan(basePackages = { "com.tecnalia.datausage", "com.tecnalia.datausage.api" , "com.tecnalia.datausage.configuration", +@ComponentScan(basePackages = { "com.tecnalia.datausage", "com.tecnalia.datausage.api", "com.tecnalia.datausage.utils", "io.dataspaceconnector.services.usagecontrol"}) public class Swagger2SpringBoot { @@ -35,34 +35,7 @@ public class Swagger2SpringBoot { new SpringApplication(Swagger2SpringBoot.class).run(args); } - @Bean - public OpenAPI openApi(@Value("${server.servlet.context-path}") String contextPath, - @Value("${spring.security.oauth2.resourceserver.jwt.issuer-uri}") String issuerUri) { - return new OpenAPI() - .info(new Info() - .title("Platoon Data Usage") - .description("Api Documentation") - .termsOfService("") - .version("1.0") - .license(new License() - .name("Apache 2.0") - .url("http://www.apache.org/licenses/LICENSE-2.0")) - .contact(new io.swagger.v3.oas.models.info.Contact() - .email(""))) - .addServersItem(new Server().url(contextPath)) - .components(new Components() - .addSecuritySchemes("openid-connect", - new SecurityScheme().type(SecurityScheme.Type.OPENIDCONNECT) - .openIdConnectUrl(issuerUri + "/.well-known/openid-configuration")) - .addSecuritySchemes("bearer-jwt", - new SecurityScheme().type(SecurityScheme.Type.HTTP).scheme("bearer") - .bearerFormat("JWT"))) - .addSecurityItem(new SecurityRequirement().addList("bearer-jwt", Arrays.asList("read", "write"))) - .addSecurityItem(new SecurityRequirement().addList("openid-connect", Arrays.asList("read", "write"))); - } - - - + } diff --git a/src/main/java/com/tecnalia/datausage/config/JWTSecurityConfig.java b/src/main/java/com/tecnalia/datausage/config/JWTSecurityConfig.java deleted file mode 100644 index c40cbca6d991048d851480dee6d74fa06919c7d7..0000000000000000000000000000000000000000 --- a/src/main/java/com/tecnalia/datausage/config/JWTSecurityConfig.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package com.tecnalia.datausage.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.http.SessionCreationPolicy; - -/** - * - * @author root - */ -@Configuration -public class JWTSecurityConfig extends WebSecurityConfigurerAdapter { - - @Value("${spring.profiles.active:Unknown}") - private String activeProfile; - - @Override - public void configure(HttpSecurity http) throws Exception { - http.cors().and().csrf().disable().formLogin().disable().headers().httpStrictTransportSecurity().disable().and() - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.ALWAYS).and() - .authorizeRequests(authz -> authz.antMatchers("/swagger-ui.html", "/swagger-ui/**","/v3/api-docs/**","/platoontec/**") - .permitAll().anyRequest().authenticated()) - .oauth2ResourceServer(oauth2 -> oauth2.jwt()); - }} - diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1d1fcaf3d7d8d2ac26517a8bfa3b8c4aad78ce1d..b95df2573edf59e1c388f6be5eea7ef6d88fb217 100755 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,8 +3,8 @@ server.servlet.contextPath=/platoontec/PlatoonDataUsage/1.0 # #/platoon-data-usage # -#server.port=8080 -server.port=443 +server.port=8080 + spring.jackson.date-format=com.tecnalia.datausage.RFC3339DateFormat spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false @@ -20,8 +20,12 @@ spring.jackson.deserialization.fail-on-unknown-properties=true #spring.jpa.database=POSTGRESQL spring.datasource.platform = usagecontrol #spring.datasource.url = jdbc:postgresql://localhost:5432/usagecontrol -spring.datasource.url = jdbc:postgresql://postgres:5432/usagecontrol +#spring.datasource.url = jdbc:postgresql://postgres:5432/usagecontrol spring.datasource.username = connector +#spring.datasource.username = postgres + + + spring.datasource.password = 12345 spring.jpa.show-sql=true spring.jpa.generate-ddl=true @@ -35,10 +39,6 @@ spring.jpa.database-platform = org.hibernate.dialect.PostgreSQLDialect - - - - ## General Information title=@project.name@ version=@project.version@ @@ -63,25 +63,8 @@ spring.jpa.hibernate.ddl-auto=update -#Keycloak -spring.security.oauth2.resourceserver.jwt.issuer-uri=https://platoon.tecnalia.com:8443/auth/realms/platoon - - - - - -#ssl settings -# The format used for the keystore. It could be set to JKS in case it is a JKS file -server.ssl.key-store-type=JKS -# The path to the keystore containing the certificate -#server.ssl.key-store=classpath:keystore.jks -server.ssl.key-store=file:/etc/keycloak/keystore.jks -# The password used to generate the certificate -server.ssl.key-store-password=tecnalia2021 -# The alias mapped to the certificate -server.ssl.key-alias=1 diff --git a/src/main/resources/keystore.jks b/src/main/resources/keystore.jks deleted file mode 100755 index a86a77ca90a4d78bc54c88e1e18b799f9cd7be31..0000000000000000000000000000000000000000 Binary files a/src/main/resources/keystore.jks and /dev/null differ