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.

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

chore: Updated securit vulnerability #233

Merged
merged 4 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ maven/mavencentral/net.minidev/json-smart/2.5.1, Apache-2.0, approved, #19431
maven/mavencentral/org.apache.commons/commons-lang3/3.14.0, Apache-2.0, approved, #11677
maven/mavencentral/org.apache.logging.log4j/log4j-api/2.23.1, Apache-2.0, approved, #13368
maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.23.1, Apache-2.0, approved, #15121
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.34, Apache-2.0 AND (EPL-2.0 OR (GPL-2.0 WITH Classpath-exception-2.0)) AND CDDL-1.0 AND (CDDL-1.1 OR (GPL-2.0-only WITH Classpath-exception-2.0)) AND EPL-2.0, approved, #15195
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.34, Apache-2.0, approved, #6997
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.34, Apache-2.0, approved, #7920
maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/10.1.34, Apache-2.0, approved, #8196
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.36, Apache-2.0 AND (EPL-2.0 OR (GPL-2.0 WITH Classpath-exception-2.0)) AND CDDL-1.0 AND (CDDL-1.1 OR (GPL-2.0-only WITH Classpath-exception-2.0)) AND EPL-2.0, approved, #15195
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.36, Apache-2.0, approved, #6997
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.36, Apache-2.0, approved, #7920
maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/10.1.36, Apache-2.0, approved, #8196
maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, #17641
maven/mavencentral/org.assertj/assertj-core/3.25.3, Apache-2.0, approved, #12585
maven/mavencentral/org.awaitility/awaitility/4.2.2, Apache-2.0, approved, #14178
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Architecture communication and documentation are defined in [ARC42](docs/archite

```shell
Software version: 2.1.18
Helm Chart version: 2.1.26
Helm Chart version: 2.1.27
```


Expand Down
2 changes: 1 addition & 1 deletion charts/sdfactory/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ sources:
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: "2.1.26"
version: "2.1.27"

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion charts/sdfactory/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sdfactory

![Version: 2.1.26](https://img.shields.io/badge/Version-2.1.26-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.18](https://img.shields.io/badge/AppVersion-2.1.18-informational?style=flat-square)
![Version: 2.1.27](https://img.shields.io/badge/Version-2.1.27-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.18](https://img.shields.io/badge/AppVersion-2.1.18-informational?style=flat-square)

Helm Charts for SD Factory application. Self-Description Factory component is responsible for the creation of Self Descriptions.

Expand Down
90 changes: 65 additions & 25 deletions docs/api/openAPI.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#################################################################################
# Copyright (c) 2024 T-Systems International GmbH
# Copyright (c) 2024 Contributors to the Eclipse Foundation
# Copyright (c) 2024, 2025 T-Systems International GmbH
# Copyright (c) 2024, 2025 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand All @@ -20,11 +20,11 @@

openapi: 3.0.0
info:
version: Release3
version: TagusRelease
title: SD-Factory API
description: API for creating and storing the Verifiable Credentials
paths:
/api/rel3/selfdescription:
/api/tagus/selfdescription:
post:
summary: Creates a Verifiable Credential and returns it
operationId: selfdescriptionPost
Expand All @@ -49,24 +49,32 @@ paths:
externalId: ID01234-123-4321
type: LegalParticipant
holder: BPNL000000000000
issuer: CAXSDUMMYCATENAZZ
name: CAXSDUMMYCATENAZZ
registrationNumber:
- type: taxID
value: o12345678
headquarterAddress.country: DE
legalAddress.country: DE
bpn: BPNL000000000000
headquarterAddress.countrySubdivisionCode: DE-BY
legalAddress.countrySubdivisionCode: DE-NW
ServiceOffering:
description: payload to create ServiceOffering
value:
externalId: ID01234-123-4321
type: ServiceOffering
holder: BPNL000000000000
termsAndConditions:
gx:URL: https://raw.githubusercontent.com/eclipse-tractusx/sd-factory/main/LICENSE
gx:hash: A8789884DECDE0E00D75FA204A78E0A000
issuer: CAXSDUMMYCATENAZZ
providedBy: https://participant.url
policy: https://policy.url
aggregationOf: https://aggr1.url, https://aggr2.url
termsAndConditions: https://raw.githubusercontent.com/eclipse-tractusx/sd-factory/main/LICENSE
policies: policy1, policy2
dataProtectionRegime:
- GDPR2016
dataAccountExport:
gx:requestType: API
gx:accessType: digital
gx:formatType: application/json
connectorUrl: https://company.connector-url.org/
responses:
'202':
description: request has been accepted for processing
Expand All @@ -84,14 +92,17 @@ components:
type: string
holder:
type: string
issuer:
type: string
externalId:
type: string
attachment:
type: array
description: any VC that can be attached to a resource
items: { }
minItems: 1
maxItems: 10
required:
- type
- holder
- issuer
- externalId
RegistrationNumberSchema:
type: object
Expand All @@ -102,7 +113,6 @@ components:
description: the mean to request data retrieval
enum:
- taxID
- local
- vatID
- EUID
- EORI
Expand All @@ -118,6 +128,8 @@ components:
- $ref: '#/components/schemas/SelfDescriptionSchema'
- type: object
properties:
name:
type: string
registrationNumber:
type: array
uniqueItems: true
Expand All @@ -126,32 +138,60 @@ components:
description: A list of registration numbers
items:
$ref: '#/components/schemas/RegistrationNumberSchema'
headquarterAddress.country:
type: string
legalAddress.country:
headquarterAddress.countrySubdivisionCode:
type: string
bpn:
legalAddress.countrySubdivisionCode:
type: string
required:
- registrationNumber
- headquarterAddress.country
- legalAddress.country
- bpn
- headquarterAddress.countrySubdivisionCode
- legalAddress.countrySubdivisionCode
ServiceOfferingSchema:
type: object
allOf:
- $ref: '#/components/schemas/SelfDescriptionSchema'
- type: object
properties:
aggregationOf:
type: array
uniqueItems: true
minItems: 1
maximum: 512
items:
type: string
format: uri
termsAndConditions:
type: object
properties:
gx:URL:
type: string
gx:hash:
type: string
providedBy:
type: string
format: uri
aggregationOf:
type: string
termsAndConditions:
policy:
type: string
policies:
format: uri
dataProtectionRegime:
type: array
uniqueItems: true
minItems: 1
maximum: 10
items:
type: string
dataAccountExport:
type: object
properties:
gx:requestType:
type: string
gx:accessType:
type: string
gx:formatType:
type: string
connectorUrl:
type: string
format: uri
required:
- providedBy
security:
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<resource.delimiter>^</resource.delimiter>
<spring-cloud.version>4.1.3</spring-cloud.version>
<dash-tool.version>1.0.3-SNAPSHOT</dash-tool.version>
<tomcat.version>10.1.34</tomcat.version>
<tomcat.version>10.1.36</tomcat.version>
</properties>
<dependencies>
<dependency>
Expand All @@ -54,6 +54,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
5 changes: 2 additions & 3 deletions src/main/resources/static/SDFactoryApi-Tagus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ paths:
- GDPR2016
dataAccountExport:
gx:requestType: API
gx:accessType:
gx:accessType: digital
gx:formatType: application/json
connectorUrl: https://company.connector-url.org/
attachment:
Expand Down Expand Up @@ -246,7 +246,7 @@ components:
gx:hash:
type: string
providedBy:
type: String
type: string
format: uri
policy:
type: string
Expand All @@ -272,6 +272,5 @@ components:
format: uri
required:
- providedBy
- connectorUrl
security:
- bearerAuth: []
Loading