Merge 544e820 into 742dcd0

sse-secure-systems · Dec 17, 2020 · 165f518 · 165f518
2 parents 742dcd0 + 544e820
commit 165f518
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/connaisseur/res/snapshot_schema.json b/connaisseur/res/snapshot_schema.json
@@ -20,7 +20,7 @@
                 "meta": {
                     "type": "object",
                     "patternProperties": {
-                        "^(root|targets(\/\\w*)?)$": {
+                        "^(root|targets(/([a-z\\d][a-z\\d_-]*))?)$": {
                             "type": "object",
                             "properties": {
                                 "hashes": {

diff --git a/connaisseur/res/targets_schema.json b/connaisseur/res/targets_schema.json
@@ -75,7 +75,7 @@
                                     },
                                     "name": {
                                         "type": "string",
-                                        "pattern": "^targets\/\\w*$"
+                                        "pattern": "^targets/([a-z\\d][a-z\\d_-]*)+$"
                                     },
                                     "paths": {
                                         "type": "array",

diff --git a/connaisseur/tests/data/sample7_snapshot.json b/connaisseur/tests/data/sample7_snapshot.json
@@ -0,0 +1 @@
+{"signed":{"_type":"Snapshot","expires":"2023-12-16T17:50:52.757602085Z","meta":{"root":{"hashes":{"sha256":"uOiDSNCYk3GUivUKNViKIXuOJR3jGkl23UVi2oVBKpo=","sha512":"i9X/zKp+J2EeaJ6mFEdl9W2wyM+/px8fyzmaaHqTWwFeV6Nm1w0TrKLbwb2NThQK1+69PFi/F+ZbccdVg7pfTg=="},"length":2393},"targets":{"hashes":{"sha256":"HxAvZ1Ixv2UXCZIBD8CtWuXnX1lFARWGl/3nWqwm6vU=","sha512":"62kLw4HcLnLTGf4cXFalvhOyEDrYlp18hd07GBQzlCm86vbvblGaElgA21+2tM1nMXxwISlAKy5/V2ksXHp71g=="},"length":860},"targets/my-signer":{"hashes":{"sha256":"RtV4p3qdSA4lM2LTyELZ66PkG+Pk0EKpEDi4U2C/LSo=","sha512":"3w/Cmq7Ao2Y/ZqVeTn4uDshFoDBc3Ny+JN62GYUku9ko4FRkO0z3RuCfZPJl8WodP+bxTM0df0WNKLw7rj8S+Q=="},"length":437},"targets/releases":{"hashes":{"sha256":"hph/ujG+Oyvg3U64SMpp3Vw0ZDGQIXdpttHrLNiCggE=","sha512":"jEWwFMbVLMkl9bAl/BpmaOWmSR32Dv30qidqGHinbUaOa5A+pPtVwpyLwHXAuKFG/fMJYE9pjOavkaXMJGyoOg=="},"length":437}},"version":2},"signatures":[{"keyid":"77512d2f3dc6811c294537154bf0ccf31f8f7b7e40e0f5d8febb8a260271f4dd","method":"ecdsa","sig":"XWuptOjcmpn46aeZFYb5z7Kjb8DnenlNazjiLEFUZrIPO8I7Hb/gcIourv3IQjXAxFPv6h/nXE20EX4aEeQL7w=="}]}
diff --git a/connaisseur/tests/data/sample7_targets.json b/connaisseur/tests/data/sample7_targets.json
@@ -0,0 +1 @@
+{"signed":{"_type":"Targets","delegations":{"keys":{"595580ab31f98625431f0a8c1a8af7d40926cb38f60c670511d6e4c430fc28b7":{"keytype":"ecdsa","keyval":{"private":null,"public":"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE8uxglYIx2F2eKee3WYxkblrn40yJ1qP8us4nNguFX59YRQGhCiwLowxOr/Tv+ySK62KERPKLLXWsFfiGctqIaw=="}}},"roles":[{"keyids":["595580ab31f98625431f0a8c1a8af7d40926cb38f60c670511d6e4c430fc28b7"],"name":"targets/my-signer","paths":[""],"threshold":1},{"keyids":["595580ab31f98625431f0a8c1a8af7d40926cb38f60c670511d6e4c430fc28b7"],"name":"targets/releases","paths":[""],"threshold":1}]},"expires":"2023-12-16T18:50:02.599111172+01:00","targets":{},"version":2},"signatures":[{"keyid":"bed081636f1f425129f57417cd5fecbe69e030eea8b71d8d0d8fe273afe5df87","method":"ecdsa","sig":"6DH/cVFi9eALjd4fztYAWw3u5FnAe/vDD4hHw/CkB+AfFO76SE7UMv56bH6l+KCt04qPLAZjBW+YQC0tK6WaiQ=="}]}
diff --git a/connaisseur/tests/test_trust_data.py b/connaisseur/tests/test_trust_data.py
@@ -330,6 +330,8 @@ def test_validate_schema_error(td, mock_schema_path, trustdata: dict, role: str)
         (trust_data("tests/data/sample_timestamp.json"), "timestamp"),
         (trust_data("tests/data/sample3_targets.json"), "targets"),
         (trust_data("tests/data/sample4_targets.json"), "targets"),
+        (trust_data("tests/data/sample7_targets.json"), "targets"),
+        (trust_data("tests/data/sample7_snapshot.json"), "snapshot"),
     ],
 )
 def test_validate_schema(td, mock_schema_path, trustdata: dict, role: str):

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -1,7 +1,7 @@
 # configure connaisseur deployment
 deployment:
   replicasCount: 3
-  image: securesystemsengineering/connaisseur:v1.4.1
+  image: securesystemsengineering/connaisseur:v1.4.2
   imagePullPolicy: Always
   resources: {}
   # limits: