Skip to content

Commit 767e740

Browse files
committed
Update core, rest api, and UCS client code
1 parent 9431e7a commit 767e740

File tree

11 files changed

+894
-240
lines changed

11 files changed

+894
-240
lines changed

README.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,61 @@ uos --help
4949
### Parameters
5050

5151
The service requires the following configuration parameters:
52+
- <a id="properties/audit_record_topic"></a>**`audit_record_topic`** *(string, required)*: Name of the topic used for events conveying audit record information.
53+
54+
55+
Examples:
56+
57+
```json
58+
"audit-records"
59+
```
60+
61+
62+
- <a id="properties/audit_record_type"></a>**`audit_record_type`** *(string, required)*: The type used for events conveying audit record information.
63+
64+
65+
Examples:
66+
67+
```json
68+
"audit_record_logged"
69+
```
70+
71+
72+
- <a id="properties/ucs_url"></a>**`ucs_url`** *(string, required)*: URL pointing to the UCS API.
73+
74+
75+
Examples:
76+
77+
```json
78+
"http://127.0.0.1/upload"
79+
```
80+
81+
82+
- <a id="properties/work_order_signing_key"></a>**`work_order_signing_key`** *(string, format: password, required, write-only)*: The private key for signing work order tokens.
83+
84+
85+
Examples:
86+
87+
```json
88+
"{\"crv\": \"P-256\", \"kty\": \"EC\", \"x\": \"...\", \"y\": \"...\"}"
89+
```
90+
91+
92+
- <a id="properties/ucs_public_key"></a>**`ucs_public_key`** *(string, required)*: The public key used to encrypt work order tokens sent to the UCS.
93+
94+
95+
Examples:
96+
97+
- <a id="properties/access_url"></a>**`access_url`** *(string, required)*: URL pointing to the internal access API.
98+
99+
100+
Examples:
101+
102+
```json
103+
"http://127.0.0.1/access"
104+
```
105+
106+
52107
- <a id="properties/service_name"></a>**`service_name`** *(string)*: Default: `"uos"`.
53108

54109
- <a id="properties/service_instance_id"></a>**`service_instance_id`** *(string, required)*: A string that uniquely identifies this instance across all instances of this service. This is included in log messages.
@@ -311,6 +366,26 @@ The service requires the following configuration parameters:
311366

312367
- <a id="properties/log_traceback"></a>**`log_traceback`** *(boolean)*: Whether to include exception tracebacks in log messages. Default: `true`.
313368

369+
- <a id="properties/auth_key"></a>**`auth_key`** *(string, required)*: The GHGA internal public key for validating the token signature.
370+
371+
372+
Examples:
373+
374+
```json
375+
"{\"crv\": \"P-256\", \"kty\": \"EC\", \"x\": \"...\", \"y\": \"...\"}"
376+
```
377+
378+
379+
- <a id="properties/auth_algs"></a>**`auth_algs`** *(array)*: A list of all algorithms used for signing GHGA internal tokens. Default: `["ES256"]`.
380+
381+
- <a id="properties/auth_algs/items"></a>**Items** *(string)*
382+
383+
- <a id="properties/auth_check_claims"></a>**`auth_check_claims`** *(object)*: A dict of all GHGA internal claims that shall be verified. Can contain additional properties. Default: `{"id": null, "name": null, "email": null, "iat": null, "exp": null}`.
384+
385+
- <a id="properties/auth_map_claims"></a>**`auth_map_claims`** *(object)*: A mapping of claims to attributes in the GHGA auth context. Can contain additional properties. Default: `{}`.
386+
387+
- <a id="properties/auth_map_claims/additionalProperties"></a>**Additional properties** *(string)*
388+
314389
- <a id="properties/host"></a>**`host`** *(string)*: IP of the host. Default: `"127.0.0.1"`.
315390

316391
- <a id="properties/port"></a>**`port`** *(integer)*: Port to expose the server on the specified host. Default: `8080`.

config_schema.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,6 @@
22
"additionalProperties": false,
33
"description": "Modifies the original Settings class provided by the user",
44
"properties": {
5-
"work_order_signing_key": {
6-
"description": "The private key for signing work order tokens",
7-
"examples": [
8-
"{\"crv\": \"P-256\", \"kty\": \"EC\", \"x\": \"...\", \"y\": \"...\"}"
9-
],
10-
"format": "password",
11-
"title": "Work Order Signing Key",
12-
"type": "string",
13-
"writeOnly": true
14-
},
15-
"ucs_public_key": {
16-
"description": "The public key used to encrypt work order tokens sent to the UCS",
17-
"examples": [],
18-
"title": "Ucs Public Key",
19-
"type": "string"
20-
},
215
"audit_record_topic": {
226
"description": "Name of the topic used for events conveying audit record information.",
237
"examples": [
@@ -42,6 +26,22 @@
4226
"title": "Ucs Url",
4327
"type": "string"
4428
},
29+
"work_order_signing_key": {
30+
"description": "The private key for signing work order tokens",
31+
"examples": [
32+
"{\"crv\": \"P-256\", \"kty\": \"EC\", \"x\": \"...\", \"y\": \"...\"}"
33+
],
34+
"format": "password",
35+
"title": "Work Order Signing Key",
36+
"type": "string",
37+
"writeOnly": true
38+
},
39+
"ucs_public_key": {
40+
"description": "The public key used to encrypt work order tokens sent to the UCS",
41+
"examples": [],
42+
"title": "Ucs Public Key",
43+
"type": "string"
44+
},
4545
"access_url": {
4646
"description": "URL pointing to the internal access API.",
4747
"examples": [
@@ -479,11 +479,11 @@
479479
}
480480
},
481481
"required": [
482-
"work_order_signing_key",
483-
"ucs_public_key",
484482
"audit_record_topic",
485483
"audit_record_type",
486484
"ucs_url",
485+
"work_order_signing_key",
486+
"ucs_public_key",
487487
"access_url",
488488
"service_instance_id",
489489
"kafka_servers",

0 commit comments

Comments
 (0)