Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add cors config for external wallets #22

Merged
merged 11 commits into from
Nov 21, 2024
Merged

add cors config for external wallets #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b0db30f
add cors config for external wallets
rubenmodamioin2 Nov 20, 2024
d83eddb
adjust cors
rubenmodamioin2 Nov 20, 2024
d9dc372
rename package
rubenmodamioin2 Nov 21, 2024
a40b956
remove security hotspot
rubenmodamioin2 Nov 21, 2024
465e03c
add tests
rubenmodamioin2 Nov 21, 2024
ec641f9
remove sonar exclusions
rubenmodamioin2 Nov 21, 2024
0151962
add test
rubenmodamioin2 Nov 21, 2024
0b0179d
add csrf disable
rubenmodamioin2 Nov 21, 2024
3c6b6fd
add csrf disable for specific endpoints
rubenmodamioin2 Nov 21, 2024
b9e0bfa
add csrf disable for specific endpoints
rubenmodamioin2 Nov 21, 2024
9cd58db
add csrf disable for specific matchers
rubenmodamioin2 Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v1.0.10](https://github.com/in2workspace/in2-verifier-api/releases/tag/v1.0.9)
## [v1.0.11](https://github.com/in2workspace/in2-verifier-api/releases/tag/v1.0.11)
### Fixed
- Add cors configuration to allow requests from external wallets, on the endpoints the wallet use.

## [v1.0.10](https://github.com/in2workspace/in2-verifier-api/releases/tag/v1.0.10)
### Fixed
- Add an error page for errors during the client authentication request.

Expand Down
16 changes: 7 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

group = 'es.in2'
version = '1.0.10'
version = '1.0.11'

java {
toolchain {
Expand Down Expand Up @@ -46,11 +46,10 @@ sonar {
property "sonar.organization", "in2workspace"
property "sonar.host.url", "https://sonarcloud.io"
property 'sonar.coverage.exclusions',
"src/main/java/es/in2/vcverifier/VcVerifierApplication.java, " +
"src/main/java/es/in2/vcverifier/service/impl/ClientAssertionValidationServiceImpl.java, " +
"src/main/java/es/in2/vcverifier/service/impl/TrustFrameworkServiceImpl.java, " +
"src/main/java/es/in2/vcverifier/service/impl/CertificateValidationServiceImpl.java, " +
"src/main/java/es/in2/vcverifier/exception/MismatchOrganizationIdentifierException.java"
"src/main/java/es/in2/verifier/VerifierApplication.java, " +
"src/main/java/es/in2/verifier/service/impl/TrustFrameworkServiceImpl.java, " +
"src/main/java/es/in2/verifier/service/impl/CertificateValidationServiceImpl.java, " +
"src/main/java/es/in2/verifier/exception/MismatchOrganizationIdentifierException.java"
}
}

Expand All @@ -67,12 +66,12 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-actuator'
// Cryptography
implementation 'com.nimbusds:nimbus-jose-jwt:9.40'
implementation 'org.bitcoinj:bitcoinj-core:0.17-alpha5'
implementation 'org.bitcoinj:bitcoinj-core:0.17-beta1'
implementation 'io.github.novacrypto:Base58:2022.01.17'
//Jackson
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2'
// JSON
implementation 'org.json:json:20230227'
implementation 'org.json:json:20240303'
// QR GENERATOR
implementation 'com.github.kenglxn.QRGen:javase:3.0.1'
// DevTools
Expand Down Expand Up @@ -122,7 +121,6 @@ tasks.jacocoTestReport {
}
classDirectories.setFrom(files(classDirectories.files.collect {
fileTree(dir: it, exclude: [
"**/AuthorizationResponseProcessorServiceImpl.class",
"**/TrustFrameworkServiceImpl.class",
"**/CertificateValidationServiceImpl.class",
"**/MismatchOrganizationIdentifierException.class",
Expand Down
37 changes: 0 additions & 37 deletions src/main/java/es/in2/vcverifier/security/SecurityConfig.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...in2/vcverifier/VcVerifierApplication.java → .../es/in2/verifier/VerifierApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier;
package es.in2.verifier;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.DeserializationFeature;
Expand All @@ -14,7 +14,7 @@
@SpringBootApplication
@EnableConfigurationProperties
@ConfigurationPropertiesScan
public class VcVerifierApplication {
public class VerifierApplication {

private static final ObjectMapper OBJECT_MAPPER =
JsonMapper.builder()
Expand All @@ -23,7 +23,7 @@ public class VcVerifierApplication {
.serializationInclusion(JsonInclude.Include.NON_NULL)
.build();
public static void main(String[] args) {
SpringApplication.run(VcVerifierApplication.class, args);
SpringApplication.run(VerifierApplication.class, args);
}

@Bean
Expand Down
10 changes: 5 additions & 5 deletions ...vcverifier/component/CryptoComponent.java → ...2/verifier/component/CryptoComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package es.in2.vcverifier.component;
package es.in2.verifier.component;

import com.nimbusds.jose.crypto.bc.BouncyCastleProviderSingleton;
import com.nimbusds.jose.jwk.Curve;
import com.nimbusds.jose.jwk.ECKey;
import com.nimbusds.jose.jwk.KeyUse;
import es.in2.vcverifier.config.CryptoConfig;
import es.in2.vcverifier.exception.DidKeyCreationException;
import es.in2.vcverifier.exception.ECKeyCreationException;
import es.in2.vcverifier.util.UVarInt;
import es.in2.verifier.config.CryptoConfig;
import es.in2.verifier.exception.DidKeyCreationException;
import es.in2.verifier.exception.ECKeyCreationException;
import es.in2.verifier.util.UVarInt;
import lombok.RequiredArgsConstructor;
import org.bitcoinj.base.Base58;
import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
Expand Down
2 changes: 1 addition & 1 deletion .../es/in2/vcverifier/config/CacheStore.java → ...va/es/in2/verifier/config/CacheStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.config;
package es.in2.verifier.config;

import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
Expand Down
8 changes: 4 additions & 4 deletions ...2/vcverifier/config/CacheStoreConfig.java → ...in2/verifier/config/CacheStoreConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package es.in2.vcverifier.config;
package es.in2.verifier.config;

import es.in2.vcverifier.config.properties.SecurityProperties;
import es.in2.vcverifier.model.AuthorizationCodeData;
import es.in2.vcverifier.model.AuthorizationRequestJWT;
import es.in2.verifier.config.properties.SecurityProperties;
import es.in2.verifier.model.AuthorizationCodeData;
import es.in2.verifier.model.AuthorizationRequestJWT;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
10 changes: 5 additions & 5 deletions ...vcverifier/config/ClientLoaderConfig.java → ...2/verifier/config/ClientLoaderConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package es.in2.vcverifier.config;
package es.in2.verifier.config;

import es.in2.vcverifier.exception.ClientLoadingException;
import es.in2.vcverifier.model.ClientData;
import es.in2.vcverifier.model.ExternalTrustedListYamlData;
import es.in2.vcverifier.service.TrustFrameworkService;
import es.in2.verifier.exception.ClientLoadingException;
import es.in2.verifier.model.ClientData;
import es.in2.verifier.model.ExternalTrustedListYamlData;
import es.in2.verifier.service.TrustFrameworkService;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
4 changes: 2 additions & 2 deletions ...s/in2/vcverifier/config/CryptoConfig.java → .../es/in2/verifier/config/CryptoConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package es.in2.vcverifier.config;
package es.in2.verifier.config;

import es.in2.vcverifier.config.properties.CryptoProperties;
import es.in2.verifier.config.properties.CryptoProperties;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Configuration;

Expand Down
2 changes: 1 addition & 1 deletion .../in2/vcverifier/config/JtiTokenCache.java → ...es/in2/verifier/config/JtiTokenCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.config;
package es.in2.verifier.config;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...n2/vcverifier/config/WebSocketConfig.java → .../in2/verifier/config/WebSocketConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.config;
package es.in2.verifier.config;

import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
Expand Down
2 changes: 1 addition & 1 deletion ...r/config/properties/CryptoProperties.java → ...r/config/properties/CryptoProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.config.properties;
package es.in2.verifier.config.properties;

import jakarta.validation.constraints.NotNull;
import org.springframework.boot.context.properties.ConfigurationProperties;
Expand Down
4 changes: 2 additions & 2 deletions ...config/properties/SecurityProperties.java → ...config/properties/SecurityProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.config.properties;
package es.in2.verifier.config.properties;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
Expand All @@ -9,7 +9,7 @@

import java.util.Optional;

import static es.in2.vcverifier.util.Constants.MINUTES;
import static es.in2.verifier.util.Constants.MINUTES;
@Validated
@ConfigurationProperties(prefix = "security")
public record SecurityProperties(
Expand Down
2 changes: 1 addition & 1 deletion .../properties/TrustFrameworkProperties.java → .../properties/TrustFrameworkProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.config.properties;
package es.in2.verifier.config.properties;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
Expand Down
2 changes: 1 addition & 1 deletion ...erties/VerifierUiLoginUrisProperties.java → ...erties/VerifierUiLoginUrisProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.config.properties;
package es.in2.verifier.config.properties;

import org.springframework.boot.context.properties.ConfigurationProperties;

Expand Down
4 changes: 2 additions & 2 deletions ...ier/controller/ClientErrorController.java → ...ier/controller/ClientErrorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package es.in2.vcverifier.controller;
package es.in2.verifier.controller;

import es.in2.vcverifier.config.properties.VerifierUiLoginUrisProperties;
import es.in2.verifier.config.properties.VerifierUiLoginUrisProperties;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
Expand Down
8 changes: 4 additions & 4 deletions ...erifier/controller/LoginQrController.java → ...erifier/controller/LoginQrController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package es.in2.vcverifier.controller;
package es.in2.verifier.controller;

import es.in2.vcverifier.config.properties.SecurityProperties;
import es.in2.vcverifier.config.properties.VerifierUiLoginUrisProperties;
import es.in2.vcverifier.exception.QRCodeGenerationException;
import es.in2.verifier.config.properties.SecurityProperties;
import es.in2.verifier.config.properties.VerifierUiLoginUrisProperties;
import es.in2.verifier.exception.QRCodeGenerationException;
import lombok.RequiredArgsConstructor;
import net.glxn.qrgen.javase.QRCode;
import org.springframework.http.HttpStatus;
Expand Down
10 changes: 5 additions & 5 deletions ...verifier/controller/Oid4vpController.java → ...verifier/controller/Oid4vpController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package es.in2.vcverifier.controller;
package es.in2.verifier.controller;

import es.in2.vcverifier.config.CacheStore;
import es.in2.vcverifier.exception.ResourceNotFoundException;
import es.in2.vcverifier.model.AuthorizationRequestJWT;
import es.in2.vcverifier.service.AuthorizationResponseProcessorService;
import es.in2.verifier.config.CacheStore;
import es.in2.verifier.exception.ResourceNotFoundException;
import es.in2.verifier.model.AuthorizationRequestJWT;
import es.in2.verifier.service.AuthorizationResponseProcessorService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
Expand Down
8 changes: 4 additions & 4 deletions ...rifier/controller/ResolverController.java → ...rifier/controller/ResolverController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package es.in2.vcverifier.controller;
package es.in2.verifier.controller;

import es.in2.vcverifier.model.CustomJWK;
import es.in2.vcverifier.model.CustomJWKS;
import es.in2.vcverifier.service.DIDService;
import es.in2.verifier.model.CustomJWK;
import es.in2.verifier.model.CustomJWKS;
import es.in2.verifier.service.DIDService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
Expand Down
2 changes: 1 addition & 1 deletion ...ier/exception/ClientLoadingException.java → ...ier/exception/ClientLoadingException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class ClientLoadingException extends RuntimeException{

Expand Down
2 changes: 1 addition & 1 deletion ...rifier/exception/CredentialException.java → ...rifier/exception/CredentialException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class CredentialException extends RuntimeException {
public CredentialException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion ...exception/CredentialMappingException.java → ...exception/CredentialMappingException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class CredentialMappingException extends RuntimeException{

Expand Down
2 changes: 1 addition & 1 deletion ...exception/CredentialRevokedException.java → ...exception/CredentialRevokedException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class CredentialRevokedException extends RuntimeException {
public CredentialRevokedException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion ...er/exception/DidKeyCreationException.java → ...er/exception/DidKeyCreationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class DidKeyCreationException extends RuntimeException{

Expand Down
2 changes: 1 addition & 1 deletion ...ier/exception/ECKeyCreationException.java → ...ier/exception/ECKeyCreationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class ECKeyCreationException extends RuntimeException {

Expand Down
2 changes: 1 addition & 1 deletion ...ception/FailedCommunicationException.java → ...ception/FailedCommunicationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class FailedCommunicationException extends RuntimeException {

Expand Down
2 changes: 1 addition & 1 deletion ...ption/InvalidCredentialTypeException.java → ...ption/InvalidCredentialTypeException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class InvalidCredentialTypeException extends RuntimeException {

Expand Down
2 changes: 1 addition & 1 deletion ...ifier/exception/InvalidSpringProfile.java → ...ifier/exception/InvalidSpringProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class InvalidSpringProfile extends RuntimeException{
public InvalidSpringProfile(String message) {
Expand Down
2 changes: 1 addition & 1 deletion ...ception/IssuerNotAuthorizedException.java → ...ception/IssuerNotAuthorizedException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class IssuerNotAuthorizedException extends RuntimeException {
public IssuerNotAuthorizedException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion ...ption/IssuerOrParticipantIdException.java → ...ption/IssuerOrParticipantIdException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class IssuerOrParticipantIdException extends RuntimeException {

Expand Down
2 changes: 1 addition & 1 deletion ...r/exception/JWTClaimMissingException.java → ...r/exception/JWTClaimMissingException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class JWTClaimMissingException extends RuntimeException{

Expand Down
2 changes: 1 addition & 1 deletion ...ifier/exception/JWTCreationException.java → ...ifier/exception/JWTCreationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class JWTCreationException extends RuntimeException {

Expand Down
2 changes: 1 addition & 1 deletion ...rifier/exception/JWTParsingException.java → ...rifier/exception/JWTParsingException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class JWTParsingException extends RuntimeException{

Expand Down
2 changes: 1 addition & 1 deletion ...r/exception/JWTVerificationException.java → ...r/exception/JWTVerificationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class JWTVerificationException extends RuntimeException {

Expand Down
2 changes: 1 addition & 1 deletion ...er/exception/JsonConversionException.java → ...er/exception/JsonConversionException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class JsonConversionException extends RuntimeException{

Expand Down
2 changes: 1 addition & 1 deletion ...matchOrganizationIdentifierException.java → ...matchOrganizationIdentifierException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class MismatchOrganizationIdentifierException extends RuntimeException {
public MismatchOrganizationIdentifierException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion ...anizationIdentifierNotFoundException.java → ...anizationIdentifierNotFoundException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class OrganizationIdentifierNotFoundException extends Exception {
public OrganizationIdentifierNotFoundException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion ...exception/PublicKeyDecodingException.java → ...exception/PublicKeyDecodingException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class PublicKeyDecodingException extends RuntimeException {
public PublicKeyDecodingException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion .../exception/QRCodeGenerationException.java → .../exception/QRCodeGenerationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.in2.vcverifier.exception;
package es.in2.verifier.exception;

public class QRCodeGenerationException extends RuntimeException{

Expand Down
Loading