Skip to content

Commit

Permalink
Cert doc update part 4 (#31)
Browse files Browse the repository at this point in the history
* updated .properties

* Add properties for swagger

* Update REST_API.md

* Updated new cosign hashes

* Added ocsp to provider

---------

Co-authored-by: David Jovanovic <[email protected]>
Co-authored-by: Marko Stojanovic <[email protected]>
  • Loading branch information
3 people authored Oct 12, 2023
1 parent 64f5832 commit 671a124
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 12 deletions.
1 change: 0 additions & 1 deletion be-dataapp_resources/application-docker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ logging.pattern.console=%d{dd-MM-yyyy HH:mm:ss.SSS} [%thread] %-5level %logger.%
application.targetDirectory=/cert/
server.port=8083
application.proxyPort=8183
server.ssl.enabled=${SERVER_SSL_ENABLED}
server.ssl.key-store=${application.targetDirectory}${KEYSTORE_NAME}
server.ssl.key-password=${KEYSTORE_PASSWORD}
server.ssl.key-alias=${ALIAS}
Expand Down
4 changes: 2 additions & 2 deletions doc/cosign.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The following checks were performed on each of these signatures:
"docker-reference": "index.docker.io/rdlabengpa/ids_execution_core_container"
},
"image": {
"docker-manifest-digest": "sha256:ef7f614c15b31cd3965224ba734bca27d3f2ee0907af05859172821907d9dd3e"
"docker-manifest-digest": "sha256:30385617e1c430b881474daf5cbe8a829082d487206b4bc215916ef4d1ab7eef"
},
"type": "cosign container image signature"
},
Expand All @@ -54,7 +54,7 @@ The following checks were performed on each of these signatures:
"docker-reference": "index.docker.io/rdlabengpa/ids_be_data_app"
},
"image": {
"docker-manifest-digest": "sha256:49248ba8c0dc65a97c22ed8261100eec317b7428ae90d0f323bb94354d53f200"
"docker-manifest-digest": "sha256:6dae75837854133f6e895e9bf811a25d963b4dfcfb583bbf975c2b550bfe8d86"
},
"type": "cosign container image signature"
},
Expand Down
6 changes: 3 additions & 3 deletions doc/rest_api/REST_API.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ Overview of all available endpoints:
| PUT | /api/contractOffer/{resourceId} | Update existing contract offer | Connector |
| DELETE | /api/contractOffer/{representationId} | Delete existing contract offer | Connector |

Swagger UI for offered resources CRUD operations:
Offered resources CRUD operations:

![Offered resource](Offered_Resource_Swagger.jpg "Offered resource swagger API")

Swagger UI for contract offer CRUD operations:
Contract offer CRUD operations:

![Contract offer](Contract_Offer_Swagger.jpg "Contract Offer swagger API")

Swagger UI for representation CRUD operations:
Representation CRUD operations:

![Resource representation](Resource_Representation_Swagger.jpg "Resource representation swagger API")

Expand Down
11 changes: 10 additions & 1 deletion ecc_resources_consumer/application-docker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ server.ssl.key-store-provider=SUN
server.ssl.key-store-type=JKS
server.ssl.SHA256=AC3BCAED1F01C63E18D4E0994C48D18EB6F79D01844564A4BA8476BE2D17F5E4

# Values accepted
# good -> only good check
# unknown -> only good and unknown check
# none -> no OCSP test needed
application.OCSP_RevocationCheckValue=none

#### Enable WebSocket over Https
application.dataApp.websocket.isEnabled=${WS_EDGE}
#Enabling WS internally
Expand Down Expand Up @@ -196,4 +202,7 @@ application.healthcheck.dataapp=https://be-dataapp-consume:8183/about/version
application.healthcheck.usagecontrol=https://uc-dataapp-consumer:8080/platoontec/PlatoonDataUsage/1.0/about/version

application.healthcheck.daps=${application.dapsJWKSUrl}
application.healthcheck.clearinghouse=
application.healthcheck.clearinghouse=

springdoc.swagger-ui.enabled=false
springdoc.api-docs.enabled=false
15 changes: 10 additions & 5 deletions ecc_resources_provider/application-docker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ server.ssl.key-store-provider=SUN
server.ssl.key-store-type=JKS
server.ssl.SHA256=AC3BCAED1F01C63E18D4E0994C48D18EB6F79D01844564A4BA8476BE2D17F5E4

# Values accepted
# good -> only good check
# unknown -> only good and unknown check
# none -> no OCSP test needed
application.OCSP_RevocationCheckValue=none

#### Enable WebSocket over Https
application.dataApp.websocket.isEnabled=${WS_EDGE}
#Enabling WS between ECC
Expand Down Expand Up @@ -96,10 +102,6 @@ application.clearinghouse.processEndpoint=/process/

#Connector ID
application.connectorid=${CONNECTOR_ID}
#Connector URIs
application.uriSchema=http
application.uriAuthority=//w3id.org/engrd
application.uriConnector=/connector/provider

#IDSCP2 enabled
application.idscp2.isEnabled=${IDSCP2}
Expand Down Expand Up @@ -195,4 +197,7 @@ application.healthcheck.dataapp=https://be-dataapp-provider:8183/about/version
application.healthcheck.usagecontrol=https://uc-dataapp-provider:8080/platoontec/PlatoonDataUsage/1.0/about/version

application.healthcheck.daps=${application.dapsJWKSUrl}
application.healthcheck.clearinghouse=
application.healthcheck.clearinghouse=

springdoc.swagger-ui.enabled=false
springdoc.api-docs.enabled=false

0 comments on commit 671a124

Please sign in to comment.