Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Self-Report Submission (SRS) #1949

Merged
merged 101 commits into from
Dec 21, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
a1e87b6
cwa-protocol-buffers/pull/57
hilmarf Nov 1, 2022
be9d56f
Merge branch 'main' into feature/srs
hilmarf Nov 3, 2022
da82b5b
allow all kinds of submissionTypes on diagnosis_key
hilmarf Nov 3, 2022
dfbd4f0
new DB table: self_report_submissions
hilmarf Nov 3, 2022
8401931
TODO: implement SrsOtpVerifier
hilmarf Nov 3, 2022
8b03e1d
introduce: "cwa-otp" header
hilmarf Nov 3, 2022
9d6530e
let's be OS independent!
hilmarf Nov 7, 2022
4dfbf8a
ensure enough space for the submission_type
hilmarf Nov 7, 2022
13785db
ValidSubmissionTypeValidatorTest
hilmarf Nov 7, 2022
0f6eaa2
test diagnosisKeyService#recordSrs
hilmarf Nov 7, 2022
5deaa9c
Merge branch 'main' into feature/srs
hilmarf Nov 8, 2022
6eef966
java17
hilmarf Nov 8, 2022
aa01812
mitigate Log Injection
hilmarf Nov 8, 2022
f5033d2
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Nov 8, 2022
2dd4afa
more integration tests - especially for BAD_REQUEST
hilmarf Nov 8, 2022
ea95d8a
fix spring-security issue
hilmarf Nov 8, 2022
c27f796
use same version as on OTC
hilmarf Nov 9, 2022
4ab961e
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Nov 10, 2022
2d73138
Merge branch 'feature/srs' into java17
hilmarf Nov 10, 2022
2da827a
revision=3.0.0
hilmarf Nov 10, 2022
8169cf6
SQL
hilmarf Nov 10, 2022
0d04eca
Java 17
hilmarf Nov 10, 2022
3b3f6d9
Java 17
hilmarf Nov 10, 2022
7187026
pacify hadolint
hilmarf Nov 11, 2022
1eeee4f
remove xmlns
hilmarf Nov 15, 2022
06d0a79
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Nov 15, 2022
db9d142
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Nov 16, 2022
27b9ad1
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Nov 21, 2022
d36007d
prepare SRS daily limit and retention
hilmarf Nov 21, 2022
67e2051
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Nov 21, 2022
873501e
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Nov 22, 2022
88ad639
draft diagnosisKeyService SRS retention policy
hilmarf Nov 22, 2022
27c4bd9
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Nov 24, 2022
1ba8f1e
Mobile-App-Config setSelfReportParameters
hilmarf Nov 24, 2022
1674433
prepare maxSrsPerDay
hilmarf Nov 24, 2022
38c6bd2
submissionServiceConfig MaxSrsPerDay
hilmarf Nov 25, 2022
f1cd3a6
pin sonar-maven-plugin version 3.9.1.2184
hilmarf Nov 25, 2022
3b07c9d
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Nov 28, 2022
3b6d92d
new certs
hilmarf Dec 1, 2022
787b6f9
SrsVerifyClient
hilmarf Dec 1, 2022
4102b8f
actuator heath test incl. srs-verify
hilmarf Dec 2, 2022
dc3d91a
use Collection in APIs; fix code smell: 'Stream.toList()'
hilmarf Dec 2, 2022
d6ba19e
ensure SRS is not uploaded to EFGS/CHGS
hilmarf Dec 2, 2022
bec78c2
filter by 'srs-days: ${MAX_NUMBER_OF_DAYS_FOR_SRS:14}'
hilmarf Dec 2, 2022
7a13574
set 'cwa-keys-truncated' header in case keys are older than 'srsDays'
hilmarf Dec 2, 2022
1b1ce31
retention policy for 'self_report_submissions' table
hilmarf Dec 2, 2022
cb6815a
better test readability
hilmarf Dec 2, 2022
084ccd7
lauch configs for eclipse
hilmarf Dec 2, 2022
844c198
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Dec 5, 2022
abe5c10
switch to com.github.erosb:everit-json-schema:1.14.1
hilmarf Dec 6, 2022
a7ecdef
switch to org.bouncycastle:bcpkix-jdk18on:1.72
hilmarf Dec 6, 2022
4072ae3
switch to org.junit.jupiter:junit-jupiter:5.9.1
hilmarf Dec 6, 2022
6df8c77
monitoring: add selfReports counter
hilmarf Dec 6, 2022
5db7e17
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Dec 6, 2022
1b31568
org.everit.json.schema.SchemaException: #: could not determine version
hilmarf Dec 6, 2022
9218b2d
postgresql:11.5 everywhere
hilmarf Dec 7, 2022
705480e
STATISTICS_PANDEMIC_RADAR_BMG
hilmarf Dec 7, 2022
eeb8fae
+ :lang
hilmarf Dec 7, 2022
7a1ba6a
fix code smells
hilmarf Dec 7, 2022
8f8b331
forkedProcessExitTimeoutInSeconds 60
hilmarf Dec 7, 2022
2e0ce41
DiagnosisKeyRepository + exists(Collection<byte[]>)
hilmarf Dec 8, 2022
97794f7
DiagnosisKeyService + exists(Collection<DiagnosisKey>)
hilmarf Dec 8, 2022
7fcc351
there is only one: Marker SECURITY
hilmarf Dec 8, 2022
a3c3721
add submission type
hilmarf Dec 8, 2022
830efac
SRS - throw DiagnosisKeyExistsAlreadyException
hilmarf Dec 8, 2022
aea8bfe
really return 400 - 'BAD REQUEST' and not http 500
hilmarf Dec 9, 2022
21c1c46
exclude outdated bouncycastle:bcpkix-jdk15on
hilmarf Dec 9, 2022
e41e0a6
log errors
hilmarf Dec 9, 2022
5afd8cf
prevent BAD SQL grammar exception
hilmarf Dec 9, 2022
0c8a550
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Dec 13, 2022
afe43c8
exclude bcpkix-jdk15on
hilmarf Dec 13, 2022
223e21c
HealthIndicator logging
hilmarf Dec 13, 2022
7c743ec
SrsOtpRedemptionResponse
hilmarf Dec 13, 2022
33dbe07
JSON desirialization of SrsOtpRedemptionResponse
hilmarf Dec 13, 2022
6315a9e
mitigate NullPointerException
hilmarf Dec 13, 2022
34b490f
SrsOtpVerifier test coverage
hilmarf Dec 13, 2022
9186f29
auto close JsonParser
hilmarf Dec 13, 2022
33b4700
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Dec 15, 2022
76288d7
set supported-countries for profile integration-test
hilmarf Dec 15, 2022
cf1d0e3
protobuf 3.21.12
hilmarf Dec 15, 2022
69e242c
Revert "protobuf 3.21.12"
hilmarf Dec 15, 2022
b83a23b
OTP syntax check for valid UUID
hilmarf Dec 15, 2022
d3cfdce
refactor
hilmarf Dec 15, 2022
f089f8f
MAX_KEYS_PER_DAY
hilmarf Dec 15, 2022
aeec6ca
refactor
hilmarf Dec 15, 2022
6ad592b
pass UUID validation check
hilmarf Dec 15, 2022
88b6917
add header "cwa-error-code": "KEYS_ALREADY_EXIST"
hilmarf Dec 15, 2022
9940fce
feign timeouts 20 seconds
hilmarf Dec 15, 2022
c80adca
feign debug loggerLevel FULL
hilmarf Dec 15, 2022
684ae30
add our own feign.Retryer
hilmarf Dec 15, 2022
0b3116d
Merge remote-tracking branch 'origin/main' into feature/srs
hilmarf Dec 16, 2022
9fc5f89
Revert "add our own feign.Retryer"
hilmarf Dec 16, 2022
7910bb1
deferredResult.setResult - instead of creating a new one
hilmarf Dec 16, 2022
f5185f3
add assertion condition
hilmarf Dec 16, 2022
31949f8
feign Retry configuration
hilmarf Dec 16, 2022
c998852
checkstyle
hilmarf Dec 16, 2022
e9d3357
indent
hilmarf Dec 16, 2022
05eda53
sonar code smell
hilmarf Dec 16, 2022
468bf57
move KEYS_ALREADY_EXIST check, before OTP redemption
hilmarf Dec 19, 2022
371a144
quick launch
hilmarf Dec 19, 2022
bba0a59
Merge branch 'main' into feature/srs
hilmarf Dec 21, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@ message SubmissionPayload {
SUBMISSION_TYPE_PCR_TEST = 0;
SUBMISSION_TYPE_RAPID_TEST = 1;
SUBMISSION_TYPE_HOST_WARNING = 2;
SUBMISSION_TYPE_SRS_SELF_TEST = 3;
SUBMISSION_TYPE_SRS_RAT = 4;
SUBMISSION_TYPE_SRS_REGISTERED_PCR = 5;
SUBMISSION_TYPE_SRS_UNREGISTERED_PCR = 6;
SUBMISSION_TYPE_SRS_RAPID_PCR = 7;
SUBMISSION_TYPE_SRS_OTHER = 8;
hilmarf marked this conversation as resolved.
Show resolved Hide resolved
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import "app/coronawarn/server/common/protocols/internal/v2/key_download_paramete
import "app/coronawarn/server/common/protocols/internal/v2/ppdd_edus_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/ppdd_els_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/ppdd_ppa_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/ppdd_srs_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/presence_tracing_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/risk_calculation_parameters.proto";

Expand Down Expand Up @@ -41,6 +42,8 @@ message ApplicationConfigurationAndroid {
CoronaTestParameters coronaTestParameters = 14;

DGCParameters dgcParameters = 15;

PPDDSelfReportSubmissionParametersAndroid selfReportParameters = 16;
}

message DiagnosisKeysDataMapping {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import "app/coronawarn/server/common/protocols/internal/v2/key_download_paramete
import "app/coronawarn/server/common/protocols/internal/v2/ppdd_edus_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/ppdd_els_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/ppdd_ppa_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/ppdd_srs_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/risk_calculation_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/presence_tracing_parameters.proto";
import "app/coronawarn/server/common/protocols/internal/v2/semantic_version.proto";
Expand Down Expand Up @@ -40,6 +41,8 @@ message ApplicationConfigurationIOS {
CoronaTestParameters coronaTestParameters = 13;

DGCParameters dgcParameters = 14;

PPDDSelfReportSubmissionParametersIOS selfReportParameters = 15;
}

message ExposureConfiguration {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
syntax = "proto3";
package app.coronawarn.server.common.protocols.internal.v2;
option java_multiple_files = true;
import "app/coronawarn/server/common/protocols/internal/v2/ppdd_ppac_parameters.proto";

message PPDDSelfReportSubmissionParametersIOS {
PPDDSelfReportSubmissionParametersCommon common = 1;
PPDDPrivacyPreservingAccessControlParametersIOS ppac = 2;
}

message PPDDSelfReportSubmissionParametersAndroid {
PPDDSelfReportSubmissionParametersCommon common = 1;
PPDDPrivacyPreservingAccessControlParametersAndroid ppac = 2;
}

message PPDDSelfReportSubmissionParametersCommon {
int32 timeSinceOnboardingInHours = 1;
int32 timeBetweenSubmissionsInDays = 2;
}