Skip to content

Commit 63faf62

Browse files
vishalegbert-ttdvishalegbert-ttd
committed
Merge remote-tracking branch 'origin/master' into vse-UID2-797-track-advertiser-token-expiry
2 parents e147a39 + c02f438 commit 63faf62

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1076
-623
lines changed

‎.github/workflows/create-release.yaml‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎.github/workflows/publish-docker-major.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Publish Major Version to Docker
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
tag:
6+
description: 'The tag to apply to the Docker file'
7+
type: string
8+
cloud_provider:
9+
type: choice
10+
description: 'The Cloud Provider to build for'
11+
options:
12+
- default
13+
- aws
14+
- gcp
15+
- azure
16+
default: default
17+
18+
jobs:
19+
build-publish-docker:
20+
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-docker-versioned.yaml@main
21+
with:
22+
tag: ${{ inputs.tag }}
23+
cloud_provider: ${{ inputs.cloud_provider }}
24+
release_type: 'Major'
25+
secrets: inherit

‎.github/workflows/publish-docker-minor.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Publish Minor Version to Docker
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
tag:
6+
description: 'The tag to apply to the Docker file'
7+
type: string
8+
cloud_provider:
9+
type: choice
10+
description: 'The Cloud Provider to build for'
11+
options:
12+
- default
13+
- aws
14+
- gcp
15+
- azure
16+
default: default
17+
18+
jobs:
19+
build-publish-docker:
20+
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-docker-versioned.yaml@main
21+
with:
22+
tag: ${{ inputs.tag }}
23+
cloud_provider: ${{ inputs.cloud_provider }}
24+
release_type: 'Minor'
25+
secrets: inherit

.github/workflows/publish-docker.yaml renamed to .github/workflows/publish-docker-patch.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
name: Publish Docker
1+
name: Publish Patch to Docker
22
on:
33
workflow_dispatch:
44
inputs:
55
tag:
66
description: 'The tag to apply to the Docker file'
77
type: string
88
cloud_provider:
9-
description: 'Must be one of [aws, gcp, azure, default]'
10-
required: false
11-
default: 'default'
12-
type: string
9+
type: choice
10+
description: 'The Cloud Provider to build for'
11+
options:
12+
- default
13+
- aws
14+
- gcp
15+
- azure
16+
default: default
1317

1418
jobs:
1519
build-publish-docker:
16-
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-docker.yaml@main
20+
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-docker-versioned.yaml@main
1721
with:
1822
tag: ${{ inputs.tag }}
1923
cloud_provider: ${{ inputs.cloud_provider }}
20-
secrets: inherit
24+
release_type: 'Patch'
25+
secrets: inherit

‎.github/workflows/publish-docker-snapshot.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Publish Snapshot to Docker
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
tag:
6+
description: 'The tag to apply to the Docker file'
7+
type: string
8+
cloud_provider:
9+
type: choice
10+
description: 'The Cloud Provider to build for'
11+
options:
12+
- default
13+
- aws
14+
- gcp
15+
- azure
16+
default: default
17+
18+
jobs:
19+
build-publish-docker:
20+
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-docker-versioned.yaml@main
21+
with:
22+
tag: ${{ inputs.tag }}
23+
cloud_provider: ${{ inputs.cloud_provider }}
24+
release_type: 'Snapshot'
25+
secrets: inherit

‎.github/workflows/validate-image.yaml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,40 @@
11
name: Validate Docker Image
22
on:
33
workflow_dispatch:
4+
inputs:
45
failure_severity:
56
description: 'Must be one of CRITICAL, HIGH, MEDIUM'
67
required: false
7-
default: 'CRITICAL'
8-
type: string
8+
default: 'HIGH'
9+
fail_on_error:
10+
description: 'If true, will fail the build if vulnerabilities are found'
11+
required: true
12+
type: boolean
13+
default: true
914
schedule:
1015
- cron: '0 20 * * *' #every day at 20:00
1116

1217
jobs:
1318
build-publish-docker-default:
1419
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@main
1520
with:
16-
failure_severity: ${{ inputs.failure_severity || 'CRITICAL'}}
21+
failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
22+
fail_on_error: ${{ inputs.fail_on_error || true }}
1723
cloud_provider: 'default'
1824
secrets: inherit
1925
build-publish-docker-aws:
2026
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@main
2127
with:
22-
failure_severity: ${{ inputs.failure_severity || 'CRITICAL'}}
28+
failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
29+
fail_on_error: ${{ inputs.fail_on_error || true }}
2330
cloud_provider: 'aws'
2431
secrets: inherit
2532
needs: [build-publish-docker-default]
2633
build-publish-docker-gcp:
2734
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@main
2835
with:
29-
failure_severity: ${{ inputs.failure_severity || 'CRITICAL'}}
36+
failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
37+
fail_on_error: ${{ inputs.fail_on_error || true }}
3038
cloud_provider: 'gcp'
3139
secrets: inherit
32-
needs: [build-publish-docker-aws]
40+
needs: [build-publish-docker-aws]

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin@sha256:c99492a6cf649269c2e39f468fa64dacca233e362059ce1deb218c56e51969a0
1+
FROM eclipse-temurin@sha256:d19c17f59e768549cd3d26f577be73b5e26e652dd66210d91a6738a355aa1dfe
22

33
WORKDIR /app
44
EXPOSE 8080

‎Dockerfile.nitro.builder‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ RUN mvn package -B -Paws -DskipTests=true \
2323
&& (mvn help:evaluate -Dexpression=project.version | grep -e '^[1-9][^\[]' > ./package.version)
2424

2525
# build libjnsm.so
26-
RUN git clone https://github.com/IABTechLab/nsm-java.git \
27-
&& (cd nsm-java/jnsm; cargo build --lib --release; cd ../..) \
28-
&& cp nsm-java/jnsm/target/release/libjnsm.so .
26+
RUN git clone https://github.com/IABTechLab/uid2-attestation-aws.git \
27+
&& (cd uid2-attestation-aws/jnsm; cargo build --lib --release; cd ../..) \
28+
&& cp uid2-attestation-aws/jnsm/target/release/libjnsm.so .
2929

3030
# build vsockpx
31-
RUN git clone https://github.com/IABTechLab/vsock-skeleton-key.git \
32-
&& mkdir vsock-skeleton-key/build \
33-
&& (cd vsock-skeleton-key/build; cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo; make; cd ../..) \
34-
&& cp vsock-skeleton-key/build/vsock-bridge/src/vsock-bridge ./vsockpx
31+
RUN git clone https://github.com/IABTechLab/uid2-aws-enclave-vsockproxy.git \
32+
&& mkdir uid2-aws-enclave-vsockproxy/build \
33+
&& (cd uid2-aws-enclave-vsockproxy/build; cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo; make; cd ../..) \
34+
&& cp uid2-aws-enclave-vsockproxy/build/vsock-bridge/src/vsock-bridge ./vsockpx

‎conf/local-config.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"refresh_token_expires_after_seconds": 86400,
1010
"refresh_identity_token_after_seconds": 900,
1111
"advertising_token_v3": false,
12+
"advertising_token_v4": false,
1213
"refresh_token_v3": false,
1314
"identity_v3": false,
1415
"identity_scope": "uid2",
@@ -27,4 +28,4 @@
2728
"optout_heap_default_capacity": 8192,
2829
"optout_max_partitions": 30,
2930
"optout_partition_interval": 86400
30-
}
31+
}

‎conf/local-e2e-docker-private-config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"storage_mock": true,
44
"enforce_https": false,
55
"core_attest_url": "http://core:8088/attest",
6-
"core_api_token": "OPINTAjLRWcVlCDl9+BbwR38gzxYdiWFa751ynWLuI7JU4iA=",
6+
"core_api_token": "OPLCLAjLRWcVlCDl9+BbwR38gzxYdiWFa751ynWLuI7JU4iA=",
77
"clients_metadata_path": "http://core:8088/clients/refresh",
88
"keys_metadata_path": "http://core:8088/key/refresh",
99
"keys_acl_metadata_path": "http://core:8088/key/acl/refresh",

0 commit comments

Comments
 (0)